[gnome-disk-utility] Add HighContrast icons

[David Zeuthen <davidz src gnome org>]

commit 700bb75e8c193b9da7abf4c314bbb3b817b9d848
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Feb 12 17:48:15 2013 -0500

    Add HighContrast icons
    
    https://bugzilla.gnome.org/show_bug.cgi?id=687304
    
    Signed-off-by: David Zeuthen <zeuthen gmail com>

 configure.ac                                       |   22 +++++++++++++------
 data/icons/{ => HighContrast}/16x16/Makefile.am    |    2 +-
 data/icons/HighContrast/16x16/gnome-disks.png      |  Bin 0 -> 493 bytes
 .../{16x16 => HighContrast/22x22}/Makefile.am      |    2 +-
 data/icons/HighContrast/22x22/gnome-disks.png      |  Bin 0 -> 655 bytes
 .../{32x32 => HighContrast/24x24}/Makefile.am      |    2 +-
 data/icons/HighContrast/24x24/gnome-disks.png      |  Bin 0 -> 694 bytes
 .../{32x32 => HighContrast/256x256}/Makefile.am    |    2 +-
 data/icons/HighContrast/256x256/gnome-disks.png    |  Bin 0 -> 4909 bytes
 data/icons/{ => HighContrast}/32x32/Makefile.am    |    2 +-
 data/icons/HighContrast/32x32/gnome-disks.png      |  Bin 0 -> 858 bytes
 .../{32x32 => HighContrast/48x48}/Makefile.am      |    2 +-
 data/icons/HighContrast/48x48/gnome-disks.png      |  Bin 0 -> 1256 bytes
 data/icons/HighContrast/Makefile.am                |   16 ++++++++++++++
 data/icons/Makefile.am                             |   17 +--------------
 data/icons/{ => hicolor}/16x16/Makefile.am         |    0
 data/icons/{ => hicolor}/16x16/gnome-disks.png     |  Bin 1090 -> 1090 bytes
 data/icons/{ => hicolor}/22x22/Makefile.am         |    0
 data/icons/{ => hicolor}/22x22/gnome-disks.png     |  Bin 1548 -> 1548 bytes
 data/icons/{ => hicolor}/24x24/Makefile.am         |    0
 data/icons/{ => hicolor}/24x24/gnome-disks.png     |  Bin 1578 -> 1578 bytes
 data/icons/{ => hicolor}/256x256/Makefile.am       |    0
 data/icons/{ => hicolor}/256x256/gnome-disks.png   |  Bin 42032 -> 42032 bytes
 data/icons/{ => hicolor}/32x32/Makefile.am         |    0
 data/icons/{ => hicolor}/32x32/gnome-disks.png     |  Bin 2334 -> 2334 bytes
 data/icons/{ => hicolor}/48x48/Makefile.am         |    0
 data/icons/{ => hicolor}/48x48/gnome-disks.png     |  Bin 3644 -> 3644 bytes
 data/icons/hicolor/Makefile.am                     |   16 ++++++++++++++
 data/icons/{ => hicolor}/scalable/Makefile.am      |    0
 .../gnome-disks-state-standby-symbolic.svg         |    0
 data/icons/{ => hicolor}/src/gnome-disks.svg       |    0
 31 files changed, 54 insertions(+), 29 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2cbaedc..7ad6f39 100644
--- a/configure.ac
+++ b/configure.ac
@@ -169,13 +169,21 @@ src/notify/Makefile
 po/Makefile.in
 data/Makefile
 data/icons/Makefile
