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

Utils: Add "Run File/Selected" icons and use them in ClangTools/AutoTest

Browse Source 
In AutoTest, use the toolbar and menu variants accordingly.

Change-Id: I1405de1ace1efe6c3e51b17356a9e4dfb3b11dcd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Alessandro Portale
2020-11-30 00:20:53 +01:00
parent d28533abd4
commit 19e13ddd6b
6 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,7 +66,6 @@
#include <utils/infolabel.h>
#include <utils/progressindicator.h>
#include <utils/proxyaction.h>
#include <utils/theme/theme.h>
#include <utils/utilsicons.h>
#include <QAction>
@@ -385,23 +384,12 @@ ClangTool::ClangTool()
s_instance = this;
m_diagnosticModel = new ClangToolsDiagnosticModel(this);
const Utils::Icon RUN_SELECTED_OVERLAY(
{{":/utils/images/runselected_boxes.png", Utils::Theme::BackgroundColorDark},
{":/utils/images/runselected_tickmarks.png", Utils::Theme::IconsBaseColor}});
auto action = new QAction(tr("Analyze Project..."), this);
Utils::Icon runSelectedIcon = Utils::Icons::RUN_SMALL_TOOLBAR;
for (const Utils::IconMaskAndColor &maskAndColor : RUN_SELECTED_OVERLAY)
runSelectedIcon.append(maskAndColor);
action->setIcon(runSelectedIcon.icon());
action->setIcon(Utils::Icons::RUN_SELECTED_TOOLBAR.icon());
m_startAction = action;
action = new QAction(tr("Analyze Current File"), this);
const QIcon runFileIcon = Icon(
{{":/utils/images/run_small.png", Theme::IconsRunColor},
{":/utils/images/run_file.png", Theme::PanelTextColorMid}},
Icon::MenuTintedStyle).icon();
action->setIcon(runFileIcon);
action->setIcon(Utils::Icons::RUN_FILE.icon());
m_startOnCurrentFileAction = action;
m_stopAction = Debugger::createStopAction();
@@ -581,13 +569,10 @@ 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(ProxyAction::proxyActionWithIcon(
m_startOnCurrentFileAction, runFileIconToolBar));
m_startOnCurrentFileAction,
Utils::Icons::RUN_FILE_TOOLBAR.icon()));
m_perspective.addToolBarAction(m_stopAction);
m_perspective.addToolBarAction(m_openProjectSettings);
m_perspective.addToolbarSeparator();