data: Change icons

 - Rename the 256x256 icon
 - Provide 64x64 versions

Fixes #6

12 files changed, 21 insertions, 24 deletions

diff --git a/data/gupnp-network-light.desktop.in b/data/gupnp-network-light.desktop.in
index a91e4cc..d9fa071 100644
--- a/data/gupnp-network-light.desktop.in
+++ b/data/gupnp-network-light.desktop.in
@@ -5,7 +5,7 @@ Comment=Sample UPnP application for controlling lights
 Categories=GTK;Development;
 Exec=gupnp-network-light
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=network-light-256x256
+Icon=network-light
 Terminal=false
 Type=Application
 StartupNotify=true
diff --git a/data/meson.build b/data/meson.build
index 1b7c352..81e8b24 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -7,25 +7,22 @@ endif
 didl_dialog_ui = configure_file(input: 'didl-lite-dialog.ui.in', output: 'didl-lite-dialog.ui', configuration : didl_dialog_data)
 
 install_data(['xml/Dimming-scpd.xml', 'xml/network-light-desc.xml', 'xml/SwitchPower-scpd.xml'], install_dir : join_paths(shareddir, 'xml'))
-install_data(['pixmaps/av-cp.png',
-              'pixmaps/media-renderer.png',
-              'pixmaps/network-light-22x22.png',
-              'pixmaps/network-light-256x256.png',
-              'pixmaps/network-light-off.png',
-              'pixmaps/network-light-on.png',
-              'pixmaps/universal-cp.png',
-              'pixmaps/upnp-action-arg-in.png',
-              'pixmaps/upnp-action-arg-out.png',
-              'pixmaps/upnp-device.png',
-              'pixmaps/upnp-service.png',
-              'pixmaps/upnp-state-variable.png'], install_dir : join_paths(shareddir, 'pixmaps'))
-
-install_data([
-              'pixmaps/network-light-256x256.png',
-              'pixmaps/universal-cp.png',
-              'pixmaps/av-cp.png'],
-              install_dir : join_paths(get_option('datadir'), 'icons', 'hicolor', '256x256', 'apps'))
-
+install_data(
+    [
+        'pixmaps/media-renderer.png',
+        'pixmaps/network-light-22x22.png',
+        'pixmaps/network-light-off.png',
+        'pixmaps/network-light-on.png',
+        'pixmaps/upnp-action-arg-in.png',
+        'pixmaps/upnp-action-arg-out.png',
+        'pixmaps/upnp-device.png',
+        'pixmaps/upnp-service.png',
+        'pixmaps/upnp-state-variable.png'
+    ],
+    install_dir : join_paths(shareddir, 'pixmaps')
+)
+
+install_subdir('pixmaps/hicolor', install_dir : join_paths(get_option('datadir'), 'icons'))
 
 desktop_conf = configuration_data()
 desktop_conf.set('PKGDATADIR', shareddir)
diff --git a/data/org.gupnp.Tools.Common.gresource.xml b/data/org.gupnp.Tools.Common.gresource.xml
index 88a4c95..f8af93e 100644
--- a/data/org.gupnp.Tools.Common.gresource.xml
+++ b/data/org.gupnp.Tools.Common.gresource.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
     <gresource prefix='/org/gupnp/Tools/Common'>
-        <file>pixmaps/av-cp.png</file>
+        <file alias="pixmaps/av-cp.png">pixmaps/hicolor/256x256/apps/av-cp.png</file>
         <file>pixmaps/media-renderer.png</file>
         <file>pixmaps/upnp-action-arg-in.png</file>
         <file>pixmaps/upnp-action-arg-out.png</file>
diff --git a/data/org.gupnp.Tools.Network-Light.gresource.xml b/data/org.gupnp.Tools.Network-Light.gresource.xml
index 70f1851..c56426b 100644
--- a/data/org.gupnp.Tools.Network-Light.gresource.xml
+++ b/data/org.gupnp.Tools.Network-Light.gresource.xml
@@ -2,7 +2,7 @@
 <gresources>
     <gresource prefix='/org/gupnp/Tools/Network-Light'>
         <file preprocess='xml-stripblanks'>gupnp-network-light.ui</file>
