[tasque/xbuild] [build] All icons are now installed into hicolor theme.

From: Antonius Riha <antoniusri src gnome org>
To: commits-list gnome org
Cc:
Subject: [tasque/xbuild] [build] All icons are now installed into hicolor theme.
Date: Mon, 3 Sep 2012 13:23:16 +0000 (UTC)
commit ee0c62d48a6c60cb13cd162c779cf36031b292e2
Author: Antonius Riha <antoniusriha gmail com>
Date:   Mon Sep 3 13:56:49 2012 +0200

    [build] All icons are now installed into hicolor theme.
    
    Tasque and tasque-panel icons are being installed into global hicolor
    icon theme. Note, rtm and completing (former: clock) icons are being
    installed into local hicolor theme (/usr/share/tasque/icons/hicolor).
    
    * Adjusted icon names to meet icon naming specs:
    	- clock-16-*.png -> tasque-completing-*.png
    	- note-16.png -> tasque-note.png
    	- rtmLogo.png -> tasque-rtm-logo.png
    (svg files also updated accordingly)
    
    * Adjusted references to path changes where necessary:
    	- data/images/Makefile.am
    	- src/Gtk.Tasque/Gtk.Tasque.csproj
    	- src/Gtk.Tasque/Makefile.am
    
    * Updated code to reflect icon name changes:
    	- src/Addins/Backends/Rtm/Gtk/RtmPreferencesWidget.cs
    	- src/Gtk.Tasque/TaskTreeView.cs

 data/images/Makefile.am                            |   61 ++++++++++++++-----
 data/images/rtmLogo.png                            |  Bin 11341 -> 0 bytes
 .../{clock-16-0.png => tasque-completing-0.png}    |  Bin 336 -> 336 bytes
 .../{clock-16-0.svg => tasque-completing-0.svg}    |    0
 .../{clock-16-1.png => tasque-completing-1.png}    |  Bin 398 -> 398 bytes
 .../{clock-16-10.png => tasque-completing-10.png}  |  Bin 272 -> 272 bytes
 .../{clock-16-11.png => tasque-completing-11.png}  |  Bin 244 -> 244 bytes
 .../{clock-16-2.png => tasque-completing-2.png}    |  Bin 382 -> 382 bytes
 .../{clock-16-3.png => tasque-completing-3.png}    |  Bin 323 -> 323 bytes
 .../{clock-16-4.png => tasque-completing-4.png}    |  Bin 359 -> 359 bytes
 .../{clock-16-5.png => tasque-completing-5.png}    |  Bin 335 -> 335 bytes
 .../{clock-16-6.png => tasque-completing-6.png}    |  Bin 290 -> 290 bytes
 .../{clock-16-7.png => tasque-completing-7.png}    |  Bin 330 -> 330 bytes
 .../{clock-16-8.png => tasque-completing-8.png}    |  Bin 297 -> 297 bytes
 .../{clock-16-9.png => tasque-completing-9.png}    |  Bin 264 -> 264 bytes
 data/images/{note-16.png => tasque-note.png}       |  Bin 820 -> 820 bytes
 data/images/{note-22.svg => tasque-note.svg}       |    0
 data/images/tasque-rtm-logo.png                    |  Bin 0 -> 11414 bytes
 .../Backends/Rtm/Gtk/RtmPreferencesWidget.cs       |    2 +-
 src/Gtk.Tasque/Gtk.Tasque.csproj                   |   64 ++++++++++----------
 src/Gtk.Tasque/Makefile.am                         |   28 ++++----
 src/Gtk.Tasque/TaskTreeView.cs                     |    4 +-
 22 files changed, 94 insertions(+), 65 deletions(-)
---
diff --git a/data/images/Makefile.am b/data/images/Makefile.am
index 7aba590..0c1d74c 100644
--- a/data/images/Makefile.am
+++ b/data/images/Makefile.am
@@ -4,6 +4,7 @@ pixmap_DATA = 	tasque-16.png \
 		tasque-32.png
 
 hicolordir = $(datadir)/icons/hicolor
+hicolordir_local = $(datadir)/tasque/icons/hicolor
 
 tango_icons =	tasque-16.png \
 		tasque-22.png \
