diff options
Diffstat (limited to 'src/plugins/debugger')
23 files changed, 30 insertions, 134 deletions
diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs index c165487a9f..24aa2dc43c 100644 --- a/src/plugins/debugger/debugger.qbs +++ b/src/plugins/debugger/debugger.qbs @@ -171,39 +171,13 @@ QtcPlugin { Group { name: "Images" prefix: "images/" - files: [ - "breakpoint_16.png", - "breakpoint_24.png", - "breakpoint_disabled_16.png", - "breakpoint_disabled_24.png", - "breakpoint_disabled_32.png", - "breakpoint_pending_16.png", - "breakpoint_pending_24.png", - "debugger_breakpoints.png", - "debugger_continue.png", - "debugger_continue_32.png", - "debugger_continue_small.png", - "debugger_empty_14.png", - "debugger_interrupt.png", - "debugger_interrupt_32.png", - "debugger_reversemode_16.png", - "debugger_singleinstructionmode.png", - "debugger_snapshot_small.png", - "debugger_start.png", - "debugger_start_small.png", - "debugger_stepinto_small.png", - "debugger_steponeproc_small.png", - "debugger_stepout_small.png", - "debugger_stepover_small.png", - "debugger_stepoverproc_small.png", - "debugger_stop.png", - "debugger_stop_32.png", - "debugger_stop_small.png", - "location_16.png", - "location_24.png", - "tracepoint.png", - "watchpoint.png", - ] + files: ["*.png", "*.xpm"] + } + + Group { + name: "Images/qml" + prefix: "images/qml/" + files: ["*.png"] } Group { diff --git a/src/plugins/debugger/debugger.qrc b/src/plugins/debugger/debugger.qrc index 4e930511e0..a61acc6d8b 100644 --- a/src/plugins/debugger/debugger.qrc +++ b/src/plugins/debugger/debugger.qrc @@ -3,21 +3,20 @@ <file>images/category_debug.png</file> <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_reversemode_16.png</file> <file>images/debugger_singleinstructionmode.png</file> + <file>images/debugger_singleinstructionmode@2x.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_stepinto_small@2x.png</file> <file>images/debugger_steponeproc_small.png</file> <file>images/debugger_stepout_small.png</file> + <file>images/debugger_stepout_small@2x.png</file> <file>images/debugger_stepover_small.png</file> + <file>images/debugger_stepover_small@2x.png</file> <file>images/debugger_stepoverproc_small.png</file> - <file>images/debugger_stop.png</file> - <file>images/debugger_stop_small.png</file> <file>images/watchpoint.png</file> <file>images/tracepoint.png</file> <file>images/breakpoint_16.png</file> @@ -32,12 +31,11 @@ <file>images/mode_debug.png</file> <file>images/mode_debug@2x.png</file> <file>images/pin.xpm</file> - <file>images/qml/zoom.png</file> <file>images/qml/select.png</file> <file>images/qml/app-on-top.png</file> <file>images/qml/apply-on-save.png</file> - <file>images/debugger_restart.png</file> <file>images/debugger_restart_small.png</file> + <file>images/debugger_restart_small@2x.png</file> <file>Debugger.mimetypes.xml</file> </qresource> </RCC> diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp index b1d7e193dc..0b04200725 100644 --- a/src/plugins/debugger/debuggeractions.cpp +++ b/src/plugins/debugger/debuggeractions.cpp @@ -38,6 +38,7 @@ #include <coreplugin/icore.h> #include <utils/savedaction.h> #include <utils/qtcassert.h> +#include <utils/themehelper.h> #include <QDebug> #include <QSettings> @@ -176,7 +177,8 @@ DebuggerSettings::DebuggerSettings() item->setText(tr("Operate by Instruction")); item->setCheckable(true); item->setDefaultValue(false); - item->setIcon(QIcon(QLatin1String(":/debugger/images/debugger_singleinstructionmode.png"))); + item->setIcon(Utils::ThemeHelper::themedIcon( + QLatin1String(":/debugger/images/debugger_singleinstructionmode.png"))); item->setToolTip(tr("<p>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/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index d644824e19..a92816b6e8 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -116,6 +116,7 @@ #include <utils/savedaction.h> #include <utils/statuslabel.h> #include <utils/styledbar.h> +#include <utils/themehelper.h> #include <utils/winutils.h> #include <QApplication> @@ -2345,17 +2346,14 @@ void DebuggerPluginPrivate::extensionsInitialized() const Context cppDebuggercontext(C_CPPDEBUGGER); const Context cppeditorcontext(CppEditor::Constants::CPPEDITOR_ID); - m_startIcon = QIcon(_(":/debugger/images/debugger_start_small.png")); - m_startIcon.addFile(QLatin1String(":/debugger/images/debugger_start.png")); - m_exitIcon = QIcon(_(":/debugger/images/debugger_stop_small.png")); - m_exitIcon.addFile(QLatin1String(":/debugger/images/debugger_stop.png")); - m_continueIcon = QIcon(QLatin1String(":/debugger/images/debugger_continue_small.png")); - m_continueIcon.addFile(QLatin1String(":/debugger/images/debugger_continue.png")); - m_interruptIcon = QIcon(_(Core::Constants::ICON_PAUSE)); - m_interruptIcon.addFile(QLatin1String(":/debugger/images/debugger_interrupt.png")); + m_startIcon = ThemeHelper::themedIcon(_(Core::Constants::ICON_DEBUG_START_SMALL)); + m_exitIcon = ThemeHelper::themedIcon(_(Core::Constants::ICON_DEBUG_EXIT_SMALL)); + m_continueIcon = ThemeHelper::themedIcon(_(Core::Constants::ICON_DEBUG_CONTINUE_SMALL)); + m_continueIcon.addFile(_(":/debugger/images/debugger_continue.png")); + m_interruptIcon = ThemeHelper::themedIcon(_(Core::Constants::ICON_DEBUG_INTERRUPT_SMALL)); + m_interruptIcon.addFile(_(":/debugger/images/debugger_interrupt.png")); m_locationMarkIcon = QIcon(_(":/debugger/images/location_16.png")); - m_resetIcon = QIcon(_(":/debugger/images/debugger_restart_small.png:")); - m_resetIcon.addFile(QLatin1String(":/debugger/images/debugger_restart.png")); + m_resetIcon = ThemeHelper::themedIcon(_(":/debugger/images/debugger_restart_small.png|IconsRunColor")); m_busy = false; @@ -2445,15 +2443,15 @@ void DebuggerPluginPrivate::extensionsInitialized() connect(act, &QAction::triggered, this, &DebuggerPluginPrivate::handleReset); act = m_nextAction = new QAction(tr("Step Over"), this); - act->setIcon(QIcon(QLatin1String(":/debugger/images/debugger_stepover_small.png"))); + act->setIcon(ThemeHelper::themedIcon(_(":/debugger/images/debugger_stepover_small.png"))); connect(act, &QAction::triggered, this, &DebuggerPluginPrivate::handleExecNext); act = m_stepAction = new QAction(tr("Step Into"), this); - act->setIcon(QIcon(QLatin1String(":/debugger/images/debugger_stepinto_small.png"))); + act->setIcon(ThemeHelper::themedIcon(_(":/debugger/images/debugger_stepinto_small.png"))); connect(act, &QAction::triggered, this, &DebuggerPluginPrivate::handleExecStep); act = m_stepOutAction = new QAction(tr("Step Out"), this); - act->setIcon(QIcon(QLatin1String(":/debugger/images/debugger_stepout_small.png"))); + act->setIcon(ThemeHelper::themedIcon(_(":/debugger/images/debugger_stepout_small.png"))); connect(act, &QAction::triggered, this, &DebuggerPluginPrivate::handleExecStepOut); act = m_runToLineAction = new QAction(tr("Run to Line"), this); @@ -2538,7 +2536,7 @@ void DebuggerPluginPrivate::extensionsInitialized() // The main "Start Debugging" action. act = m_startAction = new QAction(this); - QIcon debuggerIcon(QLatin1String(":/projectexplorer/images/debugger_start_small.png")); + QIcon debuggerIcon(ThemeHelper::themedIcon(_(Core::Constants::ICON_DEBUG_START_SMALL))); debuggerIcon.addFile(QLatin1String(":/projectexplorer/images/debugger_start.png")); act->setIcon(debuggerIcon); act->setText(tr("Start Debugging")); @@ -2789,7 +2787,7 @@ void DebuggerPluginPrivate::extensionsInitialized() QAction *qmlZoomDummyAction = new QAction(tr("Zoom"), this); qmlZoomDummyAction->setCheckable(true); - qmlZoomDummyAction->setIcon(QIcon(_(":/debugger/images/qml/zoom.png"))); + qmlZoomDummyAction->setIcon(ThemeHelper::themedIcon(_(Core::Constants::ICON_ZOOM))); qmlZoomDummyAction->setEnabled(false); cmd = ActionManager::registerAction(qmlZoomDummyAction, Constants::QML_ZOOMTOOL); debugMenu->addAction(cmd); diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp index 2c323a3b1e..c57fcc0bb7 100644 --- a/src/plugins/debugger/debuggerruncontrol.cpp +++ b/src/plugins/debugger/debuggerruncontrol.cpp @@ -57,6 +57,7 @@ #include <utils/qtcassert.h> #include <utils/qtcprocess.h> #include <coreplugin/icore.h> +#include <coreplugin/coreconstants.h> #include <qmldebug/qmldebugcommandlinearguments.h> #include <qtsupport/qtkitinformation.h> @@ -113,7 +114,7 @@ DebuggerRunControl::DebuggerRunControl(RunConfiguration *runConfig, DebuggerEngi m_engine(engine), m_running(false) { - setIcon(QLatin1String(ProjectExplorer::Constants::ICON_DEBUG_SMALL)); + setIcon(QLatin1String(Core::Constants::ICON_DEBUG_START_SMALL)); connect(this, &RunControl::finished, this, &DebuggerRunControl::handleFinished); connect(engine, &DebuggerEngine::requestRemoteSetup, diff --git a/src/plugins/debugger/images/debugger_continue_small.png b/src/plugins/debugger/images/debugger_continue_small.png Binary files differdeleted file mode 100644 index 3f49f3fef3..0000000000 --- a/src/plugins/debugger/images/debugger_continue_small.png +++ /dev/null diff --git a/src/plugins/debugger/images/debugger_restart.png b/src/plugins/debugger/images/debugger_restart.png Binary files differdeleted file mode 100644 index 2c64931207..0000000000 --- a/src/plugins/debugger/images/debugger_restart.png +++ /dev/null diff --git a/src/plugins/debugger/images/debugger_restart.svg b/src/plugins/debugger/images/debugger_restart.svg deleted file mode 100644 index 08af9db3e3..0000000000 --- a/src/plugins/debugger/images/debugger_restart.svg +++ /dev/null @@ -1,77 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - id="svg2403" - height="16" - width="16" - version="1.0" - inkscape:version="0.48.4 r9939" - sodipodi:docname="restartF.svg" - inkscape:export-filename="/home/tstone/projekte/stm32/qt-creator/src/plugins/debugger/images/restart.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> - <metadata - id="metadata9"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> - </cc:Work> - </rdf:RDF> - </metadata> - <defs - id="defs7" /> - <sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:window-width="812" - inkscape:window-height="480" - id="namedview5" - showgrid="false" - inkscape:zoom="2.6074563" - inkscape:cx="29.713525" - inkscape:cy="39.686584" - inkscape:window-x="528" - inkscape:window-y="112" - inkscape:window-maximized="0" - inkscape:current-layer="svg2403" /> - <path - id="circle" - style="fill:none;stroke:#39a200;stroke-width:3;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - d="M 4.3814407,4.7280695 C 1.0195763,7.1548695 2.1753174,13.61748 7.4891237,13.770186 12.207451,13.905779 15.5821,9.9571474 11.885043,4.5928762" - inkscape:connector-curvature="0" - sodipodi:nodetypes="csc" /> - <path - id="topmark" - style="stroke:#39a200;stroke-linecap:round;stroke-width:3;fill:none;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" - d="m8 6.9952v-4.9904" /> - <path - style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" - d="M 4.677966,4.5423729 C 0.38168193,7.6562328 2.6923842,13.541247 7.5932203,13.627119" - id="arrow" - inkscape:connector-curvature="0" - sodipodi:nodetypes="cc" /> - <path - style="fill:#ffffff;fill-opacity:0.94117647;stroke:#39a200;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - d="M 7.8291211,15.145082 11.463143,13.540112 7.7592641,12.467117 z" - id="arrowhead" - inkscape:connector-curvature="0" - sodipodi:nodetypes="cccc" /> -</svg> diff --git a/src/plugins/debugger/images/debugger_restart_small.png b/src/plugins/debugger/images/debugger_restart_small.png Binary files differindex 6b10c8fe79..a1e5e8bb6c 100644 --- a/src/plugins/debugger/images/debugger_restart_small.png +++ b/src/plugins/debugger/images/debugger_restart_small.png diff --git a/src/plugins/debugger/images/debugger_restart_small@2x.png b/src/plugins/debugger/images/debugger_restart_small@2x.png Binary files differnew file mode 100644 index 0000000000..cf1743da33 --- /dev/null +++ b/src/plugins/debugger/images/debugger_restart_small@2x.png diff --git a/src/plugins/debugger/images/debugger_singleinstructionmode.png b/src/plugins/debugger/images/debugger_singleinstructionmode.png Binary files differindex d32007c18f..41529e91fd 100644 --- a/src/plugins/debugger/images/debugger_singleinstructionmode.png +++ b/src/plugins/debugger/images/debugger_singleinstructionmode.png diff --git a/src/plugins/debugger/images/debugger_singleinstructionmode@2x.png b/src/plugins/debugger/images/debugger_singleinstructionmode@2x.png Binary files differnew file mode 100644 index 0000000000..db475f81fa --- /dev/null +++ b/src/plugins/debugger/images/debugger_singleinstructionmode@2x.png diff --git a/src/plugins/debugger/images/debugger_start.png b/src/plugins/debugger/images/debugger_start.png Binary files differdeleted file mode 100644 index 8eed81a899..0000000000 --- a/src/plugins/debugger/images/debugger_start.png +++ /dev/null diff --git a/src/plugins/debugger/images/debugger_start_small.png b/src/plugins/debugger/images/debugger_start_small.png Binary files differdeleted file mode 100644 index 4a3788c149..0000000000 --- a/src/plugins/debugger/images/debugger_start_small.png +++ /dev/null diff --git a/src/plugins/debugger/images/debugger_stepinto_small.png b/src/plugins/debugger/images/debugger_stepinto_small.png Binary files differindex 729cb25e11..8e24fba5a2 100644 --- a/src/plugins/debugger/images/debugger_stepinto_small.png +++ b/src/plugins/debugger/images/debugger_stepinto_small.png diff --git a/src/plugins/debugger/images/debugger_stepinto_small@2x.png b/src/plugins/debugger/images/debugger_stepinto_small@2x.png Binary files differnew file mode 100644 index 0000000000..c93456a878 --- /dev/null +++ b/src/plugins/debugger/images/debugger_stepinto_small@2x.png diff --git a/src/plugins/debugger/images/debugger_stepout_small.png b/src/plugins/debugger/images/debugger_stepout_small.png Binary files differindex 39a2412427..615c022419 100644 --- a/src/plugins/debugger/images/debugger_stepout_small.png +++ b/src/plugins/debugger/images/debugger_stepout_small.png diff --git a/src/plugins/debugger/images/debugger_stepout_small@2x.png b/src/plugins/debugger/images/debugger_stepout_small@2x.png Binary files differnew file mode 100644 index 0000000000..5eb9aa9fea --- /dev/null +++ b/src/plugins/debugger/images/debugger_stepout_small@2x.png diff --git a/src/plugins/debugger/images/debugger_stepover_small.png b/src/plugins/debugger/images/debugger_stepover_small.png Binary files differindex 2e5acd2256..e7dc6fb20b 100644 --- a/src/plugins/debugger/images/debugger_stepover_small.png +++ b/src/plugins/debugger/images/debugger_stepover_small.png diff --git a/src/plugins/debugger/images/debugger_stepover_small@2x.png b/src/plugins/debugger/images/debugger_stepover_small@2x.png Binary files differnew file mode 100644 index 0000000000..74ff28cfa0 --- /dev/null +++ b/src/plugins/debugger/images/debugger_stepover_small@2x.png diff --git a/src/plugins/debugger/images/debugger_stop.png b/src/plugins/debugger/images/debugger_stop.png Binary files differdeleted file mode 100644 index c96dac37b0..0000000000 --- a/src/plugins/debugger/images/debugger_stop.png +++ /dev/null diff --git a/src/plugins/debugger/images/debugger_stop_small.png b/src/plugins/debugger/images/debugger_stop_small.png Binary files differdeleted file mode 100644 index 1063d08998..0000000000 --- a/src/plugins/debugger/images/debugger_stop_small.png +++ /dev/null diff --git a/src/plugins/debugger/images/qml/zoom.png b/src/plugins/debugger/images/qml/zoom.png Binary files differdeleted file mode 100644 index 7f54ec1191..0000000000 --- a/src/plugins/debugger/images/qml/zoom.png +++ /dev/null |
