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

VCS[git]: Add arguments setting for gitk, add to locator.

Browse Source 
Task-number: QTCREATORBUG-1577
This commit is contained in:
Friedemann Kleint
2010-06-16 09:05:50 +02:00
parent f96efa07e1
commit 6793f1f962
6 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,6 +46,7 @@ static const char promptToSubmitKeyC[] = "PromptForSubmit";
static const char omitAnnotationDateKeyC[] = "OmitAnnotationDate";
static const char spaceIgnorantBlameKeyC[] = "SpaceIgnorantBlame";
static const char diffPatienceKeyC[] = "DiffPatience";
static const char gitkOptionsKeyC[] = "GitKOptions";
enum {
defaultPullRebase = 0,
@@ -84,6 +85,7 @@ void GitSettings::fromSettings(QSettings *settings)
omitAnnotationDate = settings->value(QLatin1String(omitAnnotationDateKeyC), false).toBool();
spaceIgnorantBlame = settings->value(QLatin1String(spaceIgnorantBlameKeyC), true).toBool();
diffPatience = settings->value(QLatin1String(diffPatienceKeyC), true).toBool();
gitkOptions = settings->value(QLatin1String(gitkOptionsKeyC)).toString();
settings->endGroup();
}
@@ -99,6 +101,7 @@ void GitSettings::toSettings(QSettings *settings) const
settings->setValue(QLatin1String(omitAnnotationDateKeyC), omitAnnotationDate);
settings->setValue(QLatin1String(spaceIgnorantBlameKeyC), spaceIgnorantBlame);
settings->setValue(QLatin1String(diffPatienceKeyC), diffPatience);
settings->setValue(QLatin1String(gitkOptionsKeyC), gitkOptions);
settings->endGroup();
}
@@ -108,7 +111,8 @@ bool GitSettings::equals(const GitSettings &s) const
&& timeoutSeconds == s.timeoutSeconds && promptToSubmit == s.promptToSubmit
&& pullRebase == s.pullRebase
&& omitAnnotationDate == s.omitAnnotationDate && spaceIgnorantBlame == s.spaceIgnorantBlame
&& diffPatience == s.diffPatience;
&& diffPatience == s.diffPatience
&& gitkOptions == s.gitkOptions;
}
QString GitSettings::gitBinaryPath(bool *ok, QString *errorMessage) const