-data/icons/16x16/Makefile
-data/icons/22x22/Makefile
-data/icons/24x24/Makefile
-data/icons/32x32/Makefile
-data/icons/48x48/Makefile
-data/icons/256x256/Makefile
-data/icons/scalable/Makefile
+data/icons/hicolor/Makefile
+data/icons/hicolor/16x16/Makefile
+data/icons/hicolor/22x22/Makefile
+data/icons/hicolor/24x24/Makefile
+data/icons/hicolor/32x32/Makefile
+data/icons/hicolor/48x48/Makefile
+data/icons/hicolor/256x256/Makefile
+data/icons/hicolor/scalable/Makefile
+data/icons/HighContrast/Makefile
+data/icons/HighContrast/16x16/Makefile
+data/icons/HighContrast/22x22/Makefile
+data/icons/HighContrast/24x24/Makefile
+data/icons/HighContrast/32x32/Makefile
+data/icons/HighContrast/48x48/Makefile
+data/icons/HighContrast/256x256/Makefile
 data/org.gnome.Disks.gschema.xml.in
 data/org.gnome.settings-daemon.plugins.gdu-sd.gschema.xml.in
 data/ui/Makefile
diff --git a/data/icons/16x16/Makefile.am b/data/icons/HighContrast/16x16/Makefile.am
similarity index 68%
copy from data/icons/16x16/Makefile.am
copy to data/icons/HighContrast/16x16/Makefile.am
index 254ddcd..b92552b 100644
--- a/data/icons/16x16/Makefile.am
+++ b/data/icons/HighContrast/16x16/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-icondir = $(datadir)/icons/hicolor/16x16/apps
+icondir = $(datadir)/icons/HighContrast/16x16/apps
 icon_DATA =                            \
        gnome-disks.png                 \
        $(NULL)
diff --git a/data/icons/HighContrast/16x16/gnome-disks.png b/data/icons/HighContrast/16x16/gnome-disks.png
new file mode 100644
index 0000000..8d00eab
Binary files /dev/null and b/data/icons/HighContrast/16x16/gnome-disks.png differ
diff --git a/data/icons/16x16/Makefile.am b/data/icons/HighContrast/22x22/Makefile.am
similarity index 68%
copy from data/icons/16x16/Makefile.am
copy to data/icons/HighContrast/22x22/Makefile.am
index 254ddcd..74fde0b 100644
--- a/data/icons/16x16/Makefile.am
+++ b/data/icons/HighContrast/22x22/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-icondir = $(datadir)/icons/hicolor/16x16/apps
+icondir = $(datadir)/icons/HighContrast/22x22/apps
 icon_DATA =                            \
        gnome-disks.png                 \
        $(NULL)
diff --git a/data/icons/HighContrast/22x22/gnome-disks.png b/data/icons/HighContrast/22x22/gnome-disks.png
new file mode 100644
index 0000000..9f048c6
Binary files /dev/null and b/data/icons/HighContrast/22x22/gnome-disks.png differ
diff --git a/data/icons/32x32/Makefile.am b/data/icons/HighContrast/24x24/Makefile.am
similarity index 68%
copy from data/icons/32x32/Makefile.am
copy to data/icons/HighContrast/24x24/Makefile.am
index 34f689a..cceded6 100644
--- a/data/icons/32x32/Makefile.am
+++ b/data/icons/HighContrast/24x24/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-icondir = $(datadir)/icons/hicolor/32x32/apps
+icondir = $(datadir)/icons/HighContrast/24x24/apps
 icon_DATA =                            \
        gnome-disks.png                 \
        $(NULL)
diff --git a/data/icons/HighContrast/24x24/gnome-disks.png b/data/icons/HighContrast/24x24/gnome-disks.png
new file mode 100644
index 0000000..b2df877
Binary files /dev/null and b/data/icons/HighContrast/24x24/gnome-disks.png differ
diff --git a/data/icons/32x32/Makefile.am b/data/icons/HighContrast/256x256/Makefile.am
similarity index 67%
copy from data/icons/32x32/Makefile.am
copy to data/icons/HighContrast/256x256/Makefile.am
index 34f689a..829e406 100644
--- a/data/icons/32x32/Makefile.am
+++ b/data/icons/HighContrast/256x256/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-icondir = $(datadir)/icons/hicolor/32x32/apps
+icondir = $(datadir)/icons/HighContrast/256x256/apps
 icon_DATA =                            \
        gnome-disks.png                 \
        $(NULL)
