gnome-specimen r130 - in trunk-from-bzr: . data data/icons specimen

[wbolster svn gnome org]

Author: wbolster
Date: Tue Jun 17 18:43:33 2008
New Revision: 130
URL: http://svn.gnome.org/viewvc/gnome-specimen?rev=130&view=rev

Log:
* configure.ac:
* data/Makefile.am:
* data/icons/Makefile.am:
  - Install and uninstall application icons

* data/gnome-specimen.desktop.in.in:
* specimen/specimenwindow.py:
  - Use the new application icon

* specimen/main.py:
  - Fix image filename in about dialog


Added:
   trunk-from-bzr/data/icons/Makefile.am
Modified:
   trunk-from-bzr/   (props changed)
   trunk-from-bzr/configure.ac
   trunk-from-bzr/data/Makefile.am
   trunk-from-bzr/data/gnome-specimen.desktop.in.in
   trunk-from-bzr/specimen/main.py
   trunk-from-bzr/specimen/specimenwindow.py

Modified: trunk-from-bzr/configure.ac
==============================================================================
--- trunk-from-bzr/configure.ac	(original)
+++ trunk-from-bzr/configure.ac	Tue Jun 17 18:43:33 2008
@@ -26,6 +26,7 @@
 AC_CONFIG_FILES([
 	data/gnome-specimen.desktop.in
 	data/Makefile
+	data/icons/Makefile
 	Makefile
 	po/Makefile.in
 	specimen/Makefile

Modified: trunk-from-bzr/data/Makefile.am
==============================================================================
--- trunk-from-bzr/data/Makefile.am	(original)
+++ trunk-from-bzr/data/Makefile.am	Tue Jun 17 18:43:33 2008
@@ -1,4 +1,6 @@
 
+SUBDIRS = icons
+
 EXTRA_DIST =
 DISTCLEANFILES =
 
@@ -17,8 +19,8 @@
 #
 
 artdir = $(pkgdatadir)
-art_DATA = gnome-specimen.png
-EXTRA_DIST += $(art_DATA)
+art_DATA = gnome-specimen-about.png
+EXTRA_DIST += $(art_DATA) gnome-specimen-about.svg
 
 
 #

Modified: trunk-from-bzr/data/gnome-specimen.desktop.in.in
==============================================================================
--- trunk-from-bzr/data/gnome-specimen.desktop.in.in	(original)
+++ trunk-from-bzr/data/gnome-specimen.desktop.in.in	Tue Jun 17 18:43:33 2008
@@ -7,5 +7,5 @@
 StartupNotify=false
 Terminal=false
 Type=Application
-Icon=fonts
+Icon=gnome-specimen
 Categories=GTK;GNOME;Application;Graphics

Added: trunk-from-bzr/data/icons/Makefile.am
==============================================================================
--- (empty file)
+++ trunk-from-bzr/data/icons/Makefile.am	Tue Jun 17 18:43:33 2008
@@ -0,0 +1,41 @@
+
+install-data-local: install-icons update-icon-cache
+uninstall-local: uninstall-icons update-icon-cache
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+EXTRA_DIST = \
+	gnome-specimen-16.png \
+	gnome-specimen-24.png \
+	gnome-specimen-32.png \
+	gnome-specimen-48.png \
+	gnome-specimen-scalable.svg \
+	gnome-specimen.svg
+
+SIZES = 16 24 32 48
+
+install-icons:
+	@echo "Installing application icons..."
+	$(mkdir_p) $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps;
+	$(INSTALL_DATA) $(srcdir)/gnome-specimen-scalable.svg $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/gnome-specimen.svg;
+	for SIZE in $(SIZES); do \
+		$(mkdir_p) $(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps; \
+		$(INSTALL_DATA) $(srcdir)/gnome-specimen-$$SIZE.png $(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/gnome-specimen.png; \
+	done
+
+uninstall-icons:
+	@echo "Uninstalling application icons..."
+	$(RM) $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/gnome-specimen.svg;
+	for SIZE in $(SIZES); do \
+		$(RM) $(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/gnome-specimen.png; \
+	done
+
+update-icon-cache:
+	@-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
+

Modified: trunk-from-bzr/specimen/main.py
==============================================================================
--- trunk-from-bzr/specimen/main.py	(original)
+++ trunk-from-bzr/specimen/main.py	Tue Jun 17 18:43:33 2008
@@ -56,9 +56,9 @@
     gtk.glade.bindtextdomain(config.PACKAGE, config.LOCALEDIR)
     gtk.glade.textdomain(config.PACKAGE)
 
-    prog = gnome.program_init (config.PACKAGE, config.VERSION)
+    prog = gnome.program_init(config.PACKAGE, config.VERSION)
 
-    gtk.window_set_default_icon_name ("stock_font")
+    gtk.window_set_default_icon_name('gnome-specimen')
 
     from specimenwindow import SpecimenWindow
     w = SpecimenWindow()

Modified: trunk-from-bzr/specimen/specimenwindow.py
==============================================================================
--- trunk-from-bzr/specimen/specimenwindow.py	(original)
+++ trunk-from-bzr/specimen/specimenwindow.py	Tue Jun 17 18:43:33 2008
@@ -675,7 +675,7 @@
             comments = _('Preview and compare fonts')
             copyright = u'Copyright \u00A9 2006 Wouter Bolsterlee'
             authors = ['Wouter Bolsterlee (wbolster gnome org)']
-            pixmap = gtk.gdk.pixbuf_new_from_file(os.path.join(config.PKGDATADIR, 'gnome-specimen.png'))
+            pixmap = gtk.gdk.pixbuf_new_from_file(os.path.join(config.PKGDATADIR, 'gnome-specimen-about.png'))
             # Note to translators: translate this into your full name. It will
             # be displayed in the application's about dialog.
             translators = _('translator-credits')