diff options
Diffstat (limited to 'src/plugins')
60 files changed, 29 insertions, 144 deletions
diff --git a/src/plugins/android/androidsettingspage.cpp b/src/plugins/android/androidsettingspage.cpp index 8d70dcffe1..7be91957e2 100644 --- a/src/plugins/android/androidsettingspage.cpp +++ b/src/plugins/android/androidsettingspage.cpp @@ -44,8 +44,6 @@ AndroidSettingsPage::AndroidSettingsPage(QObject *parent) setId(Constants::ANDROID_SETTINGS_ID); setDisplayName(tr("Android")); setCategory(ProjectExplorer::Constants::DEVICE_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("ProjectExplorer", - ProjectExplorer::Constants::DEVICE_SETTINGS_TR_CATEGORY)); } QWidget *AndroidSettingsPage::widget() diff --git a/src/plugins/autotest/itestsettingspage.h b/src/plugins/autotest/itestsettingspage.h index cce44e8bc3..eecdec0040 100644 --- a/src/plugins/autotest/itestsettingspage.h +++ b/src/plugins/autotest/itestsettingspage.h @@ -43,8 +43,6 @@ public: setId(Core::Id(Constants::SETTINGSPAGE_PREFIX).withSuffix( QString("%1.%2").arg(framework->priority()).arg(QLatin1String(framework->name())))); setCategory(Constants::AUTOTEST_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("AutoTest", - Constants::AUTOTEST_SETTINGS_TR)); } virtual ~ITestSettingsPage() {} diff --git a/src/plugins/baremetal/gdbserverproviderssettingspage.cpp b/src/plugins/baremetal/gdbserverproviderssettingspage.cpp index c44dcbf180..c34a38f29a 100644 --- a/src/plugins/baremetal/gdbserverproviderssettingspage.cpp +++ b/src/plugins/baremetal/gdbserverproviderssettingspage.cpp @@ -422,8 +422,6 @@ GdbServerProvidersSettingsPage::GdbServerProvidersSettingsPage(QObject *parent) setId(Constants::GDB_PROVIDERS_SETTINGS_ID); setDisplayName(tr("Bare Metal")); setCategory(ProjectExplorer::Constants::DEVICE_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("ProjectExplorer", - ProjectExplorer::Constants::DEVICE_SETTINGS_TR_CATEGORY)); } QWidget *GdbServerProvidersSettingsPage::widget() diff --git a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp index 53f1dc7df3..97410fadac 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp +++ b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp @@ -98,8 +98,6 @@ ArtisticStyleOptionsPage::ArtisticStyleOptionsPage(ArtisticStyleSettings *settin setId(Constants::ArtisticStyle::OPTION_ID); setDisplayName(tr("Artistic Style")); setCategory(Constants::OPTION_CATEGORY); - setDisplayCategory(QCoreApplication::translate("Beautifier", Constants::OPTION_TR_CATEGORY)); - setCategoryIcon(Utils::Icon(Constants::OPTION_CATEGORY_ICON)); } QWidget *ArtisticStyleOptionsPage::widget() diff --git a/src/plugins/beautifier/beautifierconstants.h b/src/plugins/beautifier/beautifierconstants.h index 2fbe6600d7..4430e62f6e 100644 --- a/src/plugins/beautifier/beautifierconstants.h +++ b/src/plugins/beautifier/beautifierconstants.h @@ -33,8 +33,6 @@ namespace Constants { const char ACTION_ID[] = "Beautifier.Action"; const char MENU_ID[] = "Beautifier.Menu"; const char OPTION_CATEGORY[] = "II.Beautifier"; -const char OPTION_TR_CATEGORY[] = QT_TRANSLATE_NOOP("Beautifier", "Beautifier"); -const char OPTION_CATEGORY_ICON[] = ":/beautifier/images/beautifier.png"; const char OPTION_GENERAL_ID[] = "aaa.General"; const char SETTINGS_GROUP[] = "Beautifier"; const char SETTINGS_DIRNAME[] = "beautifier"; diff --git a/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp b/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp index d9f881dc41..970fb4ea56 100644 --- a/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp +++ b/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp @@ -108,8 +108,6 @@ ClangFormatOptionsPage::ClangFormatOptionsPage(ClangFormatSettings *settings, QO setId(Constants::ClangFormat::OPTION_ID); setDisplayName(tr("Clang Format")); setCategory(Constants::OPTION_CATEGORY); - setDisplayCategory(QCoreApplication::translate("Beautifier", Constants::OPTION_TR_CATEGORY)); - setCategoryIcon(Utils::Icon(Constants::OPTION_CATEGORY_ICON)); } QWidget *ClangFormatOptionsPage::widget() diff --git a/src/plugins/beautifier/generaloptionspage.cpp b/src/plugins/beautifier/generaloptionspage.cpp index 4f160e320f..d431a29057 100644 --- a/src/plugins/beautifier/generaloptionspage.cpp +++ b/src/plugins/beautifier/generaloptionspage.cpp @@ -82,8 +82,8 @@ GeneralOptionsPage::GeneralOptionsPage(const QSharedPointer<GeneralSettings> &se setId(Constants::OPTION_GENERAL_ID); setDisplayName(tr("General")); setCategory(Constants::OPTION_CATEGORY); - setDisplayCategory(QCoreApplication::translate("Beautifier", Constants::OPTION_TR_CATEGORY)); - setCategoryIcon(Utils::Icon(Constants::OPTION_CATEGORY_ICON)); + setDisplayCategory(QCoreApplication::translate("Beautifier", "Beautifier")); + setCategoryIcon(Utils::Icon(":/beautifier/images/beautifier.png")); } QWidget *GeneralOptionsPage::widget() diff --git a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp index a0293196cd..1e5dc0c57c 100644 --- a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp +++ b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp @@ -103,8 +103,6 @@ UncrustifyOptionsPage::UncrustifyOptionsPage(UncrustifySettings *settings, QObje setId(Constants::Uncrustify::OPTION_ID); setDisplayName(tr("Uncrustify")); setCategory(Constants::OPTION_CATEGORY); - setDisplayCategory(QCoreApplication::translate("Beautifier", Constants::OPTION_TR_CATEGORY)); - setCategoryIcon(Utils::Icon(Constants::OPTION_CATEGORY_ICON)); } QWidget *UncrustifyOptionsPage::widget() diff --git a/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp b/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp index 1c88d35e7a..2d9dc9e37d 100644 --- a/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp +++ b/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp @@ -574,9 +574,6 @@ CMakeSettingsPage::CMakeSettingsPage() setId(Constants::CMAKE_SETTINGSPAGE_ID); setDisplayName(tr("CMake")); setCategory(ProjectExplorer::Constants::KITS_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("ProjectExplorer", - ProjectExplorer::Constants::KITS_SETTINGS_TR_CATEGORY)); - setCategoryIcon(ProjectExplorer::Icons::OPTIONS_CATEGORY_KITS); } QWidget *CMakeSettingsPage::widget() diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h index 3d96aed775..e40e04d43f 100644 --- a/src/plugins/coreplugin/coreconstants.h +++ b/src/plugins/coreplugin/coreconstants.h @@ -194,8 +194,6 @@ const char WIZARD_KIND_PROJECT[] = "project"; const char WIZARD_KIND_FILE[] = "file"; const char SETTINGS_CATEGORY_CORE[] = "B.Core"; -const char SETTINGS_CATEGORY_CORE_ICON[] = ":/core/images/category_core.png"; -const char SETTINGS_TR_CATEGORY_CORE[] = QT_TRANSLATE_NOOP("Core", "Environment"); const char SETTINGS_ID_INTERFACE[] = "A.Interface"; const char SETTINGS_ID_SYSTEM[] = "B.Core.System"; const char SETTINGS_ID_SHORTCUTS[] = "C.Keyboard"; diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp index 3940b358e0..625833bad1 100644 --- a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp +++ b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp @@ -289,8 +289,6 @@ ShortcutSettings::ShortcutSettings(QObject *parent) setId(Constants::SETTINGS_ID_SHORTCUTS); setDisplayName(tr("Keyboard")); setCategory(Constants::SETTINGS_CATEGORY_CORE); - setDisplayCategory(QCoreApplication::translate("Core", Constants::SETTINGS_TR_CATEGORY_CORE)); - setCategoryIcon(Utils::Icon(Constants::SETTINGS_CATEGORY_CORE_ICON)); } QWidget *ShortcutSettings::widget() diff --git a/src/plugins/coreplugin/generalsettings.cpp b/src/plugins/coreplugin/generalsettings.cpp index f830f7c46e..8d2623b13c 100644 --- a/src/plugins/coreplugin/generalsettings.cpp +++ b/src/plugins/coreplugin/generalsettings.cpp @@ -53,8 +53,8 @@ GeneralSettings::GeneralSettings() setId(Constants::SETTINGS_ID_INTERFACE); setDisplayName(tr("Interface")); setCategory(Constants::SETTINGS_CATEGORY_CORE); - setDisplayCategory(QCoreApplication::translate("Core", Constants::SETTINGS_TR_CATEGORY_CORE)); - setCategoryIcon(Utils::Icon(Constants::SETTINGS_CATEGORY_CORE_ICON)); + setDisplayCategory(QCoreApplication::translate("Core", "Environment")); + setCategoryIcon(Utils::Icon(":/core/images/category_core.png")); } static bool hasQmFilesForLocale(const QString &locale, const QString &creatorTrPath) diff --git a/src/plugins/coreplugin/locator/locatorsettingspage.cpp b/src/plugins/coreplugin/locator/locatorsettingspage.cpp index 162b78a55c..638448f103 100644 --- a/src/plugins/coreplugin/locator/locatorsettingspage.cpp +++ b/src/plugins/coreplugin/locator/locatorsettingspage.cpp @@ -166,8 +166,6 @@ LocatorSettingsPage::LocatorSettingsPage(Locator *plugin) setId(Constants::FILTER_OPTIONS_PAGE); setDisplayName(QCoreApplication::translate("Locator", Constants::FILTER_OPTIONS_PAGE)); setCategory(Constants::SETTINGS_CATEGORY_CORE); - setDisplayCategory(QCoreApplication::translate("Core", Constants::SETTINGS_TR_CATEGORY_CORE)); - setCategoryIcon(Utils::Icon(Constants::SETTINGS_CATEGORY_CORE_ICON)); } QWidget *LocatorSettingsPage::widget() diff --git a/src/plugins/coreplugin/mimetypesettings.cpp b/src/plugins/coreplugin/mimetypesettings.cpp index 44b3413107..aed356185a 100644 --- a/src/plugins/coreplugin/mimetypesettings.cpp +++ b/src/plugins/coreplugin/mimetypesettings.cpp @@ -562,9 +562,6 @@ MimeTypeSettings::MimeTypeSettings(QObject *parent) setId(Constants::SETTINGS_ID_MIMETYPES); setDisplayName(tr("MIME Types")); setCategory(Constants::SETTINGS_CATEGORY_CORE); - setDisplayCategory(QCoreApplication::translate("Core", - Constants::SETTINGS_TR_CATEGORY_CORE)); - setCategoryIcon(Utils::Icon(Constants::SETTINGS_CATEGORY_CORE_ICON)); } MimeTypeSettings::~MimeTypeSettings() diff --git a/src/plugins/coreplugin/systemsettings.cpp b/src/plugins/coreplugin/systemsettings.cpp index 69f21929f8..3ccd0b006a 100644 --- a/src/plugins/coreplugin/systemsettings.cpp +++ b/src/plugins/coreplugin/systemsettings.cpp @@ -55,8 +55,6 @@ SystemSettings::SystemSettings() setId(Constants::SETTINGS_ID_SYSTEM); setDisplayName(tr("System")); setCategory(Constants::SETTINGS_CATEGORY_CORE); - setDisplayCategory(QCoreApplication::translate("Core", Constants::SETTINGS_TR_CATEGORY_CORE)); - setCategoryIcon(Utils::Icon(Constants::SETTINGS_CATEGORY_CORE_ICON)); connect(VcsManager::instance(), &VcsManager::configurationChanged, this, &SystemSettings::updatePath); diff --git a/src/plugins/coreplugin/toolsettings.cpp b/src/plugins/coreplugin/toolsettings.cpp index a892edbadc..0e3904e825 100644 --- a/src/plugins/coreplugin/toolsettings.cpp +++ b/src/plugins/coreplugin/toolsettings.cpp @@ -48,8 +48,6 @@ ToolSettings::ToolSettings(QObject *parent) : setId(Constants::SETTINGS_ID_TOOLS); setDisplayName(tr("External Tools")); setCategory(Constants::SETTINGS_CATEGORY_CORE); - setDisplayCategory(QCoreApplication::translate("Core", Constants::SETTINGS_TR_CATEGORY_CORE)); - setCategoryIcon(Utils::Icon(Constants::SETTINGS_CATEGORY_CORE_ICON)); } diff --git a/src/plugins/cpaster/cpasterconstants.h b/src/plugins/cpaster/cpasterconstants.h index ee678eb6c9..3c14c153f9 100644 --- a/src/plugins/cpaster/cpasterconstants.h +++ b/src/plugins/cpaster/cpasterconstants.h @@ -31,8 +31,6 @@ namespace CodePaster { namespace Constants { const char CPASTER_SETTINGS_CATEGORY[] = "XZ.CPaster"; -const char CPASTER_SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("CodePaster", "Code Pasting"); -const char SETTINGS_CATEGORY_CPASTER_ICON[] = ":/cpaster/images/category_cpaster.png"; } // namespace Constants } // namespace CodePaster diff --git a/src/plugins/cpaster/fileshareprotocolsettingspage.cpp b/src/plugins/cpaster/fileshareprotocolsettingspage.cpp index 2a4c14ae60..51b254ecba 100644 --- a/src/plugins/cpaster/fileshareprotocolsettingspage.cpp +++ b/src/plugins/cpaster/fileshareprotocolsettingspage.cpp @@ -98,7 +98,6 @@ FileShareProtocolSettingsPage::FileShareProtocolSettingsPage(const QSharedPointe setId("X.CodePaster.FileSharePaster"); setDisplayName(tr("Fileshare")); setCategory(Constants::CPASTER_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("CodePaster", Constants::CPASTER_SETTINGS_TR_CATEGORY)); } QWidget *FileShareProtocolSettingsPage::widget() diff --git a/src/plugins/cpaster/settingspage.cpp b/src/plugins/cpaster/settingspage.cpp index 1aa8f26097..2872c166b9 100644 --- a/src/plugins/cpaster/settingspage.cpp +++ b/src/plugins/cpaster/settingspage.cpp @@ -68,9 +68,8 @@ SettingsPage::SettingsPage(const QSharedPointer<Settings> &settings, QObject *pa setId("A.CodePaster.General"); setDisplayName(tr("General")); setCategory(Constants::CPASTER_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("CodePaster", - Constants::CPASTER_SETTINGS_TR_CATEGORY)); - setCategoryIcon(Utils::Icon(Constants::SETTINGS_CATEGORY_CPASTER_ICON)); + setDisplayCategory(QCoreApplication::translate("CodePaster", "Code Pasting")); + setCategoryIcon(Utils::Icon(":/cpaster/images/category_cpaster.png")); } SettingsPage::~SettingsPage() diff --git a/src/plugins/cpptools/cppcodemodelsettingspage.cpp b/src/plugins/cpptools/cppcodemodelsettingspage.cpp index e6af115aed..8bf57668ab 100644 --- a/src/plugins/cpptools/cppcodemodelsettingspage.cpp +++ b/src/plugins/cpptools/cppcodemodelsettingspage.cpp @@ -164,8 +164,8 @@ CppCodeModelSettingsPage::CppCodeModelSettingsPage(QSharedPointer<CppCodeModelSe setId(Constants::CPP_CODE_MODEL_SETTINGS_ID); setDisplayName(QCoreApplication::translate("CppTools",Constants::CPP_CODE_MODEL_SETTINGS_NAME)); setCategory(Constants::CPP_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("CppTools",Constants::CPP_SETTINGS_TR_CATEGORY)); - setCategoryIcon(Utils::Icon(Constants::SETTINGS_CATEGORY_CPP_ICON)); + setDisplayCategory(QCoreApplication::translate("CppTools", "C++")); + setCategoryIcon(Utils::Icon(":/cpptools/images/category_cpp.png")); } QWidget *CppCodeModelSettingsPage::widget() diff --git a/src/plugins/cpptools/cppcodestylesettingspage.cpp b/src/plugins/cpptools/cppcodestylesettingspage.cpp index 3f074b9f03..dc5237efc0 100644 --- a/src/plugins/cpptools/cppcodestylesettingspage.cpp +++ b/src/plugins/cpptools/cppcodestylesettingspage.cpp @@ -518,8 +518,6 @@ CppCodeStyleSettingsPage::CppCodeStyleSettingsPage(QWidget *parent) : setId(Constants::CPP_CODE_STYLE_SETTINGS_ID); setDisplayName(QCoreApplication::translate("CppTools", Constants::CPP_CODE_STYLE_SETTINGS_NAME)); setCategory(Constants::CPP_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("CppTools", Constants::CPP_SETTINGS_TR_CATEGORY)); - setCategoryIcon(Utils::Icon(Constants::SETTINGS_CATEGORY_CPP_ICON)); } QWidget *CppCodeStyleSettingsPage::widget() diff --git a/src/plugins/cpptools/cppfilesettingspage.cpp b/src/plugins/cpptools/cppfilesettingspage.cpp index 87b1f2aa5e..5c172e89a7 100644 --- a/src/plugins/cpptools/cppfilesettingspage.cpp +++ b/src/plugins/cpptools/cppfilesettingspage.cpp @@ -359,8 +359,6 @@ CppFileSettingsPage::CppFileSettingsPage(QSharedPointer<CppFileSettings> &settin setId(Constants::CPP_FILE_SETTINGS_ID); setDisplayName(QCoreApplication::translate("CppTools", Constants::CPP_FILE_SETTINGS_NAME)); setCategory(Constants::CPP_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("CppTools", Constants::CPP_SETTINGS_TR_CATEGORY)); - setCategoryIcon(Utils::Icon(Constants::SETTINGS_CATEGORY_CPP_ICON)); } QWidget *CppFileSettingsPage::widget() diff --git a/src/plugins/cpptools/cpptoolsconstants.h b/src/plugins/cpptools/cpptoolsconstants.h index f4c3538fea..9190a030be 100644 --- a/src/plugins/cpptools/cpptoolsconstants.h +++ b/src/plugins/cpptools/cpptoolsconstants.h @@ -67,8 +67,6 @@ const char CPP_FILE_SETTINGS_NAME[] = QT_TRANSLATE_NOOP("CppTools", "File Naming const char CPP_CODE_MODEL_SETTINGS_ID[] = "C.Cpp.Code Model"; const char CPP_CODE_MODEL_SETTINGS_NAME[] = QT_TRANSLATE_NOOP("CppTools", "Code Model"); const char CPP_SETTINGS_CATEGORY[] = "I.C++"; -const char CPP_SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("CppTools", "C++"); -const char SETTINGS_CATEGORY_CPP_ICON[] = ":/cpptools/images/category_cpp.png"; const char CPP_CLANG_FIXIT_AVAILABLE_MARKER_ID[] = "ClangFixItAvailableMarker"; diff --git a/src/plugins/debugger/cdb/cdboptionspage.cpp b/src/plugins/debugger/cdb/cdboptionspage.cpp index 416294b496..0496d12bbb 100644 --- a/src/plugins/debugger/cdb/cdboptionspage.cpp +++ b/src/plugins/debugger/cdb/cdboptionspage.cpp @@ -201,9 +201,6 @@ CdbOptionsPage::CdbOptionsPage() setId("F.Debugger.Cda"); setDisplayName(tr("CDB")); setCategory(Debugger::Constants::DEBUGGER_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("Debugger", - Constants::DEBUGGER_SETTINGS_TR_CATEGORY)); - setCategoryIcon(Utils::Icon(Constants::DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON)); } CdbOptionsPage::~CdbOptionsPage() @@ -280,9 +277,6 @@ CdbPathsPage::CdbPathsPage() setId("F.Debugger.Cdb"); setDisplayName(tr("CDB Paths")); setCategory(Debugger::Constants::DEBUGGER_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("Debugger", - Constants::DEBUGGER_SETTINGS_TR_CATEGORY)); - setCategoryIcon(Utils::Icon(Constants::DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON)); } CdbPathsPage::~CdbPathsPage() diff --git a/src/plugins/debugger/commonoptionspage.cpp b/src/plugins/debugger/commonoptionspage.cpp index d78e1b8948..149caec505 100644 --- a/src/plugins/debugger/commonoptionspage.cpp +++ b/src/plugins/debugger/commonoptionspage.cpp @@ -67,8 +67,8 @@ CommonOptionsPage::CommonOptionsPage(const QSharedPointer<GlobalDebuggerOptions> setId(DEBUGGER_COMMON_SETTINGS_ID); setDisplayName(QCoreApplication::translate("Debugger", "General")); setCategory(DEBUGGER_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("Debugger", DEBUGGER_SETTINGS_TR_CATEGORY)); - setCategoryIcon(Icon(DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON)); + setDisplayCategory(QCoreApplication::translate("Debugger", "Debugger")); + setCategoryIcon(Icon(":/debugger/images/category_debug.png")); } void CommonOptionsPage::apply() @@ -285,8 +285,6 @@ LocalsAndExpressionsOptionsPage::LocalsAndExpressionsOptionsPage() //: '&&' will appear as one (one is marking keyboard shortcut) setDisplayName(QCoreApplication::translate("Debugger", "Locals && Expressions")); setCategory(DEBUGGER_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("Debugger", DEBUGGER_SETTINGS_TR_CATEGORY)); - setCategoryIcon(Icon(DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON)); } void LocalsAndExpressionsOptionsPage::apply() diff --git a/src/plugins/debugger/debuggerinternalconstants.h b/src/plugins/debugger/debuggerinternalconstants.h index 509f92452a..0ec6df1111 100644 --- a/src/plugins/debugger/debuggerinternalconstants.h +++ b/src/plugins/debugger/debuggerinternalconstants.h @@ -48,8 +48,6 @@ namespace Constants { const char DEBUGGER_COMMON_SETTINGS_ID[] = "A.Debugger.General"; const char DEBUGGER_SETTINGS_CATEGORY[] = "O.Debugger"; -const char DEBUGGER_SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("Debugger", "Debugger"); -const char DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON[] = ":/debugger/images/category_debug.png"; namespace Internal { enum { debug = 0 }; diff --git a/src/plugins/debugger/debuggeritemmanager.cpp b/src/plugins/debugger/debuggeritemmanager.cpp index edc9c3aa24..4021f6baf3 100644 --- a/src/plugins/debugger/debuggeritemmanager.cpp +++ b/src/plugins/debugger/debuggeritemmanager.cpp @@ -601,9 +601,6 @@ DebuggerOptionsPage::DebuggerOptionsPage() setId(ProjectExplorer::Constants::DEBUGGER_SETTINGS_PAGE_ID); setDisplayName(tr("Debuggers")); setCategory(ProjectExplorer::Constants::KITS_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("ProjectExplorer", - ProjectExplorer::Constants::KITS_SETTINGS_TR_CATEGORY)); - setCategoryIcon(ProjectExplorer::Icons::OPTIONS_CATEGORY_KITS); } QWidget *DebuggerOptionsPage::widget() diff --git a/src/plugins/debugger/gdb/gdboptionspage.cpp b/src/plugins/debugger/gdb/gdboptionspage.cpp index 1a3cd5bb9f..1c759f939b 100644 --- a/src/plugins/debugger/gdb/gdboptionspage.cpp +++ b/src/plugins/debugger/gdb/gdboptionspage.cpp @@ -269,8 +269,6 @@ GdbOptionsPage::GdbOptionsPage() setId("M.Gdb"); setDisplayName(tr("GDB")); setCategory(Constants::DEBUGGER_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("Debugger", Constants::DEBUGGER_SETTINGS_TR_CATEGORY)); - setCategoryIcon(Utils::Icon(Constants::DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON)); } QWidget *GdbOptionsPage::widget() @@ -411,8 +409,6 @@ GdbOptionsPage2::GdbOptionsPage2() setId("M.Gdb2"); setDisplayName(tr("GDB Extended")); setCategory(Constants::DEBUGGER_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("Debugger", Constants::DEBUGGER_SETTINGS_TR_CATEGORY)); - setCategoryIcon(Utils::Icon(Constants::DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON)); } QWidget *GdbOptionsPage2::widget() diff --git a/src/plugins/designer/settingspage.cpp b/src/plugins/designer/settingspage.cpp index 248478934a..15275ce863 100644 --- a/src/plugins/designer/settingspage.cpp +++ b/src/plugins/designer/settingspage.cpp @@ -42,9 +42,6 @@ SettingsPage::SettingsPage(QDesignerOptionsPageInterface *designerPage) : setId(Core::Id::fromString(m_designerPage->name())); setDisplayName(m_designerPage->name()); setCategory(Designer::Constants::SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("Designer", - Designer::Constants::SETTINGS_TR_CATEGORY)); - setCategoryIcon(Utils::Icon(Designer::Constants::SETTINGS_CATEGORY_ICON)); } QWidget *SettingsPage::widget() diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp index aa26ce1ce7..8e6e4713ba 100644 --- a/src/plugins/fakevim/fakevimplugin.cpp +++ b/src/plugins/fakevim/fakevimplugin.cpp @@ -108,7 +108,6 @@ namespace Internal { const char INSTALL_HANDLER[] = "TextEditor.FakeVimHandler"; const char SETTINGS_CATEGORY[] = "D.FakeVim"; -const char SETTINGS_CATEGORY_FAKEVIM_ICON[] = ":/fakevim/images/category_fakevim.png"; const char SETTINGS_ID[] = "A.FakeVim.General"; const char SETTINGS_EX_CMDS_ID[] = "B.FakeVim.ExCommands"; const char SETTINGS_USER_CMDS_ID[] = "C.FakeVim.UserCommands"; @@ -365,7 +364,7 @@ public: setDisplayName(Tr::tr("General")); setCategory(SETTINGS_CATEGORY); setDisplayCategory(Tr::tr("FakeVim")); - setCategoryIcon(Utils::Icon(SETTINGS_CATEGORY_FAKEVIM_ICON)); + setCategoryIcon(Utils::Icon(":/fakevim/images/category_fakevim.png")); } QWidget *widget(); @@ -640,8 +639,6 @@ public: setId(SETTINGS_EX_CMDS_ID); setDisplayName(Tr::tr("Ex Command Mapping")); setCategory(SETTINGS_CATEGORY); - setDisplayCategory(Tr::tr("FakeVim")); - setCategoryIcon(Utils::Icon(SETTINGS_CATEGORY_FAKEVIM_ICON)); } QWidget *widget() override @@ -882,8 +879,6 @@ public: setId(SETTINGS_USER_CMDS_ID); setDisplayName(Tr::tr("User Command Mapping")); setCategory(SETTINGS_CATEGORY); - setDisplayCategory(Tr::tr("FakeVim")); - setCategoryIcon(Utils::Icon(SETTINGS_CATEGORY_FAKEVIM_ICON)); } void apply() override; diff --git a/src/plugins/help/docsettingspage.cpp b/src/plugins/help/docsettingspage.cpp index e34f65b253..93fbdb2621 100644 --- a/src/plugins/help/docsettingspage.cpp +++ b/src/plugins/help/docsettingspage.cpp @@ -134,8 +134,6 @@ DocSettingsPage::DocSettingsPage() setId("B.Documentation"); setDisplayName(tr("Documentation")); setCategory(Help::Constants::HELP_CATEGORY); - setDisplayCategory(QCoreApplication::translate("Help", Help::Constants::HELP_TR_CATEGORY)); - setCategoryIcon(Utils::Icon(Help::Constants::HELP_CATEGORY_ICON)); } QWidget *DocSettingsPage::widget() diff --git a/src/plugins/help/filtersettingspage.cpp b/src/plugins/help/filtersettingspage.cpp index bf9814e45d..adbab36c6e 100644 --- a/src/plugins/help/filtersettingspage.cpp +++ b/src/plugins/help/filtersettingspage.cpp @@ -43,8 +43,6 @@ FilterSettingsPage::FilterSettingsPage() setId("D.Filters"); setDisplayName(tr("Filters")); setCategory(Help::Constants::HELP_CATEGORY); - setDisplayCategory(QCoreApplication::translate("Help", Help::Constants::HELP_TR_CATEGORY)); - setCategoryIcon(Utils::Icon(Help::Constants::HELP_CATEGORY_ICON)); } QWidget *FilterSettingsPage::widget() diff --git a/src/plugins/help/generalsettingspage.cpp b/src/plugins/help/generalsettingspage.cpp index 1ede072893..a87b098a30 100644 --- a/src/plugins/help/generalsettingspage.cpp +++ b/src/plugins/help/generalsettingspage.cpp @@ -54,8 +54,8 @@ GeneralSettingsPage::GeneralSettingsPage() setId("A.General settings"); setDisplayName(tr("General")); setCategory(Help::Constants::HELP_CATEGORY); - setDisplayCategory(QCoreApplication::translate("Help", Help::Constants::HELP_TR_CATEGORY)); - setCategoryIcon(Utils::Icon(Help::Constants::HELP_CATEGORY_ICON)); + setDisplayCategory(QCoreApplication::translate("Help", "Help")); + setCategoryIcon(Utils::Icon(":/help/images/category_help.png")); } QWidget *GeneralSettingsPage::widget() diff --git a/src/plugins/help/helpconstants.h b/src/plugins/help/helpconstants.h index 8e3fbb88e2..a212159ceb 100644 --- a/src/plugins/help/helpconstants.h +++ b/src/plugins/help/helpconstants.h @@ -39,8 +39,6 @@ static const QLatin1String PreviousFilterNameKey("UnfilteredFilterName"); const int P_MODE_HELP = 70; const char ID_MODE_HELP [] = "Help"; const char HELP_CATEGORY[] = "H.Help"; -const char HELP_CATEGORY_ICON[] = ":/help/images/category_help.png"; -const char HELP_TR_CATEGORY[] = QT_TRANSLATE_NOOP("Help", "Help"); const char C_MODE_HELP [] = "Help Mode"; const char C_HELP_SIDEBAR[] = "Help Sidebar"; diff --git a/src/plugins/ios/iossettingspage.cpp b/src/plugins/ios/iossettingspage.cpp index e3d5bc19e3..efe98a1012 100644 --- a/src/plugins/ios/iossettingspage.cpp +++ b/src/plugins/ios/iossettingspage.cpp @@ -41,8 +41,6 @@ IosSettingsPage::IosSettingsPage(QObject *parent) setId(Constants::IOS_SETTINGS_ID); setDisplayName(tr("iOS")); setCategory(ProjectExplorer::Constants::DEVICE_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("ProjectExplorer", - ProjectExplorer::Constants::DEVICE_SETTINGS_TR_CATEGORY)); } QWidget *IosSettingsPage::widget() diff --git a/src/plugins/macros/macrooptionspage.cpp b/src/plugins/macros/macrooptionspage.cpp index 44c9d5fbf5..1cc8ec9875 100644 --- a/src/plugins/macros/macrooptionspage.cpp +++ b/src/plugins/macros/macrooptionspage.cpp @@ -45,8 +45,6 @@ MacroOptionsPage::MacroOptionsPage(QObject *parent) setId(Constants::M_OPTIONS_PAGE); setDisplayName(QCoreApplication::translate("Macros", Constants::M_OPTIONS_TR_PAGE)); setCategory(TextEditor::Constants::TEXT_EDITOR_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("TextEditor", - TextEditor::Constants::TEXT_EDITOR_SETTINGS_TR_CATEGORY)); } QWidget *MacroOptionsPage::widget() diff --git a/src/plugins/nim/settings/nimcodestylesettingspage.cpp b/src/plugins/nim/settings/nimcodestylesettingspage.cpp index 5eda9568f8..78247c8e42 100644 --- a/src/plugins/nim/settings/nimcodestylesettingspage.cpp +++ b/src/plugins/nim/settings/nimcodestylesettingspage.cpp @@ -50,7 +50,7 @@ NimCodeStyleSettingsPage::NimCodeStyleSettingsPage(QWidget *parent) setId(Nim::Constants::C_NIMCODESTYLESETTINGSPAGE_ID); setDisplayName(tr(Nim::Constants::C_NIMCODESTYLESETTINGSPAGE_DISPLAY)); setCategory(Nim::Constants::C_NIMCODESTYLESETTINGSPAGE_CATEGORY); - setDisplayCategory(tr(Nim::Constants::C_NIMCODESTYLESETTINGSPAGE_CATEGORY_DISPLAY)); + setDisplayCategory(tr("Nim")); setCategoryIcon(Utils::Icon(Nim::Constants::C_NIM_ICON_PATH)); } diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp b/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp index 078d5fdff2..3958b9d385 100644 --- a/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp +++ b/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp @@ -41,8 +41,7 @@ DeviceSettingsPage::DeviceSettingsPage(QObject *parent) setId(Constants::DEVICE_SETTINGS_PAGE_ID); setDisplayName(tr("Devices")); setCategory(Constants::DEVICE_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("ProjectExplorer", - ProjectExplorer::Constants::DEVICE_SETTINGS_TR_CATEGORY)); + setDisplayCategory(QCoreApplication::translate("ProjectExplorer", "Devices")); setCategoryIcon(Utils::Icon(":/projectexplorer/images/MaemoDevice.png")); } diff --git a/src/plugins/projectexplorer/kitoptionspage.cpp b/src/plugins/projectexplorer/kitoptionspage.cpp index 17b3484f91..6155f29c0b 100644 --- a/src/plugins/projectexplorer/kitoptionspage.cpp +++ b/src/plugins/projectexplorer/kitoptionspage.cpp @@ -237,12 +237,14 @@ QModelIndex KitOptionsPageWidget::currentIndex() const KitOptionsPage::KitOptionsPage() { + static const Utils::Icon categoryIcon({{":/projectexplorer/images/mode_project_mask.png", + Utils::Theme::PanelTextColorDark}}, + Utils::Icon::Tint); setId(Constants::KITS_SETTINGS_PAGE_ID); setDisplayName(tr("Kits")); setCategory(Constants::KITS_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("ProjectExplorer", - Constants::KITS_SETTINGS_TR_CATEGORY)); - setCategoryIcon(ProjectExplorer::Icons::OPTIONS_CATEGORY_KITS); + setDisplayCategory(QCoreApplication::translate("ProjectExplorer", "Kits")); + setCategoryIcon(categoryIcon); } QWidget *KitOptionsPage::widget() diff --git a/src/plugins/projectexplorer/projectexplorerconstants.h b/src/plugins/projectexplorer/projectexplorerconstants.h index 9750fe5a08..bbb0333bfa 100644 --- a/src/plugins/projectexplorer/projectexplorerconstants.h +++ b/src/plugins/projectexplorer/projectexplorerconstants.h @@ -102,7 +102,6 @@ const char SCXML_MIMETYPE[] = "application/scxml+xml"; // Kits settings category const char KITS_SETTINGS_CATEGORY[] = "A.Kits"; -const char KITS_SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("ProjectExplorer", "Kits"); // Kits pages const char KITS_SETTINGS_PAGE_ID[] = "D.ProjectExplorer.KitsOptions"; @@ -112,15 +111,12 @@ const char DEBUGGER_SETTINGS_PAGE_ID[] = "N.ProjectExplorer.DebuggerOptions"; // Build and Run settings category const char BUILD_AND_RUN_SETTINGS_CATEGORY[] = "K.BuildAndRun"; -const char BUILD_AND_RUN_SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("ProjectExplorer", "Build & Run"); -const char BUILD_AND_RUN_SETTINGS_CATEGORY_ICON[] = ":/projectexplorer/images/category_buildrun.png"; // Build and Run page const char BUILD_AND_RUN_SETTINGS_PAGE_ID[] = "A.ProjectExplorer.BuildAndRunOptions"; // Device settings page const char DEVICE_SETTINGS_CATEGORY[] = "XW.Devices"; -const char DEVICE_SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("ProjectExplorer", "Devices"); // Task categories const char TASK_CATEGORY_COMPILE[] = "Task.Category.Compile"; diff --git a/src/plugins/projectexplorer/projectexplorericons.cpp b/src/plugins/projectexplorer/projectexplorericons.cpp index 2a2cd8cb80..cd1913838d 100644 --- a/src/plugins/projectexplorer/projectexplorericons.cpp +++ b/src/plugins/projectexplorer/projectexplorericons.cpp @@ -96,8 +96,5 @@ const Icon MODE_PROJECT_FLAT({ const Icon MODE_PROJECT_FLAT_ACTIVE({ {":/projectexplorer/images/mode_project_mask.png", Theme::IconsModeProjectActiveColor}}); -const Icon OPTIONS_CATEGORY_KITS({ - {":/projectexplorer/images/mode_project_mask.png", Theme::PanelTextColorDark}}, Icon::Tint); - } // namespace Icons } // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/projectexplorericons.h b/src/plugins/projectexplorer/projectexplorericons.h index 72bf6747bf..fbef189663 100644 --- a/src/plugins/projectexplorer/projectexplorericons.h +++ b/src/plugins/projectexplorer/projectexplorericons.h @@ -65,7 +65,5 @@ PROJECTEXPLORER_EXPORT extern const Utils::Icon MODE_PROJECT_CLASSIC; PROJECTEXPLORER_EXPORT extern const Utils::Icon MODE_PROJECT_FLAT; PROJECTEXPLORER_EXPORT extern const Utils::Icon MODE_PROJECT_FLAT_ACTIVE; -PROJECTEXPLORER_EXPORT extern const Utils::Icon OPTIONS_CATEGORY_KITS; - } // namespace Icons } // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.cpp b/src/plugins/projectexplorer/projectexplorersettingspage.cpp index 8eaef6da20..5a8f2bc1ca 100644 --- a/src/plugins/projectexplorer/projectexplorersettingspage.cpp +++ b/src/plugins/projectexplorer/projectexplorersettingspage.cpp @@ -190,9 +190,8 @@ ProjectExplorerSettingsPage::ProjectExplorerSettingsPage() setId(Constants::BUILD_AND_RUN_SETTINGS_PAGE_ID); setDisplayName(tr("General")); setCategory(Constants::BUILD_AND_RUN_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("ProjectExplorer", - Constants::BUILD_AND_RUN_SETTINGS_TR_CATEGORY)); - setCategoryIcon(Utils::Icon(Constants::BUILD_AND_RUN_SETTINGS_CATEGORY_ICON)); + setDisplayCategory(QCoreApplication::translate("ProjectExplorer", "Build & Run")); + setCategoryIcon(Utils::Icon(":/projectexplorer/images/category_buildrun.png")); } QWidget *ProjectExplorerSettingsPage::widget() diff --git a/src/plugins/projectexplorer/toolchainoptionspage.cpp b/src/plugins/projectexplorer/toolchainoptionspage.cpp index 430b1ebad1..15ebda4998 100644 --- a/src/plugins/projectexplorer/toolchainoptionspage.cpp +++ b/src/plugins/projectexplorer/toolchainoptionspage.cpp @@ -434,9 +434,6 @@ ToolChainOptionsPage::ToolChainOptionsPage() setId(Constants::TOOLCHAIN_SETTINGS_PAGE_ID); setDisplayName(tr("Compilers")); setCategory(Constants::KITS_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("ProjectExplorer", - Constants::KITS_SETTINGS_TR_CATEGORY)); - setCategoryIcon(ProjectExplorer::Icons::OPTIONS_CATEGORY_KITS); } QWidget *ToolChainOptionsPage::widget() diff --git a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp index 7bdc2b675b..c2eb6b45d5 100644 --- a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp +++ b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp @@ -73,9 +73,6 @@ QbsProfilesSettingsPage::QbsProfilesSettingsPage(QObject *parent) setId("Y.QbsProfiles"); setDisplayName(QCoreApplication::translate("QbsProjectManager", "Qbs")); setCategory(ProjectExplorer::Constants::KITS_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("ProjectExplorer", - ProjectExplorer::Constants::KITS_SETTINGS_TR_CATEGORY)); - setCategoryIcon(ProjectExplorer::Icons::OPTIONS_CATEGORY_KITS); } QWidget *QbsProfilesSettingsPage::widget() diff --git a/src/plugins/qmldesigner/settingspage.cpp b/src/plugins/qmldesigner/settingspage.cpp index d0dd85e755..882e48eb1e 100644 --- a/src/plugins/qmldesigner/settingspage.cpp +++ b/src/plugins/qmldesigner/settingspage.cpp @@ -233,9 +233,6 @@ SettingsPage::SettingsPage() : setId("B.QmlDesigner"); setDisplayName(tr("Qt Quick Designer")); 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)); } QWidget *SettingsPage::widget() diff --git a/src/plugins/qmljseditor/qmljseditingsettingspage.cpp b/src/plugins/qmljseditor/qmljseditingsettingspage.cpp index 1e772df1b3..be805c8ce1 100644 --- a/src/plugins/qmljseditor/qmljseditingsettingspage.cpp +++ b/src/plugins/qmljseditor/qmljseditingsettingspage.cpp @@ -167,9 +167,6 @@ QmlJsEditingSettingsPage::QmlJsEditingSettingsPage() : setId("C.QmlJsEditing"); setDisplayName(tr("QML/JS Editing")); setCategory(Constants::SETTINGS_CATEGORY_QML); - setDisplayCategory(QCoreApplication::translate("QmlJSEditor", - QmlJSEditor::Constants::SETTINGS_TR_CATEGORY_QML)); - setCategoryIcon(Utils::Icon(QmlJSTools::Constants::SETTINGS_CATEGORY_QML_ICON)); } QWidget *QmlJsEditingSettingsPage::widget() diff --git a/src/plugins/qmljseditor/qmljseditorconstants.h b/src/plugins/qmljseditor/qmljseditorconstants.h index c1a78898b5..624d3b0b16 100644 --- a/src/plugins/qmljseditor/qmljseditorconstants.h +++ b/src/plugins/qmljseditor/qmljseditorconstants.h @@ -40,7 +40,6 @@ const char C_QMLJSEDITOR_ID[] = "QMLProjectManager.QMLJSEditor"; const char C_QMLJSEDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("OpenWith::Editors", "QMLJS Editor"); const char TASK_SEARCH[] = "QmlJSEditor.TaskSearch"; const char SETTINGS_CATEGORY_QML[] = "J.QtQuick"; -const char SETTINGS_TR_CATEGORY_QML[] = QT_TRANSLATE_NOOP("QmlJSEditor", "Qt Quick"); const char FIND_USAGES[] = "QmlJSEditor.FindUsages"; const char RENAME_USAGES[] = "QmlJSEditor.RenameUsages"; 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 diff --git a/src/plugins/qnx/qnxsettingspage.cpp b/src/plugins/qnx/qnxsettingspage.cpp index 8bc719a2c7..2b488887dd 100644 --- a/src/plugins/qnx/qnxsettingspage.cpp +++ b/src/plugins/qnx/qnxsettingspage.cpp @@ -45,8 +45,6 @@ QnxSettingsPage::QnxSettingsPage(QObject* parent) : setId(Core::Id(Constants::QNX_SETTINGS_ID)); setDisplayName(tr("QNX")); setCategory(ProjectExplorer::Constants::DEVICE_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("ProjectExplorer", - ProjectExplorer::Constants::DEVICE_SETTINGS_TR_CATEGORY)); } QWidget* QnxSettingsPage::widget() diff --git a/src/plugins/qtsupport/codegensettingspage.cpp b/src/plugins/qtsupport/codegensettingspage.cpp index 66038ca186..ba11ca2b26 100644 --- a/src/plugins/qtsupport/codegensettingspage.cpp +++ b/src/plugins/qtsupport/codegensettingspage.cpp @@ -97,8 +97,6 @@ CodeGenSettingsPage::CodeGenSettingsPage(QObject *parent) : setId(Constants::CODEGEN_SETTINGS_PAGE_ID); setDisplayName(QCoreApplication::translate("QtSupport", Constants::CODEGEN_SETTINGS_PAGE_NAME)); setCategory(CppTools::Constants::CPP_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("CppTools", CppTools::Constants::CPP_SETTINGS_TR_CATEGORY)); - setCategoryIcon(Utils::Icon(CppTools::Constants::SETTINGS_CATEGORY_CPP_ICON)); } QWidget *CodeGenSettingsPage::widget() diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp index 7468640368..f891f38184 100644 --- a/src/plugins/qtsupport/qtoptionspage.cpp +++ b/src/plugins/qtsupport/qtoptionspage.cpp @@ -158,9 +158,6 @@ QtOptionsPage::QtOptionsPage() setId(Constants::QTVERSION_SETTINGS_PAGE_ID); setDisplayName(QCoreApplication::translate("QtSupport", Constants::QTVERSION_SETTINGS_PAGE_NAME)); setCategory(ProjectExplorer::Constants::KITS_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("ProjectExplorer", - ProjectExplorer::Constants::KITS_SETTINGS_TR_CATEGORY)); - setCategoryIcon(ProjectExplorer::Icons::OPTIONS_CATEGORY_KITS); } QWidget *QtOptionsPage::widget() diff --git a/src/plugins/texteditor/texteditorconstants.h b/src/plugins/texteditor/texteditorconstants.h index 8007c76617..3101912e35 100644 --- a/src/plugins/texteditor/texteditorconstants.h +++ b/src/plugins/texteditor/texteditorconstants.h @@ -204,8 +204,6 @@ const char *nameForStyle(TextStyle style); TextStyle styleFromName(const char *name); const char TEXT_EDITOR_SETTINGS_CATEGORY[] = "C.TextEditor"; -const char TEXT_EDITOR_SETTINGS_CATEGORY_ICON[] = ":/core/images/category_texteditor.png"; -const char TEXT_EDITOR_SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("TextEditor", "Text Editor"); const char TEXT_EDITOR_FONT_SETTINGS[] = "A.FontSettings"; const char TEXT_EDITOR_BEHAVIOR_SETTINGS[] = "B.BehaviourSettings"; const char TEXT_EDITOR_DISPLAY_SETTINGS[] = "D.DisplaySettings"; diff --git a/src/plugins/texteditor/texteditoroptionspage.cpp b/src/plugins/texteditor/texteditoroptionspage.cpp index 2e1d9b3321..a028593e9a 100644 --- a/src/plugins/texteditor/texteditoroptionspage.cpp +++ b/src/plugins/texteditor/texteditoroptionspage.cpp @@ -35,6 +35,6 @@ TextEditorOptionsPage::TextEditorOptionsPage(QObject *parent) : Core::IOptionsPage(parent) { setCategory(Constants::TEXT_EDITOR_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("TextEditor", Constants::TEXT_EDITOR_SETTINGS_TR_CATEGORY)); - setCategoryIcon(Utils::Icon(Constants::TEXT_EDITOR_SETTINGS_CATEGORY_ICON)); + setDisplayCategory(QCoreApplication::translate("TextEditor", "Text Editor")); + setCategoryIcon(Utils::Icon(":/core/images/category_texteditor.png")); } diff --git a/src/plugins/todo/constants.h b/src/plugins/todo/constants.h index 13e141b7bc..4b396eb726 100644 --- a/src/plugins/todo/constants.h +++ b/src/plugins/todo/constants.h @@ -31,9 +31,6 @@ namespace Todo { namespace Constants { -// Dummy, needs to be changed -const char ICON_TODO[] = ":/todoplugin/images/todo.png"; - // Settings entries const char SETTINGS_GROUP[] = "TodoPlugin"; const char SCANNING_SCOPE[] = "ScanningScope"; diff --git a/src/plugins/todo/optionspage.cpp b/src/plugins/todo/optionspage.cpp index d449c5b7ac..adce5dc44e 100644 --- a/src/plugins/todo/optionspage.cpp +++ b/src/plugins/todo/optionspage.cpp @@ -49,7 +49,7 @@ OptionsPage::OptionsPage(const Settings &settings, QObject *parent) : setDisplayName(tr("To-Do")); setCategory("To-Do"); setDisplayCategory(tr("To-Do")); - setCategoryIcon(Utils::Icon(Constants::ICON_TODO)); + setCategoryIcon(Utils::Icon(":/todoplugin/images/todo.png")); } void OptionsPage::setSettings(const Settings &settings) diff --git a/src/plugins/updateinfo/settingspage.cpp b/src/plugins/updateinfo/settingspage.cpp index 03a1045a32..9cefeae682 100644 --- a/src/plugins/updateinfo/settingspage.cpp +++ b/src/plugins/updateinfo/settingspage.cpp @@ -47,9 +47,7 @@ SettingsPage::SettingsPage(UpdateInfoPlugin *plugin) { setId(FILTER_OPTIONS_PAGE_ID); setCategory(Core::Constants::SETTINGS_CATEGORY_CORE); - setCategoryIcon(Utils::Icon(Core::Constants::SETTINGS_CATEGORY_CORE_ICON)); setDisplayName(QCoreApplication::translate("Update", FILTER_OPTIONS_PAGE)); - setDisplayCategory(QCoreApplication::translate("Core", Core::Constants::SETTINGS_TR_CATEGORY_CORE)); } QWidget *SettingsPage::widget() diff --git a/src/plugins/vcsbase/vcsbaseconstants.h b/src/plugins/vcsbase/vcsbaseconstants.h index b02f14e136..05b02a1ba7 100644 --- a/src/plugins/vcsbase/vcsbaseconstants.h +++ b/src/plugins/vcsbase/vcsbaseconstants.h @@ -31,8 +31,6 @@ namespace VcsBase { namespace Constants { const char VCS_SETTINGS_CATEGORY[] = "V.Version Control"; -const char VCS_SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("VcsBase", "Version Control"); -const char SETTINGS_CATEGORY_VCS_ICON[] = ":/vcsbase/images/category_vcs.png"; const char VCS_COMMON_SETTINGS_ID[] = "A.VCS.General"; const char VCS_COMMON_SETTINGS_NAME[] = QT_TRANSLATE_NOOP("VcsBase", "General"); diff --git a/src/plugins/vcsbase/vcsbaseoptionspage.cpp b/src/plugins/vcsbase/vcsbaseoptionspage.cpp index 8a7b038a6b..6ca261c9ee 100644 --- a/src/plugins/vcsbase/vcsbaseoptionspage.cpp +++ b/src/plugins/vcsbase/vcsbaseoptionspage.cpp @@ -47,8 +47,8 @@ namespace VcsBase { VcsBaseOptionsPage::VcsBaseOptionsPage(QObject *parent) : Core::IOptionsPage(parent) { setCategory(Constants::VCS_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("VcsBase", Constants::VCS_SETTINGS_TR_CATEGORY)); - setCategoryIcon(Utils::Icon(Constants::SETTINGS_CATEGORY_VCS_ICON)); + setDisplayCategory(QCoreApplication::translate("VcsBase", "Version Control")); + setCategoryIcon(Utils::Icon(":/vcsbase/images/category_vcs.png")); } VcsBaseOptionsPage::~VcsBaseOptionsPage() = default; |