summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2018-08-28 00:05:48 +0300
committerOrgad Shaneh <orgads@gmail.com>2018-08-28 07:27:12 +0000
commitd3998c6319e4f54a18d3627912dc97834f31ab9b (patch)
tree87ed47a290f5d4340395f2b04925325f9c5ae693
parent3cc4d744656310ad5fe4f7e9441d3051dca004d3 (diff)
Adapt to upstream VCS change
Change-Id: I4097fb789a887e656d510a3fff67f5bf396a9a0a Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
-rw-r--r--plugins/fossil/constants.h3
-rw-r--r--plugins/fossil/fossilplugin.cpp23
-rw-r--r--plugins/fossil/fossilplugin.h7
3 files changed, 1 insertions, 32 deletions
diff --git a/plugins/fossil/constants.h b/plugins/fossil/constants.h
index e15a8e7..b1e6170 100644
--- a/plugins/fossil/constants.h
+++ b/plugins/fossil/constants.h
@@ -93,9 +93,6 @@ const char COMMIT[] = "Fossil.Action.Commit";
const char CONFIGURE_REPOSITORY[] = "Fossil.Action.Settings";
const char CREATE_REPOSITORY[] = "Fossil.Action.CreateRepository";
-//submit editor actions
-const char DIFFEDITOR[] = "Fossil.Action.Editor.Diff";
-
// File status hint
const char FSTATUS_ADDED[] = "Added";
const char FSTATUS_ADDED_BY_MERGE[] = "Added by Merge";
diff --git a/plugins/fossil/fossilplugin.cpp b/plugins/fossil/fossilplugin.cpp
index 206e5bc..8ee4618 100644
--- a/plugins/fossil/fossilplugin.cpp
+++ b/plugins/fossil/fossilplugin.cpp
@@ -149,8 +149,6 @@ bool FossilPlugin::initialize(const QStringList &arguments, QString *errorMessag
createMenu(context);
- createSubmitEditorActions();
-
Core::HelpManager::registerDocumentation({Core::ICore::documentationPath()
+ "/fossil.qch"});
@@ -529,26 +527,6 @@ void FossilPlugin::configureRepository()
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()
{
if (!promptBeforeCommit())
@@ -615,7 +593,6 @@ void FossilPlugin::showCommitWidget(const QList<VcsBase::VcsBaseClient::StatusIt
tags.removeAll(currentBranch.name());
commitEditor->setFields(m_submitRepository, currentBranch, tags, currentUser, status);
- commitEditor->registerActions(m_editorUndo, m_editorRedo, m_editorCommit, m_editorDiff);
connect(commitEditor, &VcsBase::VcsBaseSubmitEditor::diffSelectedFiles,
this, &FossilPlugin::diffFromEditorSelected);
commitEditor->setCheckScriptWorkingDirectory(m_submitRepository);
diff --git a/plugins/fossil/fossilplugin.h b/plugins/fossil/fossilplugin.h
index 60e6c33..2a67cc6 100644
--- a/plugins/fossil/fossilplugin.h
+++ b/plugins/fossil/fossilplugin.h
@@ -91,13 +91,12 @@ private:
void configureRepository();
void commit();
void showCommitWidget(const QList<VcsBase::VcsBaseClient::StatusItem> &status);
- void commitFromEditor();
+ void commitFromEditor() override;
void diffFromEditorSelected(const QStringList &files);
void createRepository();
// Methods
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);
@@ -124,10 +123,6 @@ private:
QAction *m_createRepositoryAction = 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;