diff --git a/src/plugins/debugger/debugger.qrc b/src/plugins/debugger/debugger.qrc index de3c9b3f02ce42cf8f9fa14bf05b3a5c90d78745..a542bdfce22d23c9e9783de8e7f4c576dbee18c1 100644 --- a/src/plugins/debugger/debugger.qrc +++ b/src/plugins/debugger/debugger.qrc @@ -1,27 +1,23 @@ <RCC> <qresource prefix="/debugger"> <file>images/debugger_breakpoints.png</file> + <file>images/debugger_continue.png</file> <file>images/debugger_continue_small.png</file> + <file>images/debugger_empty_14.png</file> + <file>images/debugger_interrupt.png</file> <file>images/debugger_interrupt_small.png</file> + <file>images/debugger_reversemode_16.png</file> + <file>images/debugger_singleinstructionmode.png</file> <file>images/debugger_snapshot_small.png</file> <file>images/debugger_start.png</file> <file>images/debugger_start_small.png</file> <file>images/debugger_stepinto_small.png</file> + <file>images/debugger_steponeproc_small.png</file> <file>images/debugger_stepout_small.png</file> <file>images/debugger_stepover_small.png</file> - <file>images/debugger_steponeproc_small.png</file> <file>images/debugger_stepoverproc_small.png</file> - <file>images/debugger_stop_small.png</file> - <file>images/delete.png</file> - <file>images/done.png</file> - <file>images/error.png</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> - <file>images/reverse_16.png</file> + <file>images/debugger_stop_small.png</file> <file>images/breakpoint_16.png</file> <file>images/breakpoint_24.png</file> <file>images/breakpoint_disabled_16.png</file> @@ -29,7 +25,6 @@ <file>images/breakpoint_disabled_32.png</file> <file>images/breakpoint_pending_16.png</file> <file>images/breakpoint_pending_24.png</file> - <file>images/empty14.png</file> <file>images/location_16.png</file> <file>images/location_24.png</file> </qresource> diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp index ab91e65df406d9209620400d803e4e9e57dc1144..e8758c84cff00f7ed87e524c674bf737a916c63e 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 45af13ae7195191ca2c0c8d7e7f57a5af388e575..097a61f54e9b964928ebd0b0d87e626dfbd99b53 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 f3dd72b56d99fe9b78d672506bd408674c6a67bd..0000000000000000000000000000000000000000 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 e4139afc552b36d5d1aabf2fe2697d00d61b6d70..0000000000000000000000000000000000000000 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 b5238f7680a8aae6176f715786077081f5e02904..0000000000000000000000000000000000000000 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 700530438a56329decd5d9a2a10cf1bd434c50c4..0000000000000000000000000000000000000000 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 7e26ea9b15b3a3eff805a859f51dd5eb5be95e44..0000000000000000000000000000000000000000 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 1cf8888ecb8bca103fc3befad8e02e478c0d215d..0000000000000000000000000000000000000000 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 af6bb22b771aeef2a67e745ce28c7e736f211cb8..6eee3850ad7a8dd779e54c1dc03009f617ddaf0e 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 05faf0d96fcd8e4ef6379a8f8338cce93873a005..5913d0c30d39179ab344645bd54672f234a9eba9 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")) { }