seahorse r2356 - in trunk: . data data/icons libseahorse pixmaps/22x22 pixmaps/48x48 pixmaps/scalable src

From: sadam svn gnome org
To: svn-commits-list gnome org
Subject: seahorse r2356 - in trunk: . data data/icons libseahorse pixmaps/22x22 pixmaps/48x48 pixmaps/scalable src
Date: Wed, 13 Aug 2008 23:25:11 +0000 (UTC)
Author: sadam
Date: Wed Aug 13 23:25:11 2008
New Revision: 2356
URL: http://svn.gnome.org/viewvc/seahorse?rev=2356&view=rev

Log:
2008-08-13  Adam Schreiber  <sadam clemson edu>

    * data/icons/hicolor_apps_16x16_seahorse.png (added):
    * data/icons/hicolor_apps_16x16_seahorse-preferences.png (added):
    * data/icons/hicolor_apps_22x22_seahorse.png (added):
    * data/icons/hicolor_apps_22x22_seahorse-preferences.png (added):
    * data/icons/hicolor_apps_24x24_seahorse.png (added):
    * data/icons/hicolor_apps_24x24_seahorse-preferences.png (added):
    * data/icons/hicolor_apps_32x32_seahorse.png (added):
    * data/icons/hicolor_apps_32x32_seahorse-preferences.png (added):
    * data/icons/hicolor_apps_48x48_seahorse.png (added):
    * data/icons/hicolor_apps_48x48_seahorse-preferences.png (added):
    * data/icons/Makefile.am (added):
    * data/icons/svg (added):
    * data/icons/svg/seahorse.svg (added):
    * data/icons/svg/seahorse-preferences.svg (added):
    * pixmaps/22x22/Makefile.am:
    * pixmaps/48x48/Makefile.am:
    * pixmaps/scalable/Makefile.am:
    * src/seahorse-viewer.vala:
    * data/Makefile.am:
    * configure.in:
    * libseahorse/seahorse-widget.c:
    * libseahorse/seahorse-gtkstock.c:
    * libseahorse/seahorse-gtkstock.h: Icon makeover.  Patch from 
Michael 
    Monreal.  Fixes bug #520114


Added:
   trunk/data/icons/Makefile.am
   trunk/data/icons/hicolor_apps_16x16_seahorse-preferences.png   (contents, props changed)
   trunk/data/icons/hicolor_apps_16x16_seahorse.png   (contents, props changed)
   trunk/data/icons/hicolor_apps_22x22_seahorse-preferences.png   (contents, props changed)
   trunk/data/icons/hicolor_apps_22x22_seahorse.png   (contents, props changed)
   trunk/data/icons/hicolor_apps_24x24_seahorse-preferences.png   (contents, props changed)
   trunk/data/icons/hicolor_apps_24x24_seahorse.png   (contents, props changed)
   trunk/data/icons/hicolor_apps_32x32_seahorse-preferences.png   (contents, props changed)
   trunk/data/icons/hicolor_apps_32x32_seahorse.png   (contents, props changed)
   trunk/data/icons/hicolor_apps_48x48_seahorse-preferences.png   (contents, props changed)
   trunk/data/icons/hicolor_apps_48x48_seahorse.png   (contents, props changed)
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/data/Makefile.am
   trunk/libseahorse/seahorse-gtkstock.c
   trunk/libseahorse/seahorse-gtkstock.h
   trunk/libseahorse/seahorse-widget.c
   trunk/pixmaps/22x22/Makefile.am
   trunk/pixmaps/48x48/Makefile.am
   trunk/pixmaps/scalable/Makefile.am
   trunk/src/seahorse-viewer.vala

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Aug 13 23:25:11 2008
@@ -570,6 +570,7 @@
 po/Makefile.in
 help/Makefile
 data/Makefile