@@ -11,27 +12,27 @@ tango_icons =	tasque-16.png \
 		tasque-32.png \
 		tasque-48.png \
 		tasque.svg \
-		note-16.png \
-		rtmLogo.png \
+		tasque-note.png \
+		tasque-rtm-logo.png \
 		tasque-panel-16.png \
 		tasque-panel-22.png \
 		tasque-panel-24.png
 
-clock_icons = clock-16-0.png \
-		clock-16-1.png \
-		clock-16-2.png \
-		clock-16-3.png \
-		clock-16-4.png \
-		clock-16-5.png \
-		clock-16-6.png \
-		clock-16-7.png \
-		clock-16-8.png \
-		clock-16-9.png \
-		clock-16-10.png \
-		clock-16-11.png 
+clock_icons = tasque-completing-0.png \
+		tasque-completing-1.png \
+		tasque-completing-2.png \
+		tasque-completing-3.png \
+		tasque-completing-4.png \
+		tasque-completing-5.png \
+		tasque-completing-6.png \
+		tasque-completing-7.png \
+		tasque-completing-8.png \
+		tasque-completing-9.png \
+		tasque-completing-10.png \
+		tasque-completing-11.png 
 
 install-data-local:
-	@-$(mkinstalldirs) $(DESTDIR)$(hicolordir)/16x16/apps $(DESTDIR)$(hicolordir)/22x22/apps $(DESTDIR)$(hicolordir)/24x24/apps $(DESTDIR)$(hicolordir)/32x32/apps $(DESTDIR)$(hicolordir)/48x48/apps $(DESTDIR)$(hicolordir)/scalable/apps
+	@-$(mkinstalldirs) $(DESTDIR)$(hicolordir)/16x16/apps $(DESTDIR)$(hicolordir)/22x22/apps $(DESTDIR)$(hicolordir)/24x24/apps $(DESTDIR)$(hicolordir)/32x32/apps $(DESTDIR)$(hicolordir)/48x48/apps $(DESTDIR)$(hicolordir)/scalable/apps $(DESTDIR)$(hicolordir_local)/16x16/status $(DESTDIR)$(hicolordir_local)/128x128/places
 	$(INSTALL_DATA) $(srcdir)/tasque-16.png $(DESTDIR)$(hicolordir)/16x16/apps/tasque.png
 	$(INSTALL_DATA) $(srcdir)/tasque-22.png $(DESTDIR)$(hicolordir)/22x22/apps/tasque.png
 	$(INSTALL_DATA) $(srcdir)/tasque-24.png $(DESTDIR)$(hicolordir)/24x24/apps/tasque.png
@@ -41,8 +42,22 @@ install-data-local:
 	$(INSTALL_DATA) $(srcdir)/tasque-panel-16.png $(DESTDIR)$(hicolordir)/16x16/apps/tasque-panel.png
 	$(INSTALL_DATA) $(srcdir)/tasque-panel-22.png $(DESTDIR)$(hicolordir)/22x22/apps/tasque-panel.png
 	$(INSTALL_DATA) $(srcdir)/tasque-panel-24.png $(DESTDIR)$(hicolordir)/24x24/apps/tasque-panel.png
