From 4e54baa84006bfee4a1a465a30a36671aa679869 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Mon, 30 Nov 2015 17:13:32 +0100 Subject: ProjectExplorer: Themed pause button Change-Id: I61a678ec3696a5d0a0555e342fb34604fc1a5cdd Reviewed-by: Alessandro Portale --- src/plugins/coreplugin/core.qrc | 1 - src/plugins/coreplugin/coreicons.h | 2 - src/plugins/coreplugin/images/pause.png | Bin 595 -> 0 bytes .../projectexplorer/images/interrupt_small.png | Bin 0 -> 94 bytes .../projectexplorer/images/interrupt_small@2x.png | Bin 0 -> 98 bytes src/plugins/projectexplorer/projectexplorer.qrc | 2 + src/plugins/projectexplorer/projectexplorericons.h | 2 + src/plugins/valgrind/callgrindtool.cpp | 3 +- src/tools/icons/qtcreatoricons.svg | 102 +++++++++++++-------- 9 files changed, 72 insertions(+), 40 deletions(-) delete mode 100644 src/plugins/coreplugin/images/pause.png create mode 100644 src/plugins/projectexplorer/images/interrupt_small.png create mode 100644 src/plugins/projectexplorer/images/interrupt_small@2x.png diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc index a383424b1b..88f39fe78a 100644 --- a/src/plugins/coreplugin/core.qrc +++ b/src/plugins/coreplugin/core.qrc @@ -105,7 +105,6 @@ images/splitbutton_vertical@2x.png images/panel_manage_button.png images/panel_manage_button@2x.png - images/pause.png images/reload_gray.png images/reload_gray@2x.png images/error.png diff --git a/src/plugins/coreplugin/coreicons.h b/src/plugins/coreplugin/coreicons.h index 46233ece14..0e7922521d 100644 --- a/src/plugins/coreplugin/coreicons.h +++ b/src/plugins/coreplugin/coreicons.h @@ -121,8 +121,6 @@ const Utils::Icon FILTER({ {QLatin1String(":/core/images/filtericon.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon LINK({ {QLatin1String(":/core/images/linkicon.png"), Utils::Theme::IconsBaseColor}}); -const Utils::Icon PAUSE({ - {QLatin1String(":/core/images/pause.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon WARNING({ {QLatin1String(":/core/images/warning.png"), Utils::Theme::IconsWarningColor}}); const Utils::Icon ERROR({ diff --git a/src/plugins/coreplugin/images/pause.png b/src/plugins/coreplugin/images/pause.png deleted file mode 100644 index 897394820c..0000000000 Binary files a/src/plugins/coreplugin/images/pause.png and /dev/null differ diff --git a/src/plugins/projectexplorer/images/interrupt_small.png b/src/plugins/projectexplorer/images/interrupt_small.png new file mode 100644 index 0000000000..1be511a21f Binary files /dev/null and b/src/plugins/projectexplorer/images/interrupt_small.png differ diff --git a/src/plugins/projectexplorer/images/interrupt_small@2x.png b/src/plugins/projectexplorer/images/interrupt_small@2x.png new file mode 100644 index 0000000000..dd5e213f2d Binary files /dev/null and b/src/plugins/projectexplorer/images/interrupt_small@2x.png differ diff --git a/src/plugins/projectexplorer/projectexplorer.qrc b/src/plugins/projectexplorer/projectexplorer.qrc index 6a730cb0d0..bc3caae0db 100644 --- a/src/plugins/projectexplorer/projectexplorer.qrc +++ b/src/plugins/projectexplorer/projectexplorer.qrc @@ -52,6 +52,8 @@ images/window.png images/stop_small.png images/stop_small@2x.png + images/interrupt_small.png + images/interrupt_small@2x.png images/disabledbuildstep.png images/disabledbuildstep@2x.png images/lightdisabledbuildstep.png diff --git a/src/plugins/projectexplorer/projectexplorericons.h b/src/plugins/projectexplorer/projectexplorericons.h index 883d5436a1..4554844c7e 100644 --- a/src/plugins/projectexplorer/projectexplorericons.h +++ b/src/plugins/projectexplorer/projectexplorericons.h @@ -73,6 +73,8 @@ const Utils::Icon MODE_PROJECT_FLAT({ {QLatin1String(":/projectexplorer/images/mode_project_mask.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon MODE_PROJECT_FLAT_ACTIVE({ {QLatin1String(":/projectexplorer/images/mode_project_mask.png"), Utils::Theme::IconsModeProjetcsActiveColor}}); +const Utils::Icon INTERRUPT_SMALL({ + {QLatin1String(":/projectexplorer/images/interrupt_small.png"), Utils::Theme::IconsInterruptColor}}); } // namespace Icons } // namespace ProjectExplorer diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp index da050dc58a..daeb465e5e 100644 --- a/src/plugins/valgrind/callgrindtool.cpp +++ b/src/plugins/valgrind/callgrindtool.cpp @@ -69,6 +69,7 @@ #include #include +#include #include #include #include @@ -684,7 +685,7 @@ QWidget *CallgrindToolPrivate::createWidgets() // pause action action = new QAction(this); action->setCheckable(true); - action->setIcon(Core::Icons::PAUSE.icon()); + action->setIcon(ProjectExplorer::Icons::INTERRUPT_SMALL.icon()); //action->setText(tr("Ignore")); action->setToolTip(tr("Pause event logging. No events are counted which will speed up program execution during profiling.")); connect(action, &QAction::toggled, this, &CallgrindToolPrivate::pauseToggled); diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index f4bfbb5a06..8fea88b91e 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -2083,7 +2083,7 @@ width="100%" height="100%" /> + + + + + + transform="translate(-16,0)"> + transform="translate(-16,0)"> + transform="translate(-16,0)"> + id="src/plugins/coreplugin/images/continue_overlay_small" + transform="translate(16,0)"> + id="src/plugins/coreplugin/images/debugger_overlay_small" + transform="translate(16,0)"> + id="src/plugins/analyzerbase/images/analyzer_overlay_small" + transform="translate(16,0)"> + transform="translate(399,0)"> - + transform="translate(394,268)"> + transform="translate(32,0)"> + transform="translate(48,0)"> + transform="translate(64,0)"> + transform="translate(80,0)"> + style="display:inline" + transform="translate(16,0)"> + id="src/leafsort" + transform="translate(16,0)"> + transform="translate(32,0)"> + transform="translate(48,0)"> + id="src/collapse" + transform="translate(16,0)"> + id="src/runselected_overlay" + transform="translate(16,0)">