+data/icons/Makefile
 pixmaps/Makefile
 pixmaps/22x22/Makefile
 pixmaps/48x48/Makefile

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Wed Aug 13 23:25:11 2008
@@ -1,3 +1,4 @@
+SUBDIRS = icons
 
 @INTLTOOL_SCHEMAS_RULE@
 

Added: trunk/data/icons/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/data/icons/Makefile.am	Wed Aug 13 23:25:11 2008
@@ -0,0 +1,77 @@
+NULL =
+
+public_icons = \
+	hicolor_apps_16x16_seahorse.png \
+	hicolor_apps_16x16_seahorse-preferences.png \
+	hicolor_apps_22x22_seahorse.png \
+	hicolor_apps_22x22_seahorse-preferences.png \
+	hicolor_apps_24x24_seahorse.png \
+	hicolor_apps_24x24_seahorse-preferences.png \
+	hicolor_apps_32x32_seahorse.png \
+	hicolor_apps_32x32_seahorse-preferences.png \
+	hicolor_apps_48x48_seahorse.png \
+	hicolor_apps_48x48_seahorse-preferences.png \
+	$(NULL)
+
+private_icons = \
+	$(NULL)
+
+noinst_DATA = \
+ 	$(NULL)
+
+EXTRA_DIST = \
+	$(public_icons)		\
+	$(private_icons)	\
+	$(noinst_DATA)		\
+	$(NULL)
+
+###############################################################################
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t
+
+update-icon-cache:
+	@-if test -z "$(DESTDIR)"; then \
+		echo "Updating Gtk icon cache."; \
+		$(gtk_update_icon_cache) $(datadir)/icons/hicolor; \
+	else \
+		echo "*** Icon cache not updated.  After (un)install, run this:"; \
+		echo "***   $(gtk_update_icon_cache) $(datadir)/icons/hicolor"; \
+	fi
+
+install-icons:
+	for icon in $(public_icons); do \
+		THEME=`echo $$icon | cut -d_ -f1`; \
+		CONTEXT=`echo $$icon | cut -d_ -f2`; \
+		SIZE=`echo $$icon | cut -d_ -f3`; \
+		ICONFILE=`echo $$icon | cut -d_ -f4`; \
+		mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
+		$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+	done; \
+	for icon in $(private_icons); do \
+		THEME=`echo $$icon | cut -d_ -f1`; \
+		CONTEXT=`echo $$icon | cut -d_ -f2`; \
+		SIZE=`echo $$icon | cut -d_ -f3`; \
+		ICONFILE=`echo $$icon | cut -d_ -f4`; \
+		mkdir -p $(DESTDIR)$(pkgdatadir)/$(BASE_VERSION)/icons/$$THEME/$$SIZE/$$CONTEXT; \
+		$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/$(BASE_VERSION)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+	done
+
+uninstall-icons:
+	-for icon in $(public_icons); do \
+		THEME=`echo $$icon | cut -d_ -f1`; \
+		CONTEXT=`echo $$icon | cut -d_ -f2`; \
+		SIZE=`echo $$icon | cut -d_ -f3`; \
+		ICONFILE=`echo $$icon | cut -d_ -f4`; \
+		rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+	done; \
+	for icon in $(private_icons); do \
+		THEME=`echo $$icon | cut -d_ -f1`; \
+		CONTEXT=`echo $$icon | cut -d_ -f2`; \
+		SIZE=`echo $$icon | cut -d_ -f3`; \
+		ICONFILE=`echo $$icon | cut -d_ -f4`; \
+		rm -f $(DESTDIR)$(pkgdatadir)/$(BASE_VERSION)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+	done
+
+install-data-local: install-icons update-icon-cache
+
+uninstall-local: uninstall-icons update-icon-cache

