summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeiko Becker <heirecka@exherbo.org>2016-06-06 15:38:55 (GMT)
committerHeiko Becker <heirecka@exherbo.org>2016-06-06 17:00:24 (GMT)
commite85b266afa328d73a4abccf1865be4b959a76fe9 (patch)
tree8a17371428efbe0ad3060c987039d4c04d9bf010
parenteffc152bf737ff2a9aa47b5151b8c0c42d9aa218 (diff)
Fix ecm_install_icons and ecm_add_app_icon
...and rename icons according to the FreeDesktop.org icon naming specification. REVIEW: 128111
-rw-r--r--16-apps-kgpg.png (renamed from hi16-app-kgpg.png)bin1006 -> 1006 bytes
-rw-r--r--22-apps-kgpg.png (renamed from hi22-app-kgpg.png)bin1245 -> 1245 bytes
-rw-r--r--32-apps-kgpg.png (renamed from hi32-app-kgpg.png)bin2056 -> 2056 bytes
-rw-r--r--48-apps-kgpg.png (renamed from hi48-app-kgpg.png)bin3399 -> 3399 bytes
-rw-r--r--CMakeLists.txt13
-rw-r--r--icons/16-actions-document-export-key.png (renamed from icons/hi16-actions-document-export-key.png)bin736 -> 736 bytes
-rw-r--r--icons/16-actions-document-import-key.png (renamed from icons/hi16-actions-document-import-key.png)bin1747 -> 1747 bytes
-rw-r--r--icons/16-actions-document-properties-key.png (renamed from icons/hi16-actions-document-properties-key.png)bin725 -> 725 bytes
-rw-r--r--icons/16-status-key-group.png (renamed from icons/hi16-status-key-group.png)bin861 -> 861 bytes
-rw-r--r--icons/16-status-key-orphan.png (renamed from icons/hi16-status-key-orphan.png)bin228 -> 228 bytes
-rw-r--r--icons/16-status-key-pair.png (renamed from icons/hi16-status-key-pair.png)bin703 -> 703 bytes
-rw-r--r--icons/16-status-key-single.png (renamed from icons/hi16-status-key-single.png)bin635 -> 635 bytes
-rw-r--r--icons/22-actions-document-export-key.png (renamed from icons/hi22-actions-document-export-key.png)bin1037 -> 1037 bytes
-rw-r--r--icons/22-actions-document-import-key.png (renamed from icons/hi22-actions-document-import-key.png)bin2770 -> 2770 bytes
-rw-r--r--icons/22-actions-document-properties-key.png (renamed from icons/hi22-actions-document-properties-key.png)bin1085 -> 1085 bytes
-rw-r--r--icons/22-actions-key-generate-pair.png (renamed from icons/hi22-action-key-generate-pair.png)bin337 -> 337 bytes
-rw-r--r--icons/22-actions-view-key-secret.png (renamed from icons/hi22-action-view-key-secret.png)bin240 -> 240 bytes
-rw-r--r--icons/22-status-key-group.png (renamed from icons/hi22-status-key-group.png)bin1266 -> 1266 bytes
-rw-r--r--icons/22-status-key-pair.png (renamed from icons/hi22-status-key-pair.png)bin1045 -> 1045 bytes
-rw-r--r--icons/22-status-key-single.png (renamed from icons/hi22-status-key-single.png)bin877 -> 877 bytes
-rw-r--r--icons/32-actions-document-export-key.png (renamed from icons/hi32-actions-document-export-key.png)bin1565 -> 1565 bytes
-rw-r--r--icons/32-actions-document-import-key.png (renamed from icons/hi32-actions-document-import-key.png)bin4919 -> 4919 bytes
-rw-r--r--icons/32-actions-document-properties-key.png (renamed from icons/hi32-actions-document-properties-key.png)bin1676 -> 1676 bytes
-rw-r--r--icons/32-status-key-group.png (renamed from icons/hi32-status-key-group.png)bin2029 -> 2029 bytes
-rw-r--r--icons/32-status-key-pair.png (renamed from icons/hi32-status-key-pair.png)bin1576 -> 1576 bytes
-rw-r--r--icons/32-status-key-single.png (renamed from icons/hi32-status-key-single.png)bin1307 -> 1307 bytes
-rw-r--r--icons/48-actions-document-export-key.png (renamed from icons/hi48-actions-document-export-key.png)bin2513 -> 2513 bytes
-rw-r--r--icons/48-actions-document-import-key.png (renamed from icons/hi48-actions-document-import-key.png)bin9282 -> 9282 bytes
-rw-r--r--icons/48-actions-document-properties-key.png (renamed from icons/hi48-actions-document-properties-key.png)bin2813 -> 2813 bytes
-rw-r--r--icons/48-status-key-group.png (renamed from icons/hi48-status-key-group.png)bin3297 -> 3297 bytes
-rw-r--r--icons/48-status-key-pair.png (renamed from icons/hi48-status-key-pair.png)bin2456 -> 2456 bytes
-rw-r--r--icons/48-status-key-single.png (renamed from icons/hi48-status-key-single.png)bin2060 -> 2060 bytes
-rw-r--r--icons/CMakeLists.txt38
-rw-r--r--icons/sc-actions-document-export-key.svgz (renamed from icons/hisc-actions-document-export-key.svgz)bin20632 -> 20632 bytes
-rw-r--r--icons/sc-actions-document-import-key.svgz (renamed from icons/hisc-actions-document-import-key.svgz)bin20583 -> 20583 bytes
-rw-r--r--icons/sc-actions-document-properties-key.svgz (renamed from icons/hisc-actions-document-properties-key.svgz)bin66516 -> 66516 bytes
-rw-r--r--icons/sc-status-key-group.svgz (renamed from icons/hisc-status-key-group.svgz)bin63827 -> 63827 bytes
-rw-r--r--icons/sc-status-key-pair.svgz (renamed from icons/hisc-status-key-pair.svgz)bin62891 -> 62891 bytes
-rw-r--r--icons/sc-status-key-single.svgz (renamed from icons/hisc-status-key-single.svgz)bin28667 -> 28667 bytes
39 files changed, 47 insertions, 4 deletions
diff --git a/hi16-app-kgpg.png b/16-apps-kgpg.png
index 08528c8..08528c8 100644
--- a/hi16-app-kgpg.png
+++ b/16-apps-kgpg.png
Binary files differ
diff --git a/hi22-app-kgpg.png b/22-apps-kgpg.png
index 774e01c..774e01c 100644
--- a/hi22-app-kgpg.png
+++ b/22-apps-kgpg.png
Binary files differ
diff --git a/hi32-app-kgpg.png b/32-apps-kgpg.png
index 2b6ea26..2b6ea26 100644
--- a/hi32-app-kgpg.png
+++ b/32-apps-kgpg.png
Binary files differ
diff --git a/hi48-app-kgpg.png b/48-apps-kgpg.png
index 16f6cb1..16f6cb1 100644
--- a/hi48-app-kgpg.png
+++ b/48-apps-kgpg.png
Binary files differ
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 62bd155..9e9282e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -203,8 +203,8 @@ ki18n_wrap_ui(kgpg_SRCS
sourceselect.ui
)
-file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/hi*-app*-kgpg.png")
-# ecm_add_app_icon(kgpg_SRCS ICONS ${ICONS_SRCS})
+file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/*-apps-kgpg.png")
+ecm_add_app_icon(kgpg_SRCS ICONS ${ICONS_SRCS})
kconfig_add_kcfg_files(kgpg_SRCS kgpgsettings.kcfgc )
@@ -245,6 +245,13 @@ install( FILES encryptfile.desktop encryptfolder.desktop viewdecrypted.desktop D
${SERVICES_INSTALL_DIR}/ServiceMenus)
install( FILES org.kde.kgpg.Key.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
-ecm_install_icons( ${ICON_INSTALL_DIR} )
+ecm_install_icons(ICONS
+ 16-apps-kgpg.png
+ 22-apps-kgpg.png
+ 32-apps-kgpg.png
+ 48-apps-kgpg.png
+ DESTINATION ${KDE_INSTALL_ICONDIR}
+ THEME hicolor
+)
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/icons/hi16-actions-document-export-key.png b/icons/16-actions-document-export-key.png
index 15d2c3a..15d2c3a 100644
--- a/icons/hi16-actions-document-export-key.png
+++ b/icons/16-actions-document-export-key.png
Binary files differ
diff --git a/icons/hi16-actions-document-import-key.png b/icons/16-actions-document-import-key.png
index 4034732..4034732 100644
--- a/icons/hi16-actions-document-import-key.png
+++ b/icons/16-actions-document-import-key.png
Binary files differ
diff --git a/icons/hi16-actions-document-properties-key.png b/icons/16-actions-document-properties-key.png
index 0846895..0846895 100644
--- a/icons/hi16-actions-document-properties-key.png
+++ b/icons/16-actions-document-properties-key.png
Binary files differ
diff --git a/icons/hi16-status-key-group.png b/icons/16-status-key-group.png
index a46ee9e..a46ee9e 100644
--- a/icons/hi16-status-key-group.png
+++ b/icons/16-status-key-group.png
Binary files differ
diff --git a/icons/hi16-status-key-orphan.png b/icons/16-status-key-orphan.png
index 99a62d8..99a62d8 100644
--- a/icons/hi16-status-key-orphan.png
+++ b/icons/16-status-key-orphan.png
Binary files differ
diff --git a/icons/hi16-status-key-pair.png b/icons/16-status-key-pair.png
index d473e38..d473e38 100644
--- a/icons/hi16-status-key-pair.png
+++ b/icons/16-status-key-pair.png
Binary files differ
diff --git a/icons/hi16-status-key-single.png b/icons/16-status-key-single.png
index d1fae6d..d1fae6d 100644
--- a/icons/hi16-status-key-single.png
+++ b/icons/16-status-key-single.png
Binary files differ
diff --git a/icons/hi22-actions-document-export-key.png b/icons/22-actions-document-export-key.png
index fa05029..fa05029 100644
--- a/icons/hi22-actions-document-export-key.png
+++ b/icons/22-actions-document-export-key.png
Binary files differ
diff --git a/icons/hi22-actions-document-import-key.png b/icons/22-actions-document-import-key.png
index 8a4a306..8a4a306 100644
--- a/icons/hi22-actions-document-import-key.png
+++ b/icons/22-actions-document-import-key.png
Binary files differ
diff --git a/icons/hi22-actions-document-properties-key.png b/icons/22-actions-document-properties-key.png
index 2410bb5..2410bb5 100644
--- a/icons/hi22-actions-document-properties-key.png
+++ b/icons/22-actions-document-properties-key.png
Binary files differ
diff --git a/icons/hi22-action-key-generate-pair.png b/icons/22-actions-key-generate-pair.png
index 9b056ab..9b056ab 100644
--- a/icons/hi22-action-key-generate-pair.png
+++ b/icons/22-actions-key-generate-pair.png
Binary files differ
diff --git a/icons/hi22-action-view-key-secret.png b/icons/22-actions-view-key-secret.png
index 44e1059..44e1059 100644
--- a/icons/hi22-action-view-key-secret.png
+++ b/icons/22-actions-view-key-secret.png
Binary files differ
diff --git a/icons/hi22-status-key-group.png b/icons/22-status-key-group.png
index 8afd1fe..8afd1fe 100644
--- a/icons/hi22-status-key-group.png
+++ b/icons/22-status-key-group.png
Binary files differ
diff --git a/icons/hi22-status-key-pair.png b/icons/22-status-key-pair.png
index 877821c..877821c 100644
--- a/icons/hi22-status-key-pair.png
+++ b/icons/22-status-key-pair.png
Binary files differ
diff --git a/icons/hi22-status-key-single.png b/icons/22-status-key-single.png
index 954d5fd..954d5fd 100644
--- a/icons/hi22-status-key-single.png
+++ b/icons/22-status-key-single.png
Binary files differ
diff --git a/icons/hi32-actions-document-export-key.png b/icons/32-actions-document-export-key.png
index be5fd6c..be5fd6c 100644
--- a/icons/hi32-actions-document-export-key.png
+++ b/icons/32-actions-document-export-key.png
Binary files differ
diff --git a/icons/hi32-actions-document-import-key.png b/icons/32-actions-document-import-key.png
index a835d5d..a835d5d 100644
--- a/icons/hi32-actions-document-import-key.png
+++ b/icons/32-actions-document-import-key.png
Binary files differ
diff --git a/icons/hi32-actions-document-properties-key.png b/icons/32-actions-document-properties-key.png
index a3dfe76..a3dfe76 100644
--- a/icons/hi32-actions-document-properties-key.png
+++ b/icons/32-actions-document-properties-key.png
Binary files differ
diff --git a/icons/hi32-status-key-group.png b/icons/32-status-key-group.png
index 067f275..067f275 100644
--- a/icons/hi32-status-key-group.png
+++ b/icons/32-status-key-group.png
Binary files differ
diff --git a/icons/hi32-status-key-pair.png b/icons/32-status-key-pair.png
index 91b4b58..91b4b58 100644
--- a/icons/hi32-status-key-pair.png
+++ b/icons/32-status-key-pair.png
Binary files differ
diff --git a/icons/hi32-status-key-single.png b/icons/32-status-key-single.png
index 41a59db..41a59db 100644
--- a/icons/hi32-status-key-single.png
+++ b/icons/32-status-key-single.png
Binary files differ
diff --git a/icons/hi48-actions-document-export-key.png b/icons/48-actions-document-export-key.png
index 9caefbf..9caefbf 100644
--- a/icons/hi48-actions-document-export-key.png
+++ b/icons/48-actions-document-export-key.png
Binary files differ
diff --git a/icons/hi48-actions-document-import-key.png b/icons/48-actions-document-import-key.png
index 3886760..3886760 100644
--- a/icons/hi48-actions-document-import-key.png
+++ b/icons/48-actions-document-import-key.png
Binary files differ
diff --git a/icons/hi48-actions-document-properties-key.png b/icons/48-actions-document-properties-key.png
index c37c7d7..c37c7d7 100644
--- a/icons/hi48-actions-document-properties-key.png
+++ b/icons/48-actions-document-properties-key.png
Binary files differ
diff --git a/icons/hi48-status-key-group.png b/icons/48-status-key-group.png
index cf2cbeb..cf2cbeb 100644
--- a/icons/hi48-status-key-group.png
+++ b/icons/48-status-key-group.png
Binary files differ
diff --git a/icons/hi48-status-key-pair.png b/icons/48-status-key-pair.png
index 0c21af7..0c21af7 100644
--- a/icons/hi48-status-key-pair.png
+++ b/icons/48-status-key-pair.png
Binary files differ
diff --git a/icons/hi48-status-key-single.png b/icons/48-status-key-single.png
index c564a32..c564a32 100644
--- a/icons/hi48-status-key-single.png
+++ b/icons/48-status-key-single.png
Binary files differ
diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index 1477f4e..da3bce7 100644
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -1 +1,37 @@
-ecm_install_icons( ${DATA_INSTALL_DIR}/kgpg/icons )
+ecm_install_icons(ICONS
+ 16-actions-document-export-key.png
+ 16-actions-document-import-key.png
+ 16-actions-document-properties-key.png
+ 16-status-key-group.png
+ 16-status-key-orphan.png
+ 16-status-key-pair.png
+ 16-status-key-single.png
+ 22-actions-key-generate-pair.png
+ 22-actions-view-key-secret.png
+ 22-actions-document-export-key.png
+ 22-actions-document-import-key.png
+ 22-actions-document-properties-key.png
+ 22-status-key-group.png
+ 22-status-key-pair.png
+ 22-status-key-single.png
+ 32-actions-document-export-key.png
+ 32-actions-document-import-key.png
+ 32-actions-document-properties-key.png
+ 32-status-key-group.png
+ 32-status-key-pair.png
+ 32-status-key-single.png
+ 48-actions-document-export-key.png
+ 48-actions-document-import-key.png
+ 48-actions-document-properties-key.png
+ 48-status-key-group.png
+ 48-status-key-pair.png
+ 48-status-key-single.png
+ sc-actions-document-export-key.svgz
+ sc-actions-document-import-key.svgz
+ sc-actions-document-properties-key.svgz
+ sc-status-key-group.svgz
+ sc-status-key-pair.svgz
+ sc-status-key-single.svgz
+ DESTINATION ${KDE_INSTALL_ICONDIR}
+ THEME hicolor
+)
diff --git a/icons/hisc-actions-document-export-key.svgz b/icons/sc-actions-document-export-key.svgz
index 3f05ae2..3f05ae2 100644
--- a/icons/hisc-actions-document-export-key.svgz
+++ b/icons/sc-actions-document-export-key.svgz
Binary files differ
diff --git a/icons/hisc-actions-document-import-key.svgz b/icons/sc-actions-document-import-key.svgz
index d3ea6fe..d3ea6fe 100644
--- a/icons/hisc-actions-document-import-key.svgz
+++ b/icons/sc-actions-document-import-key.svgz
Binary files differ
diff --git a/icons/hisc-actions-document-properties-key.svgz b/icons/sc-actions-document-properties-key.svgz
index c8f9c25..c8f9c25 100644
--- a/icons/hisc-actions-document-properties-key.svgz
+++ b/icons/sc-actions-document-properties-key.svgz
Binary files differ
diff --git a/icons/hisc-status-key-group.svgz b/icons/sc-status-key-group.svgz
index 80b0d98..80b0d98 100644
--- a/icons/hisc-status-key-group.svgz
+++ b/icons/sc-status-key-group.svgz
Binary files differ
diff --git a/icons/hisc-status-key-pair.svgz b/icons/sc-status-key-pair.svgz
index 40fe025..40fe025 100644
--- a/icons/hisc-status-key-pair.svgz
+++ b/icons/sc-status-key-pair.svgz
Binary files differ
diff --git a/icons/hisc-status-key-single.svgz b/icons/sc-status-key-single.svgz
index ffaa5ca..ffaa5ca 100644
--- a/icons/hisc-status-key-single.svgz
+++ b/icons/sc-status-key-single.svgz
Binary files differ