gnome-specimen r22 - in trunk-from-bzr: . glade

[wbolster svn gnome org]

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

Log:
* glade/gnome-specimen.glade:
  - Changed menu

* specimenwindow.py:
  - Added callbacks for the menu items


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

Modified: trunk-from-bzr/glade/gnome-specimen.glade
==============================================================================
--- trunk-from-bzr/glade/gnome-specimen.glade	(original)
+++ trunk-from-bzr/glade/gnome-specimen.glade	Tue Jun 17 18:41:35 2008
@@ -35,58 +35,18 @@
 	  <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>
 
 	  <child>
-	    <widget class="GtkImageMenuItem" id="file1">
+	    <widget class="GtkMenuItem" id="file_item">
 	      <property name="visible">True</property>
 	      <property name="stock_item">GNOMEUIINFO_MENU_FILE_TREE</property>
 
 	      <child>
-		<widget class="GtkMenu" id="file1_menu">
+		<widget class="GtkMenu" id="file_item_menu">
 
 		  <child>
-		    <widget class="GtkImageMenuItem" id="new1">
-		      <property name="visible">True</property>
-		      <property name="stock_item">GNOMEUIINFO_MENU_NEW_ITEM</property>
-		      <property name="label" translatable="yes">_New</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_new1_activate" last_modification_time="Sat, 29 Apr 2006 10:36:50 GMT"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="open1">
-		      <property name="visible">True</property>
-		      <property name="stock_item">GNOMEUIINFO_MENU_OPEN_ITEM</property>
-		      <signal name="activate" handler="on_open1_activate" last_modification_time="Sat, 29 Apr 2006 10:36:50 GMT"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="save1">
-		      <property name="visible">True</property>
-		      <property name="stock_item">GNOMEUIINFO_MENU_SAVE_ITEM</property>
-		      <signal name="activate" handler="on_save1_activate" last_modification_time="Sat, 29 Apr 2006 10:36:50 GMT"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="save_as1">
-		      <property name="visible">True</property>
-		      <property name="stock_item">GNOMEUIINFO_MENU_SAVE_AS_ITEM</property>
-		      <signal name="activate" handler="on_save_as1_activate" last_modification_time="Sat, 29 Apr 2006 10:36:50 GMT"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkSeparatorMenuItem" id="separator5">
-		      <property name="visible">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="quit1">
+		    <widget class="GtkImageMenuItem" id="quit_item">
 		      <property name="visible">True</property>
 		      <property name="stock_item">GNOMEUIINFO_MENU_EXIT_ITEM</property>
-		      <signal name="activate" handler="on_quit1_activate" last_modification_time="Sat, 29 Apr 2006 10:36:50 GMT"/>
+		      <signal name="activate" handler="on_quit_item_activate" last_modification_time="Tue, 02 May 2006 17:02:50 GMT"/>
 		    </widget>
 		  </child>
 		</widget>
@@ -95,70 +55,54 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkImageMenuItem" id="edit1">
+	    <widget class="GtkMenuItem" id="edit_item">
 	      <property name="visible">True</property>
 	      <property name="stock_item">GNOMEUIINFO_MENU_EDIT_TREE</property>
 
 	      <child>
-		<widget class="GtkMenu" id="edit1_menu">
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="cut1">
-		      <property name="visible">True</property>
-		      <property name="stock_item">GNOMEUIINFO_MENU_CUT_ITEM</property>
-		      <signal name="activate" handler="on_cut1_activate" last_modification_time="Sat, 29 Apr 2006 10:36:50 GMT"/>
-		    </widget>
-		  </child>
+		<widget class="GtkMenu" id="edit_item_menu">
 
 		  <child>
-		    <widget class="GtkImageMenuItem" id="copy1">
+		    <widget class="GtkImageMenuItem" id="copy_item">
 		      <property name="visible">True</property>