Added: trunk/data/icons/hicolor_apps_16x16_seahorse-preferences.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/icons/hicolor_apps_16x16_seahorse.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/icons/hicolor_apps_22x22_seahorse-preferences.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/icons/hicolor_apps_22x22_seahorse.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/icons/hicolor_apps_24x24_seahorse-preferences.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/icons/hicolor_apps_24x24_seahorse.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/icons/hicolor_apps_32x32_seahorse-preferences.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/icons/hicolor_apps_32x32_seahorse.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/icons/hicolor_apps_48x48_seahorse-preferences.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/icons/hicolor_apps_48x48_seahorse.png
==============================================================================
Binary file. No diff available.

Modified: trunk/libseahorse/seahorse-gtkstock.c
==============================================================================
--- trunk/libseahorse/seahorse-gtkstock.c	(original)
+++ trunk/libseahorse/seahorse-gtkstock.c	Wed Aug 13 23:25:11 2008
@@ -30,7 +30,6 @@
 #include "seahorse-gtkstock.h"
 
 static const gchar *seahorse_icons[] = {
-    SEAHORSE_STOCK_SEAHORSE,
     SEAHORSE_STOCK_KEY,
     SEAHORSE_STOCK_SECRET,
     SEAHORSE_STOCK_KEY_SSH,

Modified: trunk/libseahorse/seahorse-gtkstock.h
==============================================================================
--- trunk/libseahorse/seahorse-gtkstock.h	(original)
+++ trunk/libseahorse/seahorse-gtkstock.h	Wed Aug 13 23:25:11 2008
@@ -27,7 +27,6 @@
 #define _SEAHORSE_GTKSTOCK_H_
 
 /* The default stock icons */
-#define SEAHORSE_STOCK_SEAHORSE     "seahorse"
 #define SEAHORSE_STOCK_KEY          "seahorse-key"
 #define SEAHORSE_STOCK_SECRET       "seahorse-key-personal"
 #define SEAHORSE_STOCK_KEY_SSH      "seahorse-key-ssh"

Modified: trunk/libseahorse/seahorse-widget.c
==============================================================================
--- trunk/libseahorse/seahorse-widget.c	(original)
+++ trunk/libseahorse/seahorse-widget.c	Wed Aug 13 23:25:11 2008
@@ -194,7 +194,6 @@
 {
     SeahorseWidget *swidget;
     GtkWidget *w;
-    GdkPixbuf *pixbuf = NULL;
     char *path;
     
     swidget = SEAHORSE_WIDGET (object);
@@ -221,10 +220,7 @@
         glade_xml_set_toplevel (swidget->xml, GTK_WINDOW (w));
         glade_xml_ensure_accel (swidget->xml);
         
-        pixbuf = gtk_widget_render_icon (w, SEAHORSE_STOCK_SEAHORSE, 
-                                         (GtkIconSize)-1, NULL); 
-        gtk_window_set_icon (GTK_WINDOW (w), gdk_pixbuf_copy(pixbuf));
-        g_object_unref(pixbuf);
+        gtk_window_set_icon_name (GTK_WINDOW (w), "seahorse");
         break;
     }
 }

Modified: trunk/pixmaps/22x22/Makefile.am
==============================================================================
--- trunk/pixmaps/22x22/Makefile.am	(original)
+++ trunk/pixmaps/22x22/Makefile.am	Wed Aug 13 23:25:11 2008
@@ -1,8 +1,6 @@
 
 icon22dir = $(datadir)/pixmaps/seahorse/22x22/
-icon22_DATA = seahorse.png \
-                seahorse-preferences.png \
-                seahorse-applet-encrypted.png \
+icon22_DATA = seahorse-applet-encrypted.png \
                 seahorse-applet-key.png \
                 seahorse-applet-signed.png \
                 seahorse-applet-text.png \
@@ -16,9 +14,7 @@
                 seahorse-sign-ok.png \
                 seahorse-sign-bad.png
 
-iconsrc = seahorse.svg \
-                seahorse-preferences.svg \
-                seahorse-applet-encrypted.svg \
+iconsrc = seahorse-applet-encrypted.svg \
                 seahorse-applet-key.svg \
                 seahorse-applet-signed.svg \
                 seahorse-applet-text.svg \