diff --git a/data/icons/HighContrast/256x256/gnome-disks.png b/data/icons/HighContrast/256x256/gnome-disks.png
new file mode 100644
index 0000000..ed12220
Binary files /dev/null and b/data/icons/HighContrast/256x256/gnome-disks.png differ
diff --git a/data/icons/32x32/Makefile.am b/data/icons/HighContrast/32x32/Makefile.am
similarity index 68%
copy from data/icons/32x32/Makefile.am
copy to data/icons/HighContrast/32x32/Makefile.am
index 34f689a..761c368 100644
--- a/data/icons/32x32/Makefile.am
+++ b/data/icons/HighContrast/32x32/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-icondir = $(datadir)/icons/hicolor/32x32/apps
+icondir = $(datadir)/icons/HighContrast/32x32/apps
 icon_DATA =                            \
        gnome-disks.png                 \
        $(NULL)
diff --git a/data/icons/HighContrast/32x32/gnome-disks.png b/data/icons/HighContrast/32x32/gnome-disks.png
new file mode 100644
index 0000000..cb3e4d7
Binary files /dev/null and b/data/icons/HighContrast/32x32/gnome-disks.png differ
diff --git a/data/icons/32x32/Makefile.am b/data/icons/HighContrast/48x48/Makefile.am
similarity index 68%
copy from data/icons/32x32/Makefile.am
copy to data/icons/HighContrast/48x48/Makefile.am
index 34f689a..35398e6 100644
--- a/data/icons/32x32/Makefile.am
+++ b/data/icons/HighContrast/48x48/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-icondir = $(datadir)/icons/hicolor/32x32/apps
+icondir = $(datadir)/icons/HighContrast/48x48/apps
 icon_DATA =                            \
        gnome-disks.png                 \
        $(NULL)
