diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2018-08-28 00:03:59 +0300 |
---|---|---|
committer | Orgad Shaneh <orgads@gmail.com> | 2018-08-28 07:26:14 +0000 |
commit | 767137157e4971413ee0ab4f9ee5ea48a2b43737 (patch) | |
tree | d0397f2692a7cc469863ba84de647a81f51d2dc6 /src/plugins/subversion/subversionplugin.cpp | |
parent | f1f506b47970b746d472acb65eb94014f9fafe33 (diff) | |
download | qt-creator-767137157e4971413ee0ab4f9ee5ea48a2b43737.tar.gz |
VCS: Consolidate submit editor actions setup
Change-Id: I36754779b6a9aa35de705b368daf8c2a1de058c6
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/subversion/subversionplugin.cpp')
-rw-r--r-- | src/plugins/subversion/subversionplugin.cpp | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index 8084e37603..37166b6450 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -386,23 +386,6 @@ bool SubversionPlugin::initialize(const QStringList & /*arguments */, QString *e subversionMenu->addAction(command); m_commandLocator->appendCommand(command); - // Actions of the submit editor - Context svncommitcontext(Constants::SUBVERSION_COMMIT_EDITOR_ID); - - m_submitCurrentLogAction = new QAction(VcsBaseSubmitEditor::submitIcon(), tr("Commit"), this); - command = ActionManager::registerAction(m_submitCurrentLogAction, SUBMIT_CURRENT, svncommitcontext); - command->setAttribute(Command::CA_UpdateText); - connect(m_submitCurrentLogAction, &QAction::triggered, this, &SubversionPlugin::submitCurrentLog); - - m_submitDiffAction = new QAction(VcsBaseSubmitEditor::diffIcon(), tr("Diff &Selected Files"), this); - ActionManager::registerAction(m_submitDiffAction , DIFF_SELECTED, svncommitcontext); - - m_submitUndoAction = new QAction(tr("&Undo"), this); - ActionManager::registerAction(m_submitUndoAction, Core::Constants::UNDO, svncommitcontext); - - m_submitRedoAction = new QAction(tr("&Redo"), this); - ActionManager::registerAction(m_submitRedoAction, Core::Constants::REDO, svncommitcontext); - return true; } @@ -485,7 +468,6 @@ SubversionSubmitEditor *SubversionPlugin::openSubversionSubmitEditor(const QStri SubversionSubmitEditor *submitEditor = qobject_cast<SubversionSubmitEditor*>(editor); QTC_ASSERT(submitEditor, return 0); setSubmitEditor(submitEditor); - submitEditor->registerActions(m_submitUndoAction, m_submitRedoAction, m_submitCurrentLogAction, m_submitDiffAction); connect(submitEditor, &VcsBaseSubmitEditor::diffSelectedFiles, this, &SubversionPlugin::diffCommitFiles); submitEditor->setCheckScriptWorkingDirectory(m_commitRepository); @@ -867,7 +849,7 @@ void SubversionPlugin::slotDescribe() describe(state.topLevel(), QString::number(revision)); } -void SubversionPlugin::submitCurrentLog() +void SubversionPlugin::commitFromEditor() { m_submitActionTriggered = true; QTC_ASSERT(submitEditor(), return); |