[Quickrip-cvs] quickrip/gtk/glade gtkmain.glade,1.3,1.4

[<je...@us...>]

Update of /cvsroot/quickrip/quickrip/gtk/glade
In directory sc8-pr-cvs1:/tmp/cvs-serv3639/glade

Modified Files:
	gtkmain.glade 
Log Message:
Moved Preferences to the Edit menu.


Index: gtkmain.glade
===================================================================
RCS file: /cvsroot/quickrip/quickrip/gtk/glade/gtkmain.glade,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gtkmain.glade	4 Aug 2003 02:33:53 -0000	1.3
--- gtkmain.glade	4 Aug 2003 02:41:42 -0000	1.4
***************
*** 3,6 ****
--- 3,7 ----
  
  <glade-interface>
+ <requires lib="gnome"/>
  
  <widget class="GtkWindow" id="window">
***************
*** 37,54 ****
  
  		  <child>
! 		    <widget class="GtkMenuItem" id="scan1">
  		      <property name="visible">True</property>
  		      <property name="label" translatable="yes">_Scan</property>
  		      <property name="use_underline">True</property>
  		      <signal name="activate" handler="on_scan_activate" last_modification_time="Mon, 04 Aug 2003 00:12:23 GMT"/>
  		    </widget>
  		  </child>
  
  		  <child>
! 		    <widget class="GtkMenuItem" id="miRip">
  		      <property name="visible">True</property>
  		      <property name="label" translatable="yes">_Rip</property>
  		      <property name="use_underline">True</property>
  		      <signal name="activate" handler="on_rip_activate" last_modification_time="Mon, 04 Aug 2003 00:13:09 GMT"/>
  		    </widget>
  		  </child>
--- 38,79 ----
  
  		  <child>
! 		    <widget class="GtkImageMenuItem" id="scan1">
  		      <property name="visible">True</property>
  		      <property name="label" translatable="yes">_Scan</property>
  		      <property name="use_underline">True</property>
  		      <signal name="activate" handler="on_scan_activate" last_modification_time="Mon, 04 Aug 2003 00:12:23 GMT"/>
+ 
+ 		      <child internal-child="image">
+ 			<widget class="GtkImage" id="image7">
+ 			  <property name="visible">True</property>
+ 			  <property name="stock">gtk-cdrom</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="GtkImageMenuItem" id="miRip">
  		      <property name="visible">True</property>
  		      <property name="label" translatable="yes">_Rip</property>
  		      <property name="use_underline">True</property>
  		      <signal name="activate" handler="on_rip_activate" last_modification_time="Mon, 04 Aug 2003 00:13:09 GMT"/>
+ 
+ 		      <child internal-child="image">
+ 			<widget class="GtkImage" id="image8">
+ 			  <property name="visible">True</property>
+ 			  <property name="stock">gtk-execute</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>
***************
*** 61,84 ****
  
  		  <child>
! 		    <widget class="GtkMenuItem" id="preferences1">
  		      <property name="visible">True</property>
! 		      <property name="label" translatable="yes">_Preferences</property>
  		      <property name="use_underline">True</property>
! 		      <signal name="activate" handler="on_preferences_activate" last_modification_time="Mon, 04 Aug 2003 00:13:09 GMT"/>
  		    </widget>
  		  </child>
  
! 		  <child>
! 		    <widget class="GtkMenuItem" id="separatormenuitem1">
! 		      <property name="visible">True</property>
! 		    </widget>
! 		  </child>
  
  		  <child>
! 		    <widget class="GtkImageMenuItem" id="quit">
  		      <property name="visible">True</property>
! 		      <property name="label">gtk-quit</property>
! 		      <property name="use_stock">True</property>
! 		      <signal name="activate" handler="on_quit_activate" last_modification_time="Mon, 04 Aug 2003 00:48:22 GMT"/>
  		    </widget>
  		  </child>
--- 86,116 ----
  
  		  <child>
! 		    <widget class="GtkMenuItem" id="quit">
  		      <property name="visible">True</property>
! 		      <property name="label" translatable="yes">gtk-quit</property>
  		      <property name="use_underline">True</property>
! 		      <signal name="activate" handler="on_quit_activate" last_modification_time="Mon, 04 Aug 2003 00:48:22 GMT"/>
  		    </widget>
  		  </child>
+ 		</widget>
+ 	      </child>
+ 	    </widget>
+ 	  </child>
  
! 	  <child>
! 	    <widget class="GtkMenuItem" id="edit">
! 	      <property name="visible">True</property>
! 	      <property name="label" translatable="yes">_Edit</property>
! 	      <property name="use_underline">True</property>
! 
! 	      <child>
! 		<widget class="GtkMenu" id="edit_menu">
  
  		  <child>
! 		    <widget class="GtkMenuItem" id="preferences1">
  		      <property name="visible">True</property>
! 		      <property name="label" translatable="yes">_Preferences</property>
! 		      <property name="use_underline">True</property>
! 		      <signal name="activate" handler="on_preferences_activate" last_modification_time="Mon, 04 Aug 2003 00:13:09 GMT"/>
  		    </widget>
  		  </child>