Merge remote-tracking branch 'origin/master'

agitate · Dec 21, 2016 · 65783cf · 65783cf
2 parents 61d9adc + 609b8ca
commit 65783cf
Show file tree

Hide file tree

Showing 16 changed files with 24 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -46,7 +46,7 @@ else()
     message(STATUS "Building with Qt 4.")
 endif()
 
-set(copyq_ICON_PREFIX src/images/icon_)
+set(copyq_ICON_PREFIX src/images/icon)
 set(copyq_ICON_NORMAL src/images/icon.svg)
 set(copyq_ICON_BUSY   src/images/icon-running.svg)
 set(copyq_DESKTOP     shared/copyq.desktop)
@@ -107,7 +107,9 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     foreach (copyq_ICON_EXTENT 16 22 24 32 48 64 128)
         set(copyq_ICON_SIZE "${copyq_ICON_EXTENT}x${copyq_ICON_EXTENT}")
         string(REPLACE "%SIZE%" "${copyq_ICON_SIZE}" copyq_ICON_TARGET_PREFIX "${ICON_INSTALL_PREFIX_TEMPLATE}")
-        install(FILES "${copyq_ICON_PREFIX}${copyq_ICON_SIZE}.png" DESTINATION "${copyq_ICON_TARGET_PREFIX}" RENAME copyq.png)
+        foreach (copyq_ICON_TYPE "" "-normal" "-busy")
+            install(FILES "${copyq_ICON_PREFIX}${copyq_ICON_TYPE}_${copyq_ICON_SIZE}.png" DESTINATION "${copyq_ICON_TARGET_PREFIX}" RENAME "copyq${copyq_ICON_TYPE}.png")
+        endforeach()
     endforeach()
 
     set(copyq_THEME_INSTALL_PREFIX ${THEME_INSTALL_PREFIX})

diff --git a/src/images/icon-busy_128x128.png b/src/images/icon-busy_128x128.png
diff --git a/src/images/icon-busy_16x16.png b/src/images/icon-busy_16x16.png
diff --git a/src/images/icon-busy_22x22.png b/src/images/icon-busy_22x22.png
diff --git a/src/images/icon-busy_24x24.png b/src/images/icon-busy_24x24.png
diff --git a/src/images/icon-busy_32x32.png b/src/images/icon-busy_32x32.png
diff --git a/src/images/icon-busy_48x48.png b/src/images/icon-busy_48x48.png
diff --git a/src/images/icon-busy_64x64.png b/src/images/icon-busy_64x64.png
diff --git a/src/images/icon-normal_128x128.png b/src/images/icon-normal_128x128.png
diff --git a/src/images/icon-normal_16x16.png b/src/images/icon-normal_16x16.png
diff --git a/src/images/icon-normal_22x22.png b/src/images/icon-normal_22x22.png
diff --git a/src/images/icon-normal_24x24.png b/src/images/icon-normal_24x24.png
diff --git a/src/images/icon-normal_32x32.png b/src/images/icon-normal_32x32.png
diff --git a/src/images/icon-normal_48x48.png b/src/images/icon-normal_48x48.png
diff --git a/src/images/icon-normal_64x64.png b/src/images/icon-normal_64x64.png
diff --git a/utils/linux_make_icons.sh b/utils/linux_make_icons.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+set -e
+
+make_icons()
+{
+    input_icon=$1
+    output_basename=$2
+
+    for extent in 16 22 24 32 48 64 128; do
+        size="${extent}x${extent}"
+        output="${output_basename}_$size.png"
+        echo "Converting $input_icon -> $output"
+        convert -background transparent -density 600 "$input_icon" \
+            -resize "$size" "$output"
+    done
+}
+
+cd src/images
+make_icons icon.svg icon-normal
+make_icons icon-running.svg icon-busy