diff --git a/src/plugins/debugger/debugger.qrc b/src/plugins/debugger/debugger.qrc
index a9cf90ef6fad1dd101a942a174ea7dbcfaba0434..debe6ace90ec866b86df41b94c890b134b8e7a8e 100644
--- a/src/plugins/debugger/debugger.qrc
+++ b/src/plugins/debugger/debugger.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/debugger" >
+ <qresource prefix="/debugger">
<file>images/breakpoint.svg</file>
<file>images/breakpoint_pending.svg</file>
<file>images/breakpoint_disabled.svg</file>
@@ -22,5 +22,9 @@
<file>images/location.svg</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>
</qresource>
</RCC>
diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp
index 663670f0f5a9171f151158d0b2cc2552ca05fb64..d34495763471f242013f11bcd80c017364bceba1 100644
--- a/src/plugins/debugger/debuggeractions.cpp
+++ b/src/plugins/debugger/debuggeractions.cpp
@@ -162,7 +162,7 @@ DebuggerSettings *DebuggerSettings::instance()
item->setText(tr("Operate by Instruction"));
item->setCheckable(true);
item->setDefaultValue(false);
- item->setIcon(QIcon(":/debugger/images/debugger_stepoverproc_small.png"));
+ item->setIcon(QIcon(":/debugger/images/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 0b5d0cbb1f3f9504b88d67862aadbf9cd7acddc7..7ed1a29b9cc8ffeb123dcfae23ffe99eb8d24faf 100644
--- a/src/plugins/debugger/debuggermanager.cpp
+++ b/src/plugins/debugger/debuggermanager.cpp
@@ -253,8 +253,8 @@ struct DebuggerManagerPrivate
static DebuggerManager *instance;
- const QIcon m_stopSmallIcon;
- const QIcon m_interruptSmallIcon;
+ QIcon m_stopIcon;
+ QIcon m_interruptIcon;
const QIcon m_locationMarkIcon;
// FIXME: Remove engine-specific state
@@ -311,14 +311,16 @@ struct DebuggerManagerPrivate
DebuggerManager *DebuggerManagerPrivate::instance = 0;
DebuggerManagerPrivate::DebuggerManagerPrivate(DebuggerManager *manager) :
- m_stopSmallIcon(QLatin1String(":/debugger/images/debugger_stop_small.png")),
- m_interruptSmallIcon(QLatin1String(":/debugger/images/debugger_interrupt_small.png")),
+ m_stopIcon(QLatin1String(":/debugger/images/debugger_stop_small.png")),
+ m_interruptIcon(QLatin1String(":/debugger/images/debugger_interrupt_small.png")),
m_locationMarkIcon(QLatin1String(":/debugger/images/location.svg")),
m_startParameters(new DebuggerStartParameters),
m_inferiorPid(0),
m_disassemblerViewAgent(manager),
m_engine(0)
{
+ m_interruptIcon.addFile(":/debugger/images/debugger_interrupt.png");
+ m_stopIcon.addFile(":/debugger/images/debugger_stop.png");
}
DebuggerManager::DebuggerManager()
@@ -465,10 +467,12 @@ void DebuggerManager::init()
qRegisterMetaType<StackCookie>("StackCookie");
d->m_actions.continueAction = new QAction(tr("Continue"), this);
- d->m_actions.continueAction->setIcon(QIcon(":/debugger/images/debugger_continue_small.png"));
+ QIcon continueIcon = QIcon(":/debugger/images/debugger_continue_small.png");
+ continueIcon.addFile(":/debugger/images/debugger_continue.png");
+ d->m_actions.continueAction->setIcon(continueIcon);
d->m_actions.stopAction = new QAction(tr("Interrupt"), this);
- d->m_actions.stopAction->setIcon(d->m_interruptSmallIcon);
+ d->m_actions.stopAction->setIcon(d->m_interruptIcon);
d->m_actions.resetAction = new QAction(tr("Abort Debugging"), this);
d->m_actions.resetAction->setToolTip(tr("Aborts debugging and "
@@ -1767,10 +1771,10 @@ void DebuggerManager::setState(DebuggerState state, bool forced)
const bool interruptIsExit = !running;
if (interruptIsExit) {
- d->m_actions.stopAction->setIcon(d->m_stopSmallIcon);
+ d->m_actions.stopAction->setIcon(d->m_stopIcon);
d->m_actions.stopAction->setText(tr("Stop Debugger"));
} else {
- d->m_actions.stopAction->setIcon(d->m_interruptSmallIcon);
+ d->m_actions.stopAction->setIcon(d->m_interruptIcon);
d->m_actions.stopAction->setText(tr("Interrupt"));
}
diff --git a/src/plugins/debugger/images/Continue.png b/src/plugins/debugger/images/Continue.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3dd72b56d99fe9b78d672506bd408674c6a67bd
Binary files /dev/null and b/src/plugins/debugger/images/Continue.png differ
diff --git a/src/plugins/debugger/images/SingleInstructionMode.png b/src/plugins/debugger/images/SingleInstructionMode.png
new file mode 100644
index 0000000000000000000000000000000000000000..d32007c18fa3fd55f8cd053aa782f59ef98002cd
Binary files /dev/null and b/src/plugins/debugger/images/SingleInstructionMode.png differ
diff --git a/src/plugins/debugger/images/debugger_continue.png b/src/plugins/debugger/images/debugger_continue.png
new file mode 100644
index 0000000000000000000000000000000000000000..82a67da8fb7a7366748297f0a1410ad6f0c8bcd9
Binary files /dev/null and b/src/plugins/debugger/images/debugger_continue.png differ
diff --git a/src/plugins/debugger/images/debugger_continue_32.png b/src/plugins/debugger/images/debugger_continue_32.png
new file mode 100644
index 0000000000000000000000000000000000000000..1208cbf0cc28156abe60179407af1781fbf522a0
Binary files /dev/null and b/src/plugins/debugger/images/debugger_continue_32.png differ
diff --git a/src/plugins/debugger/images/debugger_continue_small.png b/src/plugins/debugger/images/debugger_continue_small.png
index 4a3788c149b374223fa382629cff3833f6bdb688..3f49f3fef3172461fdd462fc5978f5ccd7a84c2a 100644
Binary files a/src/plugins/debugger/images/debugger_continue_small.png and b/src/plugins/debugger/images/debugger_continue_small.png differ
diff --git a/src/plugins/debugger/images/debugger_interrupt.png b/src/plugins/debugger/images/debugger_interrupt.png
new file mode 100644
index 0000000000000000000000000000000000000000..f80291db01b39fe84816b11807aa8f8f2b77d7d7
Binary files /dev/null and b/src/plugins/debugger/images/debugger_interrupt.png differ
diff --git a/src/plugins/debugger/images/debugger_interrupt_32.png b/src/plugins/debugger/images/debugger_interrupt_32.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b74a586ab933a6d0314b7c50d00b205215191d1
Binary files /dev/null and b/src/plugins/debugger/images/debugger_interrupt_32.png differ
diff --git a/src/plugins/debugger/images/debugger_interrupt_small.png b/src/plugins/debugger/images/debugger_interrupt_small.png
index 815400cb588623d836dbcf451a44627a62e2b5cb..897394820c0d3c9889b3b3ed97fc53f8d49c573b 100644
Binary files a/src/plugins/debugger/images/debugger_interrupt_small.png and b/src/plugins/debugger/images/debugger_interrupt_small.png differ
diff --git a/src/plugins/debugger/images/debugger_snapshot_small.png b/src/plugins/debugger/images/debugger_snapshot_small.png
index 603c3732be0c172c9824aecbe19e02931d1c497a..071451e2c60a24de769e2d9d382315c0a2d0469d 100644
Binary files a/src/plugins/debugger/images/debugger_snapshot_small.png and b/src/plugins/debugger/images/debugger_snapshot_small.png differ
diff --git a/src/plugins/debugger/images/debugger_stepinto_small.png b/src/plugins/debugger/images/debugger_stepinto_small.png
index da36a5f670ae8b7c0001b534f733161d25b78f78..0c6f51818f09bde86a7a4877b06e7dc2ec587ad2 100644
Binary files a/src/plugins/debugger/images/debugger_stepinto_small.png and b/src/plugins/debugger/images/debugger_stepinto_small.png differ
diff --git a/src/plugins/debugger/images/debugger_stepout_small.png b/src/plugins/debugger/images/debugger_stepout_small.png
index e5eeeb32ada42479ca7de5d9ab44097450045f4c..4a3bfadf88c0fd60b1afeb7a06d3787f2b5b1f2c 100644
Binary files a/src/plugins/debugger/images/debugger_stepout_small.png and b/src/plugins/debugger/images/debugger_stepout_small.png differ
diff --git a/src/plugins/debugger/images/debugger_stepover_small.png b/src/plugins/debugger/images/debugger_stepover_small.png
index e8a5d080466e7b77569e99e5635bd06a0a4dcaf2..2e5acd2256f8d540d411cfb75c1c8dd39c56c713 100644
Binary files a/src/plugins/debugger/images/debugger_stepover_small.png and b/src/plugins/debugger/images/debugger_stepover_small.png differ
diff --git a/src/plugins/debugger/images/debugger_stop.png b/src/plugins/debugger/images/debugger_stop.png
new file mode 100644
index 0000000000000000000000000000000000000000..5679daf6e08e324f977864e55e10c96154d2e2f4
Binary files /dev/null and b/src/plugins/debugger/images/debugger_stop.png differ
diff --git a/src/plugins/debugger/images/debugger_stop_32.png b/src/plugins/debugger/images/debugger_stop_32.png
new file mode 100644
index 0000000000000000000000000000000000000000..23ee07ac99d1b6bc34759b75e620cd20c200df18
Binary files /dev/null and b/src/plugins/debugger/images/debugger_stop_32.png differ
diff --git a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
index 4727f0748577cc48535db8968eded5a7f31518e7..8d127d31455013377b7a89e4eb19221ad7ab4e1a 100644
--- a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
@@ -94,7 +94,7 @@ IPropertiesPanel *BuildSettingsPanelFactory::createPanel(Target *target)
BuildSettingsPanel::BuildSettingsPanel(Target *target) :
m_widget(new BuildSettingsWidget(target)),
- m_icon(":/projectexplorer/images/rebuild.png")
+ m_icon(":/projectexplorer/images/BuildSettings.png")
{
}
diff --git a/src/plugins/projectexplorer/dependenciespanel.cpp b/src/plugins/projectexplorer/dependenciespanel.cpp
index f33b1cf030c8ff95af7dd60a0e1eaaef072e550c..45f521a5910ecfb547ea4062b6499f96a3d9db6b 100644
--- a/src/plugins/projectexplorer/dependenciespanel.cpp
+++ b/src/plugins/projectexplorer/dependenciespanel.cpp
@@ -259,7 +259,7 @@ DependenciesWidget::DependenciesWidget(SessionManager *session,
DependenciesPanel::DependenciesPanel(SessionManager *session, Project *project) :
m_widget(new DependenciesWidget(session, project)),
- m_icon(":/projectexplorer/images/session.png")
+ m_icon(":/projectexplorer/images/ProjectDependencies.png")
{
}
diff --git a/src/plugins/projectexplorer/editorsettingspropertiespage.cpp b/src/plugins/projectexplorer/editorsettingspropertiespage.cpp
index 5c58468552f2f0b8302e5a9de310a4bc4d6e5553..a8c0ce17d6ac83859bbf4f32de6b4b3613a65724 100644
--- a/src/plugins/projectexplorer/editorsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/editorsettingspropertiespage.cpp
@@ -73,7 +73,7 @@ IPropertiesPanel *EditorSettingsPanelFactory::createPanel(Target *target)
EditorSettingsPanel::EditorSettingsPanel(Project *project) :
m_widget(new EditorSettingsWidget(project)),
- m_icon(":/projectexplorer/images/rebuild.png")
+ m_icon(":/projectexplorer/images/EditorSettings.png")
{
}
diff --git a/src/plugins/projectexplorer/images/BuildSettings.png b/src/plugins/projectexplorer/images/BuildSettings.png
new file mode 100644
index 0000000000000000000000000000000000000000..30a2c62380a52cab6842cd40ff8a5eccaf1dc0fb
Binary files /dev/null and b/src/plugins/projectexplorer/images/BuildSettings.png differ
diff --git a/src/plugins/projectexplorer/images/ConnectionOff.png b/src/plugins/projectexplorer/images/ConnectionOff.png
new file mode 100644
index 0000000000000000000000000000000000000000..f6b146e4ef4e29316b2dbccbb86218b3db59650b
Binary files /dev/null and b/src/plugins/projectexplorer/images/ConnectionOff.png differ
diff --git a/src/plugins/projectexplorer/images/ConnectionOn.png b/src/plugins/projectexplorer/images/ConnectionOn.png
new file mode 100644
index 0000000000000000000000000000000000000000..90b6775486e619cb90c84dbcd97090b687550ca4
Binary files /dev/null and b/src/plugins/projectexplorer/images/ConnectionOn.png differ
diff --git a/src/plugins/projectexplorer/images/Desktop.png b/src/plugins/projectexplorer/images/Desktop.png
new file mode 100644
index 0000000000000000000000000000000000000000..93a092ab13dfecfe099db859a6f56bcbed44a92a
Binary files /dev/null and b/src/plugins/projectexplorer/images/Desktop.png differ
diff --git a/src/plugins/projectexplorer/images/EditorSettings.png b/src/plugins/projectexplorer/images/EditorSettings.png
new file mode 100644
index 0000000000000000000000000000000000000000..ebd869fb32bbf4f597a0aa224565f7a428e817c0
Binary files /dev/null and b/src/plugins/projectexplorer/images/EditorSettings.png differ
diff --git a/src/plugins/projectexplorer/images/MaemoDevice.png b/src/plugins/projectexplorer/images/MaemoDevice.png
new file mode 100644
index 0000000000000000000000000000000000000000..51886524cc6e0c250a9e60a47399f7d3dbec8344
Binary files /dev/null and b/src/plugins/projectexplorer/images/MaemoDevice.png differ
diff --git a/src/plugins/projectexplorer/images/MaemoEmulator.png b/src/plugins/projectexplorer/images/MaemoEmulator.png
new file mode 100644
index 0000000000000000000000000000000000000000..43558efcfe4ea68a2505538fd161d95f81b4075c
Binary files /dev/null and b/src/plugins/projectexplorer/images/MaemoEmulator.png differ
diff --git a/src/plugins/projectexplorer/images/ProjectDependencies.png b/src/plugins/projectexplorer/images/ProjectDependencies.png
new file mode 100644
index 0000000000000000000000000000000000000000..635b4721442f242d9d05947512adc9957a3ed084
Binary files /dev/null and b/src/plugins/projectexplorer/images/ProjectDependencies.png differ
diff --git a/src/plugins/projectexplorer/images/RunSettings.png b/src/plugins/projectexplorer/images/RunSettings.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bf7dc6519cf92a919731ab2525f751dc81ebc32
Binary files /dev/null and b/src/plugins/projectexplorer/images/RunSettings.png differ
diff --git a/src/plugins/projectexplorer/images/SymbianDevice.png b/src/plugins/projectexplorer/images/SymbianDevice.png
new file mode 100644
index 0000000000000000000000000000000000000000..8281bf527be5ed4337a79b2f1f2c4f8c7d5b1cc4
Binary files /dev/null and b/src/plugins/projectexplorer/images/SymbianDevice.png differ
diff --git a/src/plugins/projectexplorer/images/SymbianEmulator.png b/src/plugins/projectexplorer/images/SymbianEmulator.png
new file mode 100644
index 0000000000000000000000000000000000000000..447054bac80f988e3ec78c866c343461a4b43ea1
Binary files /dev/null and b/src/plugins/projectexplorer/images/SymbianEmulator.png differ
diff --git a/src/plugins/projectexplorer/images/build.png b/src/plugins/projectexplorer/images/build.png
index 4b79d9d4706d0c0359874c351e924c74e26256a0..cb06a4830028c9e3c3912480def0106742ca0563 100644
Binary files a/src/plugins/projectexplorer/images/build.png and b/src/plugins/projectexplorer/images/build.png differ
diff --git a/src/plugins/projectexplorer/images/build_32.png b/src/plugins/projectexplorer/images/build_32.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc0b76493cf6b786b7cccd2a3380c83c128cbfe7
Binary files /dev/null and b/src/plugins/projectexplorer/images/build_32.png differ
diff --git a/src/plugins/projectexplorer/images/build_small.png b/src/plugins/projectexplorer/images/build_small.png
index e5a0e8a4e7f81ebf6ece8a683ae5625e1e2ff4b9..e0652170e8925cf4fbba477bcbd49e6641d2e21d 100644
Binary files a/src/plugins/projectexplorer/images/build_small.png and b/src/plugins/projectexplorer/images/build_small.png differ
diff --git a/src/plugins/projectexplorer/images/compile_error.png b/src/plugins/projectexplorer/images/compile_error.png
index 51a2779fcead2cca0a84d4af77bf0ab290c51e97..bd63cc3e568a266d4da6ca94f6a7b6f30dcc7416 100644
Binary files a/src/plugins/projectexplorer/images/compile_error.png and b/src/plugins/projectexplorer/images/compile_error.png differ
diff --git a/src/plugins/projectexplorer/images/compile_warning.png b/src/plugins/projectexplorer/images/compile_warning.png
index a42077a82a1d0e874dd6360cce2bd8324c74e3e6..f76393b5dae79b16d8cbc5ec11387547b5d37a48 100644
Binary files a/src/plugins/projectexplorer/images/compile_warning.png and b/src/plugins/projectexplorer/images/compile_warning.png differ
diff --git a/src/plugins/projectexplorer/images/rebuild.png b/src/plugins/projectexplorer/images/rebuild.png
index fe3a6504a3e14093f48487f4146a7bdaeda13028..1b69bbe05cc800b3d275a3d0ea753acca4b7751d 100644
Binary files a/src/plugins/projectexplorer/images/rebuild.png and b/src/plugins/projectexplorer/images/rebuild.png differ
diff --git a/src/plugins/projectexplorer/images/rebuild_small.png b/src/plugins/projectexplorer/images/rebuild_small.png
index 3b36d527b206f56b3a9c7397ae600077c0d9a58c..346f6a92d9d5bb9b60898bde979b043251d08464 100644
Binary files a/src/plugins/projectexplorer/images/rebuild_small.png and b/src/plugins/projectexplorer/images/rebuild_small.png differ
diff --git a/src/plugins/projectexplorer/projectexplorer.qrc b/src/plugins/projectexplorer/projectexplorer.qrc
index 1ac214079e3ef5d59263bb20db784d0d38d47610..b294eb4625e44e3a6efba5baf0a31b4db9cdf9c1 100644
--- a/src/plugins/projectexplorer/projectexplorer.qrc
+++ b/src/plugins/projectexplorer/projectexplorer.qrc
@@ -1,13 +1,10 @@
<RCC>
<qresource prefix="/projectexplorer">
- <file>images/build.png</file>
<file>images/build_small.png</file>
<file>images/clean.png</file>
<file>images/clean_small.png</file>
<file>images/closetab.png</file>
- <file>images/compile_error.png</file>
<file>images/compile_unspecified.png</file>
- <file>images/compile_warning.png</file>
<file>images/debugger_start.png</file>
<file>images/debugger_start_small.png</file>
<file>images/filtericon.png</file>
@@ -28,5 +25,18 @@
<file>images/rightselection.png</file>
<file>images/midselection.png</file>
<file>images/targetremovebutton.png</file>
+ <file>images/compile_error.png</file>
+ <file>images/compile_warning.png</file>
+ <file>images/BuildSettings.png</file>
+ <file>images/RunSettings.png</file>
+ <file>images/EditorSettings.png</file>
+ <file>images/ProjectDependencies.png</file>
+ <file>images/MaemoDevice.png</file>
+ <file>images/MaemoEmulator.png</file>
+ <file>images/SymbianDevice.png</file>
+ <file>images/SymbianEmulator.png</file>
+ <file>images/ConnectionOff.png</file>
+ <file>images/ConnectionOn.png</file>
+ <file>images/build.png</file>
</qresource>
</RCC>
diff --git a/src/plugins/projectexplorer/projectwindow.cpp b/src/plugins/projectexplorer/projectwindow.cpp
index d930acd5316a1125d09f3e8c08b081aa5ab14f9e..4fcf486eeff90b4a9cc213f954956b134fdc44d8 100644
--- a/src/plugins/projectexplorer/projectwindow.cpp
+++ b/src/plugins/projectexplorer/projectwindow.cpp
@@ -169,7 +169,7 @@ void PanelsWidget::addPropertiesPanel(IPropertiesPanel *panel)
QLabel *iconLabel = new QLabel(m_root);
iconLabel->setPixmap(panel->icon().pixmap(ICON_SIZE, ICON_SIZE));
iconLabel->setContentsMargins(0, ABOVE_HEADING_MARGIN, 0, 0);
- m_layout->addWidget(iconLabel, headerRow, 0, 2, 1, Qt::AlignTop | Qt::AlignHCenter);
+ m_layout->addWidget(iconLabel, headerRow, 0, 3, 1, Qt::AlignTop | Qt::AlignHCenter);
}
// name:
@@ -178,13 +178,14 @@ void PanelsWidget::addPropertiesPanel(IPropertiesPanel *panel)
nameLabel->setContentsMargins(0, ABOVE_HEADING_MARGIN, 0, 0);
QFont f = nameLabel->font();
f.setBold(true);
- f.setPointSizeF(f.pointSizeF() * 1.4);
+ f.setPointSizeF(f.pointSizeF() * 1.6);
nameLabel->setFont(f);
- m_layout->addWidget(nameLabel, headerRow, 1, 1, 1, Qt::AlignBottom | Qt::AlignLeft);
+ m_layout->addWidget(nameLabel, headerRow, 1, 1, 1, Qt::AlignVCenter | Qt::AlignLeft);
// line:
const int lineRow(headerRow + 1);
- m_layout->addWidget(new OnePixelBlackLine(m_root), lineRow, 1);
+ QWidget *line = new OnePixelBlackLine(m_root);
+ m_layout->addWidget(line, lineRow, 1, 1, -1, Qt::AlignTop);
// add the widget:
const int widgetRow(lineRow + 1);
diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.cpp b/src/plugins/projectexplorer/runsettingspropertiespage.cpp
index 907583a32ba7b3dfc95017961f9fb99e43e84a27..f9a0628eb70fa3cde8f5eab5878a175b8a3afcbc 100644
--- a/src/plugins/projectexplorer/runsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/runsettingspropertiespage.cpp
@@ -131,7 +131,7 @@ IPropertiesPanel *RunSettingsPanelFactory::createPanel(Target *target)
RunSettingsPanel::RunSettingsPanel(Target *target) :
m_widget(new RunSettingsWidget(target)),
- m_icon(":/projectexplorer/images/run.png")
+ m_icon(":/projectexplorer/images/RunSettings.png")
{
}
diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp
index 5dce13258fb5ded424da15616707e6b218f8e1c8..00e0982c2f1c4bc03909110dab47d998cdafa19f 100644
--- a/src/plugins/projectexplorer/taskwindow.cpp
+++ b/src/plugins/projectexplorer/taskwindow.cpp
@@ -48,6 +48,11 @@
#include <QtGui/QStyledItemDelegate>
#include <QtGui/QSortFilterProxyModel>
+namespace {
+ const int TASK_ICON_SIZE = 16;
+ const int TASK_ICON_MARGIN = 2;
+}
+
namespace ProjectExplorer {
namespace Internal {
@@ -769,6 +774,8 @@ QSize TaskDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelInd
} else {
s.setHeight(fontHeight + 3);
}
+ if (s.height() < TASK_ICON_SIZE + 2 * TASK_ICON_MARGIN)
+ s.setHeight(TASK_ICON_SIZE + 2 * TASK_ICON_MARGIN);
return s;
}
@@ -817,7 +824,7 @@ void TaskDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
TaskModel *model = static_cast<TaskFilterModel *>(view->model())->taskModel();
TaskWindow::TaskType type = TaskWindow::TaskType(index.data(TaskModel::Type).toInt());
QIcon icon = model->iconFor(type);
- painter->drawPixmap(2, opt.rect.top() + 2, icon.pixmap(16, 16));
+ painter->drawPixmap(TASK_ICON_MARGIN, opt.rect.top() + TASK_ICON_MARGIN, icon.pixmap(TASK_ICON_SIZE, TASK_ICON_SIZE));
int width = opt.rect.width() - model->sizeOfFile() - model->sizeOfLineNumber() - 12 - 22;
if (!selected) {
diff --git a/src/plugins/qt4projectmanager/images/connected.png b/src/plugins/qt4projectmanager/images/connected.png
deleted file mode 100644
index fa20718cd02da88f1a35af306bfcf4348a4b2a5d..0000000000000000000000000000000000000000
Binary files a/src/plugins/qt4projectmanager/images/connected.png and /dev/null differ
diff --git a/src/plugins/qt4projectmanager/images/forms.png b/src/plugins/qt4projectmanager/images/forms.png
index 04059d99f0eb4db720066140f8b361ea24238d6c..72d1549b58ad2185e4b6c91defd0aba15a0627bc 100644
Binary files a/src/plugins/qt4projectmanager/images/forms.png and b/src/plugins/qt4projectmanager/images/forms.png differ
diff --git a/src/plugins/qt4projectmanager/images/headers.png b/src/plugins/qt4projectmanager/images/headers.png
index ff7797fa91aac20425d04c122debd96beb3ba4b2..c26269004fb7910c404018113f1ac295878584a6 100644
Binary files a/src/plugins/qt4projectmanager/images/headers.png and b/src/plugins/qt4projectmanager/images/headers.png differ
diff --git a/src/plugins/qt4projectmanager/images/notconnected.png b/src/plugins/qt4projectmanager/images/notconnected.png
deleted file mode 100644
index 5a57aa88cc1800a38b8105860e8b93aec7a649a6..0000000000000000000000000000000000000000
Binary files a/src/plugins/qt4projectmanager/images/notconnected.png and /dev/null differ
diff --git a/src/plugins/qt4projectmanager/images/qt_qrc.png b/src/plugins/qt4projectmanager/images/qt_qrc.png
index 3643f37e1a3ede6454fe3d14224e6fc72f73a5db..961e3e1a4ee7ddf8a8f510715ffb001ea875c46b 100644
Binary files a/src/plugins/qt4projectmanager/images/qt_qrc.png and b/src/plugins/qt4projectmanager/images/qt_qrc.png differ
diff --git a/src/plugins/qt4projectmanager/images/sources.png b/src/plugins/qt4projectmanager/images/sources.png
index 60dc177b86430077a9413f4419cba0c2f9a1c979..c03a8c45f428a6716294ce5a2d4182f1be8d5aa9 100644
Binary files a/src/plugins/qt4projectmanager/images/sources.png and b/src/plugins/qt4projectmanager/images/sources.png differ
diff --git a/src/plugins/qt4projectmanager/images/unknown.png b/src/plugins/qt4projectmanager/images/unknown.png
index 0f2ad1818e23e7a6297b24ee61ffee458dc7fcb8..37ebc59f8c6335a5dcd1a269dcc1287e12ae57b1 100644
Binary files a/src/plugins/qt4projectmanager/images/unknown.png and b/src/plugins/qt4projectmanager/images/unknown.png differ
diff --git a/src/plugins/qt4projectmanager/qt-maemo/images/qemu-run.png b/src/plugins/qt4projectmanager/qt-maemo/images/qemu-run.png
index dc4f5190a23303d00a8ef896c8db32038a70a722..c65d15faf738c9a80268020e8377b8cf3435dc1d 100644
Binary files a/src/plugins/qt4projectmanager/qt-maemo/images/qemu-run.png and b/src/plugins/qt4projectmanager/qt-maemo/images/qemu-run.png differ
diff --git a/src/plugins/qt4projectmanager/qt-maemo/images/qemu-stop.png b/src/plugins/qt4projectmanager/qt-maemo/images/qemu-stop.png
index 53d0663d6ef4964b979faebd7614a71fc58b22f8..97bc159599a77f73ed2fe32aaeed46978e1b3c80 100644
Binary files a/src/plugins/qt4projectmanager/qt-maemo/images/qemu-stop.png and b/src/plugins/qt4projectmanager/qt-maemo/images/qemu-stop.png differ
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.qrc b/src/plugins/qt4projectmanager/qt4projectmanager.qrc
index d116d761aec4f41693c1ffe9dde92ce4ae9d82a5..6b17ee4244e1e1633e8712c5db59c78e13396c4d 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.qrc
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.qrc
@@ -10,7 +10,5 @@
<file>images/qt_qrc.png</file>
<file>images/sources.png</file>
<file>images/unknown.png</file>
- <file>images/connected.png</file>
- <file>images/notconnected.png</file>
</qresource>
</RCC>
diff --git a/src/plugins/qt4projectmanager/qt4target.cpp b/src/plugins/qt4projectmanager/qt4target.cpp
index b874c903e1341a300921e2c4a221d72a024e7b2b..6d3098de1b5da18748b85af0dd89fb730d67dc8a 100644
--- a/src/plugins/qt4projectmanager/qt4target.cpp
+++ b/src/plugins/qt4projectmanager/qt4target.cpp
@@ -71,13 +71,13 @@ QIcon iconForId(const QString &id) {
if (id == QLatin1String(DESKTOP_TARGET_ID))
return QIcon(qApp->style()->standardIcon(QStyle::SP_ComputerIcon));
if (id == QLatin1String(S60_EMULATOR_TARGET_ID))
- return QIcon(qApp->style()->standardIcon(QStyle::SP_ComputerIcon));
+ return QIcon(":/projectexplorer/images/SymbianEmulator.png");
if (id == QLatin1String(S60_DEVICE_TARGET_ID))
- return QIcon(qApp->style()->standardIcon(QStyle::SP_ComputerIcon));
+ return QIcon(":/projectexplorer/images/SymbianDevice.png");
if (id == QLatin1String(MAEMO_EMULATOR_TARGET_ID))
- return QIcon(qApp->style()->standardIcon(QStyle::SP_ComputerIcon));
+ return QIcon(":/projectexplorer/images/MaemoEmulator.png");
if (id == QLatin1String(MAEMO_DEVICE_TARGET_ID))
- return QIcon(qApp->style()->standardIcon(QStyle::SP_ComputerIcon));
+ return QIcon(":/projectexplorer/images/MaemoDevice.png");
return QIcon();
}
@@ -200,8 +200,8 @@ Qt4Target *Qt4TargetFactory::restore(ProjectExplorer::Project *parent, const QVa
Qt4Target::Qt4Target(Qt4Project *parent, const QString &id) :
ProjectExplorer::Target(parent, id),
- m_connectedPixmap(QLatin1String(":/qt4projectmanager/images/connected.png")),
- m_disconnectedPixmap(QLatin1String(":/qt4projectmanager/images/notconnected.png")),
+ m_connectedPixmap(QLatin1String(":/projectexplorer/images/ConnectionOn.png")),
+ m_disconnectedPixmap(QLatin1String(":/projectexplorer/images/ConnectionOff.png")),
m_buildConfigurationFactory(new Qt4BuildConfigurationFactory(this))
{
connect(project(), SIGNAL(supportedTargetIdsChanged()),