diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-04-20 15:45:11 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-04-23 11:12:26 +0000 |
| commit | d1ec4c120410b7351fc31df659a7f3be7ed4e93f (patch) | |
| tree | 87f5c7c73ca95e2b2e14747fdc20659c79d5d59d /src/plugins/qmljstools | |
| parent | 4b9945c32981105bfae3ba59f9565757f0dc7417 (diff) | |
| download | qt-creator-d1ec4c120410b7351fc31df659a7f3be7ed4e93f.tar.gz | |
Clean up options page category display name and icon set up
In cases where plugins extend an existing settings category of a plugin
that they depend on anyhow, they do not need to specify the translated
display name and icon for that category.
Some options pages were already not setting the icon, but still the
translated name, which makes even less sense.
Clean up this mess, only setting display name and icon if that is
necessary.
Change-Id: I8bc9d0c51b11d48f1d847337838704d663e70b45
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Diffstat (limited to 'src/plugins/qmljstools')
| -rw-r--r-- | src/plugins/qmljstools/qmljscodestylesettingspage.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/qmljstools/qmljstoolsconstants.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp index cb43db2d17..38ea19451d 100644 --- a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp +++ b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp @@ -131,8 +131,8 @@ QmlJSCodeStyleSettingsPage::QmlJSCodeStyleSettingsPage(/*QSharedPointer<CppFileS setId(Constants::QML_JS_CODE_STYLE_SETTINGS_ID); setDisplayName(QCoreApplication::translate("QmlJSTools", Constants::QML_JS_CODE_STYLE_SETTINGS_NAME)); setCategory(QmlJSEditor::Constants::SETTINGS_CATEGORY_QML); - setDisplayCategory(QCoreApplication::translate("QmlJSEditor", QmlJSEditor::Constants::SETTINGS_TR_CATEGORY_QML)); - setCategoryIcon(Utils::Icon(QmlJSTools::Constants::SETTINGS_CATEGORY_QML_ICON)); + setDisplayCategory(QCoreApplication::translate("QmlJSEditor", "Qt Quick")); + setCategoryIcon(Utils::Icon(":/qmljstools/images/category_qml.png")); } QWidget *QmlJSCodeStyleSettingsPage::widget() diff --git a/src/plugins/qmljstools/qmljstoolsconstants.h b/src/plugins/qmljstools/qmljstoolsconstants.h index 777321e81a..2f6cec25ae 100644 --- a/src/plugins/qmljstools/qmljstoolsconstants.h +++ b/src/plugins/qmljstools/qmljstoolsconstants.h @@ -47,7 +47,5 @@ const char QML_JS_SETTINGS_NAME[] = QT_TRANSLATE_NOOP("QmlJSTools", "Qt Quick"); const char M_TOOLS_QMLJS[] = "QmlJSTools.Tools.Menu"; const char RESET_CODEMODEL[] = "QmlJSTools.ResetCodeModel"; -const char SETTINGS_CATEGORY_QML_ICON[] = ":/qmljstools/images/category_qml.png"; - } // namespace Constants } // namespace QmlJSTools |