[Quickrip-cvs] quickrip/gtk/glade gtksettings.glade,1.2,1.3

[<iwa...@us...>]

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

Modified Files:
	gtksettings.glade 
Log Message:
Added the ogmmerge setting in preferences.

Index: gtksettings.glade
===================================================================
RCS file: /cvsroot/quickrip/quickrip/gtk/glade/gtksettings.glade,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gtksettings.glade	5 Aug 2003 01:57:27 -0000	1.2
--- gtksettings.glade	6 Aug 2003 00:33:48 -0000	1.3
***************
*** 190,194 ****
  	<widget class="GtkTable" id="table7">
  	  <property name="visible">True</property>
! 	  <property name="n_rows">3</property>
  	  <property name="n_columns">4</property>
  	  <property name="homogeneous">False</property>
--- 190,194 ----
  	<widget class="GtkTable" id="table7">
  	  <property name="visible">True</property>
! 	  <property name="n_rows">4</property>
  	  <property name="n_columns">4</property>
  	  <property name="homogeneous">False</property>
***************
*** 387,390 ****
--- 387,455 ----
  	      <property name="top_attach">2</property>
  	      <property name="bottom_attach">3</property>
+ 	      <property name="y_options"></property>
+ 	    </packing>
+ 	  </child>
+ 
+ 	  <child>
+ 	    <widget class="GtkLabel" id="label27">
+ 	      <property name="visible">True</property>
+ 	      <property name="label" translatable="yes">OGMMerge</property>
+ 	      <property name="use_underline">False</property>
+ 	      <property name="use_markup">False</property>
+ 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+ 	      <property name="wrap">False</property>
+ 	      <property name="selectable">False</property>
+ 	      <property name="xalign">0</property>
+ 	      <property name="yalign">0.5</property>
+ 	      <property name="xpad">5</property>
+ 	      <property name="ypad">0</property>
+ 	    </widget>
+ 	    <packing>
+ 	      <property name="left_attach">0</property>
+ 	      <property name="right_attach">1</property>
+ 	      <property name="top_attach">3</property>
+ 	      <property name="bottom_attach">4</property>
+ 	      <property name="x_options">fill</property>
+ 	      <property name="y_options"></property>
+ 	    </packing>
+ 	  </child>
+ 
+ 	  <child>
+ 	    <widget class="GtkEntry" id="textOgmmerge">
+ 	      <property name="visible">True</property>
+ 	      <property name="can_focus">True</property>
+ 	      <property name="editable">True</property>
+ 	      <property name="visibility">True</property>
+ 	      <property name="max_length">0</property>
+ 	      <property name="text" translatable="yes">/usr/bin/ogmmerge</property>
+ 	      <property name="has_frame">True</property>
+ 	      <property name="invisible_char" translatable="yes">*</property>
+ 	      <property name="activates_default">False</property>
+ 	    </widget>
+ 	    <packing>
+ 	      <property name="left_attach">1</property>
+ 	      <property name="right_attach">3</property>
+ 	      <property name="top_attach">3</property>
+ 	      <property name="bottom_attach">4</property>
+ 	      <property name="y_options"></property>
+ 	    </packing>
+ 	  </child>
+ 
+ 	  <child>
+ 	    <widget class="GtkButton" id="button8">
+ 	      <property name="border_width">5</property>
+ 	      <property name="visible">True</property>
+ 	      <property name="can_focus">True</property>
+ 	      <property name="label" translatable="yes">Browse</property>
+ 	      <property name="use_underline">True</property>
+ 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+ 	      <signal name="clicked" handler="on_ogmmerge_clicked" last_modification_time="Wed, 06 Aug 2003 00:26:56 GMT"/>
+ 	    </widget>
+ 	    <packing>
+ 	      <property name="left_attach">3</property>
+ 	      <property name="right_attach">4</property>
+ 	      <property name="top_attach">3</property>
+ 	      <property name="bottom_attach">4</property>
+ 	      <property name="x_options">fill</property>
  	      <property name="y_options"></property>
  	    </packing>