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

Git: Allow for pretty format selection in git show

Browse Source 
Allow for pretty format selection in git show.

Save selected value and default to "email".

Task-number: QTCREATORBUG-3341
This commit is contained in:
Tobias Hunger
2010-12-09 15:53:45 +01:00
parent 1312a04221
commit 827800c2c4
4 changed files with 79 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/git/gitsettings.cpp
View File

@@ -49,6 +49,7 @@ static const char ignoreSpaceChangesDiffKeyC[] = "SpaceIgnorantDiff";
static const char diffPatienceKeyC[] = "DiffPatience";
static const char winSetHomeEnvironmentKeyC[] = "WinSetHomeEnvironment";
static const char gitkOptionsKeyC[] = "GitKOptions";
static const char showPrettyFormatC[] = "DiffPrettyFormat";
enum {
defaultPullRebase = 0,
@@ -73,7 +74,8 @@ GitSettings::GitSettings() :
ignoreSpaceChangesInDiff(false),
ignoreSpaceChangesInBlame(true),
diffPatience(true),
winSetHomeEnvironment(false)
winSetHomeEnvironment(false),
showPrettyFormat(5)
{
}
@@ -92,6 +94,7 @@ void GitSettings::fromSettings(QSettings *settings)
diffPatience = settings->value(QLatin1String(diffPatienceKeyC), true).toBool();
winSetHomeEnvironment = settings->value(QLatin1String(winSetHomeEnvironmentKeyC), false).toBool();
gitkOptions = settings->value(QLatin1String(gitkOptionsKeyC)).toString();
showPrettyFormat = settings->value(QLatin1String(showPrettyFormatC), 5).toInt();
settings->endGroup();
}
@@ -110,6 +113,7 @@ void GitSettings::toSettings(QSettings *settings) const
settings->setValue(QLatin1String(diffPatienceKeyC), diffPatience);
settings->setValue(QLatin1String(winSetHomeEnvironmentKeyC), winSetHomeEnvironment);
settings->setValue(QLatin1String(gitkOptionsKeyC), gitkOptions);
settings->setValue(QLatin1String(showPrettyFormatC), showPrettyFormat);
settings->endGroup();
}
@@ -122,7 +126,7 @@ bool GitSettings::equals(const GitSettings &s) const
&& ignoreSpaceChangesInBlame == s.ignoreSpaceChangesInBlame
&& ignoreSpaceChangesInDiff == s.ignoreSpaceChangesInDiff
&& diffPatience == s.diffPatience && winSetHomeEnvironment == s.winSetHomeEnvironment
&& gitkOptions == s.gitkOptions;
&& gitkOptions == s.gitkOptions && showPrettyFormat == s.showPrettyFormat;
}
QString GitSettings::gitBinaryPath(bool *ok, QString *errorMessage) const