[geany/geany] b80c8c: Fix custom icons on Windows

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Mon, 14 Jan 2013 18:42:03 UTC
Commit:      b80c8cd2a98b2623a85f36d5b28f55abf2e82a92
             https://github.com/geany/geany/commit/b80c8cd2a98b2623a85f36d5b28f55abf2e82a92

Log Message:
-----------
Fix custom icons on Windows

Install all icons on Windows, as well as a theme index because the
system doesn't have one and one is required.

Also install the theme index on non-Windows, although it shouldn't
be necessary because the system is likely to provide one.


Modified Paths:
--------------
    icons/Makefile.am
    icons/index.theme
    icons/tango/Makefile.am
    icons/tango/index.theme
    wscript

Modified: icons/Makefile.am
5 files changed, 4 insertions(+), 1 deletions(-)
===================================================================
@@ -1,6 +1,9 @@
 SUBDIRS =  16x16 24x24 32x32 48x48 scalable tango
 
-EXTRA_DIST = geany.ico
+iconsdir = $(datadir)/icons/hicolor
+
+dist_icons_DATA = index.theme
+dist_noinst_DATA = geany.ico
 
 gtk_update_icon_cache = gtk-update-icon-cache -f -t
 


Modified: icons/index.theme
60 files changed, 60 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,60 @@
+[Icon Theme]
+Name=Hicolor
+Comment=Fallback icon theme
+Hidden=true
+Directories=16x16/actions,16x16/apps,24x24/actions,24x24/apps,32x32/actions,32x32/apps,48x48/actions,48x48/apps,scalable/actions,scalable/apps
+
+
+[16x16/actions]
+Size=16
+Context=Actions
+Type=Threshold
+
+[16x16/apps]
+Size=16
+Context=Applications
+Type=Threshold
+
+[24x24/actions]
+Size=24
+Context=Actions
+Type=Threshold
+
+[24x24/apps]
+Size=24
+Context=Applications
+Type=Threshold
+
+[32x32/actions]
+Size=32
+Context=Actions
+Type=Threshold
+
+[32x32/apps]
+Size=32
+Context=Applications
+Type=Threshold
+
+[48x48/actions]
+Size=48
+Context=Actions
+Type=Threshold
+
+[48x48/apps]
+Size=48
+Context=Applications
+Type=Threshold
+
+[scalable/actions]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Actions
+Type=Scalable
+
+[scalable/apps]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Applications
+Type=Scalable


Modified: icons/tango/Makefile.am
4 files changed, 4 insertions(+), 0 deletions(-)
===================================================================
@@ -1 +1,5 @@
 SUBDIRS = 16x16 24x24 32x32 48x48 scalable
+
+iconsdir = $(datadir)/icons/Tango
+
+dist_icons_DATA = index.theme


Modified: icons/tango/index.theme
33 files changed, 33 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,33 @@
+[Icon Theme]
+Name=Tango
+Comment=Tango Icon Theme
+Inherits=gnome,crystalsvg
+Directories=16x16/actions,24x24/actions,32x32/actions,48x48/actions,scalable/actions
+
+
+[16x16/actions]
+Size=16
+Context=Actions
+Type=Threshold
+
+[24x24/actions]
+Size=24
+Context=Actions
+Type=Threshold
+
+[32x32/actions]
+Size=32
+Context=Actions
+Type=Threshold
+
+[48x48/actions]
+Size=48
+Context=Actions
+Type=Threshold
+
+[scalable/actions]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Actions
+Type=Scalable


Modified: wscript
7 files changed, 3 insertions(+), 4 deletions(-)
===================================================================
@@ -135,6 +135,7 @@ geany_sources = set([
     'src/ui_utils.c', 'src/utils.c'])
 
 geany_icons = {
+    'hicolor':                  ['index.theme'],
     'hicolor/16x16/apps':       ['16x16/classviewer-class.png',
                                  '16x16/classviewer-macro.png',
                                  '16x16/classviewer-member.png',
@@ -161,6 +162,7 @@ geany_icons = {
     'hicolor/scalable/actions': ['scalable/geany-build.svg',
                                  'scalable/geany-close-all.svg',
                                  'scalable/geany-save-all.svg'],
+    'Tango':                    ['tango/index.theme'],
     'Tango/16x16/actions':      ['tango/16x16/geany-save-all.png'],
     'Tango/24x24/actions':      ['tango/24x24/geany-save-all.png'],
     'Tango/32x32/actions':      ['tango/32x32/geany-save-all.png'],
@@ -530,10 +532,7 @@ def build(bld):
     bld.install_files(template_dest, start_dir.ant_glob('**/*'), cwd=start_dir, relative_trick=True)
     # Icons
     for dest in geany_icons:
-        if is_win32 and dest != 'hicolor/16x16/apps':
-            continue
-
-        dest_dir = '${PREFIX}/share/icons' if is_win32 else os.path.join('${DATADIR}/icons/', dest)
+        dest_dir = os.path.join('${PREFIX}/share/icons' if is_win32 else '${DATADIR}/icons', dest)
         bld.install_files(dest_dir, geany_icons[dest], cwd=bld.path.find_dir('icons'))
 
 



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).