From c4fa365cbba5c7355792676d2c0a35d56cfb6b87 Mon Sep 17 00:00:00 2001 From: Christian Stenger <christian.stenger@digia.com> Date: Tue, 25 Mar 2014 12:45:51 +0100 Subject: [PATCH] Valgrind: Fix missing pause icon Task-number: QTCREATORBUG-11836 Change-Id: Id38cecac418754adf61834ccc343420c31fb4f48 Reviewed-by: hjk <hjk121@nokiamail.com> --- src/plugins/coreplugin/core.qrc | 1 + src/plugins/coreplugin/coreconstants.h | 1 + .../images/pause.png} | Bin src/plugins/debugger/debugger.qbs | 1 - src/plugins/debugger/debugger.qrc | 1 - src/plugins/debugger/debuggerplugin.cpp | 2 +- src/plugins/valgrind/callgrindtool.cpp | 2 +- 7 files changed, 4 insertions(+), 4 deletions(-) rename src/plugins/{debugger/images/debugger_interrupt_small.png => coreplugin/images/pause.png} (100%) diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc index 6fd7523c22b..19423dfa055 100644 --- a/src/plugins/coreplugin/core.qrc +++ b/src/plugins/coreplugin/core.qrc @@ -76,5 +76,6 @@ <file>images/panel_manage_button.png</file> <file>images/sidebysidediff.png</file> <file>images/textdiff.png</file> + <file>images/pause.png</file> </qresource> </RCC> diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h index 34225188708..60529fc9b8a 100644 --- a/src/plugins/coreplugin/coreconstants.h +++ b/src/plugins/coreplugin/coreconstants.h @@ -210,6 +210,7 @@ const char ICON_SIDE_BY_SIDE_DIFF[] = ":/core/images/sidebysidediff.png"; const char ICON_TEXT_DIFF[] = ":/core/images/textdiff.png"; const char ICON_FILTER[] = ":/core/images/filtericon.png"; const char ICON_LINK[] = ":/core/images/linkicon.png"; +const char ICON_PAUSE[] = ":/core/images/pause.png"; const char ICON_QTLOGO_32[] = ":/core/images/logo/32/QtProject-qtcreator.png"; const char ICON_QTLOGO_64[] = ":/core/images/logo/64/QtProject-qtcreator.png"; const char ICON_QTLOGO_128[] = ":/core/images/logo/128/QtProject-qtcreator.png"; diff --git a/src/plugins/debugger/images/debugger_interrupt_small.png b/src/plugins/coreplugin/images/pause.png similarity index 100% rename from src/plugins/debugger/images/debugger_interrupt_small.png rename to src/plugins/coreplugin/images/pause.png diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs index 4cd091e42b7..b85b9977882 100644 --- a/src/plugins/debugger/debugger.qbs +++ b/src/plugins/debugger/debugger.qbs @@ -199,7 +199,6 @@ QtcPlugin { "debugger_empty_14.png", "debugger_interrupt.png", "debugger_interrupt_32.png", - "debugger_interrupt_small.png", "debugger_reversemode_16.png", "debugger_singleinstructionmode.png", "debugger_snapshot_small.png", diff --git a/src/plugins/debugger/debugger.qrc b/src/plugins/debugger/debugger.qrc index b1e7d73495f..56337b4437d 100644 --- a/src/plugins/debugger/debugger.qrc +++ b/src/plugins/debugger/debugger.qrc @@ -5,7 +5,6 @@ <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> diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 2b381184b4e..d43bd57b28d 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -2729,7 +2729,7 @@ void DebuggerPluginPrivate::extensionsInitialized() 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(_(":/debugger/images/debugger_interrupt_small.png")); + m_interruptIcon = QIcon(_(Core::Constants::ICON_PAUSE)); m_interruptIcon.addFile(QLatin1String(":/debugger/images/debugger_interrupt.png")); m_locationMarkIcon = QIcon(_(":/debugger/images/location_16.png")); diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp index cb70f83fa19..d0a4c9ae894 100644 --- a/src/plugins/valgrind/callgrindtool.cpp +++ b/src/plugins/valgrind/callgrindtool.cpp @@ -696,7 +696,7 @@ QWidget *CallgrindToolPrivate::createWidgets() // pause action action = new QAction(this); action->setCheckable(true); - action->setIcon(QIcon(QLatin1String(":/qml/images/pause-small.png"))); + action->setIcon(QIcon(QLatin1String(Core::Constants::ICON_PAUSE))); //action->setText(tr("Ignore")); action->setToolTip(tr("Pause event logging. No events are counted which will speed up program execution during profiling.")); connect(action, SIGNAL(toggled(bool)), this, SIGNAL(pauseToggled(bool))); -- GitLab