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: [PATCH] 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.cpp | 5 +++ .../cmakeprojectmanager/cmakeprojectmanager.h | 1 + .../actionmanager/commandmappings.h | 6 ---- src/plugins/coreplugin/core.qrc | 8 +++++ src/plugins/coreplugin/coreconstants.h | 1 + src/plugins/coreplugin/dialogs/ioptionspage.h | 2 ++ .../coreplugin/dialogs/settingsdialog.cpp | 29 ++++++++++++++++-- .../coreplugin/dialogs/shortcutsettings.cpp | 5 +++ .../coreplugin/dialogs/shortcutsettings.h | 1 + src/plugins/coreplugin/generalsettings.cpp | 5 +++ src/plugins/coreplugin/generalsettings.h | 1 + .../coreplugin/images/category_core.png | Bin 0 -> 930 bytes .../coreplugin/images/category_debug.png | Bin 0 -> 1924 bytes .../coreplugin/images/category_design.png | Bin 0 -> 852 bytes .../coreplugin/images/category_help.png | Bin 0 -> 2173 bytes .../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 + .../cpaster/pastebindotcomprotocol.cpp | 2 +- src/plugins/cpaster/pastebindotcomprotocol.h | 2 +- .../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 + .../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 + .../projectexplorerconstants.h | 1 + .../projectexplorersettingspage.cpp | 9 ++++-- .../projectexplorersettingspage.h | 1 + src/plugins/qmldesigner/settingspage.cpp | 5 +++ src/plugins/qmldesigner/settingspage.h | 1 + .../qt-maemo/maemosettingspage.cpp | 5 +++ .../qt-maemo/maemosettingspage.h | 1 + .../qt-s60/s60devicespreferencepane.cpp | 7 +++-- .../qt-s60/s60devicespreferencepane.h | 4 ++- .../qt4projectmanagerconstants.h | 1 + .../qt4projectmanager/qtoptionspage.cpp | 5 +++ src/plugins/qt4projectmanager/qtoptionspage.h | 1 + src/plugins/subversion/settingspage.cpp | 5 +++ src/plugins/subversion/settingspage.h | 1 + .../texteditor/behaviorsettingspage.cpp | 5 +++ src/plugins/texteditor/behaviorsettingspage.h | 2 ++ .../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 diff --git a/src/libs/utils/parameteraction.cpp b/src/libs/utils/parameteraction.cpp index 4839d2f19ca..8a6863b596d 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 71fc36f0b6c..c80b7bed2da 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 4ba6a66dee2..b138e8c0dea 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 69cc4b5cbf8..92f2ab01763 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 a040c2f9afd..929618e9c59 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 009ec866870..cb606618ee0 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 014b9e63954..765c899c2b1 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 e2e69b5bedd..7818921e7e1 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 6fd7e708118..7d0f8c4656f 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 b756dd9d51b..51ccb8aca45 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 32343f10cb0..ab0933c1e46 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 da2c7d59c70..cd2a4f922ff 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 ef85249ee38..62b478ec823 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 0000000000000000000000000000000000000000..89745b3bc7e002866658a9d2951e2c39ba4d59d4 GIT binary patch literal 930 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>U|>t~ zc6VX;4}uH!E}zW6z`$AH5n0T@z%2~Ij105pNH8!ku$OrHy0YJ5mJ(p%I=P`hkAZ<% z$5kso;Sz20C8Il;1$T3Bh`%}HP9MceZMO&wJ&^ zA(C${%2MCR{oPQpJLXE`t{s}(6F|KF*q^0Ur9(|(})L8>Bj!!`E@vISSNw%XY-W|+{*KF8!`Esz$`O_k2g|0^}-s({&A_m4|vh51HvU&mZcS%Qy8YP4uiIO*vZCULd*JfxMV1SuNHH@^2vTY}k^41- zFNIMeIlxPhh0$x}O2$bCZMX$oFV2`DkTm7(WPn(N=LcQ&|w`V?Ym|NzMefH8N zA*YUwYdy}_n@=j0cMe^B^^BK?)rXVc|9Y(qNvf`vR%E%G_ucdD^G=JGY6p%TW81xZ zcg9*lCx)6+Og}z8d-iPi)~%*uVq!OL-`3v4XnO2O?Xlf!bS++$?f&w+w&uS69@Wpa z^XvBeFTc!aG3$zG{pTC&Yq@pAat`DlINu-pQGaGA!ym3c41ZW^A`Kc?{&~Es-=#Z$ zYwqrCJ9nP^^vS5WxVUu{yW@ekZ*`|npPsSy{`RP~?OT}R*REgR9kuq``ajG?GVM`o z+YH;vcJF2QGmmXXY-HrmoJg_q@^Tq@dGWZm?(Xi8)uFfEe#;5t`_Zp!tgfye6C0a& zyI!<2_jblw_hOxt$S}2lT{GX7Sjou96jW45Y=1hF{o?b80t1Nvt*OWSw(4}4IQ+7- jv^g)$`epvEe=H^HuW~2d`Z0llfq}u()z4*}Q$iB}ewLfz literal 0 HcmV?d00001 diff --git a/src/plugins/coreplugin/images/category_debug.png b/src/plugins/coreplugin/images/category_debug.png new file mode 100644 index 0000000000000000000000000000000000000000..f8c040c744c326d42409e7bf8c59740cff483a1a GIT binary patch literal 1924 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>U|>t~ zc6VX;4}uH!E}zW6z`$AH5n0T@z%2~Ij105pNH8!ku$OrHy0YJ5mJ(p)$oSuWl!1Yr z#nZ(xB;xSf>Df6k?xM&47r(cA^R=q{@10nCq2u3fb>==g()o$6(M*?R#e%Gji`=pV z7KAh?$glX-*wnDf!{ zx$h2_zieNY_Dp`ZY{knz`*}7bo)=_(KJ#2{b(u--?OlRwu1&9mR8{?M(YgAeMO)kP!e?(ROUmN^+%0)OU;f{6##i6u3=5{s`t_!<+KbQbgQNs63m0SC z@xL!#$+-qjxo3@5zXe^8thz(8=}s1sFrS-_wvBW$@;IvT_${6_j5#3R zG%_H}y!654-`=y|+cUT_K3k_I$fN#nLuA0lYrQue1QsX9-Qeb0pux4Mu*)T?-BD42 zYs1QW%`)AgZ+Dv%l;pnsmb_W`?k`#9D{pMR+?W@;Th8K2jeH2}ho8z9B$}rG^0KGTBgT1~rL?roYlDY#_c%^BY)s4-nZw*)^Hd>7 z^Y71SMu{-KB~xy1)(tx%BqG_{I3c^!=|tBQMHUu@WTuek7fSi2uaP|fWg1$MpJo{D`>`kU46D%;8o#-}&%s z*}}jw-|5^2NiFqutgRY1?nE@NT6^~UIw{73k&}YDS_7o4guCVRt2SR@=ZMskZ(*=n zeB$J$1se}C+sd{sF5&gzYJ4E$HktDzk9%F6T!z}mLWZ^5Sub4LIPYWO{dcmvwGS{Q zoqX_ndZOkDZ>!9?%Gci=`r%=Ju6(X*LKVkK7YPL}o3GZ4i<##bzg{J{VCIij^IP|h zJzHx%VQR9Y(zG3kch^_%F_Q5XU=wZ%-y`uhxAn@U6>;Hg3wXK~C1orT4&YXpF)gl? zUu3#@49EF?-yWW?i?m&DT=Z~3^*Q^xH)RaF*Z31gN+ir%GahmcP#3hy#F7k*0pJhQr^lkoehQC?#$>*(PEuE@o`bU zx?a3Z`1j`d`;)4k^6$4PzrA0Pq2_m|@Rv8Qk3YSUP=4{olbSeMKD%D({)HXI{1Z3j*DR{r-eEIM{=@GxD_umQv>2IH9&t~8 zVR^qXX}a)M`P+^A_kT4P@N~Sn)mEvc~_;T~DWI&+Xcq zw&Ui9+V=Tp{=d%OFJ1NL#_H<%zi*nKe*WiP`~1p8h5tvN*L`VSw{9Ev;=SwFpFF7> z^Im7|Dbw_5VXLzi5|5XLt!544@R;WoB`i?%bM{hIJ&&C>f;)_U2CO@rSsO3Q&`@DB zjjbVl{;yx_Zne$TEw0nwSGvKD<-w0qS@*hommmJ@)LFf@!0qxRH(TNLmv_EA82{(T zij~{edG3nwi_p0_!HI#v;yFi~((%==zM1yK+g;{o_;@1bk@MWH@Kbxg*Z&l}e`G`U ziuI4%&G)a)%~;a(BW*p&U?Qn#u>=fzS^?&(B&=L7hO{Rzu0`P?)*QK9v^U|>t~ zc6VX;4}uH!E}zW6z`$AH5n0T@z%2~Ij105pNH8!ku$OrHy0YJ5mJ(o6?q+)7#K6FG z#nZ(xB;xSf>G!=t0!5D1PrE+Z>fcOr4_zbg$vIw9lcr43;9A)9Y29~@s_qRQ${LG= zM7vpXn^X*^o=U$UvwY8+H+#dxf6p=IGhQsG{!!`rS-bTAk@s)i-+s+X#$rS5wyvbf zXV0FU<)QM=^2U`bA&haU8+$ulntt=oo1D`%G49@tiN%2dS9)K$1$xM?e)KnK+Qjzl z-SbxKJT-^Zxe@$FX0|37*eg74Qi9%|2z44GQ) z{n|$_b!Nl~C9cQZuR9LBh+#{#`&b)%Xc2RDSs%-JNtI?&Yc&+uQ1ripNTlQS#M^~ zj!m!gR-R+t=C*O(rFt#7cifYV5)7@FEp{=dGq|Z<*|B`78p}7Am-+pli^_EO6bj5( zm8@69m$PjB@}+EyRsP2ULx0`Ma(H;^WyQUj*>Cgyy1DC~w_DrBdooy8pVR%h@t3XF zKBVa#zPim~ecE-dsJst01>5vk_@DK-OEO9<|NmM)TQOq8wCg|r6k6<^B`(3xUM}3Q ze)iYXK1Uk&{P?qZ18;c1ffIgfOGJN|zFGOGQg8A4`7291x36U3-PyB$@|u2@eS29N z3>S!=a&VVjRIquo-u0&L8+*CG+RTg8wQtzKRp7(3JbY*Ax_Qgx!)4Ac3%I@F!EK`j zv$EAzotivzs;;oMR>hKh$B^99diqU)>|U|>t~ zc6VX;4}uH!E}zW6z`$AH5n0T@z%2~Ij105pNH8!ku$OrHy0YJ5mJ(ocE{hU;iF@H*0J8_33wQ zcc(vlf7o(&oV7s5uM6$-u4bI;OFQ@f?DzWr_Wv3FzvutmQyiI_n>%rl#%xj7l^btd zwMsg(E_;^!T2(g7=hJ`v`o+c&;P?BAd!@(WpxWfeakKA!e4KTEQrEQJ*|MrjQ@1f~ z?>@PyC&Hx7BSoop>*q^rZbyrFXRdr48*X1G+VD+5fIq3>XU#sN?b}~m5ubnW&GI3?(88s6Q#Rnxf9-Jy)bm(=P`u)al+sxk16+X_kTzPW!-@1BnhC+LV zH({z1bUt|T@Oro3 zfBs!xAHVz4r@uFL$TL)y7N0)p8-L^1n{~FoKdt-PpQvGwCox4#B5hgaXYU?HmxjCR zlK!5uD%ti|`RBXa`QQ3@_}1{ZA2#N8Jn`K?&(y@k=KGWB+hl91zTew(KmLVFjv1e) zQO~5Eb52~4ILn*z{fNYZ<(DORS^{>z5nQ@$*|EFVYggykh}6_8GCY;D)7RBnU6Fge z`1hxC|JE`ekzf%#z<7+~v{%fHOPjckw#wbe4P$6oGR@6G=%~K`+~(CwM1)kD1=;Sr zl0WqLtM*#$u(kIlcbwmI_xA1IiVSu3Y)@V-J$-KPhe!Uee;-TEQ8MG@V>)r;L9+Mi z4`=5_2Sz<)|+MIS%9ZSBXI zFCU*wF`AmFB+jrpKj+u2;PW=s37*cAzb=-pQz_+ZXq>^gXxEkIU#i`P22uy!-^)LG z^YdB>2^mMp9A^{-wWI+DY+!TRFk_s;(Q{AM=ScxGSi`jEoH z+_-x~MDENT3WVFi5gd$uOmnz76ctz;CoqW1%#mKO>QwiJWgF!t z9TAv2>sWRDdzY(^w4B*p1X5gh1Pw&?bRTn{J-6)Y&cj>IE?M(SM=ZY3b7pCl8lN7= z93viyHX|JgUk7ofvRX0woBwrpaD5W&^?fLwzmGZHk?{o2`8WMNVx7K+Uw>^nIqg;} z&w*zFuVduQXM3tFEM}a0*`}Fof~CV8;kcSQ`8{&x%hJ+5T-*I#QOMu9wDQ@r4jvZe z;Ac;*9|nXPEZWqQo2sX3v|GnJ(wU_}g1J%BHd%qgSl=KgB8sov(e6hPM5qe>EynM5-z{?(!A^3((|S3vkphySQBkp1CmeB5X_Qb< zaY#F~B)CaQ+S^jRK&+xCXXfTULrxVz4~e9do`a_vJWRNRYE&k(Z{krA>iniHJN=QU zYb#sQq8yG_hdP>K#11rkNMYHeq?}s#>_@DFILo=8dkoL9icJ?^{QR1)uATMeS&S1B z8`|32f9J>TH~Tu5sr~eseF8l^^+s$;Y>`OKID$%|CyI<5JAAwsoqL)vc{>U9R4?<;f9)O?Fp~#;EN1^7ieI zpa0fBn)?2&+2Ugo=jR?SKBl$z=ZsFj3nwlVgsTY6{L#YA(DC~Ex;;hDj(nV0v|adY zX*bX7G$F+a6B&KI_U4I;g->(ddiwzD(;XV_Yg{huY?vxIFJr~wi-+5l%AL#i@hi-= z?0Lq>ATVEs|DE-()y^AzSBEP+?&6VdI+4)KePYtakieASpOz=Pc6_|g^OARU_=7+4 z=Z_wDYmet*Yj$S%Qa!hg!QoU%{RQy)y$>}D)eT7dxy_GiSWAb=%jrqIQ$rOf4-?Q2Jb&r2CduP9r+qk8y z>|njQ*>;6!cBzL)C7P#XPMTODk$mItPBjBv#W?#fn>!o#-Scg9SYSW>-|wj@3=7Wt z`OlU7QXbxNoY{Ndrq7bIk0(0kCnVJwo{V_Ls`AWh^RruCZ(_D{$^U!W{A1-~cfEdI z{(4IZ9zGqDe+yPcuqAx{Su@-Fw03{(-`&5xr|HEn{L;r_SfbvdefZ&-Kz_Cb`!;dx z3(}t!GEK=&cCmS!wTPsoY~9Z7yMMQMR%8Jg6S~KR%C|J64gWz>tmZV8bmWW1Pl3gX09dlKraQEGp t{QnB3u{Sa1uGk-6J;VCZ|2IGR#V71^-@$Y6HUk3#gQu&X%Q~loCID96?a=@L literal 0 HcmV?d00001 diff --git a/src/plugins/coreplugin/images/category_project.png b/src/plugins/coreplugin/images/category_project.png new file mode 100644 index 0000000000000000000000000000000000000000..18d157e971f0864175274cfcdca540f9a5424e1b GIT binary patch literal 1100 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 literal 0 HcmV?d00001 diff --git a/src/plugins/coreplugin/images/category_texteditor.png b/src/plugins/coreplugin/images/category_texteditor.png new file mode 100644 index 0000000000000000000000000000000000000000..c4798e04148c1bb1c46fe9958cfc28dd423587cf GIT binary patch literal 615 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>U|>t~ zc6VX;4}uH!E}zW6z`$AH5n0T@z%2~Ij105pNH8!ku$OrHy0YJ5mJ(n!HJE<-3IhY< zb59q?kch)?!#A#a!i zjg1{1)qWg|hYb=U!=C)=;VPY!5?FUkg6D8Y@5DgX{H;-5S+d6+*M@Pw{cgh_bZU9^ zR0gxzz1PI;&lw(5XbEUK|Kd`$h0KFp>!#gUGG#~HdWMFhNgw4HTAdhQe~sE1#=&_0 z^A?jSGaBR8mp{)ok;>S9Tk%z>XRz^xsI~Lv*(U2Oh`U}lk5NI%qK{drX^PPY*Ivu# zA8O+@&mG}8leRfP)0XXPt^Azgx5fS}4-6wNJ<&IGaCuQ;wQ=_AuU0v?ud&VMIH3Rb z^iv}kxHfq?|igWq*ec)uI+`YaEA3Zn0@-Fp9Bg0DTwG4{Hv-t=nT z1G;COI8ru8`lt!N6~7pLdO~sE<(DlNGemCoXiYu!{L}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 b5d310ed31f..f88fecdf506 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 42c2bdb5a90..82243a155d1 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 eb151c23239..bead94988cd 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 f7ddc25b714..433c9fc1e2f 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 68adfd9f970..7ec1607f2d6 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 ec1fe9bdeb1..b8cf5da2714 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 ffec7caa73e..93c16dfb311 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 da8a05153da..eed43167a34 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 708e4662c18..2d16327da61 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 063c372afac..10145ed6bff 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 f513ac93e28..79729b7215b 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 a3e16da0645..ab41757fe5e 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 ae4297cbaeb..34de7008856 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 58508cb336c..236cd3abdb6 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 7f9fb6a74ec..2a137e93b28 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 9b230835059..fab22d1c866 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 db6bb35c7b8..3482de3dc05 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 05ff7a6e14a..3c1ffdfbb3a 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 e509d176cc9..d32936f4390 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 7b4b19fa9b2..7fbf855fe37 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 f78b90c5e19..fd4c33c6d86 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 d06fef2954e..8647c34a547 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 3b059f3c362..5c3706ba5d2 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 d6b71f60b8b..ecb6d977d7d 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 8348ed83e92..7c2166eca8f 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 1127321bfea..f316a6e78cb 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 71570e211dd..0732e386fac 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 2958b7bac81..01a4afc779f 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 11edb065ce3..4c50a1581ab 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 203c4ce483c..7d10c032932 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 5f1938bc802..4933f53dd4e 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 80c1bc67a79..66de3ac8ae3 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 e73e882fe3d..8577b42960e 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 74398e51c53..b8f74d5359d 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 bb62461df05..0df4288670e 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 f37ab2de26f..dbfc97e39b3 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 36195359dbc..e9910e830f9 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 f0c7b0e214a..0dcfdb5cf9c 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 26d44e8b519..e89b044edb7 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 118c7bb60f9..8702830a900 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 8f0fcd3b86d..821fa13703c 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 7eea709afa3..bb3d6dfdab8 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 f49c933ec60..6d10556c68e 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 1dd417d7145..fa57502a13a 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 d7fc674585a..32000e80642 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 417873c4596..7026a8f8ceb 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 b10dbf88581..3ee1744fece 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 369d8f03d39..66fa5da9d59 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 253ae22ab28..404e8c86ed3 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 d834a8049be..e325134d3cb 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 b04bedcebe2..db5b54c1d50 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 b1bb9496c7b..312c1efb906 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 ef8cc3a0672..5e84afd49e8 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 b620910c5f2..9d316c639e9 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 3965e7b4247..517d0a28524 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 98f45069b69..36145ccb5a7 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 72aaa8e8287..cdbf809536d 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 71113551057..f49abc713d2 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 53a46a2ef43..71c9c6a5ec6 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 6d002a857b4..86551c337d3 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 b1099ea79f7..dce289ad10b 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 d046592632f..63dd9292cc8 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 0735e774443..9f84a0c9ecf 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 e101842fd56..7fc41a9f888 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 44316736daf..3ca0410e33a 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 1c038926ccc..5b52fbe20e3 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 af47f60d1fc..5828b5bf884 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();