feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Valgrind: Fix missing pause icon

Browse Source 
Task-number: QTCREATORBUG-11836

Change-Id: Id38cecac418754adf61834ccc343420c31fb4f48
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Christian Stenger
2014-03-25 12:45:51 +01:00
committed by hjk
parent 672a2c4ea6
commit c4fa365cbb
7 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/coreplugin/core.qrc
View File

@@ -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>

1
src/plugins/coreplugin/coreconstants.h
View File

@@ -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";

0
src/plugins/debugger/images/debugger_interrupt_small.png → src/plugins/coreplugin/images/pause.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 595 B

After

Width:  |  Height:  |  Size: 595 B

1
src/plugins/debugger/debugger.qbs
View File

@@ -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",

1
src/plugins/debugger/debugger.qrc
View File

@@ -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>

2
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -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"));

2
src/plugins/valgrind/callgrindtool.cpp
View File

@@ -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)));