diff --git a/src/plugins/projectexplorer/images/continue_1_small.png b/src/libs/utils/images/continue_1_small.png similarity index 100% rename from src/plugins/projectexplorer/images/continue_1_small.png rename to src/libs/utils/images/continue_1_small.png diff --git a/src/plugins/projectexplorer/images/continue_1_small@2x.png b/src/libs/utils/images/continue_1_small@2x.png similarity index 100% rename from src/plugins/projectexplorer/images/continue_1_small@2x.png rename to src/libs/utils/images/continue_1_small@2x.png diff --git a/src/plugins/projectexplorer/images/continue_2_small.png b/src/libs/utils/images/continue_2_small.png similarity index 100% rename from src/plugins/projectexplorer/images/continue_2_small.png rename to src/libs/utils/images/continue_2_small.png diff --git a/src/plugins/projectexplorer/images/continue_2_small@2x.png b/src/libs/utils/images/continue_2_small@2x.png similarity index 100% rename from src/plugins/projectexplorer/images/continue_2_small@2x.png rename to src/libs/utils/images/continue_2_small@2x.png diff --git a/src/plugins/projectexplorer/images/debugger_overlay_small.png b/src/libs/utils/images/debugger_overlay_small.png similarity index 100% rename from src/plugins/projectexplorer/images/debugger_overlay_small.png rename to src/libs/utils/images/debugger_overlay_small.png diff --git a/src/plugins/projectexplorer/images/debugger_overlay_small@2x.png b/src/libs/utils/images/debugger_overlay_small@2x.png similarity index 100% rename from src/plugins/projectexplorer/images/debugger_overlay_small@2x.png rename to src/libs/utils/images/debugger_overlay_small@2x.png diff --git a/src/libs/utils/utils.qrc b/src/libs/utils/utils.qrc index c0f2d2559a1..91070dc708b 100644 --- a/src/libs/utils/utils.qrc +++ b/src/libs/utils/utils.qrc @@ -48,6 +48,12 @@ images/clean_pane_small@2x.png images/compile_error_taskbar.png images/compile_error_taskbar@2x.png + images/continue_1_small.png + images/continue_1_small@2x.png + images/continue_2_small.png + images/continue_2_small@2x.png + images/debugger_overlay_small.png + images/debugger_overlay_small@2x.png images/editcopy.png images/editcopy@2x.png images/editcut.png diff --git a/src/libs/utils/utilsicons.cpp b/src/libs/utils/utilsicons.cpp index 60928ae7945..3fa62969d90 100644 --- a/src/libs/utils/utilsicons.cpp +++ b/src/libs/utils/utilsicons.cpp @@ -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({ diff --git a/src/libs/utils/utilsicons.h b/src/libs/utils/utilsicons.h index 33588dc0d58..5848882764f 100644 --- a/src/libs/utils/utilsicons.h +++ b/src/libs/utils/utilsicons.h @@ -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; diff --git a/src/plugins/debugger/debuggericons.cpp b/src/plugins/debugger/debuggericons.cpp index b59b9254364..2965934f291 100644 --- a/src/plugins/debugger/debuggericons.cpp +++ b/src/plugins/debugger/debuggericons.cpp @@ -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); diff --git a/src/plugins/projectexplorer/projectexplorer.qrc b/src/plugins/projectexplorer/projectexplorer.qrc index 0cc88e3331a..f40c1b8d5bf 100644 --- a/src/plugins/projectexplorer/projectexplorer.qrc +++ b/src/plugins/projectexplorer/projectexplorer.qrc @@ -20,8 +20,6 @@ images/run@2x.png images/run_mask.png images/run_mask@2x.png - images/debugger_overlay_small.png - images/debugger_overlay_small@2x.png images/analyzer_overlay_small.png images/analyzer_overlay_small@2x.png images/devicestatusindicator.png @@ -34,10 +32,6 @@ images/build_hammerhead_mask@2x.png images/targetpanel_bottom.png images/window.png - images/continue_1_small.png - images/continue_1_small@2x.png - images/continue_2_small.png - images/continue_2_small@2x.png images/buildstepdisable.png images/buildstepdisable@2x.png images/buildstepmovedown.png diff --git a/src/plugins/projectexplorer/projectexplorericons.cpp b/src/plugins/projectexplorer/projectexplorericons.cpp index 59b72adbda0..9d1dd991a49 100644 --- a/src/plugins/projectexplorer/projectexplorericons.cpp +++ b/src/plugins/projectexplorer/projectexplorericons.cpp @@ -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); diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index 0d5cfa9e23b..e1154577f7b 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -4626,7 +4626,7 @@ sodipodi:nodetypes="cc" /> + id="src/libs/utils/images/continue_1_small"> + id="src/libs/utils/images/continue_2_small">