feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Adapt to upstream VCS change

Browse Source 
Change-Id: I4097fb789a887e656d510a3fff67f5bf396a9a0a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Orgad Shaneh
2018-08-28 00:05:48 +03:00
committed by Orgad Shaneh
parent 3cc4d74465
commit d3998c6319
3 changed files with 1 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/fossil/constants.h
View File

@@ -93,9 +93,6 @@ const char COMMIT[] = "Fossil.Action.Commit";
const char CONFIGURE_REPOSITORY[] = "Fossil.Action.Settings"; const char CONFIGURE_REPOSITORY[] = "Fossil.Action.Settings";
const char CREATE_REPOSITORY[] = "Fossil.Action.CreateRepository"; const char CREATE_REPOSITORY[] = "Fossil.Action.CreateRepository";
//submit editor actions
const char DIFFEDITOR[] = "Fossil.Action.Editor.Diff";
// File status hint // File status hint
const char FSTATUS_ADDED[] = "Added"; const char FSTATUS_ADDED[] = "Added";
const char FSTATUS_ADDED_BY_MERGE[] = "Added by Merge"; const char FSTATUS_ADDED_BY_MERGE[] = "Added by Merge";

23
plugins/fossil/fossilplugin.cpp
View File

@@ -149,8 +149,6 @@ bool FossilPlugin::initialize(const QStringList &arguments, QString *errorMessag
createMenu(context); createMenu(context);
createSubmitEditorActions();
Core::HelpManager::registerDocumentation({Core::ICore::documentationPath() Core::HelpManager::registerDocumentation({Core::ICore::documentationPath()
+ "/fossil.qch"}); + "/fossil.qch"});
@@ -529,26 +527,6 @@ void FossilPlugin::configureRepository()
m_client->synchronousConfigureRepository(state.topLevel(), newSettings, currentSettings); m_client->synchronousConfigureRepository(state.topLevel(), newSettings, currentSettings);
} }
void FossilPlugin::createSubmitEditorActions()
{
Core::Context context(Constants::COMMIT_ID);
Core::Command *command;
m_editorCommit = new QAction(VcsBase::VcsBaseSubmitEditor::submitIcon(), tr("Commit"), this);
command = Core::ActionManager::registerAction(m_editorCommit, Constants::COMMIT, context);
command->setAttribute(Core::Command::CA_UpdateText);
connect(m_editorCommit, &QAction::triggered, this, &FossilPlugin::commitFromEditor);
m_editorDiff = new QAction(VcsBase::VcsBaseSubmitEditor::diffIcon(), tr("Diff &Selected Files"), this);
command = Core::ActionManager::registerAction(m_editorDiff, Constants::DIFFEDITOR, context);
m_editorUndo = new QAction(tr("&Undo"), this);
command = Core::ActionManager::registerAction(m_editorUndo, Core::Constants::UNDO, context);
m_editorRedo = new QAction(tr("&Redo"), this);
command = Core::ActionManager::registerAction(m_editorRedo, Core::Constants::REDO, context);
}
void FossilPlugin::commit() void FossilPlugin::commit()
{ {
if (!promptBeforeCommit()) if (!promptBeforeCommit())
@@ -615,7 +593,6 @@ void FossilPlugin::showCommitWidget(const QList<VcsBase::VcsBaseClient::StatusIt
tags.removeAll(currentBranch.name()); tags.removeAll(currentBranch.name());
commitEditor->setFields(m_submitRepository, currentBranch, tags, currentUser, status); commitEditor->setFields(m_submitRepository, currentBranch, tags, currentUser, status);
commitEditor->registerActions(m_editorUndo, m_editorRedo, m_editorCommit, m_editorDiff);
connect(commitEditor, &VcsBase::VcsBaseSubmitEditor::diffSelectedFiles, connect(commitEditor, &VcsBase::VcsBaseSubmitEditor::diffSelectedFiles,
this, &FossilPlugin::diffFromEditorSelected); this, &FossilPlugin::diffFromEditorSelected);
commitEditor->setCheckScriptWorkingDirectory(m_submitRepository); commitEditor->setCheckScriptWorkingDirectory(m_submitRepository);

7
plugins/fossil/fossilplugin.h
View File

@@ -91,13 +91,12 @@ private:
void configureRepository(); void configureRepository();
void commit(); void commit();
void showCommitWidget(const QList<VcsBase::VcsBaseClient::StatusItem> &status); void showCommitWidget(const QList<VcsBase::VcsBaseClient::StatusItem> &status);
void commitFromEditor(); void commitFromEditor() override;
void diffFromEditorSelected(const QStringList &files); void diffFromEditorSelected(const QStringList &files);
void createRepository(); void createRepository();
// Methods // Methods
void createMenu(const Core::Context &context); void createMenu(const Core::Context &context);
void createSubmitEditorActions();
void createFileActions(const Core::Context &context); void createFileActions(const Core::Context &context);
void createDirectoryActions(const Core::Context &context); void createDirectoryActions(const Core::Context &context);
void createRepositoryActions(const Core::Context &context); void createRepositoryActions(const Core::Context &context);
@@ -124,10 +123,6 @@ private:
QAction *m_createRepositoryAction = nullptr; QAction *m_createRepositoryAction = nullptr;
// Submit editor actions // Submit editor actions
QAction *m_editorCommit = nullptr;
QAction *m_editorDiff = nullptr;
QAction *m_editorUndo = nullptr;
QAction *m_editorRedo = nullptr;
QAction *m_menuAction = nullptr; QAction *m_menuAction = nullptr;
QString m_submitRepository; QString m_submitRepository;