aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/bazaar
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2018-08-28 00:03:59 +0300
committerOrgad Shaneh <orgads@gmail.com>2018-08-28 07:26:14 +0000
commit767137157e4971413ee0ab4f9ee5ea48a2b43737 (patch)
treed0397f2692a7cc469863ba84de647a81f51d2dc6 /src/plugins/bazaar
parentf1f506b47970b746d472acb65eb94014f9fafe33 (diff)
VCS: Consolidate submit editor actions setup
Change-Id: I36754779b6a9aa35de705b368daf8c2a1de058c6 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/bazaar')
-rw-r--r--src/plugins/bazaar/bazaarplugin.cpp26
-rw-r--r--src/plugins/bazaar/bazaarplugin.h8
2 files changed, 1 insertions, 33 deletions
diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp
index 8d6b62e29c..707ad88c2e 100644
--- a/src/plugins/bazaar/bazaarplugin.cpp
+++ b/src/plugins/bazaar/bazaarplugin.cpp
@@ -104,9 +104,6 @@ const char COMMIT[] = "Bazaar.Action.Commit";
const char UNCOMMIT[] = "Bazaar.Action.UnCommit";
const char CREATE_REPOSITORY[] = "Bazaar.Action.CreateRepository";
-// Submit editor actions
-const char DIFFEDITOR[] = "Bazaar.Action.Editor.Diff";
-
const VcsBaseEditorParameters editorParameters[] = {
{ LogOutput, // type
Constants::FILELOG_ID, // id
@@ -175,8 +172,6 @@ bool BazaarPlugin::initialize(const QStringList &arguments, QString *errorMessag
createMenu(context);
- createSubmitEditorActions();
-
return true;
}
@@ -486,26 +481,6 @@ void BazaarPlugin::update()
m_client->update(state.topLevel(), revertUi.revisionLineEdit->text());
}
-void BazaarPlugin::createSubmitEditorActions()
-{
- Context context(COMMIT_ID);
- Command *command;
-
- m_editorCommit = new QAction(VcsBaseSubmitEditor::submitIcon(), tr("Commit"), this);
- command = ActionManager::registerAction(m_editorCommit, COMMIT, context);
- command->setAttribute(Command::CA_UpdateText);
- connect(m_editorCommit, &QAction::triggered, this, &BazaarPlugin::commitFromEditor);
-
- m_editorDiff = new QAction(VcsBaseSubmitEditor::diffIcon(), tr("Diff &Selected Files"), this);
- ActionManager::registerAction(m_editorDiff, DIFFEDITOR, context);
-
- m_editorUndo = new QAction(tr("&Undo"), this);
- ActionManager::registerAction(m_editorUndo, Core::Constants::UNDO, context);
-
- m_editorRedo = new QAction(tr("&Redo"), this);
- ActionManager::registerAction(m_editorRedo, Core::Constants::REDO, context);
-}
-
void BazaarPlugin::commit()
{
if (!promptBeforeCommit())
@@ -559,7 +534,6 @@ void BazaarPlugin::showCommitWidget(const QList<VcsBaseClient::StatusItem> &stat
}
setSubmitEditor(commitEditor);
- commitEditor->registerActions(m_editorUndo, m_editorRedo, m_editorCommit, m_editorDiff);
connect(commitEditor, &VcsBaseSubmitEditor::diffSelectedFiles,
this, &BazaarPlugin::diffFromEditorSelected);
commitEditor->setCheckScriptWorkingDirectory(m_submitRepository);
diff --git a/src/plugins/bazaar/bazaarplugin.h b/src/plugins/bazaar/bazaarplugin.h
index 8e8c9dbfba..54184f5598 100644
--- a/src/plugins/bazaar/bazaarplugin.h
+++ b/src/plugins/bazaar/bazaarplugin.h
@@ -96,13 +96,12 @@ private:
void update();
void commit();
void showCommitWidget(const QList<VcsBase::VcsBaseClient::StatusItem> &status);
- void commitFromEditor();
+ void commitFromEditor() override;
void uncommit();
void diffFromEditorSelected(const QStringList &files);
// Functions
void createMenu(const Core::Context &context);
- void createSubmitEditorActions();
void createFileActions(const Core::Context &context);
void createDirectoryActions(const Core::Context &context);
void createRepositoryActions(const Core::Context &context);
@@ -127,11 +126,6 @@ private:
Utils::ParameterAction *m_revertFile = nullptr;
Utils::ParameterAction *m_statusFile = nullptr;
- // Submit editor actions
- QAction *m_editorCommit = nullptr;
- QAction *m_editorDiff = nullptr;
- QAction *m_editorUndo = nullptr;
- QAction *m_editorRedo = nullptr;
QAction *m_menuAction = nullptr;
QString m_submitRepository;