Debugger: Provide a mode-bar sized icon for the "Debugger.Stop" action

That big Icon was always there, but unused. add it to the
"Debugger.Stop" (in addition to the toolbar sized one), so that it looks
good when it appears in the mode bar.

For the "Classic" variant, I needed to add a @2x variant of the non-flat
icon.

Change-Id: Iea7200c7821b3780ff11a17b3ec74c44e06ba8d1
Reviewed-by: hjk <hjk@qt.io>

src/plugins/debugger/debugger.qrc

@@ -14,6 +14,8 @@
         <file>images/debugger_interrupt@2x.png</file>
         <file>images/debugger_interrupt_mask.png</file>
         <file>images/debugger_interrupt_mask@2x.png</file>
+        <file>images/debugger_stop.png</file>
+        <file>images/debugger_stop@2x.png</file>
         <file>images/debugger_stop_mask.png</file>
         <file>images/debugger_stop_mask@2x.png</file>
         <file>images/debugger_reversemode.png</file>

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},

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;

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());