-        <file>pixmaps/network-light-256x256.png</file>
+        <file alias="pixmaps/network-light.png">pixmaps/hicolor/256x256/apps/network-light.png</file>
         <file>pixmaps/network-light-on.png</file>
         <file>pixmaps/network-light-off.png</file>
    </gresource>
diff --git a/data/org.gupnp.Tools.Universal-CP.gresource.xml b/data/org.gupnp.Tools.Universal-CP.gresource.xml
index 6d0bf62..c7eec76 100644
--- a/data/org.gupnp.Tools.Universal-CP.gresource.xml
+++ b/data/org.gupnp.Tools.Universal-CP.gresource.xml
@@ -2,6 +2,6 @@
 <gresources>
     <gresource prefix='/org/gupnp/Tools/Universal-CP'>
         <file preprocess='xml-stripblanks'>gupnp-universal-cp.ui</file>
-        <file>pixmaps/universal-cp.png</file>
+        <file alias="pixmaps/universal-cp.png">pixmaps/hicolor/256x256/apps/universal-cp.png</file>
    </gresource>
 </gresources>
diff --git a/data/pixmaps/av-cp.png b/data/pixmaps/hicolor/256x256/apps/av-cp.png
index 9670410..9670410 100644
--- a/data/pixmaps/av-cp.png
+++ b/data/pixmaps/hicolor/256x256/apps/av-cp.png
diff --git a/data/pixmaps/network-light-256x256.png b/data/pixmaps/hicolor/256x256/apps/network-light.png
index 60d6f48..60d6f48 100644
--- a/data/pixmaps/network-light-256x256.png
+++ b/data/pixmaps/hicolor/256x256/apps/network-light.png
diff --git a/data/pixmaps/universal-cp.png b/data/pixmaps/hicolor/256x256/apps/universal-cp.png
index 28680b4..28680b4 100644
--- a/data/pixmaps/universal-cp.png
+++ b/data/pixmaps/hicolor/256x256/apps/universal-cp.png
diff --git a/data/pixmaps/hicolor/64x64/apps/av-cp.png b/data/pixmaps/hicolor/64x64/apps/av-cp.png
new file mode 100644
index 0000000..4912a21
--- /dev/null
+++ b/data/pixmaps/hicolor/64x64/apps/av-cp.png
diff --git a/data/pixmaps/hicolor/64x64/apps/network-light.png b/data/pixmaps/hicolor/64x64/apps/network-light.png
new file mode 100644
index 0000000..83ae315
--- /dev/null
+++ b/data/pixmaps/hicolor/64x64/apps/network-light.png
diff --git a/data/pixmaps/hicolor/64x64/apps/universal-cp.png b/data/pixmaps/hicolor/64x64/apps/universal-cp.png
new file mode 100644
index 0000000..b33f3a0
--- /dev/null
+++ b/data/pixmaps/hicolor/64x64/apps/universal-cp.png
diff --git a/src/network-light/gui.c b/src/network-light/gui.c
index 3eea8d8..b15d366 100644
--- a/src/network-light/gui.c
+++ b/src/network-light/gui.c
@@ -31,7 +31,7 @@
 #include "main.h"
 
 #define UI_FILE   "/org/gupnp/Tools/Network-Light/gupnp-network-light.ui"
-#define ICON_FILE "/org/gupnp/Tools/Network-Light/pixmaps/network-light-256x256.png"
+#define ICON_FILE "/org/gupnp/Tools/Network-Light/pixmaps/network-light.png"
 #define OFF_FILE  "/org/gupnp/Tools/Network-Light/pixmaps/network-light-off.png"
 #define ON_FILE   "/org/gupnp/Tools/Network-Light/pixmaps/network-light-on.png"