use scalable icons

brezerk · Jan 24, 2014 · 520026f · 520026f
1 parent 59e0467
commit 520026f
Show file tree

Hide file tree

Showing 21 changed files with 64 additions and 216 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -138,9 +138,9 @@ ELSE( ${CMAKE_SYSTEM_NAME} MATCHES Darwin )
     IF( NOT PIXMAPS_ENTRY_PATH )
         SET( PIXMAPS_ENTRY_PATH ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor )
     ENDIF( NOT PIXMAPS_ENTRY_PATH )
-#    IF( NOT PIXMAPS_UNITY_ENTRY_PATH )
-#        SET( PIXMAPS_ENTRY_PATH ${CMAKE_INSTALL_PREFIX}/share/icons/ubuntu-mono-dark )
-#    ENDIF( NOT PIXMAPS_UNITY_ENTRY_PATH )
+    IF( NOT PIXMAPS_UNITY_ENTRY_PATH )
+        SET( PIXMAPS_UNITY_ENTRY_PATH ${CMAKE_INSTALL_PREFIX}/share/icons/ubuntu-mono-dark )
+    ENDIF( NOT PIXMAPS_UNITY_ENTRY_PATH )
     IF( NOT MANPAGE_ENTRY_PATH )
         SET( MANPAGE_ENTRY_PATH ${CMAKE_INSTALL_PREFIX}/share/man )
     ENDIF( NOT MANPAGE_ENTRY_PATH )
@@ -198,6 +198,7 @@ IF( RELEASE )
     MESSAGE(STATUS "CMAKE_INSTALL_PREFIX          : ${CMAKE_INSTALL_PREFIX}")
     MESSAGE(STATUS "DESKTOP_ENTRY_PATH            : ${DESKTOP_ENTRY_PATH}")
     MESSAGE(STATUS "PIXMAPS_ENTRY_PATH            : ${PIXMAPS_ENTRY_PATH}")
+    MESSAGE(STATUS "PIXMAPS_UNITY_ENTRY_PATH      : ${PIXMAPS_UNITY_ENTRY_PATH}")
     MESSAGE(STATUS "MANPAGE_ENTRY_PATH            : ${MANPAGE_ENTRY_PATH}")
     MESSAGE(STATUS "LIBS_ENTRY_PATH               : ${LIBS_ENTRY_PATH}\n")
 ELSE ( RELEASE )

diff --git a/src/icons/CMakeLists.txt b/src/icons/CMakeLists.txt
@@ -9,15 +9,9 @@ IF( ${CMAKE_SYSTEM_NAME} MATCHES Darwin )
         install(FILES ${DESKTOP_PLIST} DESTINATION ${CMAKE_INSTALL_PREFIX}/${APP_NAME_GLOBAL}.app/Contents)
     ENDIF( RELEASE )
 ELSE( ${CMAKE_SYSTEM_NAME} MATCHES Darwin )
-    foreach (SIZE 256 192 128 96 64 48 32 22 16)
-        SET( DESKTOP_PIXMAPS
-            ${CMAKE_SOURCE_DIR}/src/icons/q4wine-${SIZE}x${SIZE}.png )
-        IF( RELEASE )
-            install(FILES ${DESKTOP_PIXMAPS} DESTINATION ${PIXMAPS_ENTRY_PATH}/${SIZE}x${SIZE}/apps RENAME q4wine.png)
-        ENDIF( RELEASE )
-    endforeach()
     IF( RELEASE )
     install(FILES q4wine.svg DESTINATION ${PIXMAPS_ENTRY_PATH}/scalable/apps)
+    install(FILES q4wine-ambiance.svg DESTINATION ${PIXMAPS_UNITY_ENTRY_PATH}/scalable/apps RENAME q4wine.svg)
     ENDIF( RELEASE )
 ENDIF( ${CMAKE_SYSTEM_NAME} MATCHES Darwin )
 
diff --git a/src/icons/q4wine-128x128.ico b/src/icons/q4wine-128x128.ico
diff --git a/src/icons/q4wine-128x128.png b/src/icons/q4wine-128x128.png
diff --git a/src/icons/q4wine-16x16.png b/src/icons/q4wine-16x16.png
diff --git a/src/icons/q4wine-192x192.png b/src/icons/q4wine-192x192.png
diff --git a/src/icons/q4wine-22x22.png b/src/icons/q4wine-22x22.png
diff --git a/src/icons/q4wine-256x256.png b/src/icons/q4wine-256x256.png
diff --git a/src/icons/q4wine-32x32.png b/src/icons/q4wine-32x32.png
diff --git a/src/icons/q4wine-350x350.ico b/src/icons/q4wine-350x350.ico
diff --git a/src/icons/q4wine-350x350.png b/src/icons/q4wine-350x350.png
diff --git a/src/icons/q4wine-350x350.xcf b/src/icons/q4wine-350x350.xcf
diff --git a/src/icons/q4wine-48x48.ico b/src/icons/q4wine-48x48.ico
diff --git a/src/icons/q4wine-48x48.png b/src/icons/q4wine-48x48.png
diff --git a/src/icons/q4wine-48x48.xcf b/src/icons/q4wine-48x48.xcf
diff --git a/src/icons/q4wine-64x64.png b/src/icons/q4wine-64x64.png
diff --git a/src/icons/q4wine-96x96.png b/src/icons/q4wine-96x96.png
diff --git a/src/icons/q4wine-ambiance.svg b/src/icons/q4wine-ambiance.svg
diff --git a/src/icons/q4wine-unity-dark.svg b/src/icons/q4wine-unity-dark.svg
diff --git a/src/icons/q4wine.png b/src/icons/q4wine.png
diff --git a/src/icons/q4wine.svg b/src/icons/q4wine.svg