feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Add a non-toolbar variant of the MINUS icon

Browse Source 
Make it consistent with Utils::Icons::PLUS and
Utils::Icons::PLUS_TOOLBAR

Change-Id: I2d5c69ec13ceba172c2c583895eea6fdff77a64e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Alessandro Portale
2022-08-11 16:30:37 +02:00
parent 1e56179d0c
commit 0ec7a3797d
7 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/utils/utilsicons.cpp
View File

@@ -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({

1
src/libs/utils/utilsicons.h
View File

@@ -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;

2
src/plugins/coreplugin/outputpanemanager.cpp
View File

@@ -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); });
}

2
src/plugins/projectexplorer/projectwindow.cpp
View File

@@ -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,

2
src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwidgetswizardpage.cpp
View File

@@ -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);

2
src/plugins/qmldesigner/components/connectioneditor/connectionviewwidget.cpp
View File

@@ -320,7 +320,7 @@ QList<QToolButton *> 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);

3
src/plugins/qmldesigner/components/eventlist/eventlistdialog.cpp
View File

@@ -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);