Mercurial: Aspectify settings

Change-Id: I689ce9a52124043e07472a1c95a3672f856232c3 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-03-19 14:12:25 +01:00
parent fb9796ae8a
commit 4a2a0f1037
10 changed files with 120 additions and 351 deletions
--- a/src/plugins/mercurial/mercurialsettings.cpp
+++ b/src/plugins/mercurial/mercurialsettings.cpp
@@ -24,23 +24,112 @@
 ****************************************************************************/

 #include "mercurialsettings.h"
+
 #include "constants.h"

-#include <QSettings>
+#include <utils/layoutbuilder.h>
+
+#include <vcsbase/vcsbaseconstants.h>
+
+using namespace Utils;

 namespace Mercurial {
 namespace Internal {

-const QLatin1String MercurialSettings::diffIgnoreWhiteSpaceKey("diffIgnoreWhiteSpace");
-const QLatin1String MercurialSettings::diffIgnoreBlankLinesKey("diffIgnoreBlankLines");
-
 MercurialSettings::MercurialSettings()
 {
-    setSettingsGroup(QLatin1String("Mercurial"));
-    // Override default binary path
-    declareKey(binaryPathKey, QLatin1String(Constants::MERCURIALDEFAULT));
-    declareKey(diffIgnoreWhiteSpaceKey, false);
-    declareKey(diffIgnoreBlankLinesKey, false);
+    setSettingsGroup("Mercurial");
+    setAutoApply(false);
+
+    registerAspect(&binaryPath);
+    binaryPath.setDisplayStyle(StringAspect::PathChooserDisplay);
+    binaryPath.setExpectedKind(PathChooser::ExistingCommand);
+    binaryPath.setDefaultValue(Constants::MERCURIALDEFAULT);
+    binaryPath.setDisplayName(tr("Mercurial Command"));
+    binaryPath.setHistoryCompleter("Bazaar.Command.History");
+    binaryPath.setLabelText(tr("Command:"));
+
+    registerAspect(&userName);
+    userName.setDisplayStyle(StringAspect::LineEditDisplay);
+    userName.setLabelText(tr("Default username:"));
+    userName.setToolTip(tr("Username to use by default on commit."));
+
+    registerAspect(&userEmail);
+    userEmail.setDisplayStyle(StringAspect::LineEditDisplay);
+    userEmail.setLabelText(tr("Default email:"));
+    userEmail.setToolTip(tr("Email to use by default on commit."));
+
+    registerAspect(&diffIgnoreWhiteSpace);
+    diffIgnoreWhiteSpace.setSettingsKey("diffIgnoreWhiteSpace");
+
+    registerAspect(&diffIgnoreBlankLines);
+    diffIgnoreBlankLines.setSettingsKey("diffIgnoreBlankLines");
+}
+
+// Optionpage
+
+class OptionsPageWidget final : public Core::IOptionsPageWidget
+{
+    Q_DECLARE_TR_FUNCTIONS(Mercurial::Internal::OptionsPageWidget)
+
+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)
+{
+    MercurialSettings &s = *settings;
+
+    using namespace Layouting;
+    const Break nl;
+
+    Column {
+        Group {
+            Title(tr("Configuration")),
+            Row { s.binaryPath }
+        },
+
+        Group {
+            Title(tr("User")),
+            Form {
+                s.userName, nl,
+                s.userEmail
+            }
+        },
+
+        Group {
+            Title(tr("Miscellaneous")),
+            Row {
+                s.logCount,
+                s.timeout,
+                Stretch()
+            }
+        },
+        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); });
 }

 } // namespace Internal