From 10262574d4f96c7d1505d526e67a4efaa0cea043 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 4 Oct 2018 14:44:39 +0200 Subject: [PATCH] Debugger: Fix stopping of core file debugging using the fat button Task-number: QTCREATORBUG-21094 Change-Id: If60f6bea93a583ab27e9e8b17c07402b2ac0854c Reviewed-by: Orgad Shaneh --- src/plugins/debugger/debugger.qrc | 2 ++ src/plugins/debugger/debuggericons.cpp | 3 +++ src/plugins/debugger/debuggericons.h | 1 + src/plugins/debugger/debuggerplugin.cpp | 4 ++-- .../debugger/images/debugger_stop_mask.png | Bin 0 -> 100 bytes .../debugger/images/debugger_stop_mask@2x.png | Bin 0 -> 104 bytes src/tools/icons/qtcreatoricons.svg | 21 ++++++++++++++++++ 7 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 src/plugins/debugger/images/debugger_stop_mask.png create mode 100644 src/plugins/debugger/images/debugger_stop_mask@2x.png diff --git a/src/plugins/debugger/debugger.qrc b/src/plugins/debugger/debugger.qrc index 4dbc903b591..2e457b74e13 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_mask.png + images/debugger_stop_mask@2x.png images/debugger_reversemode.png images/debugger_reversemode@2x.png images/debugger_reversemode_background.png diff --git a/src/plugins/debugger/debuggericons.cpp b/src/plugins/debugger/debuggericons.cpp index 776e54afe12..96107377df7 100644 --- a/src/plugins/debugger/debuggericons.cpp +++ b/src/plugins/debugger/debuggericons.cpp @@ -66,6 +66,9 @@ 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_FLAT({ + {":/debugger/images/debugger_stop_mask.png", Theme::IconsStopColor}, + {":/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); diff --git a/src/plugins/debugger/debuggericons.h b/src/plugins/debugger/debuggericons.h index 0030597dbfa..3785a2191e5 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_FLAT; extern const Utils::Icon DEBUG_INTERRUPT_SMALL; extern const Utils::Icon DEBUG_INTERRUPT_SMALL_TOOLBAR; extern const Utils::Icon DEBUG_EXIT_SMALL; diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 68f224f5eb2..e016674da5d 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -1576,8 +1576,8 @@ void DebuggerPluginPrivate::updatePresetState() m_continueAction.setEnabled(false); m_exitAction.setEnabled(true); m_debugWithoutDeployAction.setEnabled(false); - m_visibleStartAction.setAction(&m_undisturbableAction); - m_visibleStartAction.setIcon(startIcon(true)); + m_visibleStartAction.setAction(&m_exitAction); + m_visibleStartAction.setIcon(Icons::STOP_FLAT.icon()); m_hiddenStopAction.setAction(&m_exitAction); m_stepAction.setEnabled(false); m_nextAction.setEnabled(false); diff --git a/src/plugins/debugger/images/debugger_stop_mask.png b/src/plugins/debugger/images/debugger_stop_mask.png new file mode 100644 index 0000000000000000000000000000000000000000..d56a35f4857ea097d0c8889bc98d6501cf43387c GIT binary patch literal 100 zcmeAS@N?(olHy`uVBq!ia0y~yU{C^KMrH;E28Pa=jSLJ7YymzYt_%ze|NsAAdUO6= z1_lO6PZ!4!j_Bkc{4DGe9ZHfCuU@((-SV5k!r*9IBAXlTp99kE>FVdQ&MBb@09_jy AzyJUM literal 0 HcmV?d00001 diff --git a/src/plugins/debugger/images/debugger_stop_mask@2x.png b/src/plugins/debugger/images/debugger_stop_mask@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..e69d67dfaf885ff989a870bf4096527e5efb69e3 GIT binary patch literal 104 zcmeAS@N?(olHy`uVBq!ia0y~yU~mCpMrH;E2By1=9~l@J*aCb)Tp1V`{{R2K^yd7# z3=9mio-U3d8o|jw_*vy8*qFN+Io`NOnxrRk|8_jf#Bk=#W{2Me{{t8p7#KWV{an^L HB{Ts5{^T8B literal 0 HcmV?d00001 diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index f3dca3a6c00..4dffd7a6b39 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -9464,6 +9464,27 @@ y="0" x="0" /> + + + +