@@ -32,8 +28,4 @@
                 seahorse-sign-ok.svg \
                 seahorse-sign-bad.svg
 
-desktop_iconsdir   = $(datadir)/icons/hicolor/22x22/apps
-desktop_icons_DATA = seahorse.svg \
-                seahorse-preferences.svg
-                
 EXTRA_DIST = $(iconsrc) $(icon22_DATA)

Modified: trunk/pixmaps/48x48/Makefile.am
==============================================================================
--- trunk/pixmaps/48x48/Makefile.am	(original)
+++ trunk/pixmaps/48x48/Makefile.am	Wed Aug 13 23:25:11 2008
@@ -1,8 +1,6 @@
 
 icon48dir = $(datadir)/pixmaps/seahorse/48x48/
-icon48_DATA = seahorse.png \
-                seahorse-preferences.png \
-                seahorse-applet.png \
+icon48_DATA = seahorse-applet.png \
                 seahorse-applet-encrypted.png \
                 seahorse-applet-key.png \
                 seahorse-applet-signed.png \
@@ -18,13 +16,7 @@
                 seahorse-sign-ok.png \
                 seahorse-sign-unknown.png
 
-pixmapdir = $(datadir)/pixmaps/
-pixmap_DATA = seahorse.png \
-                seahorse-preferences.png
-
 desktop_iconsdir   = $(datadir)/icons/hicolor/48x48/apps
-desktop_icons_DATA = seahorse.png \
-                seahorse-preferences.png \
-                seahorse-applet.png
+desktop_icons_DATA = seahorse-applet.png
 
 EXTRA_DIST = $(icon48_DATA)

Modified: trunk/pixmaps/scalable/Makefile.am
==============================================================================
--- trunk/pixmaps/scalable/Makefile.am	(original)
+++ trunk/pixmaps/scalable/Makefile.am	Wed Aug 13 23:25:11 2008
@@ -3,9 +3,7 @@
 pixmap_DATA = seahorse-applet.svg
 
 iconsvgdir = $(datadir)/pixmaps/seahorse/scalable/
-iconsvg_DATA = seahorse.svg \
-                seahorse-preferences.svg \
-                seahorse-applet.svg \
+iconsvg_DATA = seahorse-applet.svg \
                 seahorse-applet-encrypted.svg \
                 seahorse-applet-key.svg \
                 seahorse-applet-signed.svg \
@@ -22,9 +20,7 @@
                 seahorse-sign-unknown.svg
 
 desktop_iconsdir = $(datadir)/icons/hicolor/scalable/apps
-desktop_icons_DATA = seahorse.svg \
-                        seahorse-preferences.svg \
-                        seahorse-applet.svg
+desktop_icons_DATA = seahorse-applet.svg
 
 
 EXTRA_DIST = $(iconsvg_DATA)

Modified: trunk/src/seahorse-viewer.vala
==============================================================================
--- trunk/src/seahorse-viewer.vala	(original)
+++ trunk/src/seahorse-viewer.vala	Wed Aug 13 23:25:11 2008
@@ -40,7 +40,7 @@
 
 			{ "app-preferences", Gtk.STOCK_PREFERENCES, N_("Prefere_nces"), null,
 			  	N_("Change preferences for this program"), null },
-			{ "app-about", "gnome-stock-about", N_("_About"), null, 
+			{ "app-about", "gtk-about", N_("_About"), null, 
 			  	N_("About this program"), null }, 
     			{ "help-show", Gtk.STOCK_HELP, N_("_Contents"), "F1",
 			  	N_("Show Seahorse help"), null } 
@@ -235,6 +235,7 @@
 			
 			about.response += (about, resp) => { about.hide(); };
 			about.run();
+			about.destroy();
 		}
 		
 		private static void on_about_link_clicked (Gtk.AboutDialog about, string url) {
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]