diff --git a/src/plugins/debugger/debugger.qrc b/src/plugins/debugger/debugger.qrc index bf8095b3380..86a05a73ff1 100644 --- a/src/plugins/debugger/debugger.qrc +++ b/src/plugins/debugger/debugger.qrc @@ -14,6 +14,8 @@ images/debugger_interrupt@2x.png images/debugger_interrupt_mask.png images/debugger_interrupt_mask@2x.png + images/debugger_stop.png + images/debugger_stop@2x.png images/debugger_stop_mask.png images/debugger_stop_mask@2x.png images/debugger_reversemode.png diff --git a/src/plugins/debugger/debuggericons.cpp b/src/plugins/debugger/debuggericons.cpp index 1c047acc2df..c50f5fdc621 100644 --- a/src/plugins/debugger/debuggericons.cpp +++ b/src/plugins/debugger/debuggericons.cpp @@ -66,8 +66,10 @@ const Icon INTERRUPT( const Icon INTERRUPT_FLAT({ {":/debugger/images/debugger_interrupt_mask.png", Theme::IconsInterruptToolBarColor}, {":/projectexplorer/images/debugger_beetle_mask.png", Theme::IconsDebugColor}}); +const Icon STOP( + ":/debugger/images/debugger_stop.png"); const Icon STOP_FLAT({ - {":/debugger/images/debugger_stop_mask.png", Theme::IconsStopColor}, + {":/debugger/images/debugger_stop_mask.png", Theme::IconsStopToolBarColor}, {":/projectexplorer/images/debugger_beetle_mask.png", Theme::IconsDebugColor}}); const Icon DEBUG_INTERRUPT_SMALL({ {":/utils/images/interrupt_small.png", Theme::IconsInterruptColor}, diff --git a/src/plugins/debugger/debuggericons.h b/src/plugins/debugger/debuggericons.h index 778fb4a33f1..b7d83f27ddf 100644 --- a/src/plugins/debugger/debuggericons.h +++ b/src/plugins/debugger/debuggericons.h @@ -50,6 +50,7 @@ extern const Utils::Icon DEBUG_CONTINUE_SMALL; extern const Utils::Icon DEBUG_CONTINUE_SMALL_TOOLBAR; extern const Utils::Icon INTERRUPT; extern const Utils::Icon INTERRUPT_FLAT; +extern const Utils::Icon STOP; extern const Utils::Icon STOP_FLAT; extern const Utils::Icon DEBUG_INTERRUPT_SMALL; extern const Utils::Icon DEBUG_INTERRUPT_SMALL_TOOLBAR; diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index a0fb122a8c7..a18f0a652c7 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -1206,7 +1206,9 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments, touchBar->addAction(cmd); debugMenu->addAction(cmd, CC::G_DEFAULT_ONE); - act = new QAction(Icons::DEBUG_EXIT_SMALL.icon(), tr("Stop Debugger"), this); + const QIcon sidebarStopIcon = Icon::sideBarIcon(Icons::STOP, Icons::STOP_FLAT); + const QIcon stopIcon = Icon::combinedIcon({Icons::DEBUG_EXIT_SMALL.icon(), sidebarStopIcon}); + act = new QAction(stopIcon, tr("Stop Debugger"), this); act->setEnabled(false); cmd = ActionManager::registerAction(act, Constants::STOP); cmd->setTouchBarIcon(Icons::MACOS_TOUCHBAR_DEBUG_EXIT.icon()); diff --git a/src/plugins/debugger/images/debugger_stop.png b/src/plugins/debugger/images/debugger_stop.png new file mode 100644 index 00000000000..6d4c3c59e94 Binary files /dev/null and b/src/plugins/debugger/images/debugger_stop.png differ diff --git a/src/plugins/debugger/images/debugger_stop@2x.png b/src/plugins/debugger/images/debugger_stop@2x.png new file mode 100644 index 00000000000..27f6b3828f4 Binary files /dev/null and b/src/plugins/debugger/images/debugger_stop@2x.png differ diff --git a/src/plugins/debugger/images/debugger_stop_32.png b/src/plugins/debugger/images/debugger_stop_32.png deleted file mode 100644 index 23ee07ac99d..00000000000 Binary files a/src/plugins/debugger/images/debugger_stop_32.png and /dev/null differ