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

Git: Refine editor names

Browse Source 
Change-Id: I8302e1341e589b3c0e39c3d6c1d73b01e142e517
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Orgad Shaneh
2020-02-18 23:31:07 +02:00
committed by Orgad Shaneh
parent c728d04b52
commit 857102748d
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/git/gitclient.cpp
View File

@@ -3117,7 +3117,7 @@ void GitClient::subversionLog(const QString &workingDirectory)
// Create a command editor, no highlighting or interaction. // Create a command editor, no highlighting or interaction.
const QString title = tr("Git SVN Log"); const QString title = tr("Git SVN Log");
const Id editorId = Git::Constants::GIT_COMMAND_LOG_EDITOR_ID; const Id editorId = Git::Constants::GIT_SVN_LOG_EDITOR_ID;
const QString sourceFile = VcsBaseEditor::getSource(workingDirectory, QStringList()); const QString sourceFile = VcsBaseEditor::getSource(workingDirectory, QStringList());
VcsBaseEditorWidget *editor = createVcsEditor(editorId, title, sourceFile, codecFor(CodecNone), VcsBaseEditorWidget *editor = createVcsEditor(editorId, title, sourceFile, codecFor(CodecNone),
"svnLog", sourceFile); "svnLog", sourceFile);

8
src/plugins/git/gitconstants.h
View File

@@ -32,10 +32,10 @@ namespace Constants {
const char GIT_PLUGIN[] = "GitPlugin"; const char GIT_PLUGIN[] = "GitPlugin";
const char GIT_COMMAND_LOG_EDITOR_ID[] = "Git Command Log Editor"; const char GIT_SVN_LOG_EDITOR_ID[] = "Git SVN Log Editor";
const char GIT_COMMAND_LOG_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Git Command Log Editor"); const char GIT_SVN_LOG_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Git SVN Log Editor");
const char GIT_LOG_EDITOR_ID[] = "Git File Log Editor"; const char GIT_LOG_EDITOR_ID[] = "Git Log Editor";
const char GIT_LOG_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Git File Log Editor"); const char GIT_LOG_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Git Log Editor");
const char GIT_BLAME_EDITOR_ID[] = "Git Annotation Editor"; const char GIT_BLAME_EDITOR_ID[] = "Git Annotation Editor";
const char GIT_BLAME_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Git Annotation Editor"); const char GIT_BLAME_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Git Annotation Editor");
const char GIT_COMMIT_TEXT_EDITOR_ID[] = "Git Commit Editor"; const char GIT_COMMIT_TEXT_EDITOR_ID[] = "Git Commit Editor";

12
src/plugins/git/gitplugin.cpp
View File

@@ -184,11 +184,11 @@ const VcsBaseSubmitEditorParameters submitParameters {
VcsBaseSubmitEditorParameters::DiffRows VcsBaseSubmitEditorParameters::DiffRows
}; };
const VcsBaseEditorParameters commandLogEditorParameters { const VcsBaseEditorParameters svnLogEditorParameters {
OtherContent, OtherContent,
Git::Constants::GIT_COMMAND_LOG_EDITOR_ID, Git::Constants::GIT_SVN_LOG_EDITOR_ID,
Git::Constants::GIT_COMMAND_LOG_EDITOR_DISPLAY_NAME, Git::Constants::GIT_SVN_LOG_EDITOR_DISPLAY_NAME,
"text/vnd.qtcreator.git.commandlog" "text/vnd.qtcreator.git.svnlog"
}; };
const VcsBaseEditorParameters logEditorParameters { const VcsBaseEditorParameters logEditorParameters {
@@ -389,8 +389,8 @@ public:
GitGrep gitGrep{&m_gitClient}; GitGrep gitGrep{&m_gitClient};
VcsEditorFactory commandLogEditorFactory { VcsEditorFactory svnLogEditorFactory {
&commandLogEditorParameters, &svnLogEditorParameters,
[] { return new GitEditorWidget; }, [] { return new GitEditorWidget; },
std::bind(&GitPluginPrivate::describe, this, _1, _2) std::bind(&GitPluginPrivate::describe, this, _1, _2)
}; };