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

GitClient: Make styleColorName() a public function

Browse Source 
To reuse it in other Git source files.

Change-Id: I3303a7f2b70a0e8b6752ef9933eb381795031a07
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Andre Hartmann
2024-08-07 12:28:21 +02:00
committed by André Hartmann
parent 5a300a7fb7
commit bcf0335b90
2 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,17 +103,6 @@ static QString branchesDisplay(const QString &prefix, QStringList *branches, boo
return output; return output;
} }
static QString logColorName(TextEditor::TextStyle style)
{
using namespace TextEditor;
const ColorScheme &scheme = TextEditorSettings::fontSettings().colorScheme();
QColor color = scheme.formatFor(style).foreground();
if (!color.isValid())
color = scheme.formatFor(C_TEXT).foreground();
return color.name();
};
/////////////////////////////// ///////////////////////////////
static void stage(DiffEditorController *diffController, const QString &patch, bool revert) static void stage(DiffEditorController *diffController, const QString &patch, bool revert)
@@ -365,7 +354,7 @@ ShowController::ShowController(IDocument *document, const QString &id)
setDisplayName("Git Show"); setDisplayName("Git Show");
setAnsiEnabled(true); setAnsiEnabled(true);
static const QString busyMessage = Tr::tr("<resolving>"); static const QString busyMessage = Tr::tr("<resolving>");
const QColor color = QColor::fromString(logColorName(TextEditor::C_LOG_DECORATION)); const QColor color = QColor::fromString(GitClient::styleColorName(TextEditor::C_LOG_DECORATION));
const QString decorateColor = AnsiEscapeCodeHandler::ansiFromColor(color); const QString decorateColor = AnsiEscapeCodeHandler::ansiFromColor(color);
const QString noColor = AnsiEscapeCodeHandler::noColor(); const QString noColor = AnsiEscapeCodeHandler::noColor();
@@ -401,11 +390,11 @@ ShowController::ShowController(IDocument *document, const QString &id)
const auto onDescriptionSetup = [this, id](Process &process) { const auto onDescriptionSetup = [this, id](Process &process) {
process.setCodec(gitClient().encoding(GitClient::EncodingCommit, workingDirectory())); process.setCodec(gitClient().encoding(GitClient::EncodingCommit, workingDirectory()));
const QString authorName = logColorName(TextEditor::C_LOG_AUTHOR_NAME); const QString authorName = GitClient::styleColorName(TextEditor::C_LOG_AUTHOR_NAME);
const QString commitDate = logColorName(TextEditor::C_LOG_COMMIT_DATE); const QString commitDate = GitClient::styleColorName(TextEditor::C_LOG_COMMIT_DATE);
const QString commitHash = logColorName(TextEditor::C_LOG_COMMIT_HASH); const QString commitHash = GitClient::styleColorName(TextEditor::C_LOG_COMMIT_HASH);
const QString commitSubject = logColorName(TextEditor::C_LOG_COMMIT_SUBJECT); const QString commitSubject = GitClient::styleColorName(TextEditor::C_LOG_COMMIT_SUBJECT);
const QString decoration = logColorName(TextEditor::C_LOG_DECORATION); const QString decoration = GitClient::styleColorName(TextEditor::C_LOG_DECORATION);
const QString showFormat = QStringLiteral( const QString showFormat = QStringLiteral(
"--pretty=format:" "--pretty=format:"
@@ -699,11 +688,11 @@ public:
QStringList graphArguments() const QStringList graphArguments() const
{ {
const QString authorName = logColorName(TextEditor::C_LOG_AUTHOR_NAME); const QString authorName = GitClient::styleColorName(TextEditor::C_LOG_AUTHOR_NAME);
const QString commitDate = logColorName(TextEditor::C_LOG_COMMIT_DATE); const QString commitDate = GitClient::styleColorName(TextEditor::C_LOG_COMMIT_DATE);
const QString commitHash = logColorName(TextEditor::C_LOG_COMMIT_HASH); const QString commitHash = GitClient::styleColorName(TextEditor::C_LOG_COMMIT_HASH);
const QString commitSubject = logColorName(TextEditor::C_LOG_COMMIT_SUBJECT); const QString commitSubject = GitClient::styleColorName(TextEditor::C_LOG_COMMIT_SUBJECT);
const QString decoration = logColorName(TextEditor::C_LOG_DECORATION); const QString decoration = GitClient::styleColorName(TextEditor::C_LOG_DECORATION);
const QString formatArg = QStringLiteral( const QString formatArg = QStringLiteral(
"--pretty=format:" "--pretty=format:"
@@ -1035,11 +1024,11 @@ static QStringList normalLogArguments()
if (!gitHasRgbColors()) if (!gitHasRgbColors())
return {}; return {};
const QString authorName = logColorName(TextEditor::C_LOG_AUTHOR_NAME); const QString authorName = GitClient::styleColorName(TextEditor::C_LOG_AUTHOR_NAME);
const QString commitDate = logColorName(TextEditor::C_LOG_COMMIT_DATE); const QString commitDate = GitClient::styleColorName(TextEditor::C_LOG_COMMIT_DATE);
const QString commitHash = logColorName(TextEditor::C_LOG_COMMIT_HASH); const QString commitHash = GitClient::styleColorName(TextEditor::C_LOG_COMMIT_HASH);
const QString commitSubject = logColorName(TextEditor::C_LOG_COMMIT_SUBJECT); const QString commitSubject = GitClient::styleColorName(TextEditor::C_LOG_COMMIT_SUBJECT);
const QString decoration = logColorName(TextEditor::C_LOG_DECORATION); const QString decoration = GitClient::styleColorName(TextEditor::C_LOG_DECORATION);
const QString logArgs = QStringLiteral( const QString logArgs = QStringLiteral(
"--pretty=format:" "--pretty=format:"
@@ -3472,6 +3461,17 @@ void GitClient::readConfigAsync(const FilePath &workingDirectory, const QStringL
configFileCodec()); configFileCodec());
} }
QString GitClient::styleColorName(TextEditor::TextStyle style)
{
using namespace TextEditor;
const ColorScheme &scheme = TextEditorSettings::fontSettings().colorScheme();
QColor color = scheme.formatFor(style).foreground();
if (!color.isValid())
color = scheme.formatFor(C_TEXT).foreground();
return color.name();
}
static QVersionNumber parseGitVersion(const QString &output) static QVersionNumber parseGitVersion(const QString &output)
{ {
// cut 'git version 1.6.5.1.sha' // cut 'git version 1.6.5.1.sha'

4
src/plugins/git/gitclient.h
View File

@@ -10,6 +10,8 @@
#include <coreplugin/editormanager/ieditor.h> #include <coreplugin/editormanager/ieditor.h>
#include <coreplugin/iversioncontrol.h> #include <coreplugin/iversioncontrol.h>
#include <texteditor/texteditorconstants.h>
#include <vcsbase/vcsbaseclient.h> #include <vcsbase/vcsbaseclient.h>
#include <QStringList> #include <QStringList>
@@ -340,6 +342,8 @@ public:
void readConfigAsync(const Utils::FilePath &workingDirectory, const QStringList &arguments, void readConfigAsync(const Utils::FilePath &workingDirectory, const QStringList &arguments,
const VcsBase::CommandHandler &handler) const; const VcsBase::CommandHandler &handler) const;
static QString styleColorName(TextEditor::TextStyle style);
private: private:
static GitSettings &settings(); static GitSettings &settings();