diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-09-20 16:06:03 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-09-20 17:36:49 +0200 |
| commit | 0cea87f55bede30ee563f9e939743aa7dd2fcec8 (patch) | |
| tree | cddb55748370a2539f1603c4394f4c07603671a7 /src/plugins/locator | |
| parent | 80c1e74abd8ed8c80c76e307dd723959fe2e0ec1 (diff) | |
| download | qt-creator-0cea87f55bede30ee563f9e939743aa7dd2fcec8.tar.gz | |
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>
Diffstat (limited to 'src/plugins/locator')
| -rw-r--r-- | src/plugins/locator/locatorconstants.h | 5 | ||||
| -rw-r--r-- | src/plugins/locator/locatorwidget.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/locator/settingspage.cpp | 7 |
3 files changed, 7 insertions, 8 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) |