File tomboy-tango-icon-theme.patch of Package tomboy

Overview Repositories Revisions Requests Users Attributes Meta

File tomboy-tango-icon-theme.patch of Package tomboy (Revision b4ae65a518a92d988d2325219679050a)

Currently displaying revision b4ae65a518a92d988d2325219679050a , Show latest

Index: configure.in
================================================================================
--- Tomboy/Makefile.am
+++ Tomboy/Makefile.am
@@ -21,6 +21,10 @@
 FIXED_GTKSPELL_CSFLAGS = -define:FIXED_GTKSPELL
 endif
 
+if ENABLE_TANGO
+TANGO_CSFLAGS = -define:ENABLE_TANGO
+endif
+
 CSFLAGS = 				\
 	-debug				\
 	-define:DEBUG 			\
@@ -28,7 +32,8 @@
 	-target:exe 			\
 	$(DBUS_CSFLAGS) 		\
 	$(FIXED_GTKSPELL_CSFLAGS) 	\
-	$(OLD_GTKSPELL_CSFLAGS)
+	$(OLD_GTKSPELL_CSFLAGS)		\
+	$(TANGO_CSFLAGS)
 
 CSFILES = 					\
 	$(srcdir)/Tomboy.cs 			\
@@ -64,6 +69,8 @@
 	-resource:$(top_builddir)/data/DefaultPlugins.desktop,DefaultPlugins.desktop	\
 	-resource:$(top_srcdir)/data/images/tintin.png,tintin.png			\
 	-resource:$(top_srcdir)/data/images/stock_notes.png,stock_notes.png		\
+	-resource:$(top_srcdir)/data/images/tomboy.png,tomboy.png			\
+	-resource:$(top_srcdir)/data/images/stock_search.png,stock_search.png		\
 	-resource:$(top_srcdir)/data/images/gnome-stock-searchtool.png,gnome-stock-searchtool.png
 
 $(TARGET): $(CSFILES) Defines.cs
--- Tomboy/NoteWindow.cs
+++ Tomboy/NoteWindow.cs
@@ -149,7 +149,7 @@
 
 		static NoteWindow ()
 		{
-			stock_notes = new Gdk.Pixbuf (null, "stock_notes.png");
+			stock_notes = GuiUtils.GetIcon ("tomboy", 16);
 		}
 
 		// 
--- Tomboy/Preferences.cs
+++ Tomboy/Preferences.cs
@@ -114,7 +114,11 @@
 
 		static PreferencesDialog ()
 		{
+#if ENABLE_TANGO
+	        	tintin = GuiUtils.GetIcon ("tomboy", 16);
+#else
 			tintin = new Gdk.Pixbuf (null, "tintin.png");
+#endif
 		}
 
 		public PreferencesDialog ()
--- Tomboy/RecentChanges.cs
+++ Tomboy/RecentChanges.cs
@@ -23,8 +23,8 @@
 		static NoteRecentChanges ()
 		{
 			// FIXME: Get a better recent notes window icon
-			recent_icon = new Gdk.Pixbuf (null, "stock_notes.png");
-			stock_notes = GuiUtils.GetMiniIcon ("stock_notes.png");
+			recent_icon = GuiUtils.GetIcon ("tomboy", 16);
+			stock_notes = GuiUtils.GetIcon ("tomboy", 16);
 		}
 
 		public NoteRecentChanges (NoteManager manager)
--- Tomboy/Search.cs
+++ Tomboy/Search.cs
@@ -32,12 +32,20 @@
 		static string [] previous_searches;
 		static NoteFindDialog instance;
 		static Gdk.Pixbuf search_image;
+		static Gdk.Pixbuf search_image_large;
 		static Gdk.Pixbuf stock_notes;
 
 		static NoteFindDialog ()
 		{
-			search_image = new Gdk.Pixbuf (null, "gnome-stock-searchtool.png");
-			stock_notes = GuiUtils.GetMiniIcon ("stock_notes.png");
+#if ENABLE_TANGO
+			search_image = GuiUtils.GetIcon ("stock_search", 16);
+
+			search_image_large = GuiUtils.GetIcon ("gnome-searchtool", 48);
+#else
+			search_image = GuiUtils.GetIcon ("gnome-stock-searchtool", 16);
+			search_image_large = GuiUtils.GetIcon ("gnome-stock-searchtool", 48);
+#endif
+			stock_notes = GuiUtils.GetIcon ("tomboy", 16);
 		}
 
 		public static NoteFindDialog GetInstance (Note note)
