Fixes: Introduce a cpp settingspage containing file naming conventions (lower case and suffixes). Reorder VCS settings pages.

Task: 241959, 248085

RevBy: Optics/Naming checked by con
Details: Give IOptionPage an id() to differentiate from trName(). Make showOptionsDialog return a bool (applied) and give it an optional parent. Change Cpp and form class wizards, give them a Configure... button to change those settings.

2 files changed, 14 insertions, 5 deletions

diff --git a/src/plugins/perforce/settingspage.cpp b/src/plugins/perforce/settingspage.cpp
index c6a7ddfb19..1672186e9b 100644
--- a/src/plugins/perforce/settingspage.cpp
+++ b/src/plugins/perforce/settingspage.cpp
@@ -31,6 +31,9 @@
 #include "perforcesettings.h"
 #include "perforceplugin.h"
 
+#include <vcsbase/vcsbaseconstants.h>
+
+#include <QtCore/QCoreApplication>
 #include <QtGui/QLineEdit>
 #include <QtGui/QFileDialog>
 
@@ -83,19 +86,24 @@ SettingsPage::SettingsPage()
 {
 }
 
-QString SettingsPage::name() const
+QString SettingsPage::id() const
+{
+    return QLatin1String("Perforce");
+}
+
+QString SettingsPage::trName() const
 {
-    return tr("General");
+    return tr("Perforce");
 }
 
 QString SettingsPage::category() const
 {
-    return QLatin1String("Perforce");
+    return QLatin1String(VCSBase::Constants::VCS_SETTINGS_CATEGORY);
 }
 
 QString SettingsPage::trCategory() const
 {
-    return tr("Perforce");
+    return QCoreApplication::translate("VCSBase", VCSBase::Constants::VCS_SETTINGS_CATEGORY);
 }
 
 QWidget *SettingsPage::createPage(QWidget *parent)
diff --git a/src/plugins/perforce/settingspage.h b/src/plugins/perforce/settingspage.h
index 87b43784f0..0123b2d935 100644
--- a/src/plugins/perforce/settingspage.h
+++ b/src/plugins/perforce/settingspage.h
@@ -66,7 +66,8 @@ class SettingsPage : public Core::IOptionsPage
 public:
     SettingsPage();
 
-    QString name() const;
+    QString id() const;
+    QString trName() const;
     QString category() const;
     QString trCategory() const;