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

Vcs: Unify options pages for VcsBaseClientImpl based VCSes

Browse Source 
Change-Id: Ia5dd7746f5857e7254251e3510c0987737cfad6d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tobias Hunger
2015-03-27 12:55:28 +01:00
parent 9d86b7ed4e
commit 73a7732850
17 changed files with 153 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/mercurial/mercurialplugin.cpp
View File

@@ -139,8 +139,7 @@ bool MercurialPlugin::initialize(const QStringList & /* arguments */, QString *
m_client = new MercurialClient;
initializeVcs(new MercurialControl(m_client), context);
optionsPage = new OptionsPage();
addAutoReleasedObject(optionsPage);
addAutoReleasedObject(new OptionsPage(versionControl()));
connect(m_client, SIGNAL(changed(QVariant)), versionControl(), SLOT(changed(QVariant)));
connect(m_client, SIGNAL(needUpdate()), this, SLOT(update()));

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

@@ -45,8 +45,7 @@ using namespace VcsBase;
namespace Mercurial {
namespace Internal {
OptionsPageWidget::OptionsPageWidget(QWidget *parent) :
QWidget(parent)
OptionsPageWidget::OptionsPageWidget(QWidget *parent) : VcsClientOptionsPageWidget(parent)
{
m_ui.setupUi(this);
m_ui.commandChooser->setExpectedKind(Utils::PathChooser::ExistingCommand);
@@ -74,38 +73,12 @@ void OptionsPageWidget::setSettings(const VcsBaseClientSettings &s)
m_ui.timeout->setValue(s.intValue(MercurialSettings::timeoutKey));
}
OptionsPage::OptionsPage()
OptionsPage::OptionsPage(Core::IVersionControl *control) :
VcsClientOptionsPage(control, MercurialPlugin::client())
{
setId(VcsBase::Constants::VCS_ID_MERCURIAL);
setDisplayName(tr("Mercurial"));
}
QWidget *OptionsPage::widget()
{
if (!optionsPageWidget)
optionsPageWidget = new OptionsPageWidget;
optionsPageWidget->setSettings(MercurialPlugin::client()->settings());
return optionsPageWidget;
}
void OptionsPage::apply()
{
if (!optionsPageWidget)
return;
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()
{
delete optionsPageWidget;
setWidgetFactory([]() { return new OptionsPageWidget; });
}
} // namespace Internal

16
src/plugins/mercurial/optionspage.h
View File

@@ -45,7 +45,7 @@ class VcsBaseClientSettings;
namespace Mercurial {
namespace Internal {
class OptionsPageWidget : public QWidget
class OptionsPageWidget : public VcsBase::VcsClientOptionsPageWidget
{
Q_OBJECT
@@ -60,22 +60,12 @@ private:
};
class OptionsPage : public VcsBase::VcsBaseOptionsPage
class OptionsPage : public VcsBase::VcsClientOptionsPage
{
Q_OBJECT
public:
OptionsPage();
QWidget *widget();
void apply();
void finish();
signals:
void settingsChanged();
private:
QPointer<OptionsPageWidget> optionsPageWidget;
OptionsPage(Core::IVersionControl *control);
};
} // namespace Internal