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

ProjectExplorer: Remove old "clean" icon. Re-use the new one.

Browse Source 
Change-Id: Ieee022d8cdcd55215bf7468d331320a24d421cbd
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
This commit is contained in:
Alessandro Portale
2016-04-07 00:39:26 +02:00
parent 0de2cc17aa
commit 33bd06cb5c
5 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/plugins/projectexplorer/images/clean.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
src/plugins/projectexplorer/images/clean_small.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 785 B

4
src/plugins/projectexplorer/projectexplorer.cpp
View File

@@ -853,9 +853,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
msessionContextMenu->addAction(cmd, Constants::G_SESSION_REBUILD);
// clean session
QIcon cleanIcon = Icons::CLEAN.icon();
cleanIcon.addPixmap(Icons::CLEAN_SMALL.pixmap());
dd->m_cleanSessionAction = new QAction(cleanIcon, tr("Clean All"), this);
dd->m_cleanSessionAction = new QAction(Icons::CLEAN.icon(), tr("Clean All"), this);
cmd = ActionManager::registerAction(dd->m_cleanSessionAction, Constants::CLEANSESSION);
mbuild->addAction(cmd, Constants::G_BUILD_CLEAN);
msessionContextMenu->addAction(cmd, Constants::G_SESSION_REBUILD);

2
src/plugins/projectexplorer/projectexplorer.qrc
View File

@@ -2,8 +2,6 @@
<qresource prefix="/projectexplorer">
<file>images/build_small.png</file>
<file>images/category_buildrun.png</file>
<file>images/clean.png</file>
<file>images/clean_small.png</file>
<file>images/closetab.png</file>
<file>images/debugger_start.png</file>
<file>images/debugger_start@2x.png</file>

6
src/plugins/projectexplorer/projectexplorericons.h
View File

@@ -37,10 +37,8 @@ const Utils::Icon BUILD_FLAT({
{QLatin1String(":/projectexplorer/images/build_hammerhead_mask.png"), Utils::Theme::IconsBuildHammerHeadColor}});
const Utils::Icon BUILD_SMALL(
QLatin1String(":/projectexplorer/images/build_small.png"));
const Utils::Icon CLEAN(
QLatin1String(":/projectexplorer/images/clean.png"));
const Utils::Icon CLEAN_SMALL(
QLatin1String(":/projectexplorer/images/clean_small.png"));
const Utils::Icon CLEAN({
{QLatin1String(":/core/images/clean_pane_small.png"), Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint);
const Utils::Icon REBUILD({
{QLatin1String(":/projectexplorer/images/rebuildhammerhandles.png"), Utils::Theme::IconsBuildHammerHandleColor},
{QLatin1String(":/projectexplorer/images/rebuildhammerheads.png"), Utils::Theme::IconsBuildHammerHeadColor}}, Utils::Icon::Tint);