Debugger: Fix stopping of core file debugging using the fat button

Task-number: QTCREATORBUG-21094
Change-Id: If60f6bea93a583ab27e9e8b17c07402b2ac0854c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2018-10-04 14:44:39 +02:00
parent 2e4e18161b
commit 10262574d4
7 changed files with 29 additions and 2 deletions

View File

@@ -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_mask.png</file>
<file>images/debugger_stop_mask@2x.png</file>
<file>images/debugger_reversemode.png</file>
<file>images/debugger_reversemode@2x.png</file>
<file>images/debugger_reversemode_background.png</file>

View File

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

View File

@@ -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;

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 100 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 104 B

View File

@@ -9464,6 +9464,27 @@
y="0"
x="0" />
</g>
<g
id="src/plugins/debugger/images/debugger_stop_mask"
transform="translate(-711,333)"
style="display:inline">
<use
transform="translate(704,3)"
style="display:inline"
x="0"
y="0"
xlink:href="#backgroundRect_32_28"
id="use5913-0-8-1-7-9"
width="100%"
height="100%" />
<rect
style="fill:#000000"
id="rect4608-0-6"
width="17"
height="18"
x="753"
y="48" />
</g>
</g>
<g
id="src/plugins/vcsbase/images/submit_arrow">

Before

Width:  |  Height:  |  Size: 352 KiB

After

Width:  |  Height:  |  Size: 352 KiB