diff --git a/src/plugins/debugger/debugger.qrc b/src/plugins/debugger/debugger.qrc
index a9cf90ef6fa..debe6ace90e 100644
--- a/src/plugins/debugger/debugger.qrc
+++ b/src/plugins/debugger/debugger.qrc
@@ -1,5 +1,5 @@
-
+
images/breakpoint.svg
images/breakpoint_pending.svg
images/breakpoint_disabled.svg
@@ -22,5 +22,9 @@
images/location.svg
images/newitem.png
images/running.png
+ images/debugger_continue.png
+ images/debugger_interrupt.png
+ images/debugger_stop.png
+ images/SingleInstructionMode.png
diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp
index 663670f0f5a..d3449576347 100644
--- a/src/plugins/debugger/debuggeractions.cpp
+++ b/src/plugins/debugger/debuggeractions.cpp
@@ -162,7 +162,7 @@ DebuggerSettings *DebuggerSettings::instance()
item->setText(tr("Operate by Instruction"));
item->setCheckable(true);
item->setDefaultValue(false);
- item->setIcon(QIcon(":/debugger/images/debugger_stepoverproc_small.png"));
+ item->setIcon(QIcon(":/debugger/images/SingleInstructionMode.png"));
item->setToolTip(tr("This switches the debugger to instruction-wise "
"operation mode. In this mode, stepping operates on single "
"instructions and the source location view also shows the "
diff --git a/src/plugins/debugger/debuggermanager.cpp b/src/plugins/debugger/debuggermanager.cpp
index 0b5d0cbb1f3..7ed1a29b9cc 100644
--- a/src/plugins/debugger/debuggermanager.cpp
+++ b/src/plugins/debugger/debuggermanager.cpp
@@ -253,8 +253,8 @@ struct DebuggerManagerPrivate
static DebuggerManager *instance;
- const QIcon m_stopSmallIcon;
- const QIcon m_interruptSmallIcon;
+ QIcon m_stopIcon;
+ QIcon m_interruptIcon;
const QIcon m_locationMarkIcon;
// FIXME: Remove engine-specific state
@@ -311,14 +311,16 @@ struct DebuggerManagerPrivate
DebuggerManager *DebuggerManagerPrivate::instance = 0;
DebuggerManagerPrivate::DebuggerManagerPrivate(DebuggerManager *manager) :
- m_stopSmallIcon(QLatin1String(":/debugger/images/debugger_stop_small.png")),
- m_interruptSmallIcon(QLatin1String(":/debugger/images/debugger_interrupt_small.png")),
+ m_stopIcon(QLatin1String(":/debugger/images/debugger_stop_small.png")),
+ m_interruptIcon(QLatin1String(":/debugger/images/debugger_interrupt_small.png")),
m_locationMarkIcon(QLatin1String(":/debugger/images/location.svg")),
m_startParameters(new DebuggerStartParameters),
m_inferiorPid(0),
m_disassemblerViewAgent(manager),
m_engine(0)
{
+ m_interruptIcon.addFile(":/debugger/images/debugger_interrupt.png");
+ m_stopIcon.addFile(":/debugger/images/debugger_stop.png");
}
DebuggerManager::DebuggerManager()
@@ -465,10 +467,12 @@ void DebuggerManager::init()
qRegisterMetaType("StackCookie");
d->m_actions.continueAction = new QAction(tr("Continue"), this);
- d->m_actions.continueAction->setIcon(QIcon(":/debugger/images/debugger_continue_small.png"));
+ QIcon continueIcon = QIcon(":/debugger/images/debugger_continue_small.png");
+ continueIcon.addFile(":/debugger/images/debugger_continue.png");
+ d->m_actions.continueAction->setIcon(continueIcon);
d->m_actions.stopAction = new QAction(tr("Interrupt"), this);
- d->m_actions.stopAction->setIcon(d->m_interruptSmallIcon);
+ d->m_actions.stopAction->setIcon(d->m_interruptIcon);
d->m_actions.resetAction = new QAction(tr("Abort Debugging"), this);
d->m_actions.resetAction->setToolTip(tr("Aborts debugging and "
@@ -1767,10 +1771,10 @@ void DebuggerManager::setState(DebuggerState state, bool forced)
const bool interruptIsExit = !running;
if (interruptIsExit) {
- d->m_actions.stopAction->setIcon(d->m_stopSmallIcon);
+ d->m_actions.stopAction->setIcon(d->m_stopIcon);
d->m_actions.stopAction->setText(tr("Stop Debugger"));
} else {
- d->m_actions.stopAction->setIcon(d->m_interruptSmallIcon);
+ d->m_actions.stopAction->setIcon(d->m_interruptIcon);
d->m_actions.stopAction->setText(tr("Interrupt"));
}
diff --git a/src/plugins/debugger/images/Continue.png b/src/plugins/debugger/images/Continue.png
new file mode 100644
index 00000000000..f3dd72b56d9
Binary files /dev/null and b/src/plugins/debugger/images/Continue.png differ
diff --git a/src/plugins/debugger/images/SingleInstructionMode.png b/src/plugins/debugger/images/SingleInstructionMode.png
new file mode 100644
index 00000000000..d32007c18fa
Binary files /dev/null and b/src/plugins/debugger/images/SingleInstructionMode.png differ
diff --git a/src/plugins/debugger/images/debugger_continue.png b/src/plugins/debugger/images/debugger_continue.png
new file mode 100644
index 00000000000..82a67da8fb7
Binary files /dev/null and b/src/plugins/debugger/images/debugger_continue.png differ
diff --git a/src/plugins/debugger/images/debugger_continue_32.png b/src/plugins/debugger/images/debugger_continue_32.png
new file mode 100644
index 00000000000..1208cbf0cc2
Binary files /dev/null and b/src/plugins/debugger/images/debugger_continue_32.png differ
diff --git a/src/plugins/debugger/images/debugger_continue_small.png b/src/plugins/debugger/images/debugger_continue_small.png
index 4a3788c149b..3f49f3fef31 100644
Binary files a/src/plugins/debugger/images/debugger_continue_small.png and b/src/plugins/debugger/images/debugger_continue_small.png differ
diff --git a/src/plugins/debugger/images/debugger_interrupt.png b/src/plugins/debugger/images/debugger_interrupt.png
new file mode 100644
index 00000000000..f80291db01b
Binary files /dev/null and b/src/plugins/debugger/images/debugger_interrupt.png differ
diff --git a/src/plugins/debugger/images/debugger_interrupt_32.png b/src/plugins/debugger/images/debugger_interrupt_32.png
new file mode 100644
index 00000000000..7b74a586ab9
Binary files /dev/null and b/src/plugins/debugger/images/debugger_interrupt_32.png differ
diff --git a/src/plugins/debugger/images/debugger_interrupt_small.png b/src/plugins/debugger/images/debugger_interrupt_small.png
index 815400cb588..897394820c0 100644
Binary files a/src/plugins/debugger/images/debugger_interrupt_small.png and b/src/plugins/debugger/images/debugger_interrupt_small.png differ
diff --git a/src/plugins/debugger/images/debugger_snapshot_small.png b/src/plugins/debugger/images/debugger_snapshot_small.png
index 603c3732be0..071451e2c60 100644
Binary files a/src/plugins/debugger/images/debugger_snapshot_small.png and b/src/plugins/debugger/images/debugger_snapshot_small.png differ
diff --git a/src/plugins/debugger/images/debugger_stepinto_small.png b/src/plugins/debugger/images/debugger_stepinto_small.png
index da36a5f670a..0c6f51818f0 100644
Binary files a/src/plugins/debugger/images/debugger_stepinto_small.png and b/src/plugins/debugger/images/debugger_stepinto_small.png differ
diff --git a/src/plugins/debugger/images/debugger_stepout_small.png b/src/plugins/debugger/images/debugger_stepout_small.png
index e5eeeb32ada..4a3bfadf88c 100644
Binary files a/src/plugins/debugger/images/debugger_stepout_small.png and b/src/plugins/debugger/images/debugger_stepout_small.png differ
diff --git a/src/plugins/debugger/images/debugger_stepover_small.png b/src/plugins/debugger/images/debugger_stepover_small.png
index e8a5d080466..2e5acd2256f 100644
Binary files a/src/plugins/debugger/images/debugger_stepover_small.png and b/src/plugins/debugger/images/debugger_stepover_small.png differ
diff --git a/src/plugins/debugger/images/debugger_stop.png b/src/plugins/debugger/images/debugger_stop.png
new file mode 100644
index 00000000000..5679daf6e08
Binary files /dev/null and b/src/plugins/debugger/images/debugger_stop.png differ
diff --git a/src/plugins/debugger/images/debugger_stop_32.png b/src/plugins/debugger/images/debugger_stop_32.png
new file mode 100644
index 00000000000..23ee07ac99d
Binary files /dev/null and b/src/plugins/debugger/images/debugger_stop_32.png differ