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

ClangTools: Improve menu icon of "Analyze Current File" action

Browse Source 
The icons in menus should (depending on the theme) be colored
differently than the icons in toolbars.

This change assigns a menu-style icon to the "Analyze Current File"
action, and uses a ProxyAction to add the action with a toolbar-style
icon to the tool bar.

Change-Id: Ib423602adabe2c4e1322e0d8418c32e2fb70e478
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Alessandro Portale
2020-11-11 09:11:43 +01:00
parent 871c8e3ffd
commit 0c0347ce61
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/clangtools/clangtool.cpp
View File

@@ -65,6 +65,7 @@
#include <utils/fancymainwindow.h>
#include <utils/infolabel.h>
#include <utils/progressindicator.h>
#include <utils/proxyaction.h>
#include <utils/theme/theme.h>
#include <utils/utilsicons.h>
@@ -384,9 +385,6 @@ ClangTool::ClangTool()
s_instance = this;
m_diagnosticModel = new ClangToolsDiagnosticModel(this);
const Utils::Icon RUN_FILE_OVERLAY(
{{":/utils/images/run_file.png", Utils::Theme::IconsBaseColor}});
const Utils::Icon RUN_SELECTED_OVERLAY(
{{":/utils/images/runselected_boxes.png", Utils::Theme::BackgroundColorDark},
{":/utils/images/runselected_tickmarks.png", Utils::Theme::IconsBaseColor}});
@@ -399,10 +397,11 @@ ClangTool::ClangTool()
m_startAction = action;
action = new QAction(tr("Analyze Current File"), this);
Utils::Icon runFileIcon = Utils::Icons::RUN_SMALL_TOOLBAR;
for (const Utils::IconMaskAndColor &maskAndColor : RUN_FILE_OVERLAY)
runFileIcon.append(maskAndColor);
action->setIcon(runFileIcon.icon());
const QIcon runFileIcon = Icon(
{{":/utils/images/run_small.png", Theme::IconsRunColor},
{":/utils/images/run_file.png", Theme::PanelTextColorMid}},
Icon::MenuTintedStyle).icon();
action->setIcon(runFileIcon);
m_startOnCurrentFileAction = action;
m_stopAction = Debugger::createStopAction();
@@ -582,8 +581,13 @@ ClangTool::ClangTool()
startTool(FileSelectionType::CurrentFile);
});
const QIcon runFileIconToolBar = Icon(
{{":/utils/images/run_small.png", Theme::IconsRunToolBarColor},
{":/utils/images/run_file.png", Theme::IconsBaseColor}}).icon();
m_perspective.addToolBarAction(m_startAction);
m_perspective.addToolBarAction(m_startOnCurrentFileAction);
m_perspective.addToolBarAction(ProxyAction::proxyActionWithIcon(
m_startOnCurrentFileAction, runFileIconToolBar));
m_perspective.addToolBarAction(m_stopAction);
m_perspective.addToolBarAction(m_openProjectSettings);
m_perspective.addToolbarSeparator();