diff --git a/src/plugins/debugger/debugger.qrc b/src/plugins/debugger/debugger.qrc index a9cf90ef6fad1dd101a942a174ea7dbcfaba0434..debe6ace90ec866b86df41b94c890b134b8e7a8e 100644 --- a/src/plugins/debugger/debugger.qrc +++ b/src/plugins/debugger/debugger.qrc @@ -1,5 +1,5 @@ <RCC> - <qresource prefix="/debugger" > + <qresource prefix="/debugger"> <file>images/breakpoint.svg</file> <file>images/breakpoint_pending.svg</file> <file>images/breakpoint_disabled.svg</file> @@ -22,5 +22,9 @@ <file>images/location.svg</file> <file>images/newitem.png</file> <file>images/running.png</file> + <file>images/debugger_continue.png</file> + <file>images/debugger_interrupt.png</file> + <file>images/debugger_stop.png</file> + <file>images/SingleInstructionMode.png</file> </qresource> </RCC> diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp index 663670f0f5a9171f151158d0b2cc2552ca05fb64..d34495763471f242013f11bcd80c017364bceba1 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 0b5d0cbb1f3f9504b88d67862aadbf9cd7acddc7..7ed1a29b9cc8ffeb123dcfae23ffe99eb8d24faf 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>("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 0000000000000000000000000000000000000000..f3dd72b56d99fe9b78d672506bd408674c6a67bd 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 0000000000000000000000000000000000000000..d32007c18fa3fd55f8cd053aa782f59ef98002cd 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 0000000000000000000000000000000000000000..82a67da8fb7a7366748297f0a1410ad6f0c8bcd9 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 0000000000000000000000000000000000000000..1208cbf0cc28156abe60179407af1781fbf522a0 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 4a3788c149b374223fa382629cff3833f6bdb688..3f49f3fef3172461fdd462fc5978f5ccd7a84c2a 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 0000000000000000000000000000000000000000..f80291db01b39fe84816b11807aa8f8f2b77d7d7 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 0000000000000000000000000000000000000000..7b74a586ab933a6d0314b7c50d00b205215191d1 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 815400cb588623d836dbcf451a44627a62e2b5cb..897394820c0d3c9889b3b3ed97fc53f8d49c573b 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 603c3732be0c172c9824aecbe19e02931d1c497a..071451e2c60a24de769e2d9d382315c0a2d0469d 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 da36a5f670ae8b7c0001b534f733161d25b78f78..0c6f51818f09bde86a7a4877b06e7dc2ec587ad2 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 e5eeeb32ada42479ca7de5d9ab44097450045f4c..4a3bfadf88c0fd60b1afeb7a06d3787f2b5b1f2c 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 e8a5d080466e7b77569e99e5635bd06a0a4dcaf2..2e5acd2256f8d540d411cfb75c1c8dd39c56c713 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 0000000000000000000000000000000000000000..5679daf6e08e324f977864e55e10c96154d2e2f4 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 0000000000000000000000000000000000000000..23ee07ac99d1b6bc34759b75e620cd20c200df18 Binary files /dev/null and b/src/plugins/debugger/images/debugger_stop_32.png differ