@@ -127,7 +135,7 @@
 			widgets.ColumnSpacing = 4;
 			widgets.ShowAll ();
 
-			Gtk.Image image = new Gtk.Image (search_image);
+			Gtk.Image image = new Gtk.Image (search_image_large);
 			image.Show ();
 
 			Gtk.HBox hbox = new Gtk.HBox (false, 2);
--- Tomboy/Tray.cs
+++ Tomboy/Tray.cs
@@ -15,13 +15,22 @@
 
 		static Gdk.Pixbuf tintin;
 		static Gdk.Pixbuf tintin_large;
+		static Gdk.Pixbuf tintin_tiny;
 		static Gdk.Pixbuf stock_notes;
 
 		static TomboyTray ()
 		{
+#if ENABLE_TANGO
+			tintin = GuiUtils.GetIcon ("tomboy", 24);
+		        tintin_tiny = GuiUtils.GetIcon ("tomboy", 16);
+			tintin_large = GuiUtils.GetIcon ("tomboy", 48);
+			stock_notes = GuiUtils.GetIcon ("tomboy", 16);
+#else
 			tintin = GuiUtils.GetMiniIcon ("tintin.png");
+			tintin_tiny = GuiUtils.GetMiniIcon ("tintin.png");
 			tintin_large = GuiUtils.GetIcon ("tintin.png");
-			stock_notes = GuiUtils.GetMiniIcon ("stock_notes.png");
+			stock_notes = GuiUtils.GetIcon ("stock_notes", 16);
+#endif
 		}
 
 		public TomboyTray (NoteManager manager) 
@@ -240,7 +249,7 @@
 					documenters, 
 					translators,
 					tintin_large);
-			about.Icon = tintin_large;
+			about.Icon = tintin_tiny;
 			about.Show ();
 		}
 
