aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlessandro Portale <alessandro.portale@qt.io>2020-02-06 23:44:24 +0100
committerAlessandro Portale <alessandro.portale@qt.io>2020-02-07 09:22:07 +0000
commit2234c517c0857fead795983e7540916e8dc430fd (patch)
tree6d5e7348fa7f2062c354e7e79acd9cb23157e666
parenta5178afb613e1e502df8b29b1b460ea3b0c12467 (diff)
Utils: Add a non-toolbar variant of the "RELOAD" icon
New icon is: Utils::Icons::RELOAD. And the toolbar variant is now Utils::Icons::RELOAD_TOOLBAR. Change-Id: I811d83c7340a717968430ac1ce4a5c708c8ddcf9 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r--src/libs/utils/utilsicons.cpp2
-rw-r--r--src/libs/utils/utilsicons.h1
-rw-r--r--src/plugins/diffeditor/diffeditor.cpp2
-rw-r--r--src/plugins/git/branchview.cpp2
-rw-r--r--src/plugins/help/searchwidget.cpp2
-rw-r--r--src/plugins/serialterminal/serialoutputpane.cpp2
-rw-r--r--src/plugins/valgrind/callgrindtool.cpp2
-rw-r--r--src/plugins/vcsbase/vcsbaseeditorconfig.cpp2
8 files changed, 9 insertions, 6 deletions
diff --git a/src/libs/utils/utilsicons.cpp b/src/libs/utils/utilsicons.cpp
index e3965c7db0..3ba5a7514f 100644
--- a/src/libs/utils/utilsicons.cpp
+++ b/src/libs/utils/utilsicons.cpp
@@ -152,6 +152,8 @@ const Icon CLEAN({
const Icon CLEAN_TOOLBAR({
{QLatin1String(":/utils/images/clean_pane_small.png"), Theme::IconsBaseColor}});
const Icon RELOAD({
+ {QLatin1String(":/utils/images/reload_gray.png"), Theme::PanelTextColorMid}}, Icon::Tint);
+const Icon RELOAD_TOOLBAR({
{QLatin1String(":/utils/images/reload_gray.png"), Theme::IconsBaseColor}});
const Icon TOGGLE_LEFT_SIDEBAR({
{QLatin1String(":/utils/images/leftsidebaricon.png"), Theme::PanelTextColorMid}}, Icon::MenuTintedStyle);
diff --git a/src/libs/utils/utilsicons.h b/src/libs/utils/utilsicons.h
index 8505aed941..04a7566a28 100644
--- a/src/libs/utils/utilsicons.h
+++ b/src/libs/utils/utilsicons.h
@@ -93,6 +93,7 @@ QTCREATOR_UTILS_EXPORT extern const Icon MAGNIFIER;
QTCREATOR_UTILS_EXPORT extern const Icon CLEAN;
QTCREATOR_UTILS_EXPORT extern const Icon CLEAN_TOOLBAR;
QTCREATOR_UTILS_EXPORT extern const Icon RELOAD;
+QTCREATOR_UTILS_EXPORT extern const Icon RELOAD_TOOLBAR;
QTCREATOR_UTILS_EXPORT extern const Icon TOGGLE_LEFT_SIDEBAR;
QTCREATOR_UTILS_EXPORT extern const Icon TOGGLE_LEFT_SIDEBAR_TOOLBAR;
QTCREATOR_UTILS_EXPORT extern const Icon TOGGLE_RIGHT_SIDEBAR;
diff --git a/src/plugins/diffeditor/diffeditor.cpp b/src/plugins/diffeditor/diffeditor.cpp
index 516dd89c82..6c4f036e86 100644
--- a/src/plugins/diffeditor/diffeditor.cpp
+++ b/src/plugins/diffeditor/diffeditor.cpp
@@ -200,7 +200,7 @@ DiffEditor::DiffEditor()
m_toggleDescriptionAction = m_toolBar->addAction(Icons::TOP_BAR.icon(), QString());
m_toggleDescriptionAction->setCheckable(true);
- m_reloadAction = m_toolBar->addAction(Utils::Icons::RELOAD.icon(), tr("Reload Diff"));
+ m_reloadAction = m_toolBar->addAction(Utils::Icons::RELOAD_TOOLBAR.icon(), tr("Reload Diff"));
m_reloadAction->setToolTip(tr("Reload Diff"));
m_toggleSyncAction = m_toolBar->addAction(Utils::Icons::LINK_TOOLBAR.icon(), QString());
diff --git a/src/plugins/git/branchview.cpp b/src/plugins/git/branchview.cpp
index efbfd15b61..9e52a8d908 100644
--- a/src/plugins/git/branchview.cpp
+++ b/src/plugins/git/branchview.cpp
@@ -89,7 +89,7 @@ BranchView::BranchView() :
m_addButton->setProperty("noArrow", true);
connect(m_addButton, &QToolButton::clicked, this, &BranchView::add);
- m_refreshButton->setIcon(Utils::Icons::RELOAD.icon());
+ m_refreshButton->setIcon(Utils::Icons::RELOAD_TOOLBAR.icon());
m_refreshButton->setToolTip(tr("Refresh"));
m_refreshButton->setProperty("noArrow", true);
connect(m_refreshButton, &QToolButton::clicked, this, &BranchView::refreshCurrentRepository);
diff --git a/src/plugins/help/searchwidget.cpp b/src/plugins/help/searchwidget.cpp
index 4d893e15d2..f6b1b35079 100644
--- a/src/plugins/help/searchwidget.cpp
+++ b/src/plugins/help/searchwidget.cpp
@@ -277,7 +277,7 @@ SearchSideBarItem::SearchSideBarItem()
QList<QToolButton *> SearchSideBarItem::createToolBarWidgets()
{
auto reindexButton = new QToolButton;
- reindexButton->setIcon(Utils::Icons::RELOAD.icon());
+ reindexButton->setIcon(Utils::Icons::RELOAD_TOOLBAR.icon());
reindexButton->setToolTip(tr("Regenerate Index"));
connect(reindexButton, &QAbstractButton::clicked,
static_cast<SearchWidget *>(widget()), &SearchWidget::reindexDocumentation);
diff --git a/src/plugins/serialterminal/serialoutputpane.cpp b/src/plugins/serialterminal/serialoutputpane.cpp
index 191aa93180..e9dfb50ce7 100644
--- a/src/plugins/serialterminal/serialoutputpane.cpp
+++ b/src/plugins/serialterminal/serialoutputpane.cpp
@@ -367,7 +367,7 @@ void SerialOutputPane::createToolButtons()
// Reset button
m_resetButton = new QToolButton;
- m_resetButton->setIcon(Utils::Icons::RELOAD.icon());
+ m_resetButton->setIcon(Utils::Icons::RELOAD_TOOLBAR.icon());
m_resetButton->setToolTip(tr("Reset Board"));
m_resetButton->setEnabled(false);
diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp
index 96476929e5..41ee7ce411 100644
--- a/src/plugins/valgrind/callgrindtool.cpp
+++ b/src/plugins/valgrind/callgrindtool.cpp
@@ -396,7 +396,7 @@ CallgrindToolPrivate::CallgrindToolPrivate()
// reset action
m_resetAction = action = new QAction(this);
action->setDisabled(true);
- action->setIcon(Utils::Icons::RELOAD.icon());
+ action->setIcon(Utils::Icons::RELOAD_TOOLBAR.icon());
//action->setText(CallgrindTool::tr("Reset"));
action->setToolTip(CallgrindTool::tr("Reset all event counters."));
connect(action, &QAction::triggered, this, &CallgrindToolPrivate::resetRequested);
diff --git a/src/plugins/vcsbase/vcsbaseeditorconfig.cpp b/src/plugins/vcsbase/vcsbaseeditorconfig.cpp
index 5aa88dacf6..1954c60feb 100644
--- a/src/plugins/vcsbase/vcsbaseeditorconfig.cpp
+++ b/src/plugins/vcsbase/vcsbaseeditorconfig.cpp
@@ -136,7 +136,7 @@ void VcsBaseEditorConfig::setBaseArguments(const QStringList &b)
QAction *VcsBaseEditorConfig::addReloadButton()
{
- auto action = new QAction(Utils::Icons::RELOAD.icon(), tr("Reload"), d->m_toolBar);
+ auto action = new QAction(Utils::Icons::RELOAD_TOOLBAR.icon(), tr("Reload"), d->m_toolBar);
connect(action, &QAction::triggered, this, &VcsBaseEditorConfig::argumentsChanged);
addAction(action);
return action;