1 files changed, 12 insertions, 11 deletions

diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp
index db5391b674..f0e0be5d27 100644
--- a/src/plugins/mercurial/mercurialplugin.cpp
+++ b/src/plugins/mercurial/mercurialplugin.cpp
@@ -24,14 +24,14 @@
 ****************************************************************************/
 
 #include "mercurialplugin.h"
-#include "optionspage.h"
+
+#include "commiteditor.h"
 #include "constants.h"
 #include "mercurialclient.h"
 #include "mercurialeditor.h"
+#include "mercurialsettings.h"
 #include "revertdialog.h"
 #include "srcdestdialog.h"
-#include "commiteditor.h"
-#include "mercurialsettings.h"
 
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
@@ -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;
@@ -279,8 +278,11 @@ MercurialPluginPrivate::MercurialPluginPrivate()
 
     const QString prefix = QLatin1String("hg");
     m_commandLocator = new Core::CommandLocator("Mercurial", prefix, prefix, this);
+    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)
@@ -641,8 +643,7 @@ void MercurialPluginPrivate::showCommitWidget(const QList<VcsBaseClient::StatusI
         return;
     }
 
-    Core::IEditor *editor = Core::EditorManager::openEditor(saver.fileName(),
-                                                            Constants::COMMIT_ID);
+    Core::IEditor *editor = Core::EditorManager::openEditor(saver.filePath(), Constants::COMMIT_ID);
     if (!editor) {
         VcsOutputWindow::appendError(tr("Unable to create an editor for the commit."));
         return;
@@ -662,8 +663,8 @@ void MercurialPluginPrivate::showCommitWidget(const QList<VcsBaseClient::StatusI
 
     const QString branch = vcsTopic(m_submitRepository);
     commitEditor->setFields(QFileInfo(m_submitRepository), branch,
-                            m_settings.stringValue(MercurialSettings::userNameKey),
-                            m_settings.stringValue(MercurialSettings::userEmailKey), status);
+                            m_settings.userName.value(),
+                            m_settings.userEmail.value(), status);
 }
 
 void MercurialPluginPrivate::diffFromEditorSelected(const QStringList &files)
@@ -767,7 +768,7 @@ bool MercurialPluginPrivate::managesFile(const QString &workingDirectory, const
 
 bool MercurialPluginPrivate::isConfigured() const
 {
-    const Utils::FilePath binary = m_settings.binaryPath();
+    const FilePath binary = m_settings.binaryPath.filePath();
     if (binary.isEmpty())
         return false;
     QFileInfo fi = binary.toFileInfo();
@@ -839,7 +840,7 @@ Core::ShellCommand *MercurialPluginPrivate::createInitialCheckoutCommand(const Q
     args << QLatin1String("clone") << extraArgs << url << localName;
     auto command = new VcsBase::VcsCommand(baseDirectory.toString(),
                                            m_client.processEnvironment());
-    command->addJob({m_settings.binaryPath(), args}, -1);
+    command->addJob({m_settings.binaryPath.filePath(), args}, -1);
     return command;
 }