--- Tomboy/Utils.cs
+++ Tomboy/Utils.cs
@@ -11,6 +11,12 @@
 {
 	public class GuiUtils 
 	{
+		[DllImport("libgtk-win32-2.0-0.dll")]
+		private extern static IntPtr gtk_icon_theme_get_default();
+
+		[DllImport("libgtk-win32-2.0-0.dll")]
+		private extern static IntPtr gtk_icon_theme_load_icon(IntPtr theme, string name, int size,int flags, IntPtr error);
+
 		static void GetMenuPosition (Gtk.Menu menu, 
 					     out int  x, 
 					     out int  y, 
@@ -56,6 +62,22 @@
 				menu.AttachWidget.State = Gtk.StateType.Selected;
 		}
 
+		public static Gdk.Pixbuf GetIcon (string resource_name, int size) 
+		{
+			try {
+				IntPtr native = gtk_icon_theme_load_icon (gtk_icon_theme_get_default(), resource_name, size, 0, IntPtr.Zero);
+				if (native != IntPtr.Zero) {
+					Gdk.Pixbuf ret = (Gdk.Pixbuf)GLib.Object.GetObject(native, true);
+					if (ret != null) {
+						return ret;
+					}
+				}
+			} catch(Exception) {
+			}
+                        Gdk.Pixbuf noicon = new Gdk.Pixbuf (null, resource_name + ".png");
+                        return noicon.ScaleSimple(size,size, Gdk.InterpType.Nearest);
+		}
+
 		public static Gdk.Pixbuf GetIcon (string resource_name) 
 		{
 			return new Gdk.Pixbuf (null, resource_name);
@@ -64,8 +86,7 @@
 		public static Gdk.Pixbuf GetMiniIcon (string resource_name) 
 		{
 			Gdk.Pixbuf noicon = new Gdk.Pixbuf (null, resource_name);
-			return noicon.ScaleSimple (24, 24, Gdk.InterpType.Nearest);
-		}
+			return noicon.ScaleSimple (24, 24, Gdk.InterpType.Nearest);		}
 
 		public static Gtk.Button MakeImageButton (Gtk.Image image, string label)
 		{
--- configure.in
+++ configure.in
@@ -94,6 +94,14 @@
 AC_SUBST(TOMBOY_LIBS)
 
 #
+# Install Tango icons
+#
+AC_ARG_ENABLE(tango, 
+	      [  --enable-tango[[=no/yes]]  install tango icons [[default: no]]],
+	      ENABLE_TANGO="$enableval")
+AM_CONDITIONAL(ENABLE_TANGO, test "$ENABLE_TANGO" = "yes")
+
+#
 # Properly handle libraries that aren't in our standard GAC path.
 #
 DBUS_PREFIX=`$PKG_CONFIG --variable=prefix dbus-sharp`
--- data/Makefile.am
+++ data/Makefile.am
@@ -53,9 +53,16 @@
 server_in_files = GNOME_TomboyApplet.server.in
 server_DATA     = $(server_in_files:.server.in=.server)
 
+if ENABLE_TANGO
+icon="tomboy\.png"
+else
+icon="tintin\.png"
+endif
+
 $(server_in_files): $(server_in_files:.server.in=.server.in.in) Makefile
 	sed -e "s|\@bindir\@|$(bindir)|g"	\
 	    -e "s|\@wrapper\@|tomboy|g"		\
+	    -e "s|tintin\.png|$(icon)|g"		\
 	    < $< > $@
 
 @INTLTOOL_SERVER_RULE@
--- data/images/Makefile.am
+++ data/images/Makefile.am
@@ -1,10 +1,46 @@
 
 pixmapdir = $(datadir)/pixmaps
+if ENABLE_TANGO
+hicolordir = $(datadir)/icons/hicolor
+
+tango_icons =                          \
+	tomboy-16.png                   \
+	tomboy-22.png                   \
+	tomboy-48.png                   \
+	tomboy.svg                      \
+	tomboy.png
+
+install-data-local:
+	$(mkinstalldirs) $(DESTDIR)$(hicolordir)/scalable/apps
+	$(INSTALL_DATA) $(srcdir)/tomboy.svg $(DESTDIR)$(hicolordir)/scalable/apps/tomboy.svg
+	$(mkinstalldirs) $(DESTDIR)$(hicolordir)/16x16/apps
+	$(INSTALL_DATA) $(srcdir)/tomboy-16.png $(DESTDIR)$(hicolordir)/16x16/apps/tomboy.png
+	$(mkinstalldirs) $(DESTDIR)$(hicolordir)/22x22/apps
+	$(INSTALL_DATA) $(srcdir)/tomboy-22.png $(DESTDIR)$(hicolordir)/22x22/apps/tomboy.png
+	$(mkinstalldirs) $(DESTDIR)$(hicolordir)/24x24/apps
+	$(INSTALL_DATA) $(srcdir)/tomboy-24.png $(DESTDIR)$(hicolordir)/24x24/apps/tomboy.png
+	$(mkinstalldirs) $(DESTDIR)$(hicolordir)/48x48/apps
+	$(INSTALL_DATA) $(srcdir)/tomboy-48.png $(DESTDIR)$(hicolordir)/48x48/apps/tomboy.png
+
+uninstall-hook:
+	rm -f $(DESTDIR)$(hicolordir)/scalable/apps/tomboy.svg
+	rm -f $(DESTDIR)$(hicolordir)/16x16/apps/tomboy.png
+	rm -f $(DESTDIR)$(hicolordir)/22x22/apps/tomboy.png
+	rm -f $(DESTDIR)$(hicolordir)/24x24/apps/tomboy.png
+	rm -f $(DESTDIR)$(hicolordir)/48x48/apps/tomboy.png
+
+pixmap_DATA = 				\
+	tintin.png               	\
+	tomboy.png
+else
 pixmap_DATA = tintin.png
+endif
 
-noinst_DATA = 				\
-	gnome-stock-searchtool.png	\
-	stock_notes.png			\
-	tintin.png
+noinst_DATA =                          \
+	gnome-stock-searchtool.png      \
+	stock_notes.png                 \
+	tintin.png                      \
+	tomboy.png                      \
+	stock_search.png
 
-EXTRA_DIST = $(noinst_DATA) $(pixmap_DATA)
+EXTRA_DIST = $(noinst_DATA) $(pixmap_DATA) $(tango_icons)
--- data/tomboy.desktop.in
+++ data/tomboy.desktop.in
@@ -6,7 +6,7 @@
 _Comment=Quick and handy note-taker
 _GenericName=Note-taker
 Exec=tomboy
-Icon=tintin.png
+Icon=tomboy
 StartupNotify=false
 Terminal=false
 Type=Application

Places

File tomboy-tango-icon-theme.patch of Package tomboy (Revision b4ae65a518a92d988d2325219679050a)

Places