feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clean up options page category display name and icon set up

Browse Source 
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>
This commit is contained in:
Eike Ziller
2018-04-20 15:45:11 +02:00
parent 4b9945c329
commit d1ec4c1204
60 changed files with 29 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/android/androidsettingspage.cpp
View File

@@ -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()

2
src/plugins/autotest/itestsettingspage.h
View File

@@ -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() {}

2
src/plugins/baremetal/gdbserverproviderssettingspage.cpp
View File

@@ -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()

2
src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp
View File

@@ -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()

2
src/plugins/beautifier/beautifierconstants.h
View File

@@ -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";

2
src/plugins/beautifier/clangformat/clangformatoptionspage.cpp
View File

@@ -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()

4
src/plugins/beautifier/generaloptionspage.cpp
View File

@@ -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()

2
src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp
View File

@@ -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()

3
src/plugins/cmakeprojectmanager/cmakesettingspage.cpp
View File

@@ -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()

2
src/plugins/coreplugin/coreconstants.h
View File

@@ -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";

2
src/plugins/coreplugin/dialogs/shortcutsettings.cpp
View File

@@ -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()

4
src/plugins/coreplugin/generalsettings.cpp
View File

@@ -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)

2
src/plugins/coreplugin/locator/locatorsettingspage.cpp
View File

@@ -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()

3
src/plugins/coreplugin/mimetypesettings.cpp
View File

@@ -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()

2
src/plugins/coreplugin/systemsettings.cpp
View File

@@ -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);

2
src/plugins/coreplugin/toolsettings.cpp
View File

@@ -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));
}

2
src/plugins/cpaster/cpasterconstants.h
View File

@@ -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

1
src/plugins/cpaster/fileshareprotocolsettingspage.cpp
View File

@@ -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()

5
src/plugins/cpaster/settingspage.cpp
View File

@@ -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()

4
src/plugins/cpptools/cppcodemodelsettingspage.cpp
View File

@@ -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()

2
src/plugins/cpptools/cppcodestylesettingspage.cpp
View File

@@ -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()

2
src/plugins/cpptools/cppfilesettingspage.cpp
View File

@@ -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()

2
src/plugins/cpptools/cpptoolsconstants.h
View File

@@ -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";

6
src/plugins/debugger/cdb/cdboptionspage.cpp
View File

@@ -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()

6
src/plugins/debugger/commonoptionspage.cpp
View File

@@ -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()

2
src/plugins/debugger/debuggerinternalconstants.h
View File

@@ -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 };

3
src/plugins/debugger/debuggeritemmanager.cpp
View File

@@ -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()

4
src/plugins/debugger/gdb/gdboptionspage.cpp
View File

@@ -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()

3
src/plugins/designer/settingspage.cpp
View File

@@ -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()

7
src/plugins/fakevim/fakevimplugin.cpp
View File

@@ -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;

2
src/plugins/help/docsettingspage.cpp
View File

@@ -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()

2
src/plugins/help/filtersettingspage.cpp
View File

@@ -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()

4
src/plugins/help/generalsettingspage.cpp
View File

@@ -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()

2
src/plugins/help/helpconstants.h
View File

@@ -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";

2
src/plugins/ios/iossettingspage.cpp
View File

@@ -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()

2
src/plugins/macros/macrooptionspage.cpp
View File

@@ -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()

2
src/plugins/nim/settings/nimcodestylesettingspage.cpp
View File

@@ -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));
}

3
src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp
View File

@@ -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"));
}

8
src/plugins/projectexplorer/kitoptionspage.cpp
View File

@@ -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()

4
src/plugins/projectexplorer/projectexplorerconstants.h
View File

@@ -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";

3
src/plugins/projectexplorer/projectexplorericons.cpp
View File

@@ -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

2
src/plugins/projectexplorer/projectexplorericons.h
View File

@@ -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

5
src/plugins/projectexplorer/projectexplorersettingspage.cpp
View File

@@ -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()

3
src/plugins/projectexplorer/toolchainoptionspage.cpp
View File

@@ -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()

3
src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp
View File

@@ -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()

3
src/plugins/qmldesigner/settingspage.cpp
View File

@@ -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()

3
src/plugins/qmljseditor/qmljseditingsettingspage.cpp
View File

@@ -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()

1
src/plugins/qmljseditor/qmljseditorconstants.h
View File

@@ -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";

4
src/plugins/qmljstools/qmljscodestylesettingspage.cpp
View File

@@ -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()

2
src/plugins/qmljstools/qmljstoolsconstants.h
View File

@@ -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

2
src/plugins/qnx/qnxsettingspage.cpp
View File

@@ -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()

2
src/plugins/qtsupport/codegensettingspage.cpp
View File

@@ -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()

3
src/plugins/qtsupport/qtoptionspage.cpp
View File

@@ -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()

2
src/plugins/texteditor/texteditorconstants.h
View File

@@ -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";

4
src/plugins/texteditor/texteditoroptionspage.cpp
View File

@@ -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"));
}

3
src/plugins/todo/constants.h
View File

@@ -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";

2
src/plugins/todo/optionspage.cpp
View File

@@ -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)

2
src/plugins/updateinfo/settingspage.cpp
View File

@@ -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()

2
src/plugins/vcsbase/vcsbaseconstants.h
View File

@@ -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");

4
src/plugins/vcsbase/vcsbaseoptionspage.cpp
View File

@@ -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;