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/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/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/projectexplorer.qrc b/src/plugins/projectexplorer/projectexplorer.qrc index 2d1519567938b1223d2a024c2427268c479b455a..f14f180600326715243f4f590bffdcf200145a77 100644 --- a/src/plugins/projectexplorer/projectexplorer.qrc +++ b/src/plugins/projectexplorer/projectexplorer.qrc @@ -32,5 +32,11 @@ <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> </qresource> </RCC> 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/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/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()),