From 2d21060bc97cf7a20dde46e20c3b4a2c6cd50f64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Fri, 26 Mar 2010 17:34:10 +0100 Subject: Added icons to options dialog categories Some categories do not have icons yet, unfortunately. --- src/libs/utils/parameteraction.cpp | 2 +- src/libs/utils/parameteraction.h | 4 +-- .../cmakeprojectmanager/cmakeprojectmanager.cpp | 5 ++++ .../cmakeprojectmanager/cmakeprojectmanager.h | 1 + .../coreplugin/actionmanager/commandmappings.h | 6 ----- src/plugins/coreplugin/core.qrc | 8 ++++++ src/plugins/coreplugin/coreconstants.h | 1 + src/plugins/coreplugin/dialogs/ioptionspage.h | 2 ++ src/plugins/coreplugin/dialogs/settingsdialog.cpp | 29 +++++++++++++++++++-- .../coreplugin/dialogs/shortcutsettings.cpp | 5 ++++ src/plugins/coreplugin/dialogs/shortcutsettings.h | 1 + src/plugins/coreplugin/generalsettings.cpp | 5 ++++ src/plugins/coreplugin/generalsettings.h | 1 + src/plugins/coreplugin/images/category_core.png | Bin 0 -> 930 bytes src/plugins/coreplugin/images/category_debug.png | Bin 0 -> 1924 bytes src/plugins/coreplugin/images/category_design.png | Bin 0 -> 852 bytes src/plugins/coreplugin/images/category_help.png | Bin 0 -> 2173 bytes src/plugins/coreplugin/images/category_project.png | Bin 0 -> 1100 bytes src/plugins/coreplugin/images/category_qt.png | Bin 0 -> 1496 bytes .../coreplugin/images/category_texteditor.png | Bin 0 -> 615 bytes src/plugins/cpaster/codepasterprotocol.cpp | 8 +++--- src/plugins/cpaster/codepastersettings.cpp | 5 ++++ src/plugins/cpaster/codepastersettings.h | 1 + src/plugins/cpaster/pastebindotcomprotocol.cpp | 2 +- src/plugins/cpaster/pastebindotcomprotocol.h | 2 +- src/plugins/cpaster/pastebindotcomsettings.cpp | 5 ++++ src/plugins/cpaster/pastebindotcomsettings.h | 1 + src/plugins/cpaster/protocol.cpp | 2 +- src/plugins/cpaster/protocol.h | 2 +- src/plugins/cpaster/settingspage.cpp | 5 ++++ src/plugins/cpaster/settingspage.h | 1 + src/plugins/cpptools/completionsettingspage.cpp | 5 ++++ src/plugins/cpptools/completionsettingspage.h | 1 + src/plugins/cpptools/cppfilesettingspage.cpp | 5 ++++ src/plugins/cpptools/cppfilesettingspage.h | 1 + src/plugins/cvs/settingspage.cpp | 5 ++++ src/plugins/cvs/settingspage.h | 1 + src/plugins/debugger/debuggerconstants.h | 2 ++ src/plugins/debugger/debuggerplugin.cpp | 3 +++ src/plugins/debugger/gdb/gdboptionspage.cpp | 5 ++++ src/plugins/debugger/gdb/gdboptionspage.h | 1 + src/plugins/debugger/gdb/trkoptionspage.cpp | 5 ++++ src/plugins/debugger/gdb/trkoptionspage.h | 1 + src/plugins/designer/cpp/cppsettingspage.cpp | 5 ++++ src/plugins/designer/cpp/cppsettingspage.h | 1 + src/plugins/designer/designerconstants.h | 1 + src/plugins/designer/settingspage.cpp | 5 ++++ src/plugins/designer/settingspage.h | 1 + src/plugins/fakevim/fakevimplugin.cpp | 2 ++ src/plugins/git/settingspage.cpp | 5 ++++ src/plugins/git/settingspage.h | 1 + src/plugins/help/docsettingspage.cpp | 5 ++++ src/plugins/help/docsettingspage.h | 1 + src/plugins/help/filtersettingspage.cpp | 5 ++++ src/plugins/help/filtersettingspage.h | 1 + src/plugins/help/generalsettingspage.cpp | 5 ++++ src/plugins/help/generalsettingspage.h | 3 ++- src/plugins/help/helpconstants.h | 1 + src/plugins/locator/settingspage.cpp | 5 ++++ src/plugins/locator/settingspage.h | 1 + src/plugins/mercurial/optionspage.cpp | 5 ++++ src/plugins/mercurial/optionspage.h | 1 + src/plugins/perforce/settingspage.cpp | 5 ++++ src/plugins/perforce/settingspage.h | 1 + .../projectexplorer/projectexplorerconstants.h | 1 + .../projectexplorersettingspage.cpp | 9 +++++-- .../projectexplorer/projectexplorersettingspage.h | 1 + src/plugins/qmldesigner/settingspage.cpp | 5 ++++ src/plugins/qmldesigner/settingspage.h | 1 + .../qt-maemo/maemosettingspage.cpp | 5 ++++ .../qt4projectmanager/qt-maemo/maemosettingspage.h | 1 + .../qt-s60/s60devicespreferencepane.cpp | 7 +++-- .../qt-s60/s60devicespreferencepane.h | 4 ++- .../qt4projectmanager/qt4projectmanagerconstants.h | 1 + src/plugins/qt4projectmanager/qtoptionspage.cpp | 5 ++++ src/plugins/qt4projectmanager/qtoptionspage.h | 1 + src/plugins/subversion/settingspage.cpp | 5 ++++ src/plugins/subversion/settingspage.h | 1 + src/plugins/texteditor/behaviorsettingspage.cpp | 5 ++++ src/plugins/texteditor/behaviorsettingspage.h | 2 ++ src/plugins/texteditor/displaysettingspage.cpp | 5 ++++ src/plugins/texteditor/displaysettingspage.h | 2 ++ src/plugins/texteditor/fontsettingspage.cpp | 5 ++++ src/plugins/texteditor/fontsettingspage.h | 1 + src/plugins/texteditor/texteditorconstants.h | 1 + src/plugins/texteditor/texteditorsettings.cpp | 5 +++- src/plugins/vcsbase/vcsbasesettingspage.cpp | 5 ++++ src/plugins/vcsbase/vcsbasesettingspage.h | 1 + 88 files changed, 252 insertions(+), 26 deletions(-) create mode 100644 src/plugins/coreplugin/images/category_core.png create mode 100644 src/plugins/coreplugin/images/category_debug.png create mode 100644 src/plugins/coreplugin/images/category_design.png create mode 100644 src/plugins/coreplugin/images/category_help.png create mode 100644 src/plugins/coreplugin/images/category_project.png create mode 100644 src/plugins/coreplugin/images/category_qt.png create mode 100644 src/plugins/coreplugin/images/category_texteditor.png (limited to 'src') diff --git a/src/libs/utils/parameteraction.cpp b/src/libs/utils/parameteraction.cpp index 4839d2f19c..8a6863b596 100644 --- a/src/libs/utils/parameteraction.cpp +++ b/src/libs/utils/parameteraction.cpp @@ -84,4 +84,4 @@ void ParameterAction::setParameter(const QString &p) setEnabled(enabled); } -} +} // namespace Utils diff --git a/src/libs/utils/parameteraction.h b/src/libs/utils/parameteraction.h index 71fc36f0b6..c80b7bed2d 100644 --- a/src/libs/utils/parameteraction.h +++ b/src/libs/utils/parameteraction.h @@ -58,7 +58,7 @@ public: explicit ParameterAction(const QString &emptyText, const QString ¶meterText, EnablingMode em = AlwaysEnabled, - QObject* parent = 0); + QObject *parent = 0); QString emptyText() const; void setEmptyText(const QString &); @@ -78,6 +78,6 @@ private: EnablingMode m_enablingMode; }; -} +} // namespace Utils #endif // PARAMETERACTION_H diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp index 4ba6a66dee..b138e8c0de 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp @@ -258,6 +258,11 @@ QString CMakeSettingsPage::displayCategory() const return tr("CMake"); } +QIcon CMakeSettingsPage::categoryIcon() const +{ + return QIcon(); // TODO: Add CMake icon or move this into Projects category +} + QWidget *CMakeSettingsPage::createPage(QWidget *parent) { QWidget *outerWidget = new QWidget(parent); diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h index 69cc4b5cbf..92f2ab0176 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h @@ -91,6 +91,7 @@ public: virtual QString displayName() const; virtual QString category() const; virtual QString displayCategory() const; + virtual QIcon categoryIcon() const; virtual QWidget *createPage(QWidget *parent); virtual void apply(); diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.h b/src/plugins/coreplugin/actionmanager/commandmappings.h index a040c2f9af..929618e9c5 100644 --- a/src/plugins/coreplugin/actionmanager/commandmappings.h +++ b/src/plugins/coreplugin/actionmanager/commandmappings.h @@ -60,12 +60,6 @@ public: CommandMappings(QObject *parent = 0); ~CommandMappings(); - // IOptionsPage - virtual QString id() const = 0; - virtual QString displayName() const = 0; - virtual QString category() const = 0; - virtual QString displayCategory() const = 0; - protected slots: void commandChanged(QTreeWidgetItem *current); void filterChanged(const QString &f); diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc index 009ec86687..cb606618ee 100644 --- a/src/plugins/coreplugin/core.qrc +++ b/src/plugins/coreplugin/core.qrc @@ -43,6 +43,14 @@ images/unlocked.png images/extension.png images/darkclosebutton.png + images/category_debug.png + images/category_core.png + images/category_texteditor.png + images/category_help.png + images/category_project.png + images/category_design.png + images/category_qt.png + editormanager/BinFiles.mimetypes.xml images/progressbar.png diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h index 014b9e6395..765c899c2b 100644 --- a/src/plugins/coreplugin/coreconstants.h +++ b/src/plugins/coreplugin/coreconstants.h @@ -227,6 +227,7 @@ const char * const WIZARD_CATEGORY_QT = "R.Qt"; const char * const WIZARD_TR_CATEGORY_QT = QT_TRANSLATE_NOOP("Core", "Qt"); const char * const SETTINGS_CATEGORY_CORE = "A.Core"; +const char * const SETTINGS_CATEGORY_CORE_ICON = ":/core/images/category_core.png"; const char * const SETTINGS_TR_CATEGORY_CORE = QT_TRANSLATE_NOOP("Core", "Environment"); const char * const SETTINGS_ID_ENVIRONMENT = "A.General"; diff --git a/src/plugins/coreplugin/dialogs/ioptionspage.h b/src/plugins/coreplugin/dialogs/ioptionspage.h index e2e69b5bed..7818921e7e 100644 --- a/src/plugins/coreplugin/dialogs/ioptionspage.h +++ b/src/plugins/coreplugin/dialogs/ioptionspage.h @@ -32,6 +32,7 @@ #include +#include #include QT_BEGIN_NAMESPACE @@ -51,6 +52,7 @@ public: virtual QString displayName() const = 0; virtual QString category() const = 0; virtual QString displayCategory() const = 0; + virtual QIcon categoryIcon() const = 0; virtual bool matches(const QString & /* searchKeyWord*/) const { return false; } virtual QWidget *createPage(QWidget *parent) = 0; diff --git a/src/plugins/coreplugin/dialogs/settingsdialog.cpp b/src/plugins/coreplugin/dialogs/settingsdialog.cpp index 6fd7e70811..7d0f8c4656 100644 --- a/src/plugins/coreplugin/dialogs/settingsdialog.cpp +++ b/src/plugins/coreplugin/dialogs/settingsdialog.cpp @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -52,9 +53,11 @@ #include #include #include +#include static const char categoryKeyC[] = "General/LastPreferenceCategory"; static const char pageKeyC[] = "General/LastPreferencePage"; +const int categoryIconSize = 32; namespace Core { namespace Internal { @@ -64,6 +67,7 @@ namespace Internal { struct Category { QString id; QString displayName; + QIcon icon; QList pages; int index; QTabWidget *tabWidget; @@ -85,11 +89,15 @@ private: Category *findCategoryById(const QString &id); QList m_categories; + QIcon m_emptyIcon; }; CategoryModel::CategoryModel(QObject *parent) : QAbstractListModel(parent) { + QPixmap empty(categoryIconSize, categoryIconSize); + empty.fill(Qt::transparent); + m_emptyIcon = QIcon(empty); } CategoryModel::~CategoryModel() @@ -107,6 +115,12 @@ QVariant CategoryModel::data(const QModelIndex &index, int role) const switch (role) { case Qt::DisplayRole: return m_categories.at(index.row())->displayName; + case Qt::DecorationRole: { + QIcon icon = m_categories.at(index.row())->icon; + if (icon.isNull()) + icon = m_emptyIcon; + return icon; + } } return QVariant(); @@ -126,6 +140,7 @@ void CategoryModel::setPages(const QList &pages) category = new Category; category->id = categoryId; category->displayName = page->displayCategory(); + category->icon = page->categoryIcon(); category->pages.append(page); m_categories.append(category); } else { @@ -198,7 +213,10 @@ public: virtual QSize sizeHint() const { - return QSize(sizeHintForColumn(0) + frameWidth() * 2, 100); + int width = sizeHintForColumn(0) + frameWidth() * 2 + 5; + if (verticalScrollBar()->isVisible()) + width += verticalScrollBar()->width(); + return QSize(width, 100); } }; @@ -262,9 +280,14 @@ SettingsDialog::SettingsDialog(QWidget *parent, const QString &categoryId, QTabWidget *tabWidget = new QTabWidget; for (int j = 0; j < category->pages.size(); ++j) { IOptionsPage *page = category->pages.at(j); - tabWidget->addTab(page->createPage(0), page->displayName()); + QWidget *widget = page->createPage(0); + tabWidget->addTab(widget, page->displayName()); if (initialCategoryIndex == i && page->id() == initialPage) initialPageIndex = j; + + // A hack to remove the borders from all group boxes + foreach (QGroupBox *groupBox, qFindChildren(widget)) + groupBox->setFlat(true); } connect(tabWidget, SIGNAL(currentChanged(int)), @@ -276,8 +299,10 @@ SettingsDialog::SettingsDialog(QWidget *parent, const QString &categoryId, m_proxyModel->setSourceModel(m_model); m_proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive); + m_categoryList->setIconSize(QSize(categoryIconSize, categoryIconSize)); m_categoryList->setModel(m_proxyModel); m_categoryList->setSelectionMode(QAbstractItemView::SingleSelection); + m_categoryList->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel); connect(m_categoryList->selectionModel(), SIGNAL(currentRowChanged(QModelIndex,QModelIndex)), this, SLOT(currentChanged(QModelIndex))); diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp index b756dd9d51..51ccb8aca4 100644 --- a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp +++ b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp @@ -87,6 +87,11 @@ QString ShortcutSettings::displayCategory() const return QCoreApplication::translate("Core", Core::Constants::SETTINGS_TR_CATEGORY_CORE); } +QIcon ShortcutSettings::categoryIcon() const +{ + return QIcon(QLatin1String(Core::Constants::SETTINGS_CATEGORY_CORE_ICON)); +} + QWidget *ShortcutSettings::createPage(QWidget *parent) { m_keyNum = m_key[0] = m_key[1] = m_key[2] = m_key[3] = 0; diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.h b/src/plugins/coreplugin/dialogs/shortcutsettings.h index 32343f10cb..ab0933c1e4 100644 --- a/src/plugins/coreplugin/dialogs/shortcutsettings.h +++ b/src/plugins/coreplugin/dialogs/shortcutsettings.h @@ -68,6 +68,7 @@ public: QString displayName() const; QString category() const; QString displayCategory() const; + QIcon categoryIcon() const; QWidget *createPage(QWidget *parent); void apply(); diff --git a/src/plugins/coreplugin/generalsettings.cpp b/src/plugins/coreplugin/generalsettings.cpp index da2c7d59c7..cd2a4f922f 100644 --- a/src/plugins/coreplugin/generalsettings.cpp +++ b/src/plugins/coreplugin/generalsettings.cpp @@ -77,6 +77,11 @@ QString GeneralSettings::displayCategory() const return QCoreApplication::translate("Core", Core::Constants::SETTINGS_TR_CATEGORY_CORE); } +QIcon GeneralSettings::categoryIcon() const +{ + return QIcon(QLatin1String(Core::Constants::SETTINGS_CATEGORY_CORE_ICON)); +} + static bool hasQmFilesForLocale(const QString &locale, const QString &creatorTrPath) { static const QString qtTrPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath); diff --git a/src/plugins/coreplugin/generalsettings.h b/src/plugins/coreplugin/generalsettings.h index ef85249ee3..62b478ec82 100644 --- a/src/plugins/coreplugin/generalsettings.h +++ b/src/plugins/coreplugin/generalsettings.h @@ -55,6 +55,7 @@ public: QString displayName() const; QString category() const; QString displayCategory() const; + QIcon categoryIcon() const; QWidget* createPage(QWidget *parent); void apply(); void finish(); diff --git a/src/plugins/coreplugin/images/category_core.png b/src/plugins/coreplugin/images/category_core.png new file mode 100644 index 0000000000..89745b3bc7 Binary files /dev/null and b/src/plugins/coreplugin/images/category_core.png differ diff --git a/src/plugins/coreplugin/images/category_debug.png b/src/plugins/coreplugin/images/category_debug.png new file mode 100644 index 0000000000..f8c040c744 Binary files /dev/null and b/src/plugins/coreplugin/images/category_debug.png differ diff --git a/src/plugins/coreplugin/images/category_design.png b/src/plugins/coreplugin/images/category_design.png new file mode 100644 index 0000000000..fb9203565e Binary files /dev/null and b/src/plugins/coreplugin/images/category_design.png differ diff --git a/src/plugins/coreplugin/images/category_help.png b/src/plugins/coreplugin/images/category_help.png new file mode 100644 index 0000000000..ce2497f9ad Binary files /dev/null and b/src/plugins/coreplugin/images/category_help.png differ diff --git a/src/plugins/coreplugin/images/category_project.png b/src/plugins/coreplugin/images/category_project.png new file mode 100644 index 0000000000..18d157e971 Binary files /dev/null and b/src/plugins/coreplugin/images/category_project.png differ diff --git a/src/plugins/coreplugin/images/category_qt.png b/src/plugins/coreplugin/images/category_qt.png new file mode 100644 index 0000000000..3731d351d4 Binary files /dev/null and b/src/plugins/coreplugin/images/category_qt.png differ diff --git a/src/plugins/coreplugin/images/category_texteditor.png b/src/plugins/coreplugin/images/category_texteditor.png new file mode 100644 index 0000000000..c4798e0414 Binary files /dev/null and b/src/plugins/coreplugin/images/category_texteditor.png differ diff --git a/src/plugins/cpaster/codepasterprotocol.cpp b/src/plugins/cpaster/codepasterprotocol.cpp index bb154020a3..9c82a2adf0 100644 --- a/src/plugins/cpaster/codepasterprotocol.cpp +++ b/src/plugins/cpaster/codepasterprotocol.cpp @@ -113,9 +113,9 @@ void CodePasterProtocol::list() } void CodePasterProtocol::paste(const QString &text, - const QString &username, - const QString &comment, - const QString &description) + const QString &username, + const QString &comment, + const QString &description) { QString hostName = m_page->hostName(); if (!isValidHostName(hostName)) @@ -139,7 +139,7 @@ bool CodePasterProtocol::hasSettings() const return true; } -Core::IOptionsPage* CodePasterProtocol::settingsPage() +Core::IOptionsPage *CodePasterProtocol::settingsPage() { return m_page; } diff --git a/src/plugins/cpaster/codepastersettings.cpp b/src/plugins/cpaster/codepastersettings.cpp index b5d310ed31..f88fecdf50 100644 --- a/src/plugins/cpaster/codepastersettings.cpp +++ b/src/plugins/cpaster/codepastersettings.cpp @@ -75,6 +75,11 @@ QString CodePasterSettingsPage::displayCategory() const return QCoreApplication::translate("CodePaster", Constants::CPASTER_SETTINGS_TR_CATEGORY); } +QIcon CodePasterSettingsPage::categoryIcon() const +{ + return QIcon(); // TODO: Add icon for code paster category +} + QWidget *CodePasterSettingsPage::createPage(QWidget *parent) { QGroupBox *groupBox = new QGroupBox(); diff --git a/src/plugins/cpaster/codepastersettings.h b/src/plugins/cpaster/codepastersettings.h index 42c2bdb5a9..82243a155d 100644 --- a/src/plugins/cpaster/codepastersettings.h +++ b/src/plugins/cpaster/codepastersettings.h @@ -49,6 +49,7 @@ public: QString displayName() const; QString category() const; QString displayCategory() const; + QIcon categoryIcon() const; QWidget *createPage(QWidget *parent); void apply(); diff --git a/src/plugins/cpaster/pastebindotcomprotocol.cpp b/src/plugins/cpaster/pastebindotcomprotocol.cpp index eb151c2323..bead94988c 100644 --- a/src/plugins/cpaster/pastebindotcomprotocol.cpp +++ b/src/plugins/cpaster/pastebindotcomprotocol.cpp @@ -149,7 +149,7 @@ void PasteBinDotComProtocol::fetchFinished() emit fetchDone(title, content, error); } -Core::IOptionsPage* PasteBinDotComProtocol::settingsPage() +Core::IOptionsPage *PasteBinDotComProtocol::settingsPage() { return settings; } diff --git a/src/plugins/cpaster/pastebindotcomprotocol.h b/src/plugins/cpaster/pastebindotcomprotocol.h index f7ddc25b71..433c9fc1e2 100644 --- a/src/plugins/cpaster/pastebindotcomprotocol.h +++ b/src/plugins/cpaster/pastebindotcomprotocol.h @@ -48,7 +48,7 @@ public: virtual unsigned capabilities() const { return 0; } bool hasSettings() const { return true; } - Core::IOptionsPage* settingsPage(); + Core::IOptionsPage *settingsPage(); bool canList() const { return false; } diff --git a/src/plugins/cpaster/pastebindotcomsettings.cpp b/src/plugins/cpaster/pastebindotcomsettings.cpp index 68adfd9f97..7ec1607f2d 100644 --- a/src/plugins/cpaster/pastebindotcomsettings.cpp +++ b/src/plugins/cpaster/pastebindotcomsettings.cpp @@ -66,6 +66,11 @@ QString PasteBinDotComSettings::displayCategory() const return QCoreApplication::translate("CodePaster", CodePaster::Constants::CPASTER_SETTINGS_TR_CATEGORY); } +QIcon PasteBinDotComSettings::categoryIcon() const +{ + return QIcon(); // TODO: Icon for CodePaster +} + QWidget *PasteBinDotComSettings::createPage(QWidget *parent) { Ui_PasteBinComSettingsWidget ui; diff --git a/src/plugins/cpaster/pastebindotcomsettings.h b/src/plugins/cpaster/pastebindotcomsettings.h index ec1fe9bdeb..b8cf5da271 100644 --- a/src/plugins/cpaster/pastebindotcomsettings.h +++ b/src/plugins/cpaster/pastebindotcomsettings.h @@ -52,6 +52,7 @@ public: QString displayName() const; QString category() const; QString displayCategory() const; + QIcon categoryIcon() const; QWidget *createPage(QWidget *parent); void apply(); diff --git a/src/plugins/cpaster/protocol.cpp b/src/plugins/cpaster/protocol.cpp index ffec7caa73..93c16dfb31 100644 --- a/src/plugins/cpaster/protocol.cpp +++ b/src/plugins/cpaster/protocol.cpp @@ -54,7 +54,7 @@ bool Protocol::hasSettings() const return false; } -Core::IOptionsPage* Protocol::settingsPage() +Core::IOptionsPage *Protocol::settingsPage() { return 0; } diff --git a/src/plugins/cpaster/protocol.h b/src/plugins/cpaster/protocol.h index da8a05153d..eed43167a3 100644 --- a/src/plugins/cpaster/protocol.h +++ b/src/plugins/cpaster/protocol.h @@ -57,7 +57,7 @@ public: virtual unsigned capabilities() const = 0; virtual bool hasSettings() const; - virtual Core::IOptionsPage* settingsPage(); + virtual Core::IOptionsPage *settingsPage(); virtual void fetch(const QString &id) = 0; virtual void list(); diff --git a/src/plugins/cpaster/settingspage.cpp b/src/plugins/cpaster/settingspage.cpp index 708e4662c1..2d16327da6 100644 --- a/src/plugins/cpaster/settingspage.cpp +++ b/src/plugins/cpaster/settingspage.cpp @@ -104,6 +104,11 @@ QString SettingsPage::displayCategory() const return QCoreApplication::translate("CodePaster", Constants::CPASTER_SETTINGS_TR_CATEGORY); } +QIcon SettingsPage::categoryIcon() const +{ + return QIcon(); // TODO: Icon for CodePaster +} + QWidget *SettingsPage::createPage(QWidget *parent) { m_widget = new SettingsWidget(m_protocols, parent); diff --git a/src/plugins/cpaster/settingspage.h b/src/plugins/cpaster/settingspage.h index 063c372afa..10145ed6bf 100644 --- a/src/plugins/cpaster/settingspage.h +++ b/src/plugins/cpaster/settingspage.h @@ -68,6 +68,7 @@ public: QString displayName() const; QString category() const; QString displayCategory() const; + QIcon categoryIcon() const; QWidget *createPage(QWidget *parent); void apply(); diff --git a/src/plugins/cpptools/completionsettingspage.cpp b/src/plugins/cpptools/completionsettingspage.cpp index f513ac93e2..79729b7215 100644 --- a/src/plugins/cpptools/completionsettingspage.cpp +++ b/src/plugins/cpptools/completionsettingspage.cpp @@ -70,6 +70,11 @@ QString CompletionSettingsPage::displayCategory() const return QCoreApplication::translate("Text Editor", TextEditor::Constants::TEXT_EDITOR_SETTINGS_TR_CATEGORY); } +QIcon CompletionSettingsPage::categoryIcon() const +{ + return QIcon(QLatin1String(TextEditor::Constants::TEXT_EDITOR_SETTINGS_CATEGORY_ICON)); +} + QWidget *CompletionSettingsPage::createPage(QWidget *parent) { QWidget *w = new QWidget(parent); diff --git a/src/plugins/cpptools/completionsettingspage.h b/src/plugins/cpptools/completionsettingspage.h index a3e16da064..ab41757fe5 100644 --- a/src/plugins/cpptools/completionsettingspage.h +++ b/src/plugins/cpptools/completionsettingspage.h @@ -53,6 +53,7 @@ public: QString displayName() const; QString category() const; QString displayCategory() const; + QIcon categoryIcon() const; QWidget *createPage(QWidget *parent); void apply(); diff --git a/src/plugins/cpptools/cppfilesettingspage.cpp b/src/plugins/cpptools/cppfilesettingspage.cpp index ae4297cbae..34de700885 100644 --- a/src/plugins/cpptools/cppfilesettingspage.cpp +++ b/src/plugins/cpptools/cppfilesettingspage.cpp @@ -319,6 +319,11 @@ QString CppFileSettingsPage::displayCategory() const return QCoreApplication::translate("CppTools", Constants::CPP_SETTINGS_TR_CATEGORY); } +QIcon CppFileSettingsPage::categoryIcon() const +{ + return QIcon(); // TODO: Icon for C++ or move into category +} + QWidget *CppFileSettingsPage::createPage(QWidget *parent) { diff --git a/src/plugins/cpptools/cppfilesettingspage.h b/src/plugins/cpptools/cppfilesettingspage.h index 58508cb336..236cd3abdb 100644 --- a/src/plugins/cpptools/cppfilesettingspage.h +++ b/src/plugins/cpptools/cppfilesettingspage.h @@ -101,6 +101,7 @@ public: virtual QString displayName() const; virtual QString category() const; virtual QString displayCategory() const; + virtual QIcon categoryIcon() const; virtual QWidget *createPage(QWidget *parent); virtual void apply(); diff --git a/src/plugins/cvs/settingspage.cpp b/src/plugins/cvs/settingspage.cpp index 7f9fb6a74e..2a137e93b2 100644 --- a/src/plugins/cvs/settingspage.cpp +++ b/src/plugins/cvs/settingspage.cpp @@ -108,6 +108,11 @@ QString SettingsPage::displayCategory() const return QCoreApplication::translate("VCSBase", VCSBase::Constants::VCS_SETTINGS_TR_CATEGORY); } +QIcon SettingsPage::categoryIcon() const +{ + return QIcon(); // TODO: Icon for Version Control +} + QWidget *SettingsPage::createPage(QWidget *parent) { m_widget = new SettingsPageWidget(parent); diff --git a/src/plugins/cvs/settingspage.h b/src/plugins/cvs/settingspage.h index 9b23083505..fab22d1c86 100644 --- a/src/plugins/cvs/settingspage.h +++ b/src/plugins/cvs/settingspage.h @@ -73,6 +73,7 @@ public: QString displayName() const; QString category() const; QString displayCategory() const; + QIcon categoryIcon() const; QWidget *createPage(QWidget *parent); void apply(); diff --git a/src/plugins/debugger/debuggerconstants.h b/src/plugins/debugger/debuggerconstants.h index db6bb35c7b..3482de3dc0 100644 --- a/src/plugins/debugger/debuggerconstants.h +++ b/src/plugins/debugger/debuggerconstants.h @@ -60,6 +60,8 @@ const char * const DEBUGGER_COMMON_SETTINGS_NAME = const char * const DEBUGGER_SETTINGS_CATEGORY = "O.Debugger"; const char * const DEBUGGER_SETTINGS_TR_CATEGORY = QT_TRANSLATE_NOOP("Debugger", "Debugger"); +const char * const DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON = + ":/core/images/category_debug.png"; namespace Internal { enum { debug = 0 }; diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 05ff7a6e14..3c1ffdfbb3 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -341,6 +341,8 @@ public: { return _(DEBUGGER_SETTINGS_CATEGORY); } QString displayCategory() const { return QCoreApplication::translate("Debugger", DEBUGGER_SETTINGS_TR_CATEGORY); } + QIcon categoryIcon() const + { return QIcon(QLatin1String(DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON)); } QWidget *createPage(QWidget *parent); void apply() { m_group.apply(settings()); } @@ -455,6 +457,7 @@ public: QString displayName() const { return tr("Debugging Helper"); } QString category() const { return _(DEBUGGER_SETTINGS_CATEGORY); } QString displayCategory() const { return QCoreApplication::translate("Debugger", DEBUGGER_SETTINGS_TR_CATEGORY); } + QIcon categoryIcon() const { return QIcon(QLatin1String(DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON)); } QWidget *createPage(QWidget *parent); void apply() { m_group.apply(settings()); } diff --git a/src/plugins/debugger/gdb/gdboptionspage.cpp b/src/plugins/debugger/gdb/gdboptionspage.cpp index e509d176cc..d32936f439 100644 --- a/src/plugins/debugger/gdb/gdboptionspage.cpp +++ b/src/plugins/debugger/gdb/gdboptionspage.cpp @@ -62,6 +62,11 @@ QString GdbOptionsPage::displayCategory() const return QCoreApplication::translate("Debugger", Debugger::Constants::DEBUGGER_SETTINGS_TR_CATEGORY); } +QIcon GdbOptionsPage::categoryIcon() const +{ + return QIcon(QLatin1String(Debugger::Constants::DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON)); +} + QWidget *GdbOptionsPage::createPage(QWidget *parent) { QWidget *w = new QWidget(parent); diff --git a/src/plugins/debugger/gdb/gdboptionspage.h b/src/plugins/debugger/gdb/gdboptionspage.h index 7b4b19fa9b..7fbf855fe3 100644 --- a/src/plugins/debugger/gdb/gdboptionspage.h +++ b/src/plugins/debugger/gdb/gdboptionspage.h @@ -48,6 +48,7 @@ public: virtual QString displayName() const; virtual QString category() const; virtual QString displayCategory() const; + virtual QIcon categoryIcon() const; virtual QWidget *createPage(QWidget *parent); virtual void apply(); diff --git a/src/plugins/debugger/gdb/trkoptionspage.cpp b/src/plugins/debugger/gdb/trkoptionspage.cpp index f78b90c5e1..fd4c33c6d8 100644 --- a/src/plugins/debugger/gdb/trkoptionspage.cpp +++ b/src/plugins/debugger/gdb/trkoptionspage.cpp @@ -69,6 +69,11 @@ QString TrkOptionsPage::displayCategory() const return QCoreApplication::translate("Debugger", Debugger::Constants::DEBUGGER_SETTINGS_TR_CATEGORY); } +QIcon TrkOptionsPage::categoryIcon() const +{ + return QIcon(QLatin1String(Debugger::Constants::DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON)); +} + QWidget *TrkOptionsPage::createPage(QWidget *parent) { if (!m_widget) diff --git a/src/plugins/debugger/gdb/trkoptionspage.h b/src/plugins/debugger/gdb/trkoptionspage.h index d06fef2954..8647c34a54 100644 --- a/src/plugins/debugger/gdb/trkoptionspage.h +++ b/src/plugins/debugger/gdb/trkoptionspage.h @@ -56,6 +56,7 @@ public: virtual QString displayName() const; virtual QString category() const; virtual QString displayCategory() const; + virtual QIcon categoryIcon() const; virtual QWidget *createPage(QWidget *parent); virtual void apply(); diff --git a/src/plugins/designer/cpp/cppsettingspage.cpp b/src/plugins/designer/cpp/cppsettingspage.cpp index 3b059f3c36..5c3706ba5d 100644 --- a/src/plugins/designer/cpp/cppsettingspage.cpp +++ b/src/plugins/designer/cpp/cppsettingspage.cpp @@ -123,6 +123,11 @@ QString CppSettingsPage::displayCategory() const return QCoreApplication::translate("Designer", Designer::Constants::SETTINGS_TR_CATEGORY); } +QIcon CppSettingsPage::categoryIcon() const +{ + return QIcon(QLatin1String(Designer::Constants::SETTINGS_CATEGORY_ICON)); +} + QWidget *CppSettingsPage::createPage(QWidget *parent) { m_widget = new CppSettingsPageWidget(parent); diff --git a/src/plugins/designer/cpp/cppsettingspage.h b/src/plugins/designer/cpp/cppsettingspage.h index d6b71f60b8..ecb6d977d7 100644 --- a/src/plugins/designer/cpp/cppsettingspage.h +++ b/src/plugins/designer/cpp/cppsettingspage.h @@ -67,6 +67,7 @@ public: virtual QString displayName() const; virtual QString category() const; virtual QString displayCategory() const; + virtual QIcon categoryIcon() const; virtual QWidget *createPage(QWidget *parent); virtual void apply(); diff --git a/src/plugins/designer/designerconstants.h b/src/plugins/designer/designerconstants.h index 8348ed83e9..7c2166eca8 100644 --- a/src/plugins/designer/designerconstants.h +++ b/src/plugins/designer/designerconstants.h @@ -42,6 +42,7 @@ const char * const DESIGNER_XML_EDITOR_ID ="DesignerXmlEditor"; const char * const C_DESIGNER_XML_DISPLAY_NAME = QT_TRANSLATE_NOOP("Designer", "Xml Editor"); const char * const SETTINGS_CATEGORY = "P.Designer"; +const char * const SETTINGS_CATEGORY_ICON = ":/core/images/category_design.png"; const char * const SETTINGS_TR_CATEGORY = QT_TRANSLATE_NOOP("Designer", "Designer"); const char * const SETTINGS_CPP_SETTINGS_ID = "Class Generation"; const char * const SETTINGS_CPP_SETTINGS_NAME = QT_TRANSLATE_NOOP("Designer", "Class Generation"); diff --git a/src/plugins/designer/settingspage.cpp b/src/plugins/designer/settingspage.cpp index 1127321bfe..f316a6e78c 100644 --- a/src/plugins/designer/settingspage.cpp +++ b/src/plugins/designer/settingspage.cpp @@ -65,6 +65,11 @@ QString SettingsPage::displayCategory() const return QCoreApplication::translate("Designer", Designer::Constants::SETTINGS_TR_CATEGORY); } +QIcon SettingsPage::categoryIcon() const +{ + return QIcon(QLatin1String(Designer::Constants::SETTINGS_CATEGORY_ICON)); +} + QWidget *SettingsPage::createPage(QWidget *parent) { return m_designerPage->createPage(parent); diff --git a/src/plugins/designer/settingspage.h b/src/plugins/designer/settingspage.h index 71570e211d..0732e386fa 100644 --- a/src/plugins/designer/settingspage.h +++ b/src/plugins/designer/settingspage.h @@ -53,6 +53,7 @@ public: QString displayName() const; QString category() const; QString displayCategory() const; + QIcon categoryIcon() const; virtual QWidget *createPage(QWidget *parent); virtual void apply(); diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp index 2958b7bac8..01a4afc779 100644 --- a/src/plugins/fakevim/fakevimplugin.cpp +++ b/src/plugins/fakevim/fakevimplugin.cpp @@ -131,6 +131,7 @@ public: QString displayName() const { return tr("General"); } QString category() const { return QLatin1String(Constants::SETTINGS_CATEGORY); } QString displayCategory() const { return tr("FakeVim"); } + QIcon categoryIcon() const { return QIcon(); } // TODO: Add an icon or move into another category QWidget *createPage(QWidget *parent); void apply() { m_group.apply(ICore::instance()->settings()); } @@ -289,6 +290,7 @@ public: QString displayName() const { return tr("Ex Command Mapping"); } QString category() const { return QLatin1String(Constants::SETTINGS_CATEGORY); } QString displayCategory() const { return tr("FakeVim"); } + QIcon categoryIcon() const { return QIcon(); } // TODO: Icon for FakeVim QWidget *createPage(QWidget *parent); void initialize(); diff --git a/src/plugins/git/settingspage.cpp b/src/plugins/git/settingspage.cpp index 11edb065ce..4c50a1581a 100644 --- a/src/plugins/git/settingspage.cpp +++ b/src/plugins/git/settingspage.cpp @@ -122,6 +122,11 @@ QString SettingsPage::displayCategory() const return QCoreApplication::translate("VCSBase", VCSBase::Constants::VCS_SETTINGS_TR_CATEGORY); } +QIcon SettingsPage::categoryIcon() const +{ + return QIcon(); // TODO: Icon for Version Control +} + QWidget *SettingsPage::createPage(QWidget *parent) { m_widget = new SettingsPageWidget(parent); diff --git a/src/plugins/git/settingspage.h b/src/plugins/git/settingspage.h index 203c4ce483..7d10c03293 100644 --- a/src/plugins/git/settingspage.h +++ b/src/plugins/git/settingspage.h @@ -74,6 +74,7 @@ public: QString displayName() const; QString category() const; QString displayCategory() const; + QIcon categoryIcon() const; QWidget *createPage(QWidget *parent); void apply(); diff --git a/src/plugins/help/docsettingspage.cpp b/src/plugins/help/docsettingspage.cpp index 5f1938bc80..4933f53dd4 100644 --- a/src/plugins/help/docsettingspage.cpp +++ b/src/plugins/help/docsettingspage.cpp @@ -65,6 +65,11 @@ QString DocSettingsPage::displayCategory() const return QCoreApplication::translate("Help", Help::Constants::HELP_TR_CATEGORY); } +QIcon DocSettingsPage::categoryIcon() const +{ + return QIcon(QLatin1String(Help::Constants::HELP_CATEGORY_ICON)); +} + QWidget *DocSettingsPage::createPage(QWidget *parent) { QWidget *widget = new QWidget(parent); diff --git a/src/plugins/help/docsettingspage.h b/src/plugins/help/docsettingspage.h index 80c1bc67a7..66de3ac8ae 100644 --- a/src/plugins/help/docsettingspage.h +++ b/src/plugins/help/docsettingspage.h @@ -48,6 +48,7 @@ public: QString displayName() const; QString category() const; QString displayCategory() const; + QIcon categoryIcon() const; QWidget *createPage(QWidget *parent); void apply(); diff --git a/src/plugins/help/filtersettingspage.cpp b/src/plugins/help/filtersettingspage.cpp index e73e882fe3..8577b42960 100644 --- a/src/plugins/help/filtersettingspage.cpp +++ b/src/plugins/help/filtersettingspage.cpp @@ -66,6 +66,11 @@ QString FilterSettingsPage::displayCategory() const return QCoreApplication::translate("Help", Help::Constants::HELP_TR_CATEGORY); } +QIcon FilterSettingsPage::categoryIcon() const +{ + return QIcon(QLatin1String(Help::Constants::HELP_CATEGORY_ICON)); +} + QWidget *FilterSettingsPage::createPage(QWidget *parent) { QWidget *widget = new QWidget(parent); diff --git a/src/plugins/help/filtersettingspage.h b/src/plugins/help/filtersettingspage.h index 74398e51c5..b8f74d5359 100644 --- a/src/plugins/help/filtersettingspage.h +++ b/src/plugins/help/filtersettingspage.h @@ -48,6 +48,7 @@ public: QString displayName() const; QString category() const; QString displayCategory() const; + QIcon categoryIcon() const; QWidget *createPage(QWidget *parent); void apply(); diff --git a/src/plugins/help/generalsettingspage.cpp b/src/plugins/help/generalsettingspage.cpp index bb62461df0..0df4288670 100644 --- a/src/plugins/help/generalsettingspage.cpp +++ b/src/plugins/help/generalsettingspage.cpp @@ -83,6 +83,11 @@ QString GeneralSettingsPage::displayCategory() const return QCoreApplication::translate("Help", Help::Constants::HELP_TR_CATEGORY); } +QIcon GeneralSettingsPage::categoryIcon() const +{ + return QIcon(QLatin1String(Help::Constants::HELP_CATEGORY_ICON)); +} + QWidget *GeneralSettingsPage::createPage(QWidget *parent) { QWidget *widget = new QWidget(parent); diff --git a/src/plugins/help/generalsettingspage.h b/src/plugins/help/generalsettingspage.h index f37ab2de26..dbfc97e39b 100644 --- a/src/plugins/help/generalsettingspage.h +++ b/src/plugins/help/generalsettingspage.h @@ -46,9 +46,10 @@ public: GeneralSettingsPage(); QString id() const; - virtual QString displayName() const; + QString displayName() const; QString category() const; QString displayCategory() const; + QIcon categoryIcon() const; QWidget *createPage(QWidget *parent); void apply(); diff --git a/src/plugins/help/helpconstants.h b/src/plugins/help/helpconstants.h index 36195359db..e9910e830f 100644 --- a/src/plugins/help/helpconstants.h +++ b/src/plugins/help/helpconstants.h @@ -38,6 +38,7 @@ namespace Help { const int P_MODE_HELP = 70; const char * const ID_MODE_HELP = "Help"; const char * const HELP_CATEGORY = "H.Help"; +const char * const HELP_CATEGORY_ICON = ":/core/images/category_help.png"; const char * const HELP_TR_CATEGORY = QT_TRANSLATE_NOOP("Help", "Help"); const char * const C_MODE_HELP = "Help Mode"; diff --git a/src/plugins/locator/settingspage.cpp b/src/plugins/locator/settingspage.cpp index f0c7b0e214..0dcfdb5cf9 100644 --- a/src/plugins/locator/settingspage.cpp +++ b/src/plugins/locator/settingspage.cpp @@ -69,6 +69,11 @@ QString SettingsPage::displayCategory() const return QCoreApplication::translate("Locator", Locator::Constants::LOCATOR_TR_CATEGORY); } +QIcon SettingsPage::categoryIcon() const +{ + return QIcon(); // TODO: Icon for Locator +} + QWidget *SettingsPage::createPage(QWidget *parent) { diff --git a/src/plugins/locator/settingspage.h b/src/plugins/locator/settingspage.h index 26d44e8b51..e89b044edb 100644 --- a/src/plugins/locator/settingspage.h +++ b/src/plugins/locator/settingspage.h @@ -59,6 +59,7 @@ public: QString displayName() const; QString category() const; QString displayCategory() const; + QIcon categoryIcon() const; QWidget *createPage(QWidget *parent); void apply(); diff --git a/src/plugins/mercurial/optionspage.cpp b/src/plugins/mercurial/optionspage.cpp index 118c7bb60f..8702830a90 100644 --- a/src/plugins/mercurial/optionspage.cpp +++ b/src/plugins/mercurial/optionspage.cpp @@ -107,6 +107,11 @@ QString OptionsPage::displayCategory() const return QCoreApplication::translate("VCSBase", VCSBase::Constants::VCS_SETTINGS_TR_CATEGORY); } +QIcon OptionsPage::categoryIcon() const +{ + return QIcon(); // TODO: Icon for Version Control +} + QWidget *OptionsPage::createPage(QWidget *parent) { if (!optionsPageWidget) diff --git a/src/plugins/mercurial/optionspage.h b/src/plugins/mercurial/optionspage.h index 8f0fcd3b86..821fa13703 100644 --- a/src/plugins/mercurial/optionspage.h +++ b/src/plugins/mercurial/optionspage.h @@ -67,6 +67,7 @@ public: QString displayName() const; QString category() const; QString displayCategory() const; + QIcon categoryIcon() const; QWidget *createPage(QWidget *parent); void apply(); diff --git a/src/plugins/perforce/settingspage.cpp b/src/plugins/perforce/settingspage.cpp index 7eea709afa..bb3d6dfdab 100644 --- a/src/plugins/perforce/settingspage.cpp +++ b/src/plugins/perforce/settingspage.cpp @@ -146,6 +146,11 @@ QString SettingsPage::displayCategory() const return QCoreApplication::translate("VCSBase", VCSBase::Constants::VCS_SETTINGS_TR_CATEGORY); } +QIcon SettingsPage::categoryIcon() const +{ + return QIcon(); // TODO: Icon for Version Control +} + QWidget *SettingsPage::createPage(QWidget *parent) { m_widget = new SettingsPageWidget(parent); diff --git a/src/plugins/perforce/settingspage.h b/src/plugins/perforce/settingspage.h index f49c933ec6..6d10556c68 100644 --- a/src/plugins/perforce/settingspage.h +++ b/src/plugins/perforce/settingspage.h @@ -77,6 +77,7 @@ public: QString displayName() const; QString category() const; QString displayCategory() const; + QIcon categoryIcon() const; QWidget *createPage(QWidget *parent); void apply(); diff --git a/src/plugins/projectexplorer/projectexplorerconstants.h b/src/plugins/projectexplorer/projectexplorerconstants.h index 1dd417d714..fa57502a13 100644 --- a/src/plugins/projectexplorer/projectexplorerconstants.h +++ b/src/plugins/projectexplorer/projectexplorerconstants.h @@ -187,6 +187,7 @@ const char * const RESOURCE_MIMETYPE = "application/vnd.nokia.xml.qt.resource"; // settings page const char * const PROJECTEXPLORER_SETTINGS_CATEGORY = "K.ProjectExplorer"; +const char * const PROJECTEXPLORER_SETTINGS_CATEGORY_ICON = ":/core/images/category_project.png"; const char * const PROJECTEXPLORER_SETTINGS_ID = "ProjectExplorer.ProjectExplorer"; // task categories diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.cpp b/src/plugins/projectexplorer/projectexplorersettingspage.cpp index d7fc674585..32000e8064 100644 --- a/src/plugins/projectexplorer/projectexplorersettingspage.cpp +++ b/src/plugins/projectexplorer/projectexplorersettingspage.cpp @@ -137,6 +137,11 @@ QString ProjectExplorerSettingsPage::displayCategory() const return tr("Projects"); } +QIcon ProjectExplorerSettingsPage::categoryIcon() const +{ + return QIcon(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON); +} + QWidget *ProjectExplorerSettingsPage::createPage(QWidget *parent) { m_widget = new ProjectExplorerSettingsWidget(parent); @@ -169,6 +174,6 @@ bool ProjectExplorerSettingsPage::matches(const QString &s) const return m_searchKeywords.contains(s, Qt::CaseInsensitive); } -} -} +} // namespace Internal +} // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.h b/src/plugins/projectexplorer/projectexplorersettingspage.h index 417873c459..7026a8f8ce 100644 --- a/src/plugins/projectexplorer/projectexplorersettingspage.h +++ b/src/plugins/projectexplorer/projectexplorersettingspage.h @@ -75,6 +75,7 @@ public: virtual QString displayName() const; virtual QString category() const; virtual QString displayCategory() const; + virtual QIcon categoryIcon() const; virtual QWidget *createPage(QWidget *parent); virtual void apply(); diff --git a/src/plugins/qmldesigner/settingspage.cpp b/src/plugins/qmldesigner/settingspage.cpp index b10dbf8858..3ee1744fec 100644 --- a/src/plugins/qmldesigner/settingspage.cpp +++ b/src/plugins/qmldesigner/settingspage.cpp @@ -102,6 +102,11 @@ QString SettingsPage::displayCategory() const return QCoreApplication::translate("QML", "QML"); } +QIcon SettingsPage::categoryIcon() const +{ + return QIcon(); // TODO: Icon for QML or move into other category (Designer?) +} + QWidget *SettingsPage::createPage(QWidget *parent) { m_widget = new SettingsPageWidget(parent); diff --git a/src/plugins/qmldesigner/settingspage.h b/src/plugins/qmldesigner/settingspage.h index 369d8f03d3..66fa5da9d5 100644 --- a/src/plugins/qmldesigner/settingspage.h +++ b/src/plugins/qmldesigner/settingspage.h @@ -74,6 +74,7 @@ public: QString displayName() const; QString category() const; QString displayCategory() const; + QIcon categoryIcon() const; QWidget *createPage(QWidget *parent); void apply(); diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemosettingspage.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemosettingspage.cpp index 253ae22ab2..404e8c86ed 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemosettingspage.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemosettingspage.cpp @@ -80,6 +80,11 @@ QString MaemoSettingsPage::displayCategory() const Constants::QT_SETTINGS_CATEGORY); } +QIcon MaemoSettingsPage::categoryIcon() const +{ + return QIcon(QLatin1String(Constants::QT_SETTINGS_CATEGORY_ICON)); +} + QWidget *MaemoSettingsPage::createPage(QWidget *parent) { m_widget = new MaemoSettingsWidget(parent); diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemosettingspage.h b/src/plugins/qt4projectmanager/qt-maemo/maemosettingspage.h index d834a8049b..e325134d3c 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemosettingspage.h +++ b/src/plugins/qt4projectmanager/qt-maemo/maemosettingspage.h @@ -60,6 +60,7 @@ public: virtual QString displayName() const; virtual QString category() const; virtual QString displayCategory() const; + virtual QIcon categoryIcon() const; virtual QWidget *createPage(QWidget *parent); virtual void apply(); virtual void finish(); diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp index b04bedcebe..db5b54c1d5 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp @@ -129,6 +129,11 @@ QString S60DevicesPreferencePane::displayCategory() const return QCoreApplication::translate("Qt4ProjectManager", Constants::QT_SETTINGS_CATEGORY); } +QIcon S60DevicesPreferencePane::categoryIcon() const +{ + return QIcon(Constants::QT_SETTINGS_CATEGORY_ICON); +} + QWidget *S60DevicesPreferencePane::createPage(QWidget *parent) { if (m_widget) @@ -144,5 +149,3 @@ void S60DevicesPreferencePane::apply() void S60DevicesPreferencePane::finish() { } - - diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.h b/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.h index b1bb9496c7..312c1efb90 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.h @@ -62,7 +62,8 @@ private: S60Devices *m_devices; }; -class S60DevicesPreferencePane : public Core::IOptionsPage { +class S60DevicesPreferencePane : public Core::IOptionsPage +{ Q_OBJECT public: S60DevicesPreferencePane(S60Devices *devices, QObject *parent = 0); @@ -72,6 +73,7 @@ public: QString displayName() const; QString category() const; QString displayCategory() const; + QIcon categoryIcon() const; QWidget *createPage(QWidget *parent); void apply(); diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h index ef8cc3a067..5e84afd49e 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h +++ b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h @@ -76,6 +76,7 @@ const char * const DEPLOYHELPERRUNSTEP = "trolltech.qt4projectmanager.deployhelp //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_NAME = QT_TRANSLATE_NOOP("Qt4ProjectManager", "Qt Versions"); diff --git a/src/plugins/qt4projectmanager/qtoptionspage.cpp b/src/plugins/qt4projectmanager/qtoptionspage.cpp index b620910c5f..9d316c639e 100644 --- a/src/plugins/qt4projectmanager/qtoptionspage.cpp +++ b/src/plugins/qt4projectmanager/qtoptionspage.cpp @@ -106,6 +106,11 @@ QString QtOptionsPage::displayCategory() const return QCoreApplication::translate("Qt4ProjectManager", Constants::QT_SETTINGS_TR_CATEGORY); } +QIcon QtOptionsPage::categoryIcon() const +{ + return QIcon(QLatin1String(Constants::QT_SETTINGS_CATEGORY_ICON)); +} + QWidget *QtOptionsPage::createPage(QWidget *parent) { QtVersionManager *vm = QtVersionManager::instance(); diff --git a/src/plugins/qt4projectmanager/qtoptionspage.h b/src/plugins/qt4projectmanager/qtoptionspage.h index 3965e7b424..517d0a2852 100644 --- a/src/plugins/qt4projectmanager/qtoptionspage.h +++ b/src/plugins/qt4projectmanager/qtoptionspage.h @@ -135,6 +135,7 @@ public: QString displayName() const; QString category() const; QString displayCategory() const; + QIcon categoryIcon() const; QWidget *createPage(QWidget *parent); void apply(); void finish() { } diff --git a/src/plugins/subversion/settingspage.cpp b/src/plugins/subversion/settingspage.cpp index 98f45069b6..36145ccb5a 100644 --- a/src/plugins/subversion/settingspage.cpp +++ b/src/plugins/subversion/settingspage.cpp @@ -116,6 +116,11 @@ QString SettingsPage::displayCategory() const return QCoreApplication::translate("VCSBase", VCSBase::Constants::VCS_SETTINGS_TR_CATEGORY); } +QIcon SettingsPage::categoryIcon() const +{ + return QIcon(); // TODO: Icon for Version Control +} + QWidget *SettingsPage::createPage(QWidget *parent) { m_widget = new SettingsPageWidget(parent); diff --git a/src/plugins/subversion/settingspage.h b/src/plugins/subversion/settingspage.h index 72aaa8e828..cdbf809536 100644 --- a/src/plugins/subversion/settingspage.h +++ b/src/plugins/subversion/settingspage.h @@ -73,6 +73,7 @@ public: QString displayName() const; QString category() const; QString displayCategory() const; + QIcon categoryIcon() const; QWidget *createPage(QWidget *parent); void apply(); diff --git a/src/plugins/texteditor/behaviorsettingspage.cpp b/src/plugins/texteditor/behaviorsettingspage.cpp index 7111355105..f49abc713d 100644 --- a/src/plugins/texteditor/behaviorsettingspage.cpp +++ b/src/plugins/texteditor/behaviorsettingspage.cpp @@ -98,6 +98,11 @@ QString BehaviorSettingsPage::displayCategory() const return m_d->m_parameters.displayCategory; } +QIcon BehaviorSettingsPage::categoryIcon() const +{ + return m_d->m_parameters.categoryIcon; +} + QWidget *BehaviorSettingsPage::createPage(QWidget *parent) { QWidget *w = new QWidget(parent); diff --git a/src/plugins/texteditor/behaviorsettingspage.h b/src/plugins/texteditor/behaviorsettingspage.h index 53a46a2ef4..71c9c6a5ec 100644 --- a/src/plugins/texteditor/behaviorsettingspage.h +++ b/src/plugins/texteditor/behaviorsettingspage.h @@ -48,6 +48,7 @@ struct BehaviorSettingsPageParameters QString displayName; QString category; QString displayCategory; + QIcon categoryIcon; QString settingsPrefix; }; @@ -64,6 +65,7 @@ public: QString displayName() const; QString category() const; QString displayCategory() const; + QIcon categoryIcon() const; QWidget *createPage(QWidget *parent); void apply(); diff --git a/src/plugins/texteditor/displaysettingspage.cpp b/src/plugins/texteditor/displaysettingspage.cpp index 6d002a857b..86551c337d 100644 --- a/src/plugins/texteditor/displaysettingspage.cpp +++ b/src/plugins/texteditor/displaysettingspage.cpp @@ -89,6 +89,11 @@ QString DisplaySettingsPage::displayCategory() const return m_d->m_parameters.displayCategory; } +QIcon DisplaySettingsPage::categoryIcon() const +{ + return m_d->m_parameters.categoryIcon; +} + QWidget *DisplaySettingsPage::createPage(QWidget *parent) { QWidget *w = new QWidget(parent); diff --git a/src/plugins/texteditor/displaysettingspage.h b/src/plugins/texteditor/displaysettingspage.h index b1099ea79f..dce289ad10 100644 --- a/src/plugins/texteditor/displaysettingspage.h +++ b/src/plugins/texteditor/displaysettingspage.h @@ -46,6 +46,7 @@ struct DisplaySettingsPageParameters QString displayName; QString category; QString displayCategory; + QIcon categoryIcon; QString settingsPrefix; }; @@ -62,6 +63,7 @@ public: QString displayName() const; QString category() const; QString displayCategory() const; + QIcon categoryIcon() const; QWidget *createPage(QWidget *parent); void apply(); diff --git a/src/plugins/texteditor/fontsettingspage.cpp b/src/plugins/texteditor/fontsettingspage.cpp index d046592632..63dd9292cc 100644 --- a/src/plugins/texteditor/fontsettingspage.cpp +++ b/src/plugins/texteditor/fontsettingspage.cpp @@ -346,6 +346,11 @@ QString FontSettingsPage::displayCategory() const return d_ptr->m_displayCategory; } +QIcon FontSettingsPage::categoryIcon() const +{ + return QIcon(QLatin1String(Constants::TEXT_EDITOR_SETTINGS_CATEGORY_ICON)); +} + QWidget *FontSettingsPage::createPage(QWidget *parent) { QWidget *w = new QWidget(parent); diff --git a/src/plugins/texteditor/fontsettingspage.h b/src/plugins/texteditor/fontsettingspage.h index 0735e77444..9f84a0c9ec 100644 --- a/src/plugins/texteditor/fontsettingspage.h +++ b/src/plugins/texteditor/fontsettingspage.h @@ -94,6 +94,7 @@ public: QString displayName() const; QString category() const; QString displayCategory() const; + QIcon categoryIcon() const; QWidget *createPage(QWidget *parent); void apply(); diff --git a/src/plugins/texteditor/texteditorconstants.h b/src/plugins/texteditor/texteditorconstants.h index e101842fd5..7fc41a9f88 100644 --- a/src/plugins/texteditor/texteditorconstants.h +++ b/src/plugins/texteditor/texteditorconstants.h @@ -107,6 +107,7 @@ const char * const C_DIFF_FILE = "DiffFile"; const char * const C_DIFF_LOCATION = "DiffLocation"; const char * const TEXT_EDITOR_SETTINGS_CATEGORY = "C.TextEditor"; +const char * const TEXT_EDITOR_SETTINGS_CATEGORY_ICON = ":/core/images/category_texteditor.png"; const char * const TEXT_EDITOR_SETTINGS_TR_CATEGORY = QT_TRANSLATE_NOOP("TextEditor", "Text Editor"); } // namespace Constants diff --git a/src/plugins/texteditor/texteditorsettings.cpp b/src/plugins/texteditor/texteditorsettings.cpp index 44316736da..3ca0410e33 100644 --- a/src/plugins/texteditor/texteditorsettings.cpp +++ b/src/plugins/texteditor/texteditorsettings.cpp @@ -104,6 +104,7 @@ TextEditorSettings::TextEditorSettings(QObject *parent) const QString category = QLatin1String(Constants::TEXT_EDITOR_SETTINGS_CATEGORY); const QString displayCategory = QCoreApplication::translate("TextEditor", Constants::TEXT_EDITOR_SETTINGS_TR_CATEGORY); + const QIcon categoryIcon = QIcon(QLatin1String(Constants::TEXT_EDITOR_SETTINGS_CATEGORY_ICON)); m_fontSettingsPage = new FontSettingsPage(formatDescriptions, QLatin1String("A.FontSettings"), @@ -116,6 +117,7 @@ TextEditorSettings::TextEditorSettings(QObject *parent) behaviorSettingsPageParameters.displayName = tr("Behavior"); behaviorSettingsPageParameters.category = category; behaviorSettingsPageParameters.displayCategory = displayCategory; + behaviorSettingsPageParameters.categoryIcon = categoryIcon; behaviorSettingsPageParameters.settingsPrefix = QLatin1String("text"); m_behaviorSettingsPage = new BehaviorSettingsPage(behaviorSettingsPageParameters, this); pm->addObject(m_behaviorSettingsPage); @@ -123,8 +125,9 @@ TextEditorSettings::TextEditorSettings(QObject *parent) TextEditor::DisplaySettingsPageParameters displaySettingsPageParameters; displaySettingsPageParameters.id = QLatin1String("D.DisplaySettings"), displaySettingsPageParameters.displayName = tr("Display"); - displaySettingsPageParameters.category = category;; + displaySettingsPageParameters.category = category; displaySettingsPageParameters.displayCategory = displayCategory; + displaySettingsPageParameters.categoryIcon = categoryIcon; displaySettingsPageParameters.settingsPrefix = QLatin1String("text"); m_displaySettingsPage = new DisplaySettingsPage(displaySettingsPageParameters, this); pm->addObject(m_displaySettingsPage); diff --git a/src/plugins/vcsbase/vcsbasesettingspage.cpp b/src/plugins/vcsbase/vcsbasesettingspage.cpp index 1c038926cc..5b52fbe20e 100644 --- a/src/plugins/vcsbase/vcsbasesettingspage.cpp +++ b/src/plugins/vcsbase/vcsbasesettingspage.cpp @@ -127,6 +127,11 @@ QString VCSBaseSettingsPage::displayCategory() const return QCoreApplication::translate("VCSBase", Constants::VCS_SETTINGS_TR_CATEGORY); } +QIcon VCSBaseSettingsPage::categoryIcon() const +{ + return QIcon(); // TODO: Icon for Version Control +} + QWidget *VCSBaseSettingsPage::createPage(QWidget *parent) { m_widget = new VCSBaseSettingsWidget(parent); diff --git a/src/plugins/vcsbase/vcsbasesettingspage.h b/src/plugins/vcsbase/vcsbasesettingspage.h index af47f60d1f..5828b5bf88 100644 --- a/src/plugins/vcsbase/vcsbasesettingspage.h +++ b/src/plugins/vcsbase/vcsbasesettingspage.h @@ -70,6 +70,7 @@ public: virtual QString displayName() const; virtual QString category() const; virtual QString displayCategory() const; + virtual QIcon categoryIcon() const; virtual QWidget *createPage(QWidget *parent); virtual void apply(); -- cgit v1.2.3