+	$(INSTALL_DATA) $(srcdir)/tasque-note.png $(DESTDIR)$(hicolordir_local)/16x16/status/tasque-note.png
+	$(INSTALL_DATA) $(srcdir)/tasque-rtm-logo.png $(DESTDIR)$(hicolordir_local)/128x128/places/tasque-rtm-logo.png
+	$(INSTALL_DATA) $(srcdir)/tasque-completing-0.png $(DESTDIR)$(hicolordir_local)/16x16/status/tasque-completing-0.png
+	$(INSTALL_DATA) $(srcdir)/tasque-completing-1.png $(DESTDIR)$(hicolordir_local)/16x16/status/tasque-completing-1.png
+	$(INSTALL_DATA) $(srcdir)/tasque-completing-2.png $(DESTDIR)$(hicolordir_local)/16x16/status/tasque-completing-2.png
+	$(INSTALL_DATA) $(srcdir)/tasque-completing-3.png $(DESTDIR)$(hicolordir_local)/16x16/status/tasque-completing-3.png
+	$(INSTALL_DATA) $(srcdir)/tasque-completing-4.png $(DESTDIR)$(hicolordir_local)/16x16/status/tasque-completing-4.png
+	$(INSTALL_DATA) $(srcdir)/tasque-completing-5.png $(DESTDIR)$(hicolordir_local)/16x16/status/tasque-completing-5.png
+	$(INSTALL_DATA) $(srcdir)/tasque-completing-6.png $(DESTDIR)$(hicolordir_local)/16x16/status/tasque-completing-6.png
+	$(INSTALL_DATA) $(srcdir)/tasque-completing-7.png $(DESTDIR)$(hicolordir_local)/16x16/status/tasque-completing-7.png
+	$(INSTALL_DATA) $(srcdir)/tasque-completing-8.png $(DESTDIR)$(hicolordir_local)/16x16/status/tasque-completing-8.png
+	$(INSTALL_DATA) $(srcdir)/tasque-completing-9.png $(DESTDIR)$(hicolordir_local)/16x16/status/tasque-completing-9.png
+	$(INSTALL_DATA) $(srcdir)/tasque-completing-10.png $(DESTDIR)$(hicolordir_local)/16x16/status/tasque-completing-10.png
+	$(INSTALL_DATA) $(srcdir)/tasque-completing-11.png $(DESTDIR)$(hicolordir_local)/16x16/status/tasque-completing-11.png
 
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(hicolordir); gtk-update-icon-cache -f -t $(hicolordir_local)
 
 install-data-hook: update-icon-cache
 uninstall-hook: update-icon-cache
@@ -65,6 +80,20 @@ uninstall-local:
 	rm -f $(DESTDIR)$(hicolordir)/16x16/apps/tasque-panel.png
 	rm -f $(DESTDIR)$(hicolordir)/22x22/apps/tasque-panel.png
 	rm -f $(DESTDIR)$(hicolordir)/24x24/apps/tasque-panel.png
+	rm -f $(DESTDIR)$(hicolordir_local)/16x16/status/tasque-note.png
+	rm -f $(DESTDIR)$(hicolordir_local)/128x128/places/tasque-rtm-logo.png
+	rm -f $(DESTDIR)$(hicolordir_local)/16x16/status/tasque-completing-0.png
+	rm -f $(DESTDIR)$(hicolordir_local)/16x16/status/tasque-completing-1.png
+	rm -f $(DESTDIR)$(hicolordir_local)/16x16/status/tasque-completing-2.png
+	rm -f $(DESTDIR)$(hicolordir_local)/16x16/status/tasque-completing-3.png
+	rm -f $(DESTDIR)$(hicolordir_local)/16x16/status/tasque-completing-4.png
+	rm -f $(DESTDIR)$(hicolordir_local)/16x16/status/tasque-completing-5.png
+	rm -f $(DESTDIR)$(hicolordir_local)/16x16/status/tasque-completing-6.png
+	rm -f $(DESTDIR)$(hicolordir_local)/16x16/status/tasque-completing-7.png
+	rm -f $(DESTDIR)$(hicolordir_local)/16x16/status/tasque-completing-8.png
+	rm -f $(DESTDIR)$(hicolordir_local)/16x16/status/tasque-completing-9.png
+	rm -f $(DESTDIR)$(hicolordir_local)/16x16/status/tasque-completing-10.png
+	rm -f $(DESTDIR)$(hicolordir_local)/16x16/status/tasque-completing-11.png
 
 noinst_DATA =
 
