From 03d4fdc602bcb2e5ffbcfac910d21078d323ee0d Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Wed, 1 Dec 2021 18:54:56 +0100 Subject: [PATCH] ProjectExplorer: Remove Icon from main panel Only a few panels come with an icon, and then the icon is unthemed and only for standard dpi (original design file is unavailable). The gained space benefits the vertical output pane on the right. Fixes: QTCREATORBUG-21917 Change-Id: Ie717ee7a08cbd21292a8e051c41406df58cad6d6 Reviewed-by: Reviewed-by: Cristian Adam --- .../projectexplorer/images/BuildSettings.png | Bin 2163 -> 0 bytes .../images/CodeStyleSettings.png | Bin 932 -> 0 bytes .../projectexplorer/images/EditorSettings.png | Bin 932 -> 0 bytes .../images/ProjectDependencies.png | Bin 3255 -> 0 bytes .../projectexplorer/images/RunSettings.png | Bin 2203 -> 0 bytes .../projectexplorer/images/unconfigured.png | Bin 3898 -> 0 bytes src/plugins/projectexplorer/panelswidget.cpp | 56 ++++++------------ src/plugins/projectexplorer/panelswidget.h | 13 ++-- .../projectexplorer/projectexplorer.cpp | 3 - .../projectexplorer/projectexplorer.qrc | 6 -- .../projectexplorer/projectpanelfactory.cpp | 10 ---- .../projectexplorer/projectpanelfactory.h | 4 -- src/plugins/projectexplorer/projectwindow.cpp | 7 +-- .../projectexplorer/targetsettingspanel.cpp | 10 +--- src/tools/iconlister/iconlister.cpp | 12 ---- 15 files changed, 29 insertions(+), 92 deletions(-) delete mode 100644 src/plugins/projectexplorer/images/BuildSettings.png delete mode 100644 src/plugins/projectexplorer/images/CodeStyleSettings.png delete mode 100644 src/plugins/projectexplorer/images/EditorSettings.png delete mode 100644 src/plugins/projectexplorer/images/ProjectDependencies.png delete mode 100644 src/plugins/projectexplorer/images/RunSettings.png delete mode 100644 src/plugins/projectexplorer/images/unconfigured.png diff --git a/src/plugins/projectexplorer/images/BuildSettings.png b/src/plugins/projectexplorer/images/BuildSettings.png deleted file mode 100644 index 30a2c62380a52cab6842cd40ff8a5eccaf1dc0fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2163 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?F(JmCjWemjaeAT$H!LZV4zyE7{&hq-C z8aw{)McU2Pd+vT_N_k!S`0?@n)l$;Z^Dn$Cv9{>j{8&+OuAl$W#~*_?M!ZQ;5qh}z zqDBILqXWa9IQ`czH->1jwg^PX-1Bbzy^2-lZJ2KLzx$EhPKz(ftX;XX^3=bNwRx&Zv9=#(FHDg=aHGAnv^3Xk z@kB@VX2%8dzgF2U&`9G5ZTJ6^`{l%Uflo{RJ+k(#YIy!ZtljVWR_@h;ijldZyXLY7 zw21AN+oB$D;NP=nX&ITBiE#_|9!*O0w~^sO6b+%OZpIqGc z6Oxh3H(1QM5Pjxa>;Wai+#9y7-)3CR3f;DSJ98ELw!FJsyu7>y*4Euhc1-L)dE^YZ z4QdRzrr-Hk|L})$Yy4dT_CVSd_?{ zH~;P0+OzLoIOm#BGO5#|_3?h;qPqE=9IZ||BFB#%>k4lb3+;ClxoB={TPrnr>%=w| zQ=b%r*=ILwP8Y8+P+*>Ug*QphNq?c_T2l!gMyaZ(wPG2D8d;LDPDfZpHfq25&bRB+ z&sRTZEW3Iy}sta??eEu!ht$N#i zySlpZ#FT;$OM?Z3QXGmG?b|o+tE{Z-nlG19zW)B}GvoGKF&nw_k0Z+NOG!%Jl;BtR z6S#TbD^~Y-`GQ$m3MV=Kyqj2MQS?d5$Iow5z(Td@rz2-BHSFJP&Mmzrq^q&9(cInL zJ@e=92aX|M;4?OCo0S(K}oZ<4sIo&ntVk zSN;jd6s`(|!o#N9_jw9`s0cQA>o2Q!;If-{PnTV7mdF&pm>FlDfB0d}{k%KaP4Hjn z;(gCf>eYNQa%EMixvpSneDvH$Nx_Gc3zQE8{|L|9)uX1-|5{mft&<7=g%?}Aox9`9 zrp2EYaQbn*r|s7KlJ`61Pd(vcoA)U``MD9(q2CgJ1Y7DWJ5Og$+PC^pTekeF3h}51 zWxpFug&RK98%VsWe{&=&SZ!+Zp4|$fUvv&6pJ*^YA@BS{`1GAL_FMD04C`wcHbw-C5!j5{&@Z4Np0f4NUr^Q+IOwLIxzlQ&vyBle9r5eXZu{&E7j!a z<#bxG%XciP@BMIo+LdK;4>Rx9T~5flm4AOH_otmUE%x^OGb?7y7615~mrFi2{)hG5 ziDwVap8dW2-3!MbGA+y696gS42@4!z4;JWJ=CAN)W9faJwQdfK|8gf^-IDM9y>`Ok ztu+@+IU?;0+55kL3i=W8Y&*yQ&q+EW;W`T#{`Z|st6Z^mwe*oS3qCC=;>jh^ zjI2M(eb?&p-`Hl^@WJzgKi?vDBktr4K29d{e%c=TzvaeyvFV}#4fXf$Y+HK$QYO2i zX!-}sNwE@-`#%VHr^LDcaF+g<_hlNBz&yPT|B^G`zc9^v$)G6c{6o|tBy15hj+!Y>3{S>OvIQHPa!;j6Smo%>Z){ooQmVSB1;#(CzqW{@9BrJSa+h2RT_~)gT>=(je?^iBfA^PBd+hIN@ z&Mi+TMKmo8@tz!Uc&hb<4VRWE9^}ry_*b(_#5?vtjoph4)@La<+BBRf;P!5 z*sVK<-ORe&YDw>$nM>C7Kj;43kWw9OdRFS)CiROB*9%lF`7c~8yign2;S+!Il!ffd zoNe8e8p=B&PcE96s~dXc&XPv~8L=zRega% zQ`oErA9j9TIdOCIBA10qS(7I>Y?*VRzWoA+nx$dhqf>z`%bu{@QBkt8Dq(b;<19FJ z(XA`0O?#M}HT8pTCtd7l^PR)wTA-@_Kuz%D#)+PFJN^p`raW~?ex)R|b5ffyxE4Y+vgKdS`8$0>b}C3-Bh7#J8BJYD@<);T3K0RTJ!4_N>J diff --git a/src/plugins/projectexplorer/images/CodeStyleSettings.png b/src/plugins/projectexplorer/images/CodeStyleSettings.png deleted file mode 100644 index ebd869fb32bbf4f597a0aa224565f7a428e817c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 932 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 diff --git a/src/plugins/projectexplorer/images/unconfigured.png b/src/plugins/projectexplorer/images/unconfigured.png deleted file mode 100644 index fef0ce4502e6ba865ca9ccea80a1e0f68d44ef04..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3898 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 diff --git a/src/plugins/projectexplorer/panelswidget.cpp b/src/plugins/projectexplorer/panelswidget.cpp index ef5ad7dce5c..b18c799dd10 100644 --- a/src/plugins/projectexplorer/panelswidget.cpp +++ b/src/plugins/projectexplorer/panelswidget.cpp @@ -40,12 +40,9 @@ using namespace Utils; namespace ProjectExplorer { namespace { -const int ICON_SIZE(64); - const int ABOVE_HEADING_MARGIN = 10; const int ABOVE_CONTENTS_MARGIN = 4; const int BELOW_CONTENTS_MARGIN = 16; -const int PANEL_LEFT_MARGIN = 70; } @@ -57,7 +54,7 @@ PanelsWidget::PanelsWidget(QWidget *parent) : QWidget(parent) { m_root = new QWidget(nullptr); m_root->setFocusPolicy(Qt::NoFocus); - m_root->setContentsMargins(0, 0, 40, 0); + m_root->setContentsMargins(0, 0, 0, 0); const auto scroller = new QScrollArea(this); scroller->setWidget(m_root); @@ -67,11 +64,10 @@ PanelsWidget::PanelsWidget(QWidget *parent) : QWidget(parent) // The layout holding the individual panels: auto topLayout = new QVBoxLayout(m_root); - topLayout->setContentsMargins(0, 0, 0, 0); + topLayout->setContentsMargins(PanelVMargin, 0, PanelVMargin, 0); topLayout->setSpacing(0); - m_layout = new QGridLayout; - m_layout->setColumnMinimumWidth(0, ICON_SIZE + 4); + m_layout = new QVBoxLayout; m_layout->setSpacing(0); topLayout->addLayout(m_layout); @@ -86,39 +82,28 @@ PanelsWidget::PanelsWidget(QWidget *parent) : QWidget(parent) //layout->addWidget(new FindToolBarPlaceHolder(this)); } -PanelsWidget::PanelsWidget(const QString &displayName, const QIcon &icon, QWidget *widget) +PanelsWidget::PanelsWidget(const QString &displayName, QWidget *widget) : PanelsWidget(nullptr) { - addPropertiesPanel(displayName, icon, widget); + addPropertiesPanel(displayName, widget); } PanelsWidget::~PanelsWidget() = default; /* - * Add a widget with heading information into the grid - * layout of the PanelsWidget. + * Add a widget with heading information into the layout of the PanelsWidget. * * ... - * +--------+-------------------------------------------+ ABOVE_HEADING_MARGIN - * | icon | name | - * + +-------------------------------------------+ - * | | line | - * + +-------------------------------------------+ ABOVE_CONTENTS_MARGIN - * | | widget (with contentsmargins adjusted!) | - * +--------+-------------------------------------------+ BELOW_CONTENTS_MARGIN + * +------------+ ABOVE_HEADING_MARGIN + * | name | + * +------------+ + * | line | + * +------------+ ABOVE_CONTENTS_MARGIN + * | widget | + * +------------+ BELOW_CONTENTS_MARGIN */ -void PanelsWidget::addPropertiesPanel(const QString &displayName, const QIcon &icon, QWidget *widget) +void PanelsWidget::addPropertiesPanel(const QString &displayName, QWidget *widget) { - const int headerRow = m_layout->rowCount(); - - // icon: - if (!icon.isNull()) { - auto iconLabel = new QLabel(m_root); - iconLabel->setPixmap(icon.pixmap(ICON_SIZE, ICON_SIZE)); - iconLabel->setContentsMargins(0, ABOVE_HEADING_MARGIN, 0, 0); - m_layout->addWidget(iconLabel, headerRow, 0, 3, 1, Qt::AlignTop | Qt::AlignHCenter); - } - // name: auto nameLabel = new QLabel(m_root); nameLabel->setText(displayName); @@ -127,24 +112,19 @@ void PanelsWidget::addPropertiesPanel(const QString &displayName, const QIcon &i f.setBold(true); f.setPointSizeF(f.pointSizeF() * 1.6); nameLabel->setFont(f); - m_layout->addWidget(nameLabel, headerRow, 1, 1, 1, Qt::AlignVCenter | Qt::AlignLeft); + m_layout->addWidget(nameLabel); // line: - const int lineRow = headerRow + 1; auto line = new QFrame(m_root); line->setFrameShape(QFrame::HLine); line->setForegroundRole(QPalette::Midlight); line->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); - m_layout->addWidget(line, lineRow, 1, 1, -1, Qt::AlignTop); + m_layout->addWidget(line); // add the widget: - const int widgetRow = lineRow + 1; - - widget->setContentsMargins(PANEL_LEFT_MARGIN, - ABOVE_CONTENTS_MARGIN, 0, - BELOW_CONTENTS_MARGIN); + widget->setContentsMargins(0, ABOVE_CONTENTS_MARGIN, 0, BELOW_CONTENTS_MARGIN); widget->setParent(m_root); - m_layout->addWidget(widget, widgetRow, 0, 1, 2); + m_layout->addWidget(widget); } } // ProjectExplorer diff --git a/src/plugins/projectexplorer/panelswidget.h b/src/plugins/projectexplorer/panelswidget.h index 1be7723aaad..b213f2191b9 100644 --- a/src/plugins/projectexplorer/panelswidget.h +++ b/src/plugins/projectexplorer/panelswidget.h @@ -30,8 +30,7 @@ #include QT_BEGIN_NAMESPACE -class QGridLayout; -class QIcon; +class QVBoxLayout; QT_END_NAMESPACE namespace ProjectExplorer { @@ -42,15 +41,15 @@ class PROJECTEXPLORER_EXPORT PanelsWidget : public QWidget public: explicit PanelsWidget(QWidget *parent = nullptr); - PanelsWidget(const QString &displayName, const QIcon &icon, - QWidget *widget); + PanelsWidget(const QString &displayName, QWidget *widget); ~PanelsWidget() override; - void addPropertiesPanel(const QString &displayName, const QIcon &icon, - QWidget *widget); + void addPropertiesPanel(const QString &displayName, QWidget *widget); + + static int constexpr PanelVMargin = 14; private: - QGridLayout *m_layout; + QVBoxLayout *m_layout; QWidget *m_root; }; diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 368578b150c..88556d68300 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -882,21 +882,18 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er auto panelFactory = new ProjectPanelFactory; panelFactory->setPriority(30); panelFactory->setDisplayName(QCoreApplication::translate("EditorSettingsPanelFactory", "Editor")); - panelFactory->setIcon(":/projectexplorer/images/EditorSettings.png"); panelFactory->setCreateWidgetFunction([](Project *project) { return new EditorSettingsWidget(project); }); ProjectPanelFactory::registerFactory(panelFactory); panelFactory = new ProjectPanelFactory; panelFactory->setPriority(40); panelFactory->setDisplayName(QCoreApplication::translate("CodeStyleSettingsPanelFactory", "Code Style")); - panelFactory->setIcon(":/projectexplorer/images/CodeStyleSettings.png"); panelFactory->setCreateWidgetFunction([](Project *project) { return new CodeStyleSettingsWidget(project); }); ProjectPanelFactory::registerFactory(panelFactory); panelFactory = new ProjectPanelFactory; panelFactory->setPriority(50); panelFactory->setDisplayName(QCoreApplication::translate("DependenciesPanelFactory", "Dependencies")); - panelFactory->setIcon(":/projectexplorer/images/ProjectDependencies.png"); panelFactory->setCreateWidgetFunction([](Project *project) { return new DependenciesWidget(project); }); ProjectPanelFactory::registerFactory(panelFactory); diff --git a/src/plugins/projectexplorer/projectexplorer.qrc b/src/plugins/projectexplorer/projectexplorer.qrc index 4f4cb474305..ececb0854b3 100644 --- a/src/plugins/projectexplorer/projectexplorer.qrc +++ b/src/plugins/projectexplorer/projectexplorer.qrc @@ -24,11 +24,6 @@ images/debugger_overlay_small@2x.png images/analyzer_overlay_small.png images/analyzer_overlay_small@2x.png - images/BuildSettings.png - images/CodeStyleSettings.png - images/RunSettings.png - images/EditorSettings.png - images/ProjectDependencies.png images/devicestatusindicator.png images/devicestatusindicator@2x.png images/build.png @@ -51,7 +46,6 @@ images/buildstepmoveup@2x.png images/buildstepremove.png images/buildstepremove@2x.png - images/unconfigured.png images/desktopdevice.png images/desktopdevice@2x.png images/fileoverlay_qml.png diff --git a/src/plugins/projectexplorer/projectpanelfactory.cpp b/src/plugins/projectexplorer/projectpanelfactory.cpp index 376cd7acd15..5dca1340b1e 100644 --- a/src/plugins/projectexplorer/projectpanelfactory.cpp +++ b/src/plugins/projectexplorer/projectpanelfactory.cpp @@ -90,16 +90,6 @@ void ProjectPanelFactory::setId(Utils::Id id) m_id = id; } -QString ProjectPanelFactory::icon() const -{ - return m_icon; -} - -void ProjectPanelFactory::setIcon(const QString &icon) -{ - m_icon = icon; -} - QWidget *ProjectPanelFactory::createWidget(Project *project) const { return m_widgetCreator(project); diff --git a/src/plugins/projectexplorer/projectpanelfactory.h b/src/plugins/projectexplorer/projectpanelfactory.h index 3a6adfc0f16..d1eb6500309 100644 --- a/src/plugins/projectexplorer/projectpanelfactory.h +++ b/src/plugins/projectexplorer/projectpanelfactory.h @@ -72,9 +72,6 @@ public: Utils::TreeItem *createPanelItem(Project *project); - QString icon() const; - void setIcon(const QString &icon); - void setCreateWidgetFunction(const WidgetCreator &createWidgetFunction); QWidget *createWidget(Project *project) const; @@ -87,7 +84,6 @@ private: QString m_displayName; SupportsFunction m_supportsFunction; WidgetCreator m_widgetCreator; - QString m_icon; }; } // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/projectwindow.cpp b/src/plugins/projectexplorer/projectwindow.cpp index 76d66be2547..8c9d3a64619 100644 --- a/src/plugins/projectexplorer/projectwindow.cpp +++ b/src/plugins/projectexplorer/projectwindow.cpp @@ -262,9 +262,7 @@ QVariant MiscSettingsPanelItem::data(int column, int role) const if (role == PanelWidgetRole) { if (!m_widget) { QWidget *widget = m_factory->createWidget(m_project); - m_widget = new PanelsWidget(m_factory->displayName(), - QIcon(m_factory->icon()), - widget); + m_widget = new PanelsWidget(m_factory->displayName(), widget); m_widget->setFocusProxy(widget); } @@ -610,7 +608,8 @@ public: auto innerLayout = new QVBoxLayout; innerLayout->setSpacing(10); - innerLayout->setContentsMargins(14, innerLayout->spacing(), 14, 0); + innerLayout->setContentsMargins(PanelsWidget::PanelVMargin, innerLayout->spacing(), + PanelsWidget::PanelVMargin, 0); innerLayout->addWidget(m_manageKits); innerLayout->addSpacerItem(new QSpacerItem(10, 30, QSizePolicy::Maximum, QSizePolicy::Maximum)); innerLayout->addWidget(activeLabel); diff --git a/src/plugins/projectexplorer/targetsettingspanel.cpp b/src/plugins/projectexplorer/targetsettingspanel.cpp index 7e0524d4170..95dacf0a623 100644 --- a/src/plugins/projectexplorer/targetsettingspanel.cpp +++ b/src/plugins/projectexplorer/targetsettingspanel.cpp @@ -229,9 +229,7 @@ void TargetGroupItemPrivate::ensureWidget() if (!m_configurePage) { m_targetSetupPageWrapper = new TargetSetupPageWrapper(m_project); - m_configurePage = new PanelsWidget(tr("Configure Project"), - QIcon(":/projectexplorer/images/unconfigured.png"), - m_targetSetupPageWrapper); + m_configurePage = new PanelsWidget(tr("Configure Project"), m_targetSetupPageWrapper); m_configurePage->setFocusProxy(m_targetSetupPageWrapper); } m_targetSetupPageWrapper->ensureSetupPage(); @@ -243,9 +241,7 @@ void TargetGroupItemPrivate::ensureWidget() layout->setContentsMargins(0, 0, 0, 0); layout->addWidget(label); layout->addStretch(10); - m_configuredPage = new PanelsWidget(tr("Configure Project"), - QIcon(":/projectexplorer/images/unconfigured.png"), - widget); + m_configuredPage = new PanelsWidget(tr("Configure Project"), widget); } } @@ -614,10 +610,8 @@ public: if (!m_panel) { m_panel = (m_subIndex == RunPage) ? new PanelsWidget(RunSettingsWidget::tr("Run Settings"), - QIcon(":/projectexplorer/images/RunSettings.png"), new RunSettingsWidget(target())) : new PanelsWidget(QCoreApplication::translate("BuildSettingsPanel", "Build Settings"), - QIcon(":/projectexplorer/images/BuildSettings.png"), new BuildSettingsWidget(target())); } return m_panel; diff --git a/src/tools/iconlister/iconlister.cpp b/src/tools/iconlister/iconlister.cpp index 8a896647f64..d9f858f4c2f 100644 --- a/src/tools/iconlister/iconlister.cpp +++ b/src/tools/iconlister/iconlister.cpp @@ -334,20 +334,8 @@ void IconLister::addProjectExplorerIcons() {QIcon(":/projectexplorer/images/category_buildrun.png"), "category_buildrun.png", prefix, ""}, - {QIcon(":/projectexplorer/images/BuildSettings.png"), "BuildSettings.png", prefix, - ""}, - {QIcon(":/projectexplorer/images/CodeStyleSettings.png"), "CodeStyleSettings.png", prefix, - ""}, - {QIcon(":/projectexplorer/images/RunSettings.png"), "RunSettings.png", prefix, - ""}, - {QIcon(":/projectexplorer/images/EditorSettings.png"), "EditorSettings.png", prefix, - ""}, - {QIcon(":/projectexplorer/images/ProjectDependencies.png"), "ProjectDependencies.png", prefix, - ""}, {QIcon(":/projectexplorer/images/targetpanel_bottom.png"), "targetpanel_bottom.png", prefix, ""}, - {QIcon(":/projectexplorer/images/unconfigured.png"), "unconfigured.png", prefix, - ""}, }; m_icons.append(icons); }