diff --git a/src/plugins/projectexplorer/images/ConnectionOff.png b/src/plugins/projectexplorer/images/ConnectionOff.png new file mode 100644 index 00000000000..f6b146e4ef4 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 00000000000..90b6775486e 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 00000000000..93a092ab13d Binary files /dev/null and b/src/plugins/projectexplorer/images/Desktop.png differ diff --git a/src/plugins/projectexplorer/images/MaemoDevice.png b/src/plugins/projectexplorer/images/MaemoDevice.png new file mode 100644 index 00000000000..51886524cc6 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 00000000000..43558efcfe4 Binary files /dev/null and b/src/plugins/projectexplorer/images/MaemoEmulator.png differ diff --git a/src/plugins/projectexplorer/images/SymbianDevice.png b/src/plugins/projectexplorer/images/SymbianDevice.png new file mode 100644 index 00000000000..8281bf527be 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 00000000000..447054bac80 Binary files /dev/null and b/src/plugins/projectexplorer/images/SymbianEmulator.png differ diff --git a/src/plugins/projectexplorer/projectexplorer.qrc b/src/plugins/projectexplorer/projectexplorer.qrc index 2d151956793..f14f1806003 100644 --- a/src/plugins/projectexplorer/projectexplorer.qrc +++ b/src/plugins/projectexplorer/projectexplorer.qrc @@ -32,5 +32,11 @@ images/RunSettings.png images/EditorSettings.png images/ProjectDependencies.png + images/MaemoDevice.png + images/MaemoEmulator.png + images/SymbianDevice.png + images/SymbianEmulator.png + images/ConnectionOff.png + images/ConnectionOn.png diff --git a/src/plugins/qt4projectmanager/images/connected.png b/src/plugins/qt4projectmanager/images/connected.png deleted file mode 100644 index fa20718cd02..00000000000 Binary files a/src/plugins/qt4projectmanager/images/connected.png and /dev/null differ diff --git a/src/plugins/qt4projectmanager/images/notconnected.png b/src/plugins/qt4projectmanager/images/notconnected.png deleted file mode 100644 index 5a57aa88cc1..00000000000 Binary files a/src/plugins/qt4projectmanager/images/notconnected.png and /dev/null differ diff --git a/src/plugins/qt4projectmanager/qt-maemo/images/qemu-run.png b/src/plugins/qt4projectmanager/qt-maemo/images/qemu-run.png index dc4f5190a23..c65d15faf73 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 53d0663d6ef..97bc159599a 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 d116d761aec..6b17ee4244e 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanager.qrc +++ b/src/plugins/qt4projectmanager/qt4projectmanager.qrc @@ -10,7 +10,5 @@ images/qt_qrc.png images/sources.png images/unknown.png - images/connected.png - images/notconnected.png diff --git a/src/plugins/qt4projectmanager/qt4target.cpp b/src/plugins/qt4projectmanager/qt4target.cpp index b874c903e13..6d3098de1b5 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()),