gnome-specimen r61 - in branches/import-from-bzr: . data specimen

[wbolster svn gnome org]

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

Log:
* Added PNG for the about box. Adjusted auto-fu to handle
  this file correctly.


Added:
   branches/import-from-bzr/data/gnome-specimen.png
Modified:
   branches/import-from-bzr/   (props changed)
   branches/import-from-bzr/data/Makefile.am
   branches/import-from-bzr/specimen/Makefile.am
   branches/import-from-bzr/specimen/config.py.in
   branches/import-from-bzr/specimen/specimenwindow.py

Modified: branches/import-from-bzr/data/Makefile.am
==============================================================================
--- branches/import-from-bzr/data/Makefile.am	(original)
+++ branches/import-from-bzr/data/Makefile.am	Tue Jun 17 18:52:52 2008
@@ -1,6 +1,9 @@
 gladedir   = $(pkgdatadir)/glade
 glade_DATA = gnome-specimen.glade
 
+artdir = $(pkgdatadir)
+art_DATA = gnome-specimen.png
+
 @INTLTOOL_DESKTOP_RULE@
 desktop_in_files = gnome-specimen.desktop.in.in
 desktopdir = $(datadir)/applications

Added: branches/import-from-bzr/data/gnome-specimen.png
==============================================================================
Binary files (empty file) and branches/import-from-bzr/data/gnome-specimen.png	Tue Jun 17 18:52:52 2008 differ

Modified: branches/import-from-bzr/specimen/Makefile.am
==============================================================================
--- branches/import-from-bzr/specimen/Makefile.am	(original)
+++ branches/import-from-bzr/specimen/Makefile.am	Tue Jun 17 18:52:52 2008
@@ -20,6 +20,7 @@
 	sed \
 		-e s!\ LOCALEDIR\@!$(datadir)/locale! \
 		-e s!\ DATADIR\@!$(datadir)! \
+		-e s!\ PKGDATADIR\@!$(pkgdatadir)! \
 		-e s!\ GLADEDIR\@!$(pkgdatadir)/glade! \
 		-e s!\ PACKAGE_NAME\@!$(PACKAGE_NAME)! \
 		-e s!\ PACKAGE_VERSION\@!$(PACKAGE_VERSION)! \

Modified: branches/import-from-bzr/specimen/config.py.in
==============================================================================
--- branches/import-from-bzr/specimen/config.py.in	(original)
+++ branches/import-from-bzr/specimen/config.py.in	Tue Jun 17 18:52:52 2008
@@ -20,9 +20,10 @@
 
 import os.path
 
-PACKAGE   = "@PACKAGE_NAME@"
-VERSION   = "@PACKAGE_VERSION@"
+PACKAGE     = "@PACKAGE_NAME@"
+VERSION     = "@PACKAGE_VERSION@"
 
-LOCALEDIR = "@LOCALEDIR@"
-DATADIR   = "@DATADIR@"
-GLADEDIR  = "@GLADEDIR@"
+LOCALEDIR   = "@LOCALEDIR@"
+DATADIR     = "@DATADIR@"
+PKGDATADIR  = "@PKGDATADIR@"
+GLADEDIR    = "@GLADEDIR@"

Modified: branches/import-from-bzr/specimen/specimenwindow.py
==============================================================================
--- branches/import-from-bzr/specimen/specimenwindow.py	(original)
+++ branches/import-from-bzr/specimen/specimenwindow.py	Tue Jun 17 18:52:52 2008
@@ -1,4 +1,6 @@
 
+import os.path
+
 import gobject
 import gtk
 import gtk.gdk
@@ -55,7 +57,6 @@
         'Initializes the application'
 
         # load glade interface description
-        import os.path
         glade_filename = os.path.join(config.GLADEDIR, 'gnome-specimen.glade')
         tree = gtk.glade.XML(glade_filename)
         tree.signal_autoconnect(self)
@@ -589,6 +590,7 @@
             copyright = u'Copyright \u00A9 2006 Wouter Bolsterlee'
             authors = ['Wouter Bolsterlee (wbolster gnome org)']
             translators = _('translator-credits')
+            pixmap = gtk.gdk.pixbuf_new_from_file(os.path.join(config.PKGDATADIR, 'gnome-specimen.png'))
 
             self.about_dialog = gtk.AboutDialog()
             self.about_dialog.set_transient_for(self.window)
@@ -597,6 +599,7 @@
             self.about_dialog.set_copyright(copyright)
             self.about_dialog.set_authors(authors)
             self.about_dialog.set_translator_credits(translators)
+            self.about_dialog.set_logo(pixmap)
 
             # just hide the about_dialog after first usage
             self.about_dialog.connect('response', lambda widget, response: widget.hide())