From 0ec7a3797dda7cdf2d4a2f6a3c31277ed26b51c8 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Thu, 11 Aug 2022 16:30:37 +0200 Subject: [PATCH] Utils: Add a non-toolbar variant of the MINUS icon Make it consistent with Utils::Icons::PLUS and Utils::Icons::PLUS_TOOLBAR Change-Id: I2d5c69ec13ceba172c2c583895eea6fdff77a64e Reviewed-by: Reviewed-by: Christian Stenger --- src/libs/utils/utilsicons.cpp | 4 +++- src/libs/utils/utilsicons.h | 1 + src/plugins/coreplugin/outputpanemanager.cpp | 2 +- src/plugins/projectexplorer/projectwindow.cpp | 2 +- .../customwidgetwizard/customwidgetwidgetswizardpage.cpp | 2 +- .../components/connectioneditor/connectionviewwidget.cpp | 2 +- .../qmldesigner/components/eventlist/eventlistdialog.cpp | 3 ++- 7 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/libs/utils/utilsicons.cpp b/src/libs/utils/utilsicons.cpp index afa66e95f9d..b31ed4f0cc7 100644 --- a/src/libs/utils/utilsicons.cpp +++ b/src/libs/utils/utilsicons.cpp @@ -149,8 +149,10 @@ const Icon ARROW_DOWN({ {":/utils/images/arrowdown.png", Theme::IconsBaseColor}}); const Icon ARROW_DOWN_TOOLBAR({ {":/utils/images/arrowdown.png", Theme::IconsNavigationArrowsColor}}); -const Icon MINUS({ +const Icon MINUS_TOOLBAR({ {":/utils/images/minus.png", Theme::IconsBaseColor}}); +const Icon MINUS({ + {":/utils/images/minus.png", Theme::PaletteText}}, Icon::Tint); const Icon PLUS_TOOLBAR({ {":/utils/images/plus.png", Theme::IconsBaseColor}}); const Icon PLUS({ diff --git a/src/libs/utils/utilsicons.h b/src/libs/utils/utilsicons.h index 82171bdfd76..36a0f6ec9d0 100644 --- a/src/libs/utils/utilsicons.h +++ b/src/libs/utils/utilsicons.h @@ -92,6 +92,7 @@ QTCREATOR_UTILS_EXPORT extern const Icon ARROW_UP; QTCREATOR_UTILS_EXPORT extern const Icon ARROW_UP_TOOLBAR; QTCREATOR_UTILS_EXPORT extern const Icon ARROW_DOWN; QTCREATOR_UTILS_EXPORT extern const Icon ARROW_DOWN_TOOLBAR; +QTCREATOR_UTILS_EXPORT extern const Icon MINUS_TOOLBAR; QTCREATOR_UTILS_EXPORT extern const Icon MINUS; QTCREATOR_UTILS_EXPORT extern const Icon PLUS_TOOLBAR; QTCREATOR_UTILS_EXPORT extern const Icon PLUS; diff --git a/src/plugins/coreplugin/outputpanemanager.cpp b/src/plugins/coreplugin/outputpanemanager.cpp index a7a209f3277..67fd267cb2a 100644 --- a/src/plugins/coreplugin/outputpanemanager.cpp +++ b/src/plugins/coreplugin/outputpanemanager.cpp @@ -101,7 +101,7 @@ IOutputPane::IOutputPane(QObject *parent) m_zoomInButton->setCommandId(Constants::ZOOM_IN); connect(m_zoomInButton, &QToolButton::clicked, this, [this] { emit zoomInRequested(1); }); - m_zoomOutButton->setIcon(Utils::Icons::MINUS.icon()); + m_zoomOutButton->setIcon(Utils::Icons::MINUS_TOOLBAR.icon()); m_zoomOutButton->setCommandId(Constants::ZOOM_OUT); connect(m_zoomOutButton, &QToolButton::clicked, this, [this] { emit zoomOutRequested(1); }); } diff --git a/src/plugins/projectexplorer/projectwindow.cpp b/src/plugins/projectexplorer/projectwindow.cpp index 68c2bbd5ce7..63a3ed07c81 100644 --- a/src/plugins/projectexplorer/projectwindow.cpp +++ b/src/plugins/projectexplorer/projectwindow.cpp @@ -158,7 +158,7 @@ BuildSystemOutputWindow::BuildSystemOutputWindow() Core::Constants::ZOOM_IN, Context(kBuildSystemOutputContext)); - m_zoomOut.setIcon(Utils::Icons::MINUS.icon()); + m_zoomOut.setIcon(Utils::Icons::MINUS_TOOLBAR.icon()); connect(&m_zoomOut, &QAction::triggered, this, [this] { zoomOut(); }); ActionManager::registerAction(&m_zoomOut, Core::Constants::ZOOM_OUT, diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwidgetswizardpage.cpp b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwidgetswizardpage.cpp index 859dd653a79..bf622ee0a5a 100644 --- a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwidgetswizardpage.cpp +++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwidgetswizardpage.cpp @@ -48,7 +48,7 @@ CustomWidgetWidgetsWizardPage::CustomWidgetWidgetsWizardPage(QWidget *parent) : m_ui->tabStackWidget->setLayout(m_tabStackLayout); m_ui->addButton->setIcon(Utils::Icons::PLUS_TOOLBAR.icon()); connect(m_ui->addButton, &QAbstractButton::clicked, m_ui->classList, &ClassList::startEditingNewClassItem); - m_ui->deleteButton->setIcon(Utils::Icons::MINUS.icon()); + m_ui->deleteButton->setIcon(Utils::Icons::MINUS_TOOLBAR.icon()); connect(m_ui->deleteButton, &QAbstractButton::clicked, m_ui->classList, &ClassList::removeCurrentClass); m_ui->deleteButton->setEnabled(false); diff --git a/src/plugins/qmldesigner/components/connectioneditor/connectionviewwidget.cpp b/src/plugins/qmldesigner/components/connectioneditor/connectionviewwidget.cpp index 7c4ca173a63..178f5657b19 100644 --- a/src/plugins/qmldesigner/components/connectioneditor/connectionviewwidget.cpp +++ b/src/plugins/qmldesigner/components/connectioneditor/connectionviewwidget.cpp @@ -320,7 +320,7 @@ QList ConnectionViewWidget::createToolBarWidgets() connect(this, &ConnectionViewWidget::setEnabledAddButton, buttons.constLast(), &QWidget::setEnabled); buttons << new QToolButton(); - buttons.constLast()->setIcon(Utils::Icons::MINUS.icon()); + buttons.constLast()->setIcon(Utils::Icons::MINUS_TOOLBAR.icon()); buttons.constLast()->setToolTip(tr("Remove selected binding or connection.")); connect(buttons.constLast(), &QAbstractButton::clicked, this, &ConnectionViewWidget::removeButtonClicked); connect(this, &ConnectionViewWidget::setEnabledRemoveButton, buttons.constLast(), &QWidget::setEnabled); diff --git a/src/plugins/qmldesigner/components/eventlist/eventlistdialog.cpp b/src/plugins/qmldesigner/components/eventlist/eventlistdialog.cpp index 244e93b8734..69f1dd6d536 100644 --- a/src/plugins/qmldesigner/components/eventlist/eventlistdialog.cpp +++ b/src/plugins/qmldesigner/components/eventlist/eventlistdialog.cpp @@ -68,7 +68,8 @@ EventListDialog::EventListDialog(QWidget *parent) auto *toolbar = new QToolBar; m_addAction = toolbar->addAction(Utils::Icons::PLUS_TOOLBAR.icon(), tr("Add Event")); - m_removeAction = toolbar->addAction(Utils::Icons::MINUS.icon(), tr("Remove Selected Events")); + m_removeAction = toolbar->addAction(Utils::Icons::MINUS_TOOLBAR.icon(), + tr("Remove Selected Events")); auto *filterWidget = new FilterLineWidget; toolbar->addWidget(filterWidget);