gnome-specimen r24 - in branches/import-from-bzr: . glade

[wbolster svn gnome org]

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

Log:
* glade/gnome-specimen.glade:
  - Fix (hacky!) the icon for the Help->About menu item. Not
    sure why it doesn't show up if I use a stock item.

* specimenwindow.py:
  - The about dialog is not modal anymore. Added some code
    to make sure it is only shown once.


Modified:
   branches/import-from-bzr/   (props changed)
   branches/import-from-bzr/glade/gnome-specimen.glade
   branches/import-from-bzr/specimenwindow.py

Modified: branches/import-from-bzr/glade/gnome-specimen.glade
==============================================================================
--- branches/import-from-bzr/glade/gnome-specimen.glade	(original)
+++ branches/import-from-bzr/glade/gnome-specimen.glade	Tue Jun 17 18:52:14 2008
@@ -71,7 +71,7 @@
 		      <accelerator key="C" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image14">
+			<widget class="GtkImage" id="image38">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-copy</property>
 			  <property name="icon_size">1</property>
@@ -93,7 +93,7 @@
 		      <accelerator key="L" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image15">
+			<widget class="GtkImage" id="image39">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-clear</property>
 			  <property name="icon_size">1</property>
@@ -119,10 +119,23 @@
 		<widget class="GtkMenu" id="help_item_menu">
 
 		  <child>
-		    <widget class="GtkImageMenuItem" id="about1">
+		    <widget class="GtkImageMenuItem" id="about_item">
 		      <property name="visible">True</property>
-		      <property name="stock_item">GNOMEUIINFO_MENU_ABOUT_ITEM</property>
+		      <property name="label" translatable="yes">_About</property>
+		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="on_about_item_activate" last_modification_time="Tue, 02 May 2006 22:39:57 GMT"/>
+
+		      <child internal-child="image">
+			<widget class="GtkImage" id="image40">
+			  <property name="visible">True</property>
+			  <property name="stock">gtk-about</property>
+			  <property name="icon_size">1</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+		      </child>
 		    </widget>
 		  </child>
 		</widget>

Modified: branches/import-from-bzr/specimenwindow.py
==============================================================================
--- branches/import-from-bzr/specimenwindow.py	(original)
+++ branches/import-from-bzr/specimenwindow.py	Tue Jun 17 18:52:14 2008
@@ -285,16 +285,22 @@
 
     def on_about_item_activate(self, widget, data=None):
         'Callback for the Help->About menu item'
-        name = 'GNOME Specimen'
-        comments = 'A font preview application for GNOME'
-        copyright = u'Copyright \u00A9 2006 Wouter Bolsterlee'
-        authors = ['Wouter Bolsterlee <uws+gnome xs4all nl>']
-
-        about_dialog = gtk.AboutDialog()
-        about_dialog.set_name(name)
-        about_dialog.set_comments(comments)
-        about_dialog.set_copyright(copyright)
-        about_dialog.set_authors(authors)
 
-        about_dialog.run()
+        try:
+            self.about_dialog.show()
+            self.about_dialog.present()
+
+        except (AttributeError):
+            name = 'GNOME Specimen'
+            comments = 'A font preview application for GNOME'
+            copyright = u'Copyright \u00A9 2006 Wouter Bolsterlee'
+            authors = ['Wouter Bolsterlee <uws+gnome xs4all nl>']
+
+            self.about_dialog = gtk.AboutDialog()
+            self.about_dialog.set_name(name)
+            self.about_dialog.set_comments(comments)
+            self.about_dialog.set_copyright(copyright)
+            self.about_dialog.set_authors(authors)
+
+            self.about_dialog.show()