diff --git a/data/icons/HighContrast/48x48/gnome-disks.png b/data/icons/HighContrast/48x48/gnome-disks.png
new file mode 100644
index 0000000..3dc55b4
Binary files /dev/null and b/data/icons/HighContrast/48x48/gnome-disks.png differ
diff --git a/data/icons/HighContrast/Makefile.am b/data/icons/HighContrast/Makefile.am
new file mode 100644
index 0000000..86f8604
--- /dev/null
+++ b/data/icons/HighContrast/Makefile.am
@@ -0,0 +1,16 @@
+
+SUBDIRS = 16x16 22x22 24x24 32x32 48x48 256x256
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/HighContrast
+
+install-data-hook:
+       @-if test -z "$(DESTDIR)"; then \
+               echo "Updating Gtk icon cache."; \
+               $(gtk_update_icon_cache); \
+       else \
+               echo "*** Icon cache not updated.  After install, run this:"; \
+               echo "***   $(gtk_update_icon_cache)"; \
+       fi
+
+clean-local :
+       rm -f *~
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 361deab..658356b 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,16 +1 @@
-
-SUBDIRS = 16x16 22x22 24x24 32x32 48x48 256x256 scalable
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-
-install-data-hook:
-       @-if test -z "$(DESTDIR)"; then \
-               echo "Updating Gtk icon cache."; \
-               $(gtk_update_icon_cache); \
-       else \
-               echo "*** Icon cache not updated.  After install, run this:"; \
-               echo "***   $(gtk_update_icon_cache)"; \
-       fi
-
-clean-local :
-       rm -f *~
+SUBDIRS = hicolor
diff --git a/data/icons/16x16/Makefile.am b/data/icons/hicolor/16x16/Makefile.am
similarity index 100%
rename from data/icons/16x16/Makefile.am
rename to data/icons/hicolor/16x16/Makefile.am
diff --git a/data/icons/16x16/gnome-disks.png b/data/icons/hicolor/16x16/gnome-disks.png
similarity index 100%
rename from data/icons/16x16/gnome-disks.png
rename to data/icons/hicolor/16x16/gnome-disks.png
diff --git a/data/icons/22x22/Makefile.am b/data/icons/hicolor/22x22/Makefile.am
similarity index 100%
rename from data/icons/22x22/Makefile.am
rename to data/icons/hicolor/22x22/Makefile.am
diff --git a/data/icons/22x22/gnome-disks.png b/data/icons/hicolor/22x22/gnome-disks.png
similarity index 100%
rename from data/icons/22x22/gnome-disks.png
rename to data/icons/hicolor/22x22/gnome-disks.png
diff --git a/data/icons/24x24/Makefile.am b/data/icons/hicolor/24x24/Makefile.am
similarity index 100%
rename from data/icons/24x24/Makefile.am
rename to data/icons/hicolor/24x24/Makefile.am
diff --git a/data/icons/24x24/gnome-disks.png b/data/icons/hicolor/24x24/gnome-disks.png
similarity index 100%
rename from data/icons/24x24/gnome-disks.png
rename to data/icons/hicolor/24x24/gnome-disks.png
diff --git a/data/icons/256x256/Makefile.am b/data/icons/hicolor/256x256/Makefile.am
similarity index 100%
rename from data/icons/256x256/Makefile.am
rename to data/icons/hicolor/256x256/Makefile.am
diff --git a/data/icons/256x256/gnome-disks.png b/data/icons/hicolor/256x256/gnome-disks.png
similarity index 100%
rename from data/icons/256x256/gnome-disks.png
rename to data/icons/hicolor/256x256/gnome-disks.png
diff --git a/data/icons/32x32/Makefile.am b/data/icons/hicolor/32x32/Makefile.am
similarity index 100%
rename from data/icons/32x32/Makefile.am
rename to data/icons/hicolor/32x32/Makefile.am
diff --git a/data/icons/32x32/gnome-disks.png b/data/icons/hicolor/32x32/gnome-disks.png
similarity index 100%
rename from data/icons/32x32/gnome-disks.png
rename to data/icons/hicolor/32x32/gnome-disks.png
diff --git a/data/icons/48x48/Makefile.am b/data/icons/hicolor/48x48/Makefile.am
similarity index 100%
rename from data/icons/48x48/Makefile.am
rename to data/icons/hicolor/48x48/Makefile.am
diff --git a/data/icons/48x48/gnome-disks.png b/data/icons/hicolor/48x48/gnome-disks.png
similarity index 100%
rename from data/icons/48x48/gnome-disks.png
rename to data/icons/hicolor/48x48/gnome-disks.png
diff --git a/data/icons/hicolor/Makefile.am b/data/icons/hicolor/Makefile.am
new file mode 100644
index 0000000..361deab
--- /dev/null
+++ b/data/icons/hicolor/Makefile.am
@@ -0,0 +1,16 @@
+
+SUBDIRS = 16x16 22x22 24x24 32x32 48x48 256x256 scalable
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook:
+       @-if test -z "$(DESTDIR)"; then \
+               echo "Updating Gtk icon cache."; \
+               $(gtk_update_icon_cache); \
+       else \
+               echo "*** Icon cache not updated.  After install, run this:"; \
+               echo "***   $(gtk_update_icon_cache)"; \
+       fi
+
+clean-local :
+       rm -f *~
diff --git a/data/icons/scalable/Makefile.am b/data/icons/hicolor/scalable/Makefile.am
similarity index 100%
rename from data/icons/scalable/Makefile.am
rename to data/icons/hicolor/scalable/Makefile.am
diff --git a/data/icons/scalable/gnome-disks-state-standby-symbolic.svg 
b/data/icons/hicolor/scalable/gnome-disks-state-standby-symbolic.svg
similarity index 100%
rename from data/icons/scalable/gnome-disks-state-standby-symbolic.svg
rename to data/icons/hicolor/scalable/gnome-disks-state-standby-symbolic.svg
diff --git a/data/icons/src/gnome-disks.svg b/data/icons/hicolor/src/gnome-disks.svg
similarity index 100%
rename from data/icons/src/gnome-disks.svg
rename to data/icons/hicolor/src/gnome-disks.svg