Move some settings pages.

Reducing vertical size of preferences dialog, and moving languages
settings adjacent.

Change-Id: I1cb5a4310350a0552c920982854f671ae443ed7e
Reviewed-on: http://codereview.qt-project.org/5251
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

7 files changed, 19 insertions, 15 deletions

diff --git a/src/plugins/locator/locatorconstants.h b/src/plugins/locator/locatorconstants.h
index 271fe64cfd..e5ba38fe23 100644
--- a/src/plugins/locator/locatorconstants.h
+++ b/src/plugins/locator/locatorconstants.h
@@ -38,10 +38,7 @@
 namespace Locator {
 namespace Constants {
 
-const char * const FILTER_OPTIONS_PAGE = QT_TRANSLATE_NOOP("Locator", "Filters");
-const char * const LOCATOR_CATEGORY = "G.Locator";
-const char * const LOCATOR_TR_CATEGORY = QT_TRANSLATE_NOOP("Locator", "Locator");
-const char * const SETTINGS_CATEGORY_LOCATOR_ICON = ":/core/images/category_locator.png";
+const char * const FILTER_OPTIONS_PAGE = QT_TRANSLATE_NOOP("Locator", "Locator");
 const char * const TASK_INDEX = "Locator.Task.Index";
 
 } // namespace Constants
diff --git a/src/plugins/locator/locatorwidget.cpp b/src/plugins/locator/locatorwidget.cpp
index 935df4127d..cd759106a9 100644
--- a/src/plugins/locator/locatorwidget.cpp
+++ b/src/plugins/locator/locatorwidget.cpp
@@ -38,6 +38,7 @@
 #include "ilocatorfilter.h"
 
 #include <extensionsystem/pluginmanager.h>
+#include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/modemanager.h>
 #include <coreplugin/actionmanager/actionmanager.h>
@@ -616,6 +617,6 @@ void LocatorWidget::showEvent(QShowEvent *event)
 
 void LocatorWidget::showConfigureDialog()
 {
-    Core::ICore::instance()->showOptionsDialog(Constants::LOCATOR_CATEGORY,
+    Core::ICore::instance()->showOptionsDialog(Core::Constants::SETTINGS_CATEGORY_CORE,
           Constants::FILTER_OPTIONS_PAGE);
 }
diff --git a/src/plugins/locator/settingspage.cpp b/src/plugins/locator/settingspage.cpp
index 3af7c9c205..a20137a0e5 100644
--- a/src/plugins/locator/settingspage.cpp
+++ b/src/plugins/locator/settingspage.cpp
@@ -37,6 +37,7 @@
 #include "ilocatorfilter.h"
 #include "directoryfilter.h"
 
+#include <coreplugin/coreconstants.h>
 #include <qtconcurrent/QtConcurrentTools>
 #include <utils/qtcassert.h>
 
@@ -64,17 +65,17 @@ QString SettingsPage::displayName() const
 
 QString SettingsPage::category() const
 {
-    return QLatin1String(Constants::LOCATOR_CATEGORY);
+    return QLatin1String(Core::Constants::SETTINGS_CATEGORY_CORE);
 }
 
 QString SettingsPage::displayCategory() const
 {
-    return QCoreApplication::translate("Locator", Locator::Constants::LOCATOR_TR_CATEGORY);
+    return QCoreApplication::translate("Core", Core::Constants::SETTINGS_TR_CATEGORY_CORE);
 }
 
 QIcon SettingsPage::categoryIcon() const
 {
-    return QIcon(QLatin1String(Locator::Constants::SETTINGS_CATEGORY_LOCATOR_ICON));
+    return QIcon(QLatin1String(Core::Constants::SETTINGS_CATEGORY_CORE_ICON));
 }
 
 QWidget *SettingsPage::createPage(QWidget *parent)
diff --git a/src/plugins/qmldesigner/settingspage.cpp b/src/plugins/qmldesigner/settingspage.cpp
index 486ba9eb36..ad9ddb70a0 100644
--- a/src/plugins/qmldesigner/settingspage.cpp
+++ b/src/plugins/qmldesigner/settingspage.cpp
@@ -35,6 +35,8 @@
 #include "qmldesignerplugin.h"
 #include "settingspage.h"
 
+#include <qmljseditor/qmljseditorconstants.h>
+
 #include <QtCore/QTextStream>
 #include <QtGui/QCheckBox>
 
@@ -94,12 +96,12 @@ QString SettingsPage::displayName() const
 
 QString SettingsPage::category() const
 {
-    return QLatin1String("Qt Quick");
+    return QLatin1String(QmlJSEditor::Constants::SETTINGS_CATEGORY_QML);
 }
 
 QString SettingsPage::displayCategory() const
 {
-    return QCoreApplication::translate("Qt Quick", "Qt Quick");
+    return QCoreApplication::translate("QmlJSEditor", QmlJSEditor::Constants::SETTINGS_TR_CATEGORY_QML);
 }
 
 QIcon SettingsPage::categoryIcon() const
diff --git a/src/plugins/qmljseditor/qmljseditorconstants.h b/src/plugins/qmljseditor/qmljseditorconstants.h
index 1761838e38..f2e4d67628 100644
--- a/src/plugins/qmljseditor/qmljseditorconstants.h
+++ b/src/plugins/qmljseditor/qmljseditorconstants.h
@@ -49,6 +49,8 @@ const char * const M_REFACTORING_MENU_INSERTION_POINT = "QmlJSEditor.RefactorGro
 const char * const C_QMLJSEDITOR_ID = "QMLProjectManager.QMLJSEditor";
 const char * const C_QMLJSEDITOR_DISPLAY_NAME = QT_TRANSLATE_NOOP("OpenWith::Editors", "QMLJS Editor");
 const char * const TASK_SEARCH = "QmlJSEditor.TaskSearch";
+const char * const SETTINGS_CATEGORY_QML = "J.QtQuick";
+const char * const SETTINGS_TR_CATEGORY_QML = QT_TRANSLATE_NOOP("QmlJSEditor", "Qt Quick");
 
 const char * const FOLLOW_SYMBOL_UNDER_CURSOR = "QmlJSEditor.FollowSymbolUnderCursor";
 const char * const FIND_USAGES = "QmlJSEditor.FindUsages";
diff --git a/src/plugins/qmljseditor/quicktoolbarsettingspage.cpp b/src/plugins/qmljseditor/quicktoolbarsettingspage.cpp
index 2d95efe9fc..b4d13af303 100644
--- a/src/plugins/qmljseditor/quicktoolbarsettingspage.cpp
+++ b/src/plugins/qmljseditor/quicktoolbarsettingspage.cpp
@@ -30,9 +30,10 @@
 **
 **************************************************************************/
 
-#include <qmldesigner/qmldesignerconstants.h>
 #include "quicktoolbarsettingspage.h"
+#include "qmljseditorconstants.h"
 
+#include <qmldesigner/qmldesignerconstants.h>
 #include <coreplugin/icore.h>
 
 #include <QtCore/QSettings>
@@ -140,12 +141,12 @@ QString QuickToolBarSettingsPage::displayName() const
 
 QString QuickToolBarSettingsPage::category() const
 {
-    return QLatin1String("Qt Quick");
+    return QLatin1String(Constants::SETTINGS_CATEGORY_QML);
 }
 
 QString QuickToolBarSettingsPage::displayCategory() const
 {
-    return QCoreApplication::translate("Qt Quick", "Qt Quick");
+    return QCoreApplication::translate("QmlJSEditor", QmlJSEditor::Constants::SETTINGS_TR_CATEGORY_QML);
 }
 
 QIcon QuickToolBarSettingsPage::categoryIcon() const
diff --git a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp
index 7be5e33184..aa23a62931 100644
--- a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp
+++ b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp
@@ -174,12 +174,12 @@ QString QmlJSCodeStyleSettingsPage::displayName() const
 
 QString QmlJSCodeStyleSettingsPage::category() const
 {
-    return QLatin1String("Qt Quick");
+    return QLatin1String(QmlJSEditor::Constants::SETTINGS_CATEGORY_QML);
 }
 
 QString QmlJSCodeStyleSettingsPage::displayCategory() const
 {
-    return QCoreApplication::translate("Qt Quick", "Qt Quick");
+    return QCoreApplication::translate("QmlJSEditor", QmlJSEditor::Constants::SETTINGS_TR_CATEGORY_QML);
 }
 
 QIcon QmlJSCodeStyleSettingsPage::categoryIcon() const