diff --git a/data/images/clock-16-0.png b/data/images/tasque-completing-0.png
similarity index 100%
rename from data/images/clock-16-0.png
rename to data/images/tasque-completing-0.png
diff --git a/data/images/clock-16-0.svg b/data/images/tasque-completing-0.svg
similarity index 100%
rename from data/images/clock-16-0.svg
rename to data/images/tasque-completing-0.svg
diff --git a/data/images/clock-16-1.png b/data/images/tasque-completing-1.png
similarity index 100%
rename from data/images/clock-16-1.png
rename to data/images/tasque-completing-1.png
diff --git a/data/images/clock-16-10.png b/data/images/tasque-completing-10.png
similarity index 100%
rename from data/images/clock-16-10.png
rename to data/images/tasque-completing-10.png
diff --git a/data/images/clock-16-11.png b/data/images/tasque-completing-11.png
similarity index 100%
rename from data/images/clock-16-11.png
rename to data/images/tasque-completing-11.png
diff --git a/data/images/clock-16-2.png b/data/images/tasque-completing-2.png
similarity index 100%
rename from data/images/clock-16-2.png
rename to data/images/tasque-completing-2.png
diff --git a/data/images/clock-16-3.png b/data/images/tasque-completing-3.png
similarity index 100%
rename from data/images/clock-16-3.png
rename to data/images/tasque-completing-3.png
diff --git a/data/images/clock-16-4.png b/data/images/tasque-completing-4.png
similarity index 100%
rename from data/images/clock-16-4.png
rename to data/images/tasque-completing-4.png
diff --git a/data/images/clock-16-5.png b/data/images/tasque-completing-5.png
similarity index 100%
rename from data/images/clock-16-5.png
rename to data/images/tasque-completing-5.png
diff --git a/data/images/clock-16-6.png b/data/images/tasque-completing-6.png
similarity index 100%
rename from data/images/clock-16-6.png
rename to data/images/tasque-completing-6.png
diff --git a/data/images/clock-16-7.png b/data/images/tasque-completing-7.png
similarity index 100%
rename from data/images/clock-16-7.png
rename to data/images/tasque-completing-7.png
diff --git a/data/images/clock-16-8.png b/data/images/tasque-completing-8.png
similarity index 100%
rename from data/images/clock-16-8.png
rename to data/images/tasque-completing-8.png
diff --git a/data/images/clock-16-9.png b/data/images/tasque-completing-9.png
similarity index 100%
rename from data/images/clock-16-9.png
rename to data/images/tasque-completing-9.png
diff --git a/data/images/note-16.png b/data/images/tasque-note.png
similarity index 100%
rename from data/images/note-16.png
rename to data/images/tasque-note.png
diff --git a/data/images/note-22.svg b/data/images/tasque-note.svg
similarity index 100%
rename from data/images/note-22.svg
rename to data/images/tasque-note.svg
diff --git a/data/images/tasque-rtm-logo.png b/data/images/tasque-rtm-logo.png
new file mode 100644
index 0000000..b2c5e46
Binary files /dev/null and b/data/images/tasque-rtm-logo.png differ
diff --git a/src/Addins/Backends/Rtm/Gtk/RtmPreferencesWidget.cs b/src/Addins/Backends/Rtm/Gtk/RtmPreferencesWidget.cs
index fe6097e..dec3e5f 100644
--- a/src/Addins/Backends/Rtm/Gtk/RtmPreferencesWidget.cs
+++ b/src/Addins/Backends/Rtm/Gtk/RtmPreferencesWidget.cs
@@ -20,7 +20,7 @@ namespace Tasque.Backends.RtmBackend
 		
 		static RtmPreferencesWidget ()
 		{
-			normalPixbuf = Utilities.GetIcon ("rtmLogo", 122);
+			normalPixbuf = Utilities.GetIcon ("tasque-rtm-logo", 128);
 		}
 		
 		public RtmPreferencesWidget () : base ()
diff --git a/src/Gtk.Tasque/Gtk.Tasque.csproj b/src/Gtk.Tasque/Gtk.Tasque.csproj
index 54266fd..837d818 100644
--- a/src/Gtk.Tasque/Gtk.Tasque.csproj
+++ b/src/Gtk.Tasque/Gtk.Tasque.csproj
@@ -131,47 +131,47 @@
     <PreBuildEvent>copy "$(SolutionDir)\data\images\*.png" "$(ProjectDir)"</PreBuildEvent>
   </PropertyGroup>-->
   <ItemGroup>
