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

Vcs: Move handling of settings from VcsBaseClient to VcsBaseClientImpl

Browse Source 
... and update users of that functionality accordingly.

Unexpected plus: Now every supported VCS actually saves their setting
when requested.

Change-Id: I02db7b2ce14e5f52d26409b2a01aea290c2a294a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tobias Hunger
2015-03-26 12:22:29 +01:00
parent d3100774f9
commit 90ce38da39
49 changed files with 342 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/mercurial/optionspage.cpp
View File

@@ -29,6 +29,8 @@
****************************************************************************/
#include "optionspage.h"
#include "mercurialclient.h"
#include "mercurialsettings.h"
#include "mercurialplugin.h"
@@ -38,6 +40,8 @@
#include <QTextStream>
using namespace VcsBase;
namespace Mercurial {
namespace Internal {
@@ -50,9 +54,9 @@ OptionsPageWidget::OptionsPageWidget(QWidget *parent) :
m_ui.commandChooser->setPromptDialogTitle(tr("Mercurial Command"));
}
MercurialSettings OptionsPageWidget::settings() const
VcsBaseClientSettings OptionsPageWidget::settings() const
{
MercurialSettings s = MercurialPlugin::settings();
MercurialSettings s;
s.setValue(MercurialSettings::binaryPathKey, m_ui.commandChooser->rawPath());
s.setValue(MercurialSettings::userNameKey, m_ui.defaultUsernameLineEdit->text().trimmed());
s.setValue(MercurialSettings::userEmailKey, m_ui.defaultEmailLineEdit->text().trimmed());
@@ -61,7 +65,7 @@ MercurialSettings OptionsPageWidget::settings() const
return s;
}
void OptionsPageWidget::setSettings(const MercurialSettings &s)
void OptionsPageWidget::setSettings(const VcsBaseClientSettings &s)
{
m_ui.commandChooser->setPath(s.stringValue(MercurialSettings::binaryPathKey));
m_ui.defaultUsernameLineEdit->setText(s.stringValue(MercurialSettings::userNameKey));
@@ -80,7 +84,7 @@ QWidget *OptionsPage::widget()
{
if (!optionsPageWidget)
optionsPageWidget = new OptionsPageWidget;
optionsPageWidget->setSettings(MercurialPlugin::settings());
optionsPageWidget->setSettings(MercurialPlugin::client()->settings());
return optionsPageWidget;
}
@@ -88,13 +92,15 @@ void OptionsPage::apply()
{
if (!optionsPageWidget)
return;
const MercurialSettings newSettings = optionsPageWidget->settings();
if (newSettings != MercurialPlugin::settings()) {
//assume success and emit signal that settings are changed;
MercurialPlugin::setSettings(newSettings);
newSettings.writeSettings(Core::ICore::settings());
const VcsBaseClientSettings newSettings = optionsPageWidget->settings();
VcsBaseClientSettings &s = MercurialPlugin::instance()->client()->settings();
if (s != newSettings) {
s = newSettings;
s.writeSettings(Core::ICore::settings());
emit settingsChanged();
}
}
void OptionsPage::finish()