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

Bazaar: Remove VcsClientOptionsPage level in settings class hierarchy

Browse Source 
... by inlining the code from the intermediate layer.
The base IOptionsPage infrastructure is now good enough.

Change-Id: I9999c02c290c4ad024b7c8c5480d3db579b7f454
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2020-01-10 18:43:10 +01:00
parent 6364c68768
commit 4f5287d30f
2 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/plugins/bazaar/optionspage.cpp
View File

@@ -37,29 +37,22 @@ using namespace VcsBase;
namespace Bazaar { namespace Bazaar {
namespace Internal { namespace Internal {
class OptionsPageWidget final : public VcsBase::VcsClientOptionsPageWidget class OptionsPageWidget final : public Core::IOptionsPageWidget
{ {
Q_DECLARE_TR_FUNCTIONS(Bazaar::Internal::OptionsPageWidget) Q_DECLARE_TR_FUNCTIONS(Bazaar::Internal::OptionsPageWidget)
public: public:
OptionsPageWidget(); OptionsPageWidget(Core::IVersionControl *control);
VcsBase::VcsBaseClientSettings settings() const final; void apply() final;
void setSettings(const VcsBase::VcsBaseClientSettings &s) final;
private: private:
Ui::OptionsPage m_ui; Ui::OptionsPage m_ui;
Core::IVersionControl *m_control;
BazaarClient *m_client;
}; };
OptionsPageWidget::OptionsPageWidget() void OptionsPageWidget::apply()
{
m_ui.setupUi(this);
m_ui.commandChooser->setExpectedKind(Utils::PathChooser::ExistingCommand);
m_ui.commandChooser->setPromptDialogTitle(tr("Bazaar Command"));
m_ui.commandChooser->setHistoryCompleter(QLatin1String("Bazaar.Command.History"));
}
VcsBaseClientSettings OptionsPageWidget::settings() const
{ {
VcsBaseClientSettings s = BazaarPlugin::instance()->client()->settings(); VcsBaseClientSettings s = BazaarPlugin::instance()->client()->settings();
s.setValue(BazaarSettings::binaryPathKey, m_ui.commandChooser->rawPath()); s.setValue(BazaarSettings::binaryPathKey, m_ui.commandChooser->rawPath());
@@ -67,11 +60,22 @@ VcsBaseClientSettings OptionsPageWidget::settings() const
s.setValue(BazaarSettings::userEmailKey, m_ui.defaultEmailLineEdit->text().trimmed()); s.setValue(BazaarSettings::userEmailKey, m_ui.defaultEmailLineEdit->text().trimmed());
s.setValue(BazaarSettings::logCountKey, m_ui.logEntriesCount->value()); s.setValue(BazaarSettings::logCountKey, m_ui.logEntriesCount->value());
s.setValue(BazaarSettings::timeoutKey, m_ui.timeout->value()); s.setValue(BazaarSettings::timeoutKey, m_ui.timeout->value());
return s;
const bool notify = m_client->settings() != s;
m_client->settings() = s;
if (notify)
emit m_control->configurationChanged();
} }
void OptionsPageWidget::setSettings(const VcsBaseClientSettings &s) OptionsPageWidget::OptionsPageWidget(Core::IVersionControl *control)
: m_control(control), m_client(BazaarPlugin::instance()->client())
{ {
m_ui.setupUi(this);
m_ui.commandChooser->setExpectedKind(Utils::PathChooser::ExistingCommand);
m_ui.commandChooser->setPromptDialogTitle(tr("Bazaar Command"));
m_ui.commandChooser->setHistoryCompleter(QLatin1String("Bazaar.Command.History"));
VcsBaseClientSettings s = m_client->settings();
m_ui.commandChooser->setPath(s.stringValue(BazaarSettings::binaryPathKey)); m_ui.commandChooser->setPath(s.stringValue(BazaarSettings::binaryPathKey));
m_ui.defaultUsernameLineEdit->setText(s.stringValue(BazaarSettings::userNameKey)); m_ui.defaultUsernameLineEdit->setText(s.stringValue(BazaarSettings::userNameKey));
m_ui.defaultEmailLineEdit->setText(s.stringValue(BazaarSettings::userEmailKey)); m_ui.defaultEmailLineEdit->setText(s.stringValue(BazaarSettings::userEmailKey));
@@ -80,11 +84,11 @@ void OptionsPageWidget::setSettings(const VcsBaseClientSettings &s)
} }
OptionsPage::OptionsPage(Core::IVersionControl *control, QObject *parent) : OptionsPage::OptionsPage(Core::IVersionControl *control, QObject *parent) :
VcsClientOptionsPage(control, BazaarPlugin::instance()->client(), parent) Core::IOptionsPage(parent)
{ {
setId(VcsBase::Constants::VCS_ID_BAZAAR); setId(VcsBase::Constants::VCS_ID_BAZAAR);
setDisplayName(OptionsPageWidget::tr("Bazaar")); setDisplayName(OptionsPageWidget::tr("Bazaar"));
setWidgetFactory([] { return new OptionsPageWidget; }); setWidgetCreator([control] { return new OptionsPageWidget(control); });
} }
} // Internal } // Internal

2
src/plugins/bazaar/optionspage.h
View File

@@ -30,7 +30,7 @@
namespace Bazaar { namespace Bazaar {
namespace Internal { namespace Internal {
class OptionsPage final : public VcsBase::VcsClientOptionsPage class OptionsPage final : public Core::IOptionsPage
{ {
public: public:
OptionsPage(Core::IVersionControl *control, QObject *parent); OptionsPage(Core::IVersionControl *control, QObject *parent);