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

Gerrit: Remove the "Always prompt" setting

Browse Source 
It's confusing. The user can just choose the path in the dialog rather
than in a popup

Change-Id: I91422ec9baf5508d3e3d2e552afc6b955fd84748
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2014-04-02 23:12:39 +03:00
committed by Orgad Shaneh
parent efecd15b1e
commit f7db3258b4
6 changed files with 5 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/git/gerrit/gerritparameters.cpp
View File

@@ -52,7 +52,6 @@ static const char portFlagKeyC[] = "PortFlag";
static const char sshKeyC[] = "Ssh";
static const char repositoryKeyC[] = "RepoPath";
static const char httpsKeyC[] = "Https";
static const char promptPathKeyC[] = "PromptPath";
static const char defaultHostC[] = "codereview.qt-project.org";
static const char defaultSshC[] = "ssh";
static const char savedQueriesKeyC[] = "SavedQueries";
@@ -101,7 +100,6 @@ GerritParameters::GerritParameters()
: host(QLatin1String(defaultHostC))
, port(defaultPort)
, https(true)
, promptPath(true)
, portFlag(QLatin1String(defaultPortFlag))
{
}
@@ -121,7 +119,7 @@ QString GerritParameters::sshHostArgument() const
bool GerritParameters::equals(const GerritParameters &rhs) const
{
return port == rhs.port && host == rhs.host && user == rhs.user && promptPath == rhs.promptPath
return port == rhs.port && host == rhs.host && user == rhs.user
&& ssh == rhs.ssh && https == rhs.https && repositoryPath == rhs.repositoryPath;
}
@@ -135,7 +133,6 @@ void GerritParameters::toSettings(QSettings *s) const
s->setValue(QLatin1String(sshKeyC), ssh);
s->setValue(QLatin1String(repositoryKeyC), repositoryPath);
s->setValue(QLatin1String(httpsKeyC), https);
s->setValue(QLatin1String(promptPathKeyC), promptPath);
s->endGroup();
}
@@ -158,7 +155,6 @@ void GerritParameters::fromSettings(const QSettings *s)
savedQueries = s->value(rootKey + QLatin1String(savedQueriesKeyC), QString()).toString()
.split(QLatin1String(","));
https = s->value(rootKey + QLatin1String(httpsKeyC), QVariant(true)).toBool();
promptPath = s->value(rootKey + QLatin1String(promptPathKeyC), QVariant(true)).toBool();
if (ssh.isEmpty())
ssh = detectSsh();
}