From ea9b7fb5e557bb59fa9ece01e87d33106e763fc0 Mon Sep 17 00:00:00 2001
From: Felix Geyer <debfx@fobos.de>
Date: Mon, 23 May 2011 12:29:43 +0200
Subject: [PATCH] On unix: install the application icons according to the
freedesktop spec.
This allows desktop environments to pick the right icon size when displaying
the Qt Creator menu entry.
Change-Id: I10f6b46fb99202571d081a5e6e4d680be7ca069f
Merge-request: 328
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/64
---
doc/pluginhowto/examples/loggermode/loggermode.cpp | 2 +-
doc/pluginhowto/mode.qdoc | 2 +-
src/plugins/coreplugin/core.qrc | 4 ++--
src/plugins/coreplugin/coreconstants.h | 4 ++--
src/plugins/coreplugin/coreplugin.pro | 10 +++++++---
.../128/qtcreator.png} | Bin
.../16/qtcreator.png} | Bin
.../24/qtcreator.png} | Bin
.../256/qtcreator.png} | Bin
.../32/qtcreator.png} | Bin
.../48/qtcreator.png} | Bin
.../512/qtcreator.png} | Bin
.../64/qtcreator.png} | Bin
13 files changed, 13 insertions(+), 9 deletions(-)
rename src/plugins/coreplugin/images/{qtcreator_logo_128.png => logo/128/qtcreator.png} (100%)
rename src/plugins/coreplugin/images/{qtcreator_logo_16.png => logo/16/qtcreator.png} (100%)
rename src/plugins/coreplugin/images/{qtcreator_logo_24.png => logo/24/qtcreator.png} (100%)
rename src/plugins/coreplugin/images/{qtcreator_logo_256.png => logo/256/qtcreator.png} (100%)
rename src/plugins/coreplugin/images/{qtcreator_logo_32.png => logo/32/qtcreator.png} (100%)
rename src/plugins/coreplugin/images/{qtcreator_logo_48.png => logo/48/qtcreator.png} (100%)
rename src/plugins/coreplugin/images/{qtcreator_logo_512.png => logo/512/qtcreator.png} (100%)
rename src/plugins/coreplugin/images/{qtcreator_logo_64.png => logo/64/qtcreator.png} (100%)
diff --git a/doc/pluginhowto/examples/loggermode/loggermode.cpp b/doc/pluginhowto/examples/loggermode/loggermode.cpp
index f43339353d0..682c6002461 100644
--- a/doc/pluginhowto/examples/loggermode/loggermode.cpp
+++ b/doc/pluginhowto/examples/loggermode/loggermode.cpp
@@ -144,7 +144,7 @@ QString LoggerMode::name() const
QIcon LoggerMode::icon() const
{
- return QIcon(QLatin1String(":/core/images/qtcreator_logo_32.png"));
+ return QIcon(QLatin1String(":/core/images/logo/32/qtcreator.png"));
}
diff --git a/doc/pluginhowto/mode.qdoc b/doc/pluginhowto/mode.qdoc
index bf421e949a3..f777bf83ba9 100644
--- a/doc/pluginhowto/mode.qdoc
+++ b/doc/pluginhowto/mode.qdoc
@@ -147,7 +147,7 @@ The \bold {icon()} method returns a logo for the new mode selector.
\code
QIcon LoggerMode::icon() const
{
- return QIcon(QLatin1String(":/core/images/qtcreator_logo_32.png"));
+ return QIcon(QLatin1String(":/core/images/logo/32/qtcreator.png"));
}
\endcode
diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc
index a06cdbf3c89..443831dd9ea 100644
--- a/src/plugins/coreplugin/core.qrc
+++ b/src/plugins/coreplugin/core.qrc
@@ -13,8 +13,8 @@
<file>images/filesave.png</file>
<file>images/find.png</file>
<file>images/findnext.png</file>
- <file>images/qtcreator_logo_128.png</file>
- <file>images/qtcreator_logo_32.png</file>
+ <file>images/logo/128/qtcreator.png</file>
+ <file>images/logo/32/qtcreator.png</file>
<file>images/inputfield.png</file>
<file>images/inputfield_disabled.png</file>
<file>images/linkicon.png</file>
diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h
index 23ebff0b54a..e2e933466e3 100644
--- a/src/plugins/coreplugin/coreconstants.h
+++ b/src/plugins/coreplugin/coreconstants.h
@@ -234,8 +234,8 @@ const char * const ICON_CLOSE_DARK = ":/core/images/darkclosebutton.png";
const char * const ICON_SPLIT_HORIZONTAL = ":/core/images/splitbutton_horizontal.png";
const char * const ICON_FILTER = ":/core/images/filtericon.png";
const char * const ICON_LINK = ":/core/images/linkicon.png";
-const char * const ICON_QTLOGO_32 = ":/core/images/qtcreator_logo_32.png";
-const char * const ICON_QTLOGO_128 = ":/core/images/qtcreator_logo_128.png";
+const char * const ICON_QTLOGO_32 = ":/core/images/logo/32/qtcreator.png";
+const char * const ICON_QTLOGO_128 = ":/core/images/logo/128/qtcreator.png";
const char * const WIZARD_CATEGORY_QT = "R.Qt";
const char * const WIZARD_TR_CATEGORY_QT = QT_TRANSLATE_NOOP("Core", "Qt");
diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro
index 015236026da..8bab66a249d 100644
--- a/src/plugins/coreplugin/coreplugin.pro
+++ b/src/plugins/coreplugin/coreplugin.pro
@@ -213,9 +213,13 @@ else:macx {
else:unix {
SOURCES += progressmanager/progressmanager_x11.cpp
- images.files = images/qtcreator_logo_*.png
- images.path = /share/pixmaps
- INSTALLS += images
+ IMAGE_SIZE_LIST = 16 24 32 48 64 128 256 512
+
+ for(imagesize, IMAGE_SIZE_LIST) {
+ eval(image$${imagesize}.files = images/logo/$${imagesize}/qtcreator.png)
+ eval(image$${imagesize}.path = /share/icons/hicolor/$${imagesize}x$${imagesize}/apps)
+ INSTALLS += image$${imagesize}
+ }
}
OTHER_FILES += editormanager/BinFiles.mimetypes.xml ide_version.h.in
diff --git a/src/plugins/coreplugin/images/qtcreator_logo_128.png b/src/plugins/coreplugin/images/logo/128/qtcreator.png
similarity index 100%
rename from src/plugins/coreplugin/images/qtcreator_logo_128.png
rename to src/plugins/coreplugin/images/logo/128/qtcreator.png
diff --git a/src/plugins/coreplugin/images/qtcreator_logo_16.png b/src/plugins/coreplugin/images/logo/16/qtcreator.png
similarity index 100%
rename from src/plugins/coreplugin/images/qtcreator_logo_16.png
rename to src/plugins/coreplugin/images/logo/16/qtcreator.png
diff --git a/src/plugins/coreplugin/images/qtcreator_logo_24.png b/src/plugins/coreplugin/images/logo/24/qtcreator.png
similarity index 100%
rename from src/plugins/coreplugin/images/qtcreator_logo_24.png
rename to src/plugins/coreplugin/images/logo/24/qtcreator.png
diff --git a/src/plugins/coreplugin/images/qtcreator_logo_256.png b/src/plugins/coreplugin/images/logo/256/qtcreator.png
similarity index 100%
rename from src/plugins/coreplugin/images/qtcreator_logo_256.png
rename to src/plugins/coreplugin/images/logo/256/qtcreator.png
diff --git a/src/plugins/coreplugin/images/qtcreator_logo_32.png b/src/plugins/coreplugin/images/logo/32/qtcreator.png
similarity index 100%
rename from src/plugins/coreplugin/images/qtcreator_logo_32.png
rename to src/plugins/coreplugin/images/logo/32/qtcreator.png
diff --git a/src/plugins/coreplugin/images/qtcreator_logo_48.png b/src/plugins/coreplugin/images/logo/48/qtcreator.png
similarity index 100%
rename from src/plugins/coreplugin/images/qtcreator_logo_48.png
rename to src/plugins/coreplugin/images/logo/48/qtcreator.png
diff --git a/src/plugins/coreplugin/images/qtcreator_logo_512.png b/src/plugins/coreplugin/images/logo/512/qtcreator.png
similarity index 100%
rename from src/plugins/coreplugin/images/qtcreator_logo_512.png
rename to src/plugins/coreplugin/images/logo/512/qtcreator.png
diff --git a/src/plugins/coreplugin/images/qtcreator_logo_64.png b/src/plugins/coreplugin/images/logo/64/qtcreator.png
similarity index 100%
rename from src/plugins/coreplugin/images/qtcreator_logo_64.png
rename to src/plugins/coreplugin/images/logo/64/qtcreator.png
--
GitLab