Merge pull request #24 from Fisiu/fix-icons

[Linux] Place icons in proper dirs, according to icon size.
QNapi · Sep 9, 2015 · 29f0775 · 29f0775
2 parents f98c57c + 354daf5
commit 29f0775
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 11 deletions.
diff --git a/doc/qnapi.desktop b/doc/qnapi.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Exec=qnapi
 Name=QNapi
-Icon=qnapi-48
+Icon=qnapi
 Type=Application
 Categories=AudioVideo;
 Comment=Program do pobierania napisów do filmów

diff --git a/qnapi.pro b/qnapi.pro
@@ -142,6 +142,7 @@ macx {
 
 unix { 
     INSTALL_PREFIX = /usr
+    DATADIR=$${INSTALL_PREFIX}/share
     target.path = $${INSTALL_PREFIX}/bin
     doc.path = $${INSTALL_PREFIX}/share/doc/$${TARGET}
     doc.files = doc/ChangeLog \
@@ -154,17 +155,24 @@ unix {
         doc/qnapi-scan.schemas
     man.path = $${INSTALL_PREFIX}/share/man/man1
     man.files = doc/$${TARGET}.1.gz
-    icons.path = $${INSTALL_PREFIX}/share/icons
-    icons.files = res/qnapi.png \
-        res/qnapi-48.png \
-        res/qnapi-128.png \
-        res/qnapi-512.png
+    icons16.files = res/icons/16x16/apps/qnapi.png
+    icons16.path = $${DATADIR}/icons/hicolor/16x16/apps/
+    icons22.files = res/icons/22x/apps/qnapi.png
+    icons22.path = $${DATADIR}/icons/hicolor/22x22/apps/
+    icons32.files = res/icons/32x32/apps/qnapi.png
+    icons32.path = $${DATADIR}/icons/hicolor/32x32/apps/
+    icons48.files = res/icons/48x48/apps/qnapi.png
+    icons48.path = $${DATADIR}/icons/hicolor/48x48/apps/
+    icons128.files = res/icons/128x128/apps/qnapi.png
+    icons128.path = $${DATADIR}/icons/hicolor/128x128/apps/
+    icons512.files = res/icons/512x512/apps/qnapi.png
+    icons512.path = $${DATADIR}/icons/hicolor/512x512/apps/
+    INSTALLS += icons16 icons22 icons32 icons48 icons128 icons512
     desktop.path = $${INSTALL_PREFIX}/share/applications
     desktop.files = doc/$${TARGET}.desktop
-    INSTALLS = target \
+    INSTALLS += target \
         doc \
         man \
-        icons \
         desktop
 }
 

diff --git a/res/qnapi-128.png → res/icons/128x128/apps/qnapi.png b/res/qnapi-128.png → res/icons/128x128/apps/qnapi.png
diff --git a/res/qnapi-16.png → res/icons/16x16/apps/qnapi.png b/res/qnapi-16.png → res/icons/16x16/apps/qnapi.png
diff --git a/res/qnapi.png → res/icons/22x22/apps/qnapi.png b/res/qnapi.png → res/icons/22x22/apps/qnapi.png
diff --git a/res/qnapi-32.png → res/icons/32x32/apps/qnapi.png b/res/qnapi-32.png → res/icons/32x32/apps/qnapi.png
diff --git a/res/qnapi-48.png → res/icons/48x48/apps/qnapi.png b/res/qnapi-48.png → res/icons/48x48/apps/qnapi.png
diff --git a/res/qnapi-512.png → res/icons/512x512/apps/qnapi.png b/res/qnapi-512.png → res/icons/512x512/apps/qnapi.png
diff --git a/res/resources.qrc b/res/resources.qrc
@@ -3,10 +3,9 @@
         <file>opensubtitles.gif</file>
         <file>qnapi-22-mono.png</file>
         <file>qnapi-48-icon.png</file>
-        <file>qnapi-48.png</file>
-        <file>qnapi.png</file>
         <file>napisy24.gif</file>
         <file>napiprojekt.jpg</file>
+        <file alias="qnapi.png">icons/48x48/apps/qnapi.png</file>
     </qresource>
     <qresource prefix="/languages">
         <file>el.gif</file>

diff --git a/ui/frmabout.ui b/ui/frmabout.ui
@@ -112,7 +112,7 @@
         <string/>
        </property>
        <property name="pixmap">
-        <pixmap resource="../res/resources.qrc">:/icon/qnapi-48.png</pixmap>
+        <pixmap resource="../res/resources.qrc">:/icon/qnapi.png</pixmap>
        </property>
        <property name="alignment">
         <set>Qt::AlignCenter</set>