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

Utils: Move CONTINUE_SMALL Icon from ProjectExplorer to Utils

Browse Source 
We want a variant of the icon (without the debugger beetle) in Utils, in
order to use it in the ImageViewer plugin to resume paused animations.

Change-Id: I55ff301db60cae626d8e95d2fadf3c76a36cee39
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
Alessandro Portale
2023-09-13 22:40:09 +02:00
parent 4f26d802ca
commit 7fc69e1063
13 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
src/plugins/projectexplorer/images/continue_1_small.png → src/libs/utils/images/continue_1_small.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 93 B

After

Width:  |  Height:  |  Size: 93 B

0
src/plugins/projectexplorer/images/continue_1_small@2x.png → src/libs/utils/images/continue_1_small@2x.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 96 B

After

Width:  |  Height:  |  Size: 96 B

0
src/plugins/projectexplorer/images/continue_2_small.png → src/libs/utils/images/continue_2_small.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 136 B

After

Width:  |  Height:  |  Size: 136 B

0
src/plugins/projectexplorer/images/continue_2_small@2x.png → src/libs/utils/images/continue_2_small@2x.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 161 B

After

Width:  |  Height:  |  Size: 161 B

0
src/plugins/projectexplorer/images/debugger_overlay_small.png → src/libs/utils/images/debugger_overlay_small.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 158 B

After

Width:  |  Height:  |  Size: 158 B

0
src/plugins/projectexplorer/images/debugger_overlay_small@2x.png → src/libs/utils/images/debugger_overlay_small@2x.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 175 B

After

Width:  |  Height:  |  Size: 175 B

6
src/libs/utils/utils.qrc
View File

@@ -48,6 +48,12 @@
<file>images/clean_pane_small@2x.png</file>
<file>images/compile_error_taskbar.png</file>
<file>images/compile_error_taskbar@2x.png</file>
<file>images/continue_1_small.png</file>
<file>images/continue_1_small@2x.png</file>
<file>images/continue_2_small.png</file>
<file>images/continue_2_small@2x.png</file>
<file>images/debugger_overlay_small.png</file>
<file>images/debugger_overlay_small@2x.png</file>
<file>images/editcopy.png</file>
<file>images/editcopy@2x.png</file>
<file>images/editcut.png</file>

6
src/libs/utils/utilsicons.cpp
View File

@@ -225,6 +225,12 @@ const Icon INTERRUPT_SMALL({
{":/utils/images/interrupt_small.png", Theme::IconsInterruptColor}}, Icon::MenuTintedStyle);
const Icon INTERRUPT_SMALL_TOOLBAR({
{":/utils/images/interrupt_small.png", Theme::IconsInterruptToolBarColor}});
const Icon CONTINUE_SMALL({
{":/utils/images/continue_1_small.png", Theme::IconsInterruptColor},
{":/utils/images/continue_2_small.png", Theme::IconsRunColor}}, Icon::MenuTintedStyle);
const Icon CONTINUE_SMALL_TOOLBAR({
{":/utils/images/continue_1_small.png", Theme::IconsInterruptToolBarColor},
{":/utils/images/continue_2_small.png", Theme::IconsRunToolBarColor}});
const Icon BOUNDING_RECT({
{":/utils/images/boundingrect.png", Theme::IconsBaseColor}});
const Icon EYE_OPEN({

3
src/libs/utils/utilsicons.h
View File

@@ -120,6 +120,9 @@ QTCREATOR_UTILS_EXPORT extern const Icon STOP_SMALL;
QTCREATOR_UTILS_EXPORT extern const Icon STOP_SMALL_TOOLBAR;
QTCREATOR_UTILS_EXPORT extern const Icon INTERRUPT_SMALL;
QTCREATOR_UTILS_EXPORT extern const Icon INTERRUPT_SMALL_TOOLBAR;
QTCREATOR_UTILS_EXPORT extern const Icon CONTINUE_SMALL;
QTCREATOR_UTILS_EXPORT extern const Icon CONTINUE_SMALL_TOOLBAR;
QTCREATOR_UTILS_EXPORT extern const Icon BOUNDING_RECT;
QTCREATOR_UTILS_EXPORT extern const Icon EYE_OPEN;
QTCREATOR_UTILS_EXPORT extern const Icon EYE_OPEN_TOOLBAR;

20
src/plugins/debugger/debuggericons.cpp
View File

@@ -34,13 +34,13 @@ const Icon CONTINUE_FLAT({
{":/debugger/images/debugger_continue_2_mask.png", Theme::IconsRunToolBarColor},
{":/projectexplorer/images/debugger_beetle_mask.png", Theme::IconsDebugColor}});
const Icon DEBUG_CONTINUE_SMALL({
{":/projectexplorer/images/continue_1_small.png", Theme::IconsInterruptColor},
{":/projectexplorer/images/continue_2_small.png", Theme::IconsRunColor},
{":/projectexplorer/images/debugger_overlay_small.png", Theme::PanelTextColorMid}}, Icon::MenuTintedStyle);
{":/utils/images/continue_1_small.png", Theme::IconsInterruptColor},
{":/utils/images/continue_2_small.png", Theme::IconsRunColor},
{":/utils/images/debugger_overlay_small.png", Theme::PanelTextColorMid}}, Icon::MenuTintedStyle);
const Icon DEBUG_CONTINUE_SMALL_TOOLBAR({
{":/projectexplorer/images/continue_1_small.png", Theme::IconsInterruptToolBarColor},
{":/projectexplorer/images/continue_2_small.png", Theme::IconsRunToolBarColor},
{":/projectexplorer/images/debugger_overlay_small.png", Theme::IconsDebugColor}});
{":/utils/images/continue_1_small.png", Theme::IconsInterruptToolBarColor},
{":/utils/images/continue_2_small.png", Theme::IconsRunToolBarColor},
{":/utils/images/debugger_overlay_small.png", Theme::IconsDebugColor}});
const Icon INTERRUPT(
":/debugger/images/debugger_interrupt.png");
const Icon INTERRUPT_FLAT({
@@ -53,16 +53,16 @@ const Icon STOP_FLAT({
{":/projectexplorer/images/debugger_beetle_mask.png", Theme::IconsDebugColor}});
const Icon DEBUG_INTERRUPT_SMALL({
{":/utils/images/interrupt_small.png", Theme::IconsInterruptColor},
{":/projectexplorer/images/debugger_overlay_small.png", Theme::PanelTextColorMid}}, Icon::MenuTintedStyle);
{":/utils/images/debugger_overlay_small.png", Theme::PanelTextColorMid}}, Icon::MenuTintedStyle);
const Icon DEBUG_INTERRUPT_SMALL_TOOLBAR({
{":/utils/images/interrupt_small.png", Theme::IconsInterruptToolBarColor},
{":/projectexplorer/images/debugger_overlay_small.png", Theme::IconsDebugColor}});
{":/utils/images/debugger_overlay_small.png", Theme::IconsDebugColor}});
const Icon DEBUG_EXIT_SMALL({
{":/utils/images/stop_small.png", Theme::IconsStopColor},
{":/projectexplorer/images/debugger_overlay_small.png", Theme::PanelTextColorMid}}, Icon::MenuTintedStyle);
{":/utils/images/debugger_overlay_small.png", Theme::PanelTextColorMid}}, Icon::MenuTintedStyle);
const Icon DEBUG_EXIT_SMALL_TOOLBAR({
{":/utils/images/stop_small.png", Theme::IconsStopToolBarColor},
{":/projectexplorer/images/debugger_overlay_small.png", Theme::IconsDebugColor}});
{":/utils/images/debugger_overlay_small.png", Theme::IconsDebugColor}});
const Icon LOCATION({
{":/debugger/images/location_background.png", Theme::IconsCodeModelOverlayForegroundColor},
{":/debugger/images/location.png", Theme::IconsWarningToolBarColor}}, Icon::Tint);

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

