diff --git a/src/plugins/debugger/debugger.qrc b/src/plugins/debugger/debugger.qrc index de3c9b3f02c..a542bdfce22 100644 --- a/src/plugins/debugger/debugger.qrc +++ b/src/plugins/debugger/debugger.qrc @@ -1,27 +1,23 @@ images/debugger_breakpoints.png + images/debugger_continue.png images/debugger_continue_small.png + images/debugger_empty_14.png + images/debugger_interrupt.png images/debugger_interrupt_small.png + images/debugger_reversemode_16.png + images/debugger_singleinstructionmode.png images/debugger_snapshot_small.png images/debugger_start.png images/debugger_start_small.png images/debugger_stepinto_small.png + images/debugger_steponeproc_small.png images/debugger_stepout_small.png images/debugger_stepover_small.png - images/debugger_steponeproc_small.png images/debugger_stepoverproc_small.png - images/debugger_stop_small.png - images/delete.png - images/done.png - images/error.png - images/newitem.png - images/running.png - images/debugger_continue.png - images/debugger_interrupt.png images/debugger_stop.png - images/SingleInstructionMode.png - images/reverse_16.png + images/debugger_stop_small.png images/breakpoint_16.png images/breakpoint_24.png images/breakpoint_disabled_16.png @@ -29,7 +25,6 @@ images/breakpoint_disabled_32.png images/breakpoint_pending_16.png images/breakpoint_pending_24.png - images/empty14.png images/location_16.png images/location_24.png diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp index ab91e65df40..e8758c84cff 100644 --- a/src/plugins/debugger/debuggeractions.cpp +++ b/src/plugins/debugger/debuggeractions.cpp @@ -163,7 +163,7 @@ DebuggerSettings *DebuggerSettings::instance() item->setText(tr("Operate by Instruction")); item->setCheckable(true); item->setDefaultValue(false); - item->setIcon(QIcon(":/debugger/images/SingleInstructionMode.png")); + item->setIcon(QIcon(":/debugger/images/debugger_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 45af13ae719..097a61f54e9 100644 --- a/src/plugins/debugger/debuggermanager.cpp +++ b/src/plugins/debugger/debuggermanager.cpp @@ -521,7 +521,7 @@ void DebuggerManager::init() d->m_actions.reverseDirectionAction->setCheckable(true); d->m_actions.reverseDirectionAction->setChecked(false); d->m_actions.reverseDirectionAction->setIcon( - QIcon(":/debugger/images/reverse_16.png")); + QIcon(":/debugger/images/debugger_reversemode_16.png")); connect(d->m_actions.continueAction, SIGNAL(triggered()), this, SLOT(executeContinue())); diff --git a/src/plugins/debugger/images/Continue.png b/src/plugins/debugger/images/Continue.png deleted file mode 100644 index f3dd72b56d9..00000000000 Binary files a/src/plugins/debugger/images/Continue.png and /dev/null differ diff --git a/src/plugins/debugger/images/empty14.png b/src/plugins/debugger/images/debugger_empty_14.png similarity index 100% rename from src/plugins/debugger/images/empty14.png rename to src/plugins/debugger/images/debugger_empty_14.png diff --git a/src/plugins/debugger/images/reverse.svg b/src/plugins/debugger/images/debugger_reversemode.svg similarity index 100% rename from src/plugins/debugger/images/reverse.svg rename to src/plugins/debugger/images/debugger_reversemode.svg diff --git a/src/plugins/debugger/images/reverse_16.png b/src/plugins/debugger/images/debugger_reversemode_16.png similarity index 100% rename from src/plugins/debugger/images/reverse_16.png rename to src/plugins/debugger/images/debugger_reversemode_16.png diff --git a/src/plugins/debugger/images/SingleInstructionMode.png b/src/plugins/debugger/images/debugger_singleinstructionmode.png similarity index 100% rename from src/plugins/debugger/images/SingleInstructionMode.png rename to src/plugins/debugger/images/debugger_singleinstructionmode.png diff --git a/src/plugins/debugger/images/delete.png b/src/plugins/debugger/images/delete.png deleted file mode 100644 index e4139afc552..00000000000 Binary files a/src/plugins/debugger/images/delete.png and /dev/null differ diff --git a/src/plugins/debugger/images/done.png b/src/plugins/debugger/images/done.png deleted file mode 100644 index b5238f7680a..00000000000 Binary files a/src/plugins/debugger/images/done.png and /dev/null differ diff --git a/src/plugins/debugger/images/error.png b/src/plugins/debugger/images/error.png deleted file mode 100644 index 700530438a5..00000000000 Binary files a/src/plugins/debugger/images/error.png and /dev/null differ diff --git a/src/plugins/debugger/images/newitem.png b/src/plugins/debugger/images/newitem.png deleted file mode 100644 index 7e26ea9b15b..00000000000 Binary files a/src/plugins/debugger/images/newitem.png and /dev/null differ diff --git a/src/plugins/debugger/images/running.png b/src/plugins/debugger/images/running.png deleted file mode 100644 index 1cf8888ecb8..00000000000 Binary files a/src/plugins/debugger/images/running.png and /dev/null differ diff --git a/src/plugins/debugger/snapshothandler.cpp b/src/plugins/debugger/snapshothandler.cpp index af6bb22b771..6eee3850ad7 100644 --- a/src/plugins/debugger/snapshothandler.cpp +++ b/src/plugins/debugger/snapshothandler.cpp @@ -112,7 +112,7 @@ QDebug operator<<(QDebug d, const SnapshotData &f) SnapshotHandler::SnapshotHandler(QObject *parent) : QAbstractTableModel(parent), m_positionIcon(QIcon(":/debugger/images/location_16.png")), - m_emptyIcon(QIcon(":/debugger/images/empty14.png")) + m_emptyIcon(QIcon(":/debugger/images/debugger_empty_14.png")) { m_currentIndex = 0; connect(theDebuggerAction(OperateByInstruction), SIGNAL(triggered()), diff --git a/src/plugins/debugger/stackhandler.cpp b/src/plugins/debugger/stackhandler.cpp index 05faf0d96fc..5913d0c30d3 100644 --- a/src/plugins/debugger/stackhandler.cpp +++ b/src/plugins/debugger/stackhandler.cpp @@ -115,7 +115,7 @@ QDebug operator<<(QDebug d, const StackFrame &f) StackHandler::StackHandler(QObject *parent) : QAbstractTableModel(parent), m_positionIcon(QIcon(":/debugger/images/location_16.png")), - m_emptyIcon(QIcon(":/debugger/images/empty14.png")) + m_emptyIcon(QIcon(":/debugger/images/debugger_empty_14.png")) { m_currentIndex = 0; m_canExpand = false; @@ -289,7 +289,7 @@ ThreadsHandler::ThreadsHandler(QObject *parent) : QAbstractTableModel(parent), m_currentIndex(0), m_positionIcon(QLatin1String(":/debugger/images/location_16.png")), - m_emptyIcon(QLatin1String(":/debugger/images/empty14.png")) + m_emptyIcon(QLatin1String(":/debugger/images/debugger_empty_14.png")) { }