-    <Content Include="..\..\data\images\clock-16-0.png">
-      <Link>data\images\clock-16-0.png</Link>
+    <Content Include="..\..\data\images\tasque-completing-0.png">
+      <Link>data\images\tasque-completing-0.png</Link>
     </Content>
-    <Content Include="..\..\data\images\clock-16-1.png">
-      <Link>data\images\clock-16-1.png</Link>
+    <Content Include="..\..\data\images\tasque-completing-1.png">
+      <Link>data\images\tasque-completing-1.png</Link>
     </Content>
-    <Content Include="..\..\data\images\clock-16-10.png">
-      <Link>data\images\clock-16-10.png</Link>
+    <Content Include="..\..\data\images\tasque-completing-10.png">
+      <Link>data\images\tasque-completing-10.png</Link>
     </Content>
-    <Content Include="..\..\data\images\clock-16-11.png">
-      <Link>data\images\clock-16-11.png</Link>
+    <Content Include="..\..\data\images\tasque-completing-11.png">
+      <Link>data\images\tasque-completing-11.png</Link>
     </Content>
-    <Content Include="..\..\data\images\clock-16-2.png">
-      <Link>data\images\clock-16-2.png</Link>
+    <Content Include="..\..\data\images\tasque-completing-2.png">
+      <Link>data\images\tasque-completing-2.png</Link>
     </Content>
-    <Content Include="..\..\data\images\clock-16-3.png">
-      <Link>data\images\clock-16-3.png</Link>
+    <Content Include="..\..\data\images\tasque-completing-3.png">
+      <Link>data\images\tasque-completing-3.png</Link>
     </Content>
-    <Content Include="..\..\data\images\clock-16-4.png">
-      <Link>data\images\clock-16-4.png</Link>
+    <Content Include="..\..\data\images\tasque-completing-4.png">
+      <Link>data\images\tasque-completing-4.png</Link>
     </Content>
-    <Content Include="..\..\data\images\clock-16-5.png">
-      <Link>data\images\clock-16-5.png</Link>
+    <Content Include="..\..\data\images\tasque-completing-5.png">
+      <Link>data\images\tasque-completing-5.png</Link>
     </Content>
-    <Content Include="..\..\data\images\clock-16-6.png">
-      <Link>data\images\clock-16-6.png</Link>
+    <Content Include="..\..\data\images\tasque-completing-6.png">
+      <Link>data\images\tasque-completing-6.png</Link>
     </Content>
-    <Content Include="..\..\data\images\clock-16-7.png">
-      <Link>data\images\clock-16-7.png</Link>
+    <Content Include="..\..\data\images\tasque-completing-7.png">
+      <Link>data\images\tasque-completing-7.png</Link>
     </Content>
-    <Content Include="..\..\data\images\clock-16-8.png">
-      <Link>data\images\clock-16-8.png</Link>
+    <Content Include="..\..\data\images\tasque-completing-8.png">
+      <Link>data\images\tasque-completing-8.png</Link>
     </Content>
-    <Content Include="..\..\data\images\clock-16-9.png">
-      <Link>data\images\clock-16-9.png</Link>
+    <Content Include="..\..\data\images\tasque-completing-9.png">
+      <Link>data\images\tasque-completing-9.png</Link>
     </Content>
-    <Content Include="..\..\data\images\note-16.png">
-      <Link>data\images\note-16.png</Link>
+    <Content Include="..\..\data\images\tasque-note.png">
+      <Link>data\images\tasque-note.png</Link>
     </Content>
-    <Content Include="..\..\data\images\rtmLogo.png">
-      <Link>data\images\rtmLogo.png</Link>
+    <Content Include="..\..\data\images\tasque-rtm-logo.png">
+      <Link>data\images\tasque-rtm-logo.png</Link>
     </Content>
     <Content Include="..\..\data\images\tasque-16.png">
       <Link>data\images\tasque-16.png</Link>
@@ -193,11 +193,11 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\data\images\clock-16-0.svg">
-      <Link>data\images\clock-16-0.svg</Link>
+    <None Include="..\..\data\images\tasque-completing-0.svg">
+      <Link>data\images\tasque-completing-0.svg</Link>
     </None>
