From 5bc6692ee597e56a89620f5fc5155acaa9d24540 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@nokia.com>
Date: Thu, 15 Sep 2011 19:20:50 +0200
Subject: [PATCH] Reduce number of categories and minimum size of preferences
Merges the Project, Qt4 and Tool Chain categories into one Build & Run
category, which makes it finally possible to reduce the minimum height
of the preferences dialog.
Change-Id: I8d94aac9c9531200f5d8ca212a53d3edc5734138
Reviewed-on: http://codereview.qt-project.org/5023
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
---
src/plugins/coreplugin/core.qrc | 4 ++--
.../coreplugin/dialogs/settingsdialog.cpp | 2 +-
.../coreplugin/images/category_buildrun.png | Bin 0 -> 1153 bytes
.../coreplugin/images/category_project.png | Bin 838 -> 0 bytes
src/plugins/coreplugin/images/category_qt.png | Bin 801 -> 0 bytes
src/plugins/debugger/debuggerplugin.cpp | 2 +-
src/plugins/debugger/gdb/gdbengine.cpp | 8 ++++----
.../projectexplorer/projectexplorerconstants.h | 8 +++-----
.../projectexplorer/toolchainoptionspage.cpp | 7 ++++---
.../qmlprojectmanager/qmlprojectplugin.cpp | 3 ++-
.../qmlprojectrunconfigurationwidget.cpp | 3 ++-
.../qt4projectmanager/qt4projectconfigwidget.cpp | 4 ++--
src/plugins/qtsupport/qtoptionspage.cpp | 8 +++++---
src/plugins/qtsupport/qtsupportconstants.h | 4 +---
14 files changed, 27 insertions(+), 26 deletions(-)
create mode 100644 src/plugins/coreplugin/images/category_buildrun.png
delete mode 100644 src/plugins/coreplugin/images/category_project.png
delete mode 100644 src/plugins/coreplugin/images/category_qt.png
diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc
index 443831dd9ea..ec32fb3d654 100644
--- a/src/plugins/coreplugin/core.qrc
+++ b/src/plugins/coreplugin/core.qrc
@@ -47,7 +47,6 @@
<file>images/category_core.png</file>
<file>images/category_texteditor.png</file>
<file>images/category_help.png</file>
- <file>images/category_project.png</file>
<file>images/category_design.png</file>
<file>images/category_qt.png</file>
<file>editormanager/BinFiles.mimetypes.xml</file>
@@ -65,6 +64,7 @@
<file>images/category_cpp.png</file>
<file>images/category_vcs.png</file>
<file>images/category_qml.png</file>
- <file>images/filtericon.png</file>
+ <file>images/filtericon.png</file>
+ <file>images/category_buildrun.png</file>
</qresource>
</RCC>
diff --git a/src/plugins/coreplugin/dialogs/settingsdialog.cpp b/src/plugins/coreplugin/dialogs/settingsdialog.cpp
index fcf8fb2b737..9a3828c9879 100644
--- a/src/plugins/coreplugin/dialogs/settingsdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/settingsdialog.cpp
@@ -393,7 +393,7 @@ void SettingsDialog::createGui()
mainGridLayout->addWidget(buttonBox, 2, 0, 1, 2);
mainGridLayout->setColumnStretch(1, 4);
setLayout(mainGridLayout);
- setMinimumSize(1070, 680);
+ setMinimumSize(1000, 550);
}
SettingsDialog::~SettingsDialog()
diff --git a/src/plugins/coreplugin/images/category_buildrun.png b/src/plugins/coreplugin/images/category_buildrun.png
new file mode 100644
index 0000000000000000000000000000000000000000..8401b4195160dfe237c47bc9b98c2d4ae60e60fe
GIT binary patch
literal 1153
zcmV-{1b+L8P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000C?Nkl<ZNDZA<
zZA=?w9RFQg=(QARwa|{ats5J4B)n{0g18N57_uyjbBH+c4HvT*+y`LUWG0$S^n?3A
z79xIdabzUo=7tyzY%?ef!^UE!g&;6_yVAj^ydBU2Z7KDht9KM~mFe^0{%^nk@Auq4
zm*+Xk@Arc&>eSOk2BZ4$E6K*xbvjzhrC18E`axNNCEF5YR$8%WElRCo`G!Y)P(*+_
zon8Pxs!nEaMXXl2R_lKf4hWn|Z^C2rzE88_*CPM7IxoCLf$@8NXG@=|VhC6!bQr?r
zg8P51mK*jy%8vpl6efX06c7@@_Al0rjzKpR?#;-E%R!1hBe?uXz9JOLYGc6+>+s|8
z^U%-{BFtjQL`}~*EcjfgZ+GB>j1%yMInX}dB4UCa$v2pGdGU3JOC+ChPvV`cXYec2
z3B77PvNq)N94!M=*uO0s(c$`F&K16-K=;Tjic|KBJ8!mMfm~xl?v*mWdAmLheRc(k
zEl2n`I{a~%A`@2-3xT9S*O&{3688ug^sx7^DMpQ<@gXs{+jtP=IVbs;2<Dkf#9FW;
zDZqMthzy#$&|ok|@M9uzxYC1)pKJJ1WA9Crw|*kPR#-^^f{3CuD}bv5W!Q47Cc=kB
z<=|=vA1|X;l_OQlU(TwM7|uKAP+eUO_kaq?zJuK7tQKp66H;J!${}DvTDd|Fnx^s5
z*)q6CW!N&F2~FD=V(RZ76PiK_2!LSgaC)&`XW&x{i*pF4mB`D>L)pa=6un=J2X-4Y
znisIqt9-rU&?XB3N(!XLYH(+uL*zE9Oab5NL0ohU?~l&e#JWr_L+NV?sH?q-1&;?4
zDFrTj(i@S5g@rmvfq1<dmphw8f+YQJwDnG+ASIj6xqb8KpZNm}`;d>PFE`-1#7umg
zt-}|eRl?2;tF;=ssj;!qDtT0pZ@#u`5SQ+Jk2lkw#}31@IBc55i#sxT!nTomXw_jj
z_gfPVl-m$*dIHmZxACXbi7h!gT)%#UvfJ(ReSLjtk^+R~-SiE3?{)>I=bgy4Wbr~|
z=WQbmxa+uq=!h^>dfeEUU;umn7qrh#V<P8C#6NW6=I1|5%#6)#<?b3*azsQx$sOM%
z&zR8cxP~uV>qv@UL$f`g<q?Q&uw##TFWBxD{LYT^<OHBwr@@(q{9Hm#;*bKQNY?ha
zNPKv=4$cJ^lyVh+Bp4bVV5cb!<K4H=F*}8+my!Zt;kmfT2yVy`2>>#RW0okqTyp}&
zdym5NZ7sGL%oyuzM*q?R*rUk;^dC!|7j83>SW|$2%-ma;<ABkxDv@9`W1_1C3^?-q
zRPJv940nq$+|7Oql;3*Va^XADBdmY`6_}Thl(M>e&KZ-|6gAe>ieb6CfAZCxZ<p@6
z&@6=w&IJU#s<)yPauZib4c-yuUt)ZejNyrP0T+*K{t01<nB(8{uAWOU=L-LC&BTbc
T%*L}C00000NkvXXu0mjf*4!&&
literal 0
HcmV?d00001
diff --git a/src/plugins/coreplugin/images/category_project.png b/src/plugins/coreplugin/images/category_project.png
deleted file mode 100644
index a29396b2f8c5d1a01e23e3ab6bdf6dee317afc52..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 838
zcmV-M1G)T(P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!=t)FDRCwB?mTO2;VHn5%TVA7rh%OSE
zX<i7GDV85*XjEpd`p|_Ef)a@?U{FL~f-WEWP~eB6lJrvvk~0)jMu-?>PL0_rGjwCi
z%chhvET=nXXXl*Woz0kMXLgP~?7s&N?|FaE^M79UPQ~*)LL>jcg}WqOBKi<iuRptU
z4ZrY@7=ADj_AE+b-7Wvu(b7U))GD>kVt2qk>IBSXBa1Mi_XIcy86gEgea&sWe$$Pf
zJ~JxHOOcV5im4wn8CJU^!#*~7&SIN@!(8SG?Jy{(EI@M77F;=h5_#F_xOwjx5;sMo
zK$D8(?J3AQxEt%%mVov$@dQ?68+8_aADe=C(CU9xB?}<Tg?zLHIWRO<qrJn3h9(2{
za%z13*bj>KA|YWbl9E%Q&Cf(h@h)7vUM*>nIuc+}aj`KtaikbmFP}kk=MbDOpirwt
zt|l9Evp>=Bq81#-MV!I104|s*uMb%})A0Q19c)X<MD5FNw6(RNva(WG&vE?90DiG7
zhXs#UsB(3D9L|>OFzs?LS-)Hd(la0x@c|M%v`>J9LdBsRzy|;n&A>x>m)Io*U{?ZQ
zNY(CndP(Jrps)^Dg#iC16czBD69H(_RcuVOY>Om^Jnx|~zd#f3SyEj<Y*0hPHfXYT
zhyV&tk=soPzJ^NZhFH<nJ%Hnf_xxW6{!_yR#fFM(G;AG3UQU|GQiU^MIW}y#!hp#>
z4C9lS0k3e#Z1`{^9nqCo)L2*F3X5$#;JZi>e;nm@KrWKgmJv)2eEL?kzqlYuSE7~C
zfx=VdNH<&~E^Y33+uzdI(uv8bnSgB}9WV?7lgSjgDy`$n0KraNa~i|3p8hXY_aD`J
z`%GW|R;t(Q;q&=CPipGA2y^aL`@0sY+brUcMWDxP%w@g$)~;sP?C&K1Go#U1LDH$-
z4TeL)qV<vASBZViypbrmkU%z))I?N7penilD%6k}WYcMq_7OdVg7_oA0Q$KSQB$c8
QB>(^b07*qoM6N<$g8Pepk^lez
diff --git a/src/plugins/coreplugin/images/category_qt.png b/src/plugins/coreplugin/images/category_qt.png
deleted file mode 100644
index bbd4dc681e16b5d41a7b0aed90830bc77acd6412..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 801
zcmV++1K#|JP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!!%0LzRCwBA{Qv(ygGQMw!-IDm1#%MX
z{!S(W1`@(-0t^fcAAtA*6hDNqS8Tow5+?|5bUg;sEFc1Ccmj~>cQF-Y5EEjBsR3Ey
z0L5?+;j2oL#Vk-dUL0sJlHvFOA&VaXaU+z5Tfo51#>7A&5J0kYA<P22roMXjo8ii>
z{|rn&G#DJ@;~5OZ-AT5U1((F-J6{=|JQ8QvRl0<MpNkJJZXq4au;5Y=!;e2-81|n2
zz)<Q|%J7fv5yOR-JF%LB)dwHH{9!nH{tw*n4?kWo#Li7*ICS$Qg9Nt<gNIT!+!1~{
zkqiPH5;%Q;)q>lPzBBk5y1-q&<K9#TR=!&dsq@Rhd{9u`xyQ{AY8n6ue0B*21%3nK
zEqL_uCxf4XD<Vz5J<0&gBMcAUJVgnr*@>NS3lsGEh_~R!uYW+-^J0jDECB@*IMs3d
zU})Ji8O+{vWjRCB?kwUh0DBuLVzB|_WX;F-i{T%~4bm*&Ctv}w0H*~H-#nqM1=y4C
zUj}&*8Av<<^8wiw$VqSjBl8rT4@{2?za4Q9XidWQlF#Mv1(pWhAVgOcHyYo8hX
zfO!Mv`Uf8_GCX_>2}VhF3x+SR^cgsr#EA6)JHz|m_ZX(^SpZM-9?IG9bbsK{LI!>w
zW`<o?_W><=%AhW;&d?Lw&%n>gM|@cn>?p!8X@3vHhi{)5Vy%N1a$FL?E(aNY;^|tT
z1uP6f&YTR5`@$IX<un<-|9gcsUYPKu^C)*Qh7->hF-+OL04@#+8V(j7NKyt`0`~2%
zdpIMVU@B6T<78NTY#qbLZ=b*hgNg)Lq~ie(h_(RaN@sI6hLD+I;3DC{$BPUfe!jq`
zWdgAJd_XV`(0!pQ_lx1&``JK@)wLje5L!2Hz!u5Gv=opH0<(dJ9U!(wOJrwdQUE1+
fat*=-00ImE8M_EYp@>8O00000NkvXXu0mjfma0_%
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 23aee74157a..2eee04487a7 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -2511,7 +2511,7 @@ void DebuggerPluginPrivate::showQtDumperLibraryWarning(const QString &details)
dialog.exec();
if (dialog.clickedButton() == qtPref) {
ICore::instance()->showOptionsDialog(
- _(QtSupport::Constants::QT_SETTINGS_CATEGORY),
+ _(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY),
_(QtSupport::Constants::QTVERSION_SETTINGS_PAGE_ID));
} else if (dialog.clickedButton() == helperOff) {
action(UseDebuggingHelpers)->setValue(qVariantFromValue(false), false);
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 2f7229724ef..86ba28d6539 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -4504,16 +4504,16 @@ bool checkGdbConfiguration(const DebuggerStartParameters &sp, ConfigurationCheck
const QString binary = gdbBinary(sp);
if (gdbBinary(sp).isEmpty()) {
check->errorDetails.push_back(msgNoGdbBinaryForToolChain(sp.toolChainAbi));
- check->settingsCategory = _(ProjectExplorer::Constants::TOOLCHAIN_SETTINGS_CATEGORY);
- check->settingsPage = _(ProjectExplorer::Constants::TOOLCHAIN_SETTINGS_CATEGORY);
+ check->settingsCategory = _(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY);
+ check->settingsPage = _(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY);
return false;
}
if (sp.toolChainAbi.os() == Abi::WindowsOS && !QFileInfo(binary).isAbsolute()) {
// See initialization below, we need an absolute path to be able to locate Python on Windows.
check->errorDetails.push_back(GdbEngine::tr("The gdb location must be given as an "
"absolute path in the debugger settings (%1).").arg(binary));
- check->settingsCategory = _(ProjectExplorer::Constants::TOOLCHAIN_SETTINGS_CATEGORY);
- check->settingsPage = _(ProjectExplorer::Constants::TOOLCHAIN_SETTINGS_CATEGORY);
+ check->settingsCategory = _(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY);
+ check->settingsPage = _(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY);
return false;
}
return true;
diff --git a/src/plugins/projectexplorer/projectexplorerconstants.h b/src/plugins/projectexplorer/projectexplorerconstants.h
index 002f7e49133..e6bf1674976 100644
--- a/src/plugins/projectexplorer/projectexplorerconstants.h
+++ b/src/plugins/projectexplorer/projectexplorerconstants.h
@@ -165,7 +165,6 @@ const char ICON_RUN_SMALL[] = ":/projectexplorer/images/run_small.png";
const char ICON_DEBUG_SMALL[] = ":/projectexplorer/images/debugger_start_small.png";
const char ICON_STOP[] = ":/projectexplorer/images/stop.png";
const char ICON_STOP_SMALL[] = ":/projectexplorer/images/stop_small.png";
-const char ICON_TOOLCHAIN_SETTINGS_CATEGORY[] = ":projectexplorer/images/build.png"; // FIXME: Need an icon!
const char ICON_WINDOW[] = ":/projectexplorer/images/window.png";
const char TASK_BUILD[] = "ProjectExplorer.Task.Build";
@@ -181,10 +180,9 @@ const char RESOURCE_MIMETYPE[] = "application/vnd.nokia.xml.qt.resource";
// Settings page
const char PROJECTEXPLORER_SETTINGS_CATEGORY[] = "K.ProjectExplorer";
-const char PROJECTEXPLORER_SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("ProjectExplorer", "Projects");
-const char PROJECTEXPLORER_SETTINGS_CATEGORY_ICON[] = ":/core/images/category_project.png";
-const char PROJECTEXPLORER_SETTINGS_ID[] = "ProjectExplorer.ProjectExplorer";
-const char TOOLCHAIN_SETTINGS_CATEGORY[] = "ProjectExplorer.Settings.ToolChains";
+const char PROJECTEXPLORER_SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("ProjectExplorer", "Build & Run");
+const char PROJECTEXPLORER_SETTINGS_CATEGORY_ICON[] = ":/core/images/category_buildrun.png";
+const char PROJECTEXPLORER_SETTINGS_ID[] = "A.ProjectExplorer.ProjectExplorer";
const char TOOLCHAIN_SETTINGS_PAGE_ID[] = "M.ProjectExplorer.ToolChainOptions";
// Task categories
diff --git a/src/plugins/projectexplorer/toolchainoptionspage.cpp b/src/plugins/projectexplorer/toolchainoptionspage.cpp
index b2bf43d9bc4..ef44303889b 100644
--- a/src/plugins/projectexplorer/toolchainoptionspage.cpp
+++ b/src/plugins/projectexplorer/toolchainoptionspage.cpp
@@ -467,17 +467,18 @@ QString ToolChainOptionsPage::displayName() const
QString ToolChainOptionsPage::category() const
{
- return QLatin1String(Constants::TOOLCHAIN_SETTINGS_CATEGORY);
+ return QLatin1String(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY);
}
QString ToolChainOptionsPage::displayCategory() const
{
- return tr("Tool Chains");
+ return QCoreApplication::translate("ProjectExplorer",
+ Constants::PROJECTEXPLORER_SETTINGS_TR_CATEGORY);
}
QIcon ToolChainOptionsPage::categoryIcon() const
{
- return QIcon(QLatin1String(Constants::ICON_TOOLCHAIN_SETTINGS_CATEGORY));
+ return QIcon(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON);
}
QWidget *ToolChainOptionsPage::createPage(QWidget *parent)
diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
index 9e204d228e3..2e261a4ff6e 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
@@ -49,6 +49,7 @@
#include <texteditor/texteditoractionhandler.h>
#include <projectexplorer/taskhub.h>
+#include <projectexplorer/projectexplorerconstants.h>
#include <qtsupport/qtsupportconstants.h>
@@ -116,7 +117,7 @@ void QmlProjectPlugin::showQmlObserverToolWarning()
dialog.exec();
if (dialog.clickedButton() == qtPref) {
Core::ICore::instance()->showOptionsDialog(
- QtSupport::Constants::QT_SETTINGS_CATEGORY,
+ ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY,
QtSupport::Constants::QTVERSION_SETTINGS_PAGE_ID);
}
}
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp
index f0da0a29e16..4aebcc0ac0a 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp
@@ -39,6 +39,7 @@
#include <coreplugin/icore.h>
#include <projectexplorer/environmentwidget.h>
#include <projectexplorer/projectexplorer.h>
+#include <projectexplorer/projectexplorerconstants.h>
#include <utils/debuggerlanguagechooser.h>
#include <utils/detailswidget.h>
#include <utils/environment.h>
@@ -279,7 +280,7 @@ void QmlProjectRunConfigurationWidget::qmlDebugServerPortChanged(uint port)
void QmlProjectRunConfigurationWidget::manageQtVersions()
{
ICore *core = ICore::instance();
- core->showOptionsDialog(QtSupport::Constants::QT_SETTINGS_CATEGORY,
+ core->showOptionsDialog(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY,
QtSupport::Constants::QTVERSION_SETTINGS_PAGE_ID);
}
diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
index 979b14f6f92..57b008e598a 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
@@ -180,13 +180,13 @@ void Qt4ProjectConfigWidget::updateShadowBuildUi()
void Qt4ProjectConfigWidget::manageQtVersions()
{
Core::ICore *core = Core::ICore::instance();
- core->showOptionsDialog(QtSupport::Constants::QT_SETTINGS_CATEGORY, QtSupport::Constants::QTVERSION_SETTINGS_PAGE_ID);
+ core->showOptionsDialog(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY, QtSupport::Constants::QTVERSION_SETTINGS_PAGE_ID);
}
void Qt4ProjectConfigWidget::manageToolChains()
{
Core::ICore *core = Core::ICore::instance();
- core->showOptionsDialog(ProjectExplorer::Constants::TOOLCHAIN_SETTINGS_CATEGORY,
+ core->showOptionsDialog(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY,
ProjectExplorer::Constants::TOOLCHAIN_SETTINGS_PAGE_ID);
}
diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp
index 487ab794b61..b9bdcc16ab4 100644
--- a/src/plugins/qtsupport/qtoptionspage.cpp
+++ b/src/plugins/qtsupport/qtoptionspage.cpp
@@ -50,6 +50,7 @@
#include <utils/pathchooser.h>
#include <projectexplorer/toolchainmanager.h>
#include <projectexplorer/toolchain.h>
+#include <projectexplorer/projectexplorerconstants.h>
#include <qtconcurrent/runextensions.h>
#include <QtCore/QDir>
@@ -84,17 +85,18 @@ QString QtOptionsPage::displayName() const
QString QtOptionsPage::category() const
{
- return QLatin1String(Constants::QT_SETTINGS_CATEGORY);
+ return QLatin1String(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY);
}
QString QtOptionsPage::displayCategory() const
{
- return QCoreApplication::translate("Qt4ProjectManager", Constants::QT_SETTINGS_TR_CATEGORY);
+ return QCoreApplication::translate("ProjectExplorer",
+ ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_TR_CATEGORY);
}
QIcon QtOptionsPage::categoryIcon() const
{
- return QIcon(QLatin1String(Constants::QT_SETTINGS_CATEGORY_ICON));
+ return QIcon(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON);
}
QWidget *QtOptionsPage::createPage(QWidget *parent)
diff --git a/src/plugins/qtsupport/qtsupportconstants.h b/src/plugins/qtsupport/qtsupportconstants.h
index 802dabdd55e..acf649c3f1d 100644
--- a/src/plugins/qtsupport/qtsupportconstants.h
+++ b/src/plugins/qtsupport/qtsupportconstants.h
@@ -37,10 +37,8 @@ namespace QtSupport {
namespace Constants {
//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_ID = "B.Qt Versions";
const char * const QTVERSION_SETTINGS_PAGE_NAME = QT_TRANSLATE_NOOP("Qt4ProjectManager", "Qt Versions");
// QtVersions
--
GitLab