-		      <property name="stock_item">GNOMEUIINFO_MENU_COPY_ITEM</property>
-		      <signal name="activate" handler="on_copy1_activate" last_modification_time="Sat, 29 Apr 2006 10:36:50 GMT"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="paste1">
-		      <property name="visible">True</property>
-		      <property name="stock_item">GNOMEUIINFO_MENU_PASTE_ITEM</property>
-		      <signal name="activate" handler="on_paste1_activate" last_modification_time="Sat, 29 Apr 2006 10:36:50 GMT"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="clear1">
-		      <property name="visible">True</property>
-		      <property name="stock_item">GNOMEUIINFO_MENU_CLEAR_ITEM</property>
-		      <signal name="activate" handler="on_clear1_activate" last_modification_time="Sat, 29 Apr 2006 10:36:50 GMT"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkSeparatorMenuItem" id="separator6">
-		      <property name="visible">True</property>
-		    </widget>
-		  </child>
+		      <property name="label" translatable="yes">_Copy Font Name</property>
+		      <property name="use_underline">True</property>
+		      <signal name="activate" handler="on_copy_item_activate" last_modification_time="Sat, 29 Apr 2006 10:36:50 GMT"/>
+		      <accelerator key="C" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
-		  <child>
-		    <widget class="GtkImageMenuItem" id="properties1">
-		      <property name="visible">True</property>
-		      <property name="stock_item">GNOMEUIINFO_MENU_PROPERTIES_ITEM</property>
-		      <signal name="activate" handler="on_properties1_activate" last_modification_time="Sat, 29 Apr 2006 10:36:50 GMT"/>
+		      <child internal-child="image">
+			<widget class="GtkImage" id="image14">
+			  <property name="visible">True</property>
+			  <property name="stock">gtk-copy</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>
 
 		  <child>
-		    <widget class="GtkSeparatorMenuItem" id="separator7">
+		    <widget class="GtkImageMenuItem" id="clear_item">
 		      <property name="visible">True</property>
-		    </widget>
-		  </child>
+		      <property name="label" translatable="yes">Clear_List</property>
+		      <property name="use_underline">True</property>
+		      <signal name="activate" handler="on_clear_item_activate" last_modification_time="Sat, 29 Apr 2006 10:36:50 GMT"/>
+		      <accelerator key="L" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
-		  <child>
-		    <widget class="GtkImageMenuItem" id="preferences1">
-		      <property name="visible">True</property>
-		      <property name="stock_item">GNOMEUIINFO_MENU_PREFERENCES_ITEM</property>
-		      <signal name="activate" handler="on_preferences1_activate" last_modification_time="Sat, 29 Apr 2006 10:36:50 GMT"/>
+		      <child internal-child="image">
+			<widget class="GtkImage" id="image15">
+			  <property name="visible">True</property>
+			  <property name="stock">gtk-clear</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>
@@ -167,30 +111,18 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkImageMenuItem" id="view1">
-	      <property name="visible">True</property>
-	      <property name="stock_item">GNOMEUIINFO_MENU_VIEW_TREE</property>
-
-	      <child>
-		<widget class="GtkMenu" id="view1_menu">
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkImageMenuItem" id="help1">
+	    <widget class="GtkMenuItem" id="help_item">
 	      <property name="visible">True</property>
 	      <property name="stock_item">GNOMEUIINFO_MENU_HELP_TREE</property>
 
 	      <child>
-		<widget class="GtkMenu" id="help1_menu">
+		<widget class="GtkMenu" id="help_item_menu">
 
 		  <child>
 		    <widget class="GtkImageMenuItem" id="about1">
 		      <property name="visible">True</property>
 		      <property name="stock_item">GNOMEUIINFO_MENU_ABOUT_ITEM</property>
-		      <signal name="activate" handler="on_about_clicked" last_modification_time="Sat, 29 Apr 2006 11:23:40 GMT"/>
+		      <signal name="activate" handler="on_about1_activate" last_modification_time="Tue, 02 May 2006 22:39:57 GMT"/>
 		    </widget>
 		  </child>
 		</widget>

Modified: trunk-from-bzr/specimenwindow.py
==============================================================================
--- trunk-from-bzr/specimenwindow.py	(original)
+++ trunk-from-bzr/specimenwindow.py	Tue Jun 17 18:41:35 2008
@@ -272,9 +272,18 @@
             model.remove(iter)
 
     def on_clear_button_clicked(self, widget, data=None):
-        self.previews_store.clear()
+        self.clear_previews()
 
-    def on_about_clicked(self, widget, data=None):
+    def on_quit_item_activate(self, widget, data=None):
+        self.quit()
+
+    def on_clear_item_activate(self, widget, data=None):
+        self.clear_previews()
+
+    def on_copy_item_activate(self, widget, data=None):
+        print 'on_copy_item_clicked'
+
+    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'
@@ -289,4 +298,3 @@
 
         about_dialog.run()
 
-