-    <None Include="..\..\data\images\note-22.svg">
-      <Link>data\images\note-22.svg</Link>
+    <None Include="..\..\data\images\tasque-note.svg">
+      <Link>data\images\tasque-note.svg</Link>
     </None>
     <None Include="..\..\data\images\tasque-icons-source.svg">
       <Link>data\images\tasque-icons-source.svg</Link>
diff --git a/src/Gtk.Tasque/Makefile.am b/src/Gtk.Tasque/Makefile.am
index 4982ee6..111f771 100644
--- a/src/Gtk.Tasque/Makefile.am
+++ b/src/Gtk.Tasque/Makefile.am
@@ -55,20 +55,20 @@ RESOURCES = \
 	-resource:$(top_srcdir)/data/images/tasque-24.png \
 	-resource:$(top_srcdir)/data/images/tasque-32.png \
 	-resource:$(top_srcdir)/data/images/tasque-48.png \
-	-resource:$(top_srcdir)/data/images/note-16.png,note.png \
-	-resource:$(top_srcdir)/data/images/rtmLogo.png \
-	-resource:$(top_srcdir)/data/images/clock-16-0.png \
-	-resource:$(top_srcdir)/data/images/clock-16-1.png \
-	-resource:$(top_srcdir)/data/images/clock-16-2.png \
-	-resource:$(top_srcdir)/data/images/clock-16-3.png \
-	-resource:$(top_srcdir)/data/images/clock-16-4.png \
-	-resource:$(top_srcdir)/data/images/clock-16-5.png \
-	-resource:$(top_srcdir)/data/images/clock-16-6.png \
-	-resource:$(top_srcdir)/data/images/clock-16-7.png \
-	-resource:$(top_srcdir)/data/images/clock-16-8.png \
-	-resource:$(top_srcdir)/data/images/clock-16-9.png \
-	-resource:$(top_srcdir)/data/images/clock-16-10.png \
-	-resource:$(top_srcdir)/data/images/clock-16-11.png
+	-resource:$(top_srcdir)/data/images/tasque-note.png \
+	-resource:$(top_srcdir)/data/images/tasque-rtm-logo.png \
+	-resource:$(top_srcdir)/data/images/tasque-completing-0.png \
+	-resource:$(top_srcdir)/data/images/tasque-completing-1.png \
+	-resource:$(top_srcdir)/data/images/tasque-completing-2.png \
+	-resource:$(top_srcdir)/data/images/tasque-completing-3.png \
+	-resource:$(top_srcdir)/data/images/tasque-completing-4.png \
+	-resource:$(top_srcdir)/data/images/tasque-completing-5.png \
+	-resource:$(top_srcdir)/data/images/tasque-completing-6.png \
+	-resource:$(top_srcdir)/data/images/tasque-completing-7.png \
+	-resource:$(top_srcdir)/data/images/tasque-completing-8.png \
+	-resource:$(top_srcdir)/data/images/tasque-completing-9.png \
+	-resource:$(top_srcdir)/data/images/tasque-completing-10.png \
+	-resource:$(top_srcdir)/data/images/tasque-completing-11.png
 
 ASSEMBLIES = \
 	-r:System \
diff --git a/src/Gtk.Tasque/TaskTreeView.cs b/src/Gtk.Tasque/TaskTreeView.cs
index 56bb1ad..8b93481 100644
--- a/src/Gtk.Tasque/TaskTreeView.cs
+++ b/src/Gtk.Tasque/TaskTreeView.cs
@@ -26,11 +26,11 @@ namespace Tasque
 		
 		static TaskTreeView ()
 		{
-			notePixbuf = Utilities.GetIcon ("note", 16);
+			notePixbuf = Utilities.GetIcon ("tasque-note", 16);
 			
 			inactiveAnimPixbufs = new Gdk.Pixbuf [12];
 			for (int i = 0; i < 12; i++) {
-				string iconName = string.Format ("clock-16-{0}", i);
+				string iconName = string.Format ("tasque-completing-{0}", i);
 				inactiveAnimPixbufs [i] = Utilities.GetIcon (iconName, 16);
 			}
 		}
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]