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

Mercurial: Use the new AspectContainer::applied signal

Browse Source 
Change-Id: I5c3a60b316f74b4c1fd96d5ddd955f31f18d3010
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2021-04-06 12:10:29 +02:00
parent ffd5fc055f
commit 1ba18b7f78
3 changed files with 40 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -196,8 +196,7 @@ private:
// Variables
MercurialSettings m_settings;
MercurialClient m_client{&m_settings};
OptionsPage m_optionsPage{[this] { configurationChanged(); }, &m_settings};
MercurialSettingsPage m_settingsPage{&m_settings};
Core::CommandLocator *m_commandLocator = nullptr;
Core::ActionContainer *m_mercurialContainer = nullptr;
@@ -282,6 +281,8 @@ MercurialPluginPrivate::MercurialPluginPrivate()
m_commandLocator->setDescription(tr("Triggers a Mercurial version control operation."));
createMenu(context);
connect(&m_settings, &AspectContainer::applied, this, &IVersionControl::configurationChanged);
}
void MercurialPluginPrivate::createMenu(const Core::Context &context)

47
src/plugins/mercurial/mercurialsettings.cpp
View File

@@ -66,35 +66,27 @@ MercurialSettings::MercurialSettings()
diffIgnoreBlankLines.setSettingsKey("diffIgnoreBlankLines");
}
// Optionpage
// MercurialSettingsPage
class OptionsPageWidget final : public Core::IOptionsPageWidget
MercurialSettingsPage::MercurialSettingsPage(MercurialSettings *settings)
{
Q_DECLARE_TR_FUNCTIONS(Mercurial::Internal::OptionsPageWidget)
setId(VcsBase::Constants::VCS_ID_MERCURIAL);
setDisplayName(MercurialSettings::tr("Mercurial"));
setCategory(VcsBase::Constants::VCS_SETTINGS_CATEGORY);
setSettings(m_settings);
public:
OptionsPageWidget(const std::function<void()> &onApply, MercurialSettings *settings);
void apply() final;
private:
std::function<void()> m_onApply;
MercurialSettings *m_settings;
};
OptionsPageWidget::OptionsPageWidget(const std::function<void()> &onApply, MercurialSettings *settings)
: m_onApply(onApply), m_settings(settings)
{
setLayouter([settings](QWidget *widget) {
MercurialSettings &s = *settings;
using namespace Layouting;
Column {
Group {
Title(tr("Configuration")),
Title(MercurialSettings::tr("Configuration")),
Row { s.binaryPath }
},
Group {
Title(tr("User")),
Title(MercurialSettings::tr("User")),
Form {
s.userName,
s.userEmail
@@ -102,7 +94,7 @@ OptionsPageWidget::OptionsPageWidget(const std::function<void()> &onApply, Mercu
},
Group {
Title(tr("Miscellaneous")),
Title(MercurialSettings::tr("Miscellaneous")),
Row {
s.logCount,
s.timeout,
@@ -111,23 +103,8 @@ OptionsPageWidget::OptionsPageWidget(const std::function<void()> &onApply, Mercu
},
Stretch()
}.attachTo(this);
}
void OptionsPageWidget::apply()
{
if (!m_settings->isDirty())
return;
m_settings->apply();
m_onApply();
}
OptionsPage::OptionsPage(const std::function<void()> &onApply, MercurialSettings *settings)
{
setId(VcsBase::Constants::VCS_ID_MERCURIAL);
setDisplayName(OptionsPageWidget::tr("Mercurial"));
setCategory(VcsBase::Constants::VCS_SETTINGS_CATEGORY);
setWidgetCreator([onApply, settings] { return new OptionsPageWidget(onApply, settings); });
}.attachTo(widget);
});
}
} // namespace Internal

4
src/plugins/mercurial/mercurialsettings.h
View File

@@ -41,10 +41,10 @@ public:
MercurialSettings();
};
class OptionsPage final : public Core::IOptionsPage
class MercurialSettingsPage final : public Core::IOptionsPage
{
public:
OptionsPage(const std::function<void()> &onApply, MercurialSettings *settings);
explicit MercurialSettingsPage(MercurialSettings *settings);
};
} // namespace Internal