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

Git: Add color to ChangeSelectionDialog

Browse Source 
As already used in diff description and log.

Change-Id: I3ad3a6beb48d96a3680da90e0a16d53e889670a1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Andre Hartmann
2024-09-02 20:53:38 +02:00
committed by André Hartmann
parent 269bb4a3ea
commit 66da2150ef
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/git/changeselectiondialog.cpp
View File

@@ -9,6 +9,7 @@
#include <coreplugin/vcsmanager.h> #include <coreplugin/vcsmanager.h>
#include <utils/ansiescapecodehandler.h>
#include <utils/completinglineedit.h> #include <utils/completinglineedit.h>
#include <utils/layoutbuilder.h> #include <utils/layoutbuilder.h>
#include <utils/pathchooser.h> #include <utils/pathchooser.h>
@@ -174,7 +175,8 @@ void ChangeSelectionDialog::setDetails()
{ {
QPalette palette; QPalette palette;
if (m_process->result() == ProcessResult::FinishedWithSuccess) { if (m_process->result() == ProcessResult::FinishedWithSuccess) {
m_detailsText->setPlainText(m_process->cleanedStdOut()); const QString text = m_process->cleanedStdOut();
AnsiEscapeCodeHandler::setTextInEditor(m_detailsText, text);
palette.setColor(QPalette::Text, creatorColor(Theme::TextColorNormal)); palette.setColor(QPalette::Text, creatorColor(Theme::TextColorNormal));
m_changeNumberEdit->setPalette(palette); m_changeNumberEdit->setPalette(palette);
} else if (m_process->result() == ProcessResult::StartFailed) { } else if (m_process->result() == ProcessResult::StartFailed) {
@@ -240,7 +242,19 @@ void ChangeSelectionDialog::recalculateDetails()
connect(m_process.get(), &Process::done, this, &ChangeSelectionDialog::setDetails); connect(m_process.get(), &Process::done, this, &ChangeSelectionDialog::setDetails);
m_process->setWorkingDirectory(workingDir); m_process->setWorkingDirectory(workingDir);
m_process->setEnvironment(m_gitEnvironment); m_process->setEnvironment(m_gitEnvironment);
m_process->setCommand({m_gitExecutable, {"show", "--decorate", "--stat=80", ref}});
const ColorNames colors = GitClient::colorNames();
const QString showFormat = QStringLiteral(
"--pretty=format:"
"commit %C(%1)%H%Creset %C(%2)%d%Creset%n"
"Author: %C(%3)%aN <%aE>%Creset%n"
"Date: %C(%4)%ad (%ar)%Creset%n"
"%n%C(%5)%s%Creset%n%n%b"
).arg(colors.hash, colors.decoration, colors.author,
colors.date, colors.subject);
m_process->setCommand({m_gitExecutable, {"show", "--decorate", "--stat=80",
"--color=always", showFormat, ref}});
m_process->start(); m_process->start();
m_detailsText->setPlainText(Tr::tr("Fetching commit data...")); m_detailsText->setPlainText(Tr::tr("Fetching commit data..."));
} }