@@ -20,8 +20,6 @@
<file>images/run@2x.png</file>
<file>images/run_mask.png</file>
<file>images/run_mask@2x.png</file>
<file>images/debugger_overlay_small.png</file>
<file>images/debugger_overlay_small@2x.png</file>
<file>images/analyzer_overlay_small.png</file>
<file>images/analyzer_overlay_small@2x.png</file>
<file>images/devicestatusindicator.png</file>
@@ -34,10 +32,6 @@
<file>images/build_hammerhead_mask@2x.png</file>
<file>images/targetpanel_bottom.png</file>
<file>images/window.png</file>
<file>images/continue_1_small.png</file>
<file>images/continue_1_small@2x.png</file>
<file>images/continue_2_small.png</file>
<file>images/continue_2_small@2x.png</file>
<file>images/buildstepdisable.png</file>
<file>images/buildstepdisable@2x.png</file>
<file>images/buildstepmovedown.png</file>

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

@@ -50,10 +50,10 @@ const Icon DEBUG_START_FLAT({
{":/projectexplorer/images/debugger_beetle_mask.png", Theme::IconsDebugColor}});
const Icon DEBUG_START_SMALL({
{":/utils/images/run_small.png", Theme::IconsRunColor},
{":/projectexplorer/images/debugger_overlay_small.png", Theme::PanelTextColorMid}}, Icon::MenuTintedStyle);
{":/utils/images/debugger_overlay_small.png", Theme::PanelTextColorMid}}, Icon::MenuTintedStyle);
const Icon DEBUG_START_SMALL_TOOLBAR({
{":/utils/images/run_small.png", Theme::IconsRunToolBarColor},
{":/projectexplorer/images/debugger_overlay_small.png", Theme::IconsDebugColor}});
{":/utils/images/debugger_overlay_small.png", Theme::IconsDebugColor}});
const Icon ANALYZER_START_SMALL({
{":/utils/images/run_small.png", Theme::IconsRunColor},
{":/projectexplorer/images/analyzer_overlay_small.png", Theme::PanelTextColorMid}}, Icon::MenuTintedStyle);

6
src/tools/icons/qtcreatoricons.svg
View File

@@ -4626,7 +4626,7 @@
sodipodi:nodetypes="cc" />
</g>
<g
id="src/plugins/projectexplorer/images/debugger_overlay_small"
id="src/libs/utils/images/debugger_overlay_small"
transform="translate(16)">
<rect
style="fill:#ffffff;fill-opacity:1;stroke:none"
@@ -5363,7 +5363,7 @@
<g
style="display:inline"
transform="translate(144)"
id="src/plugins/projectexplorer/images/continue_1_small">
id="src/libs/utils/images/continue_1_small">
<rect
style="fill:#ffffff;fill-opacity:1;stroke:none"
x="265"
@@ -5383,7 +5383,7 @@
<g
style="display:inline"
transform="translate(160)"
id="src/plugins/projectexplorer/images/continue_2_small">
id="src/libs/utils/images/continue_2_small">
<rect
style="fill:#ffffff;fill-opacity:1;stroke:none"
x="265"
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 366 KiB

After

Width:  |  Height:  |  Size: 366 KiB