diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-09-15 19:20:50 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-09-29 16:26:48 +0200 |
| commit | 5bc6692ee597e56a89620f5fc5155acaa9d24540 (patch) | |
| tree | cc516e9e07e982c00dbce7a397e59504434806cc /src/plugins/qtsupport | |
| parent | 7fa56b08cf4b4a251c90cfb3437ef692a1fc5c39 (diff) | |
| download | qt-creator-5bc6692ee597e56a89620f5fc5155acaa9d24540.tar.gz | |
Reduce number of categories and minimum size of preferences
Merges the Project, Qt4 and Tool Chain categories into one Build & Run
category, which makes it finally possible to reduce the minimum height
of the preferences dialog.
Change-Id: I8d94aac9c9531200f5d8ca212a53d3edc5734138
Reviewed-on: http://codereview.qt-project.org/5023
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Diffstat (limited to 'src/plugins/qtsupport')
| -rw-r--r-- | src/plugins/qtsupport/qtoptionspage.cpp | 8 | ||||
| -rw-r--r-- | src/plugins/qtsupport/qtsupportconstants.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp index 487ab794b6..b9bdcc16ab 100644 --- a/src/plugins/qtsupport/qtoptionspage.cpp +++ b/src/plugins/qtsupport/qtoptionspage.cpp @@ -50,6 +50,7 @@ #include <utils/pathchooser.h> #include <projectexplorer/toolchainmanager.h> #include <projectexplorer/toolchain.h> +#include <projectexplorer/projectexplorerconstants.h> #include <qtconcurrent/runextensions.h> #include <QtCore/QDir> @@ -84,17 +85,18 @@ QString QtOptionsPage::displayName() const QString QtOptionsPage::category() const { - return QLatin1String(Constants::QT_SETTINGS_CATEGORY); + return QLatin1String(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY); } QString QtOptionsPage::displayCategory() const { - return QCoreApplication::translate("Qt4ProjectManager", Constants::QT_SETTINGS_TR_CATEGORY); + return QCoreApplication::translate("ProjectExplorer", + ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_TR_CATEGORY); } QIcon QtOptionsPage::categoryIcon() const { - return QIcon(QLatin1String(Constants::QT_SETTINGS_CATEGORY_ICON)); + return QIcon(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON); } QWidget *QtOptionsPage::createPage(QWidget *parent) diff --git a/src/plugins/qtsupport/qtsupportconstants.h b/src/plugins/qtsupport/qtsupportconstants.h index 802dabdd55..acf649c3f1 100644 --- a/src/plugins/qtsupport/qtsupportconstants.h +++ b/src/plugins/qtsupport/qtsupportconstants.h @@ -37,10 +37,8 @@ namespace QtSupport { namespace Constants { //Qt4 settings pages -const char * const QT_SETTINGS_CATEGORY = "L.Qt4"; -const char * const QT_SETTINGS_CATEGORY_ICON = ":/core/images/category_qt.png"; const char * const QT_SETTINGS_TR_CATEGORY = QT_TRANSLATE_NOOP("Qt4ProjectManager", "Qt4"); -const char * const QTVERSION_SETTINGS_PAGE_ID = "Qt Versions"; +const char * const QTVERSION_SETTINGS_PAGE_ID = "B.Qt Versions"; const char * const QTVERSION_SETTINGS_PAGE_NAME = QT_TRANSLATE_NOOP("Qt4ProjectManager", "Qt Versions"); // QtVersions |