X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=glade.patch;h=9081dae7a1a4c390d04c304a16f34847ecd4ecb4;hb=a10cebe053263d7e936b6533a3dbf5ac2f0586a1;hp=d4a01e7c1f330086b53fd0d16e0a8451cc852732;hpb=9683d7528884fcb3c60705812de9f96889536388;p=pspp-builds.git

diff --git a/glade.patch b/glade.patch
index d4a01e7c..9081dae7 100644
--- a/glade.patch
+++ b/glade.patch
@@ -1,62 +1,810 @@
 This patch mitigates a bug in glade-2, which silently deletes stock_ids, which 
 it thinks are not valid.   You may have to apply this patch after editing 
-data-editor.glade with glade-2.  Glade-3 is another story and might give 
-problems of its own.
---- src/ui/gui/data-editor.glade,old	2006-12-31 07:29:39.000000000 +0900
-+++ src/ui/gui/data-editor.glade	2006-12-31 07:30:04.000000000 +0900
-@@ -653,6 +653,7 @@
- 		  <property name="visible">True</property>
- 		  <property name="sensitive">False</property>
- 		  <property name="tooltip" translatable="yes">Variables</property>
-+                  <property name="stock_id">pspp-goto-variable</property>
- 		  <property name="label" translatable="yes"></property>
- 		  <property name="use_underline">True</property>
- 		  <property name="visible_horizontal">True</property>
-@@ -712,6 +713,7 @@
- 		  <property name="visible">True</property>
- 		  <property name="sensitive">False</property>
- 		  <property name="tooltip" translatable="yes">Insert Case</property>
-+                  <property name="stock_id">pspp-insert-case</property>
- 		  <property name="label" translatable="yes"></property>
- 		  <property name="use_underline">True</property>
- 		  <property name="visible_horizontal">True</property>
-@@ -730,6 +732,7 @@
- 		  <property name="visible">True</property>
- 		  <property name="sensitive">False</property>
- 		  <property name="tooltip" translatable="yes">Insert Variable</property>
-+                  <property name="stock_id">pspp-insert-variable</property>
- 		  <property name="label" translatable="yes"></property>
- 		  <property name="use_underline">True</property>
- 		  <property name="visible_horizontal">True</property>
-@@ -760,6 +763,7 @@
- 		  <property name="visible">True</property>
- 		  <property name="sensitive">False</property>
- 		  <property name="tooltip" translatable="yes">Split File</property>
-+                  <property name="stock_id">pspp-split-file</property>
- 		  <property name="label" translatable="yes"></property>
- 		  <property name="use_underline">True</property>
- 		  <property name="visible_horizontal">True</property>
-@@ -777,6 +781,7 @@
- 		  <property name="visible">True</property>
- 		  <property name="sensitive">False</property>
- 		  <property name="tooltip" translatable="yes">Weight Cases</property>
-+                  <property name="stock_id">pspp-weight-cases</property>
- 		  <property name="label" translatable="yes"></property>
- 		  <property name="use_underline">True</property>
- 		  <property name="visible_horizontal">True</property>
-@@ -794,6 +799,7 @@
- 		  <property name="visible">True</property>
- 		  <property name="sensitive">False</property>
- 		  <property name="tooltip" translatable="yes">Select Cases</property>
-+                  <property name="stock_id">pspp-select-cases</property>
- 		  <property name="label" translatable="yes"></property>
- 		  <property name="use_underline">True</property>
- 		  <property name="visible_horizontal">True</property>
-@@ -823,6 +829,7 @@
- 		<widget class="GtkToggleToolButton" id="togglebutton-value-labels">
- 		  <property name="visible">True</property>
- 		  <property name="tooltip" translatable="yes">Value Labels</property>
-+                  <property name="stock_id">pspp-value-labels</property>
- 		  <property name="label" translatable="yes"></property>
- 		  <property name="use_underline">True</property>
- 		  <property name="visible_horizontal">True</property>
+data-editor.glade with glade-3.
+--- src/ui/gui/data-editor.glade,bad	2007-01-26 16:15:32.000000000 +0900
++++ src/ui/gui/data-editor.glade	2007-01-26 16:16:18.000000000 +0900
+@@ -506,7 +506,7 @@
+                     <property name="sensitive">False</property>
+                     <property name="tooltip" translatable="yes">Variables</property>
+                     <property name="use_underline">True</property>
+-                    <property name="stock_id">gtk-missing-image</property>
++                    <property name="stock_id">pspp-goto-variable</property>
+                   </widget>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -547,7 +547,7 @@
+                     <property name="sensitive">False</property>
+                     <property name="tooltip" translatable="yes">Insert Case</property>
+                     <property name="use_underline">True</property>
+-                    <property name="stock_id">gtk-missing-image</property>
++                    <property name="stock_id">pspp-insert-case</property>
+                     <signal name="clicked" handler="on_insert_case_clicked"/>
+                   </widget>
+                   <packing>
+@@ -560,7 +560,7 @@
+                     <property name="sensitive">False</property>
+                     <property name="tooltip" translatable="yes">Insert Variable</property>
+                     <property name="use_underline">True</property>
+-                    <property name="stock_id">gtk-missing-image</property>
++                    <property name="stock_id">pspp-insert-variable</property>
+                   </widget>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -581,7 +581,7 @@
+                     <property name="sensitive">False</property>
+                     <property name="tooltip" translatable="yes">Split File</property>
+                     <property name="use_underline">True</property>
+-                    <property name="stock_id">gtk-missing-image</property>
++                    <property name="stock_id">pspp-split-file</property>
+                   </widget>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -592,7 +592,7 @@
+                     <property name="visible">True</property>
+                     <property name="tooltip" translatable="yes">Weight Cases</property>
+                     <property name="use_underline">True</property>
+-                    <property name="stock_id">gtk-missing-image</property>
++                    <property name="stock_id">pspp-weight-cases</property>
+                   </widget>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -604,7 +604,7 @@
+                     <property name="sensitive">False</property>
+                     <property name="tooltip" translatable="yes">Select Cases</property>
+                     <property name="use_underline">True</property>
+-                    <property name="stock_id">gtk-missing-image</property>
++                    <property name="stock_id">pspp-select-cases</property>
+                   </widget>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -624,7 +624,7 @@
+                     <property name="visible">True</property>
+                     <property name="tooltip" translatable="yes">Value Labels</property>
+                     <property name="use_underline">True</property>
+-                    <property name="stock_id">gtk-missing-image</property>
++                    <property name="stock_id">pspp-value-labels</property>
+                     <signal name="toggled" handler="on_togglebutton_value_labels_toggled"/>
+                   </widget>
+                   <packing>
+@@ -667,25 +667,25 @@
+                     <property name="n_rows">1</property>
+                     <property name="n_columns">2</property>
+                     <child>
+-                      <widget class="GtkEntry" id="entry4">
++                      <widget class="GtkEntry" id="cell_ref_entry">
+                         <property name="visible">True</property>
+-                        <property name="can_focus">True</property>
++                        <property name="sensitive">False</property>
++                        <property name="editable">False</property>
++                        <property name="width_chars">25</property>
+                       </widget>
+                       <packing>
+-                        <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
++                        <property name="x_options">GTK_FILL</property>
+                         <property name="y_options"></property>
+                       </packing>
+                     </child>
+                     <child>
+-                      <widget class="GtkEntry" id="cell_ref_entry">
++                      <widget class="GtkEntry" id="entry4">
+                         <property name="visible">True</property>
+-                        <property name="sensitive">False</property>
+-                        <property name="editable">False</property>
+-                        <property name="width_chars">25</property>
++                        <property name="can_focus">True</property>
+                       </widget>
+                       <packing>
+-                        <property name="x_options">GTK_FILL</property>
++                        <property name="left_attach">1</property>
++                        <property name="right_attach">2</property>
+                         <property name="y_options"></property>
+                       </packing>
+                     </child>
+@@ -1216,63 +1216,63 @@
+                 <property name="column_spacing">2</property>
+                 <property name="row_spacing">1</property>
+                 <child>
+-                  <widget class="GtkLabel" id="decimals_label">
++                  <widget class="GtkHBox" id="hbox2">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="label" translatable="yes">Decimal Places:</property>
++                    <child>
++                      <widget class="GtkLabel" id="width_label">
++                        <property name="visible">True</property>
++                        <property name="label" translatable="yes">Width:</property>
+                     <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                   </widget>
+                   <packing>
+-                    <property name="top_attach">1</property>
+-                    <property name="bottom_attach">2</property>
++                        <property name="expand">False</property>
++                        <property name="fill">False</property>
++                        <property name="pack_type">GTK_PACK_END</property>
++                      </packing>
++                    </child>
++                  </widget>
++                  <packing>
+                     <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
++                    <property name="y_options">GTK_FILL</property>
+                   </packing>
+                 </child>
+                 <child>
+-                  <widget class="GtkEntry" id="width_entry">
++                  <widget class="GtkEntry" id="decimals_entry">
+                     <property name="width_request">25</property>
++                    <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+                   </widget>
+                   <packing>
+                     <property name="left_attach">1</property>
+                     <property name="right_attach">2</property>
++                    <property name="top_attach">1</property>
++                    <property name="bottom_attach">2</property>
+                     <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+-                  <widget class="GtkEntry" id="decimals_entry">
++                  <widget class="GtkEntry" id="width_entry">
+                     <property name="width_request">25</property>
+-                    <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+                   </widget>
+                   <packing>
+                     <property name="left_attach">1</property>
+                     <property name="right_attach">2</property>
+-                    <property name="top_attach">1</property>
+-                    <property name="bottom_attach">2</property>
+                     <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+-                  <widget class="GtkHBox" id="hbox2">
+-                    <property name="visible">True</property>
+-                    <child>
+-                      <widget class="GtkLabel" id="width_label">
++                  <widget class="GtkLabel" id="decimals_label">
+                         <property name="visible">True</property>
+-                        <property name="label" translatable="yes">Width:</property>
++                    <property name="xalign">0</property>
++                    <property name="label" translatable="yes">Decimal Places:</property>
+                         <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                       </widget>
+                       <packing>
+-                        <property name="expand">False</property>
+-                        <property name="fill">False</property>
+-                        <property name="pack_type">GTK_PACK_END</property>
+-                      </packing>
+-                    </child>
+-                  </widget>
+-                  <packing>
++                    <property name="top_attach">1</property>
++                    <property name="bottom_attach">2</property>
+                     <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options">GTK_FILL</property>
++                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+               </widget>
+@@ -1360,50 +1360,28 @@
+                     <property name="n_columns">2</property>
+                     <property name="row_spacing">5</property>
+                     <child>
+-                      <widget class="GtkVButtonBox" id="vbuttonbox2">
+-                        <property name="visible">True</property>
+-                        <property name="border_width">5</property>
+-                        <child>
+-                          <widget class="GtkButton" id="val_labs_add">
+-                            <property name="visible">True</property>
+-                            <property name="sensitive">False</property>
+-                            <property name="can_focus">True</property>
+-                            <property name="can_default">True</property>
+-                            <property name="label">gtk-add</property>
+-                            <property name="use_stock">True</property>
+-                          </widget>
+-                        </child>
+-                        <child>
+-                          <widget class="GtkButton" id="val_labs_change">
++                      <widget class="GtkScrolledWindow" id="scrolledwindow3">
+                             <property name="visible">True</property>
+-                            <property name="sensitive">False</property>
+                             <property name="can_focus">True</property>
+-                            <property name="can_default">True</property>
+-                            <property name="label">gtk-apply</property>
+-                            <property name="use_stock">True</property>
+-                          </widget>
+-                          <packing>
+-                            <property name="position">1</property>
+-                          </packing>
+-                        </child>
++                        <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
++                        <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
++                        <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+                         <child>
+-                          <widget class="GtkButton" id="val_labs_remove">
++                          <widget class="GtkTreeView" id="treeview1">
+                             <property name="visible">True</property>
+-                            <property name="sensitive">False</property>
+                             <property name="can_focus">True</property>
+-                            <property name="can_default">True</property>
+-                            <property name="label">gtk-remove</property>
+-                            <property name="use_stock">True</property>
++                            <property name="headers_visible">False</property>
++                            <property name="enable_search">False</property>
+                           </widget>
+-                          <packing>
+-                            <property name="position">2</property>
+-                          </packing>
+                         </child>
+                       </widget>
+                       <packing>
++                        <property name="left_attach">1</property>
++                        <property name="right_attach">2</property>
+                         <property name="top_attach">1</property>
+                         <property name="bottom_attach">2</property>
+                         <property name="x_options">GTK_FILL</property>
++                        <property name="y_options">GTK_FILL</property>
+                       </packing>
+                     </child>
+                     <child>
+@@ -1415,27 +1393,26 @@
+                         <property name="column_spacing">5</property>
+                         <property name="row_spacing">4</property>
+                         <child>
+-                          <widget class="GtkLabel" id="label5">
++                          <widget class="GtkHBox" id="hbox4">
+                             <property name="visible">True</property>
+-                            <property name="xalign">0</property>
+-                            <property name="label" translatable="yes">Value:</property>
++                            <child>
++                              <widget class="GtkEntry" id="value_entry">
++                                <property name="width_request">85</property>
++                                <property name="visible">True</property>
++                                <property name="can_focus">True</property>
+                           </widget>
+                           <packing>
+-                            <property name="x_options">GTK_FILL</property>
+-                            <property name="y_options"></property>
++                                <property name="expand">False</property>
++                                <property name="fill">False</property>
++                                <property name="padding">1</property>
+                           </packing>
+                         </child>
+-                        <child>
+-                          <widget class="GtkLabel" id="label6">
+-                            <property name="visible">True</property>
+-                            <property name="xalign">0</property>
+-                            <property name="label" translatable="yes">Value Label:</property>
+                           </widget>
+                           <packing>
+-                            <property name="top_attach">1</property>
+-                            <property name="bottom_attach">2</property>
++                            <property name="left_attach">1</property>
++                            <property name="right_attach">2</property>
+                             <property name="x_options">GTK_FILL</property>
+-                            <property name="y_options"></property>
++                            <property name="y_options">GTK_FILL</property>
+                           </packing>
+                         </child>
+                         <child>
+@@ -1452,26 +1429,27 @@
+                           </packing>
+                         </child>
+                         <child>
+-                          <widget class="GtkHBox" id="hbox4">
+-                            <property name="visible">True</property>
+-                            <child>
+-                              <widget class="GtkEntry" id="value_entry">
+-                                <property name="width_request">85</property>
++                          <widget class="GtkLabel" id="label6">
+                                 <property name="visible">True</property>
+-                                <property name="can_focus">True</property>
++                            <property name="xalign">0</property>
++                            <property name="label" translatable="yes">Value Label:</property>
+                               </widget>
+                               <packing>
+-                                <property name="expand">False</property>
+-                                <property name="fill">False</property>
+-                                <property name="padding">1</property>
++                            <property name="top_attach">1</property>
++                            <property name="bottom_attach">2</property>
++                            <property name="x_options">GTK_FILL</property>
++                            <property name="y_options"></property>
+                               </packing>
+                             </child>
++                        <child>
++                          <widget class="GtkLabel" id="label5">
++                            <property name="visible">True</property>
++                            <property name="xalign">0</property>
++                            <property name="label" translatable="yes">Value:</property>
+                           </widget>
+                           <packing>
+-                            <property name="left_attach">1</property>
+-                            <property name="right_attach">2</property>
+                             <property name="x_options">GTK_FILL</property>
+-                            <property name="y_options">GTK_FILL</property>
++                            <property name="y_options"></property>
+                           </packing>
+                         </child>
+                       </widget>
+@@ -1481,28 +1459,50 @@
+                       </packing>
+                     </child>
+                     <child>
+-                      <widget class="GtkScrolledWindow" id="scrolledwindow3">
++                      <widget class="GtkVButtonBox" id="vbuttonbox2">
++                        <property name="visible">True</property>
++                        <property name="border_width">5</property>
++                        <child>
++                          <widget class="GtkButton" id="val_labs_add">
+                         <property name="visible">True</property>
++                            <property name="sensitive">False</property>
+                         <property name="can_focus">True</property>
+-                        <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+-                        <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+-                        <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
++                            <property name="can_default">True</property>
++                            <property name="label">gtk-add</property>
++                            <property name="use_stock">True</property>
++                          </widget>
++                        </child>
+                         <child>
+-                          <widget class="GtkTreeView" id="treeview1">
++                          <widget class="GtkButton" id="val_labs_change">
+                             <property name="visible">True</property>
++                            <property name="sensitive">False</property>
+                             <property name="can_focus">True</property>
+-                            <property name="headers_visible">False</property>
+-                            <property name="enable_search">False</property>
++                            <property name="can_default">True</property>
++                            <property name="label">gtk-apply</property>
++                            <property name="use_stock">True</property>
+                           </widget>
++                          <packing>
++                            <property name="position">1</property>
++                          </packing>
++                        </child>
++                        <child>
++                          <widget class="GtkButton" id="val_labs_remove">
++                            <property name="visible">True</property>
++                            <property name="sensitive">False</property>
++                            <property name="can_focus">True</property>
++                            <property name="can_default">True</property>
++                            <property name="label">gtk-remove</property>
++                            <property name="use_stock">True</property>
++                          </widget>
++                          <packing>
++                            <property name="position">2</property>
++                          </packing>
+                         </child>
+                       </widget>
+                       <packing>
+-                        <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">1</property>
+                         <property name="bottom_attach">2</property>
+                         <property name="x_options">GTK_FILL</property>
+-                        <property name="y_options">GTK_FILL</property>
+                       </packing>
+                     </child>
+                   </widget>
+@@ -1590,64 +1590,68 @@
+         <property name="n_rows">2</property>
+         <property name="n_columns">2</property>
+         <child>
+-          <widget class="GtkVButtonBox" id="vbuttonbox5">
++          <widget class="GtkVBox" id="vbox7">
+             <property name="visible">True</property>
+-            <property name="border_width">5</property>
+-            <property name="spacing">5</property>
+-            <property name="layout_style">GTK_BUTTONBOX_START</property>
+             <child>
+-              <widget class="GtkButton" id="missing_val_ok">
++              <widget class="GtkRadioButton" id="range_missing">
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+-                <property name="can_default">True</property>
+-                <property name="label">gtk-ok</property>
+-                <property name="use_stock">True</property>
+-                <signal name="clicked" handler="gtk_widget_hide" object="val_labs_dialog"/>
++                <property name="label" translatable="yes">_Range plus one optional discrete missing value</property>
++                <property name="use_underline">True</property>
++                <property name="focus_on_click">False</property>
++                <property name="draw_indicator">True</property>
++                <property name="group">no_missing</property>
+               </widget>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++              </packing>
+             </child>
+             <child>
+-              <widget class="GtkButton" id="missing_val_cancel">
++              <widget class="GtkVBox" id="vbox8">
+                 <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="can_default">True</property>
+-                <property name="label">gtk-cancel</property>
+-                <property name="use_stock">True</property>
+-                <signal name="clicked" handler="gtk_widget_hide" object="val_labs_dialog"/>
++                <property name="spacing">5</property>
++                <child>
++                  <widget class="GtkHBox" id="hbox7">
++                    <property name="visible">True</property>
++                    <child>
++                      <widget class="GtkHBox" id="hbox8">
++                        <property name="visible">True</property>
++                        <child>
++                          <widget class="GtkLabel" id="label11">
++                            <property name="visible">True</property>
++                            <property name="label" translatable="yes">_Low:</property>
++                            <property name="use_underline">True</property>
++                            <property name="mnemonic_widget">mv-low</property>
+               </widget>
+               <packing>
+-                <property name="position">1</property>
++                            <property name="expand">False</property>
++                            <property name="fill">False</property>
++                            <property name="padding">20</property>
+               </packing>
+             </child>
+             <child>
+-              <widget class="GtkButton" id="help_button_missing_values">
++                          <widget class="GtkEntry" id="mv-low">
++                            <property name="width_request">75</property>
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+-                <property name="can_default">True</property>
+-                <property name="label">gtk-help</property>
+-                <property name="use_stock">True</property>
+               </widget>
+               <packing>
+-                <property name="position">2</property>
++                            <property name="expand">False</property>
++                            <property name="position">1</property>
+               </packing>
+             </child>
+           </widget>
+-          <packing>
+-            <property name="left_attach">1</property>
+-            <property name="right_attach">2</property>
+-          </packing>
+         </child>
+         <child>
+-          <widget class="GtkVBox" id="vbox5">
++                      <widget class="GtkHBox" id="hbox9">
+             <property name="visible">True</property>
+-            <property name="spacing">12</property>
+             <child>
+-              <widget class="GtkRadioButton" id="no_missing">
++                          <widget class="GtkLabel" id="label12">
+                 <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="label" translatable="yes">_No missing values</property>
++                            <property name="label" translatable="yes">_High:</property>
+                 <property name="use_underline">True</property>
+-                <property name="active">True</property>
+-                <property name="draw_indicator">True</property>
++                            <property name="mnemonic_widget">mv-high</property>
+               </widget>
+               <packing>
+                 <property name="expand">False</property>
+@@ -1655,97 +1659,102 @@
+               </packing>
+             </child>
+             <child>
+-              <widget class="GtkVBox" id="vbox6">
+-                <property name="visible">True</property>
+-                <child>
+-                  <widget class="GtkRadioButton" id="discrete_missing">
++                          <widget class="GtkEntry" id="mv-high">
++                            <property name="width_request">75</property>
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+-                    <property name="label" translatable="yes">_Discrete missing values</property>
+-                    <property name="use_underline">True</property>
+-                    <property name="focus_on_click">False</property>
+-                    <property name="draw_indicator">True</property>
+-                    <property name="group">no_missing</property>
+                   </widget>
+                   <packing>
+-                    <property name="expand">False</property>
++                            <property name="padding">5</property>
++                            <property name="position">1</property>
++                          </packing>
++                        </child>
++                      </widget>
++                      <packing>
+                     <property name="fill">False</property>
++                        <property name="padding">20</property>
++                        <property name="position">1</property>
+                   </packing>
+                 </child>
+                 <child>
+-                  <widget class="GtkHBox" id="hbox10">
+-                    <property name="visible">True</property>
++                      <placeholder/>
++                    </child>
+                     <child>
+-                      <widget class="GtkHBox" id="hbox5">
++                      <placeholder/>
++                    </child>
++                  </widget>
++                </child>
++                <child>
++                  <widget class="GtkHBox" id="hbox6">
+                         <property name="visible">True</property>
+-                        <property name="border_width">5</property>
+-                        <property name="spacing">5</property>
+-                        <property name="homogeneous">True</property>
+                         <child>
+-                          <widget class="GtkEntry" id="mv0">
+-                            <property name="width_request">75</property>
++                      <widget class="GtkLabel" id="label10">
+                             <property name="visible">True</property>
+-                            <property name="can_focus">True</property>
++                        <property name="label" translatable="yes">Di_screte value:</property>
++                        <property name="use_underline">True</property>
++                        <property name="mnemonic_widget">mv-discrete</property>
+                           </widget>
+                           <packing>
+                             <property name="expand">False</property>
+                             <property name="fill">False</property>
++                        <property name="padding">20</property>
+                           </packing>
+                         </child>
+                         <child>
+-                          <widget class="GtkEntry" id="mv1">
++                      <widget class="GtkEntry" id="mv-discrete">
+                             <property name="width_request">75</property>
+                             <property name="visible">True</property>
+                             <property name="can_focus">True</property>
+                           </widget>
+                           <packing>
+                             <property name="expand">False</property>
+-                            <property name="fill">False</property>
+                             <property name="position">1</property>
+                           </packing>
+                         </child>
+-                        <child>
+-                          <widget class="GtkEntry" id="mv2">
+-                            <property name="width_request">75</property>
+-                            <property name="visible">True</property>
+-                            <property name="can_focus">True</property>
+                           </widget>
+                           <packing>
+-                            <property name="expand">False</property>
+-                            <property name="fill">False</property>
+-                            <property name="position">2</property>
++                    <property name="position">1</property>
+                           </packing>
+                         </child>
+                       </widget>
+                       <packing>
+-                        <property name="padding">20</property>
++                <property name="position">1</property>
+                       </packing>
+                     </child>
+                   </widget>
+                   <packing>
+-                    <property name="position">1</property>
++            <property name="right_attach">2</property>
++            <property name="top_attach">1</property>
++            <property name="bottom_attach">2</property>
++            <property name="x_options">GTK_FILL</property>
+                   </packing>
+                 </child>
++        <child>
++          <widget class="GtkVBox" id="vbox5">
++            <property name="visible">True</property>
++            <property name="spacing">12</property>
++            <child>
++              <widget class="GtkRadioButton" id="no_missing">
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="label" translatable="yes">_No missing values</property>
++                <property name="use_underline">True</property>
++                <property name="active">True</property>
++                <property name="draw_indicator">True</property>
+               </widget>
+               <packing>
+                 <property name="expand">False</property>
+                 <property name="fill">False</property>
+-                <property name="position">1</property>
+-              </packing>
+-            </child>
+-          </widget>
+-          <packing>
+-            <property name="y_options">GTK_FILL</property>
+           </packing>
+         </child>
+         <child>
+-          <widget class="GtkVBox" id="vbox7">
++              <widget class="GtkVBox" id="vbox6">
+             <property name="visible">True</property>
+             <child>
+-              <widget class="GtkRadioButton" id="range_missing">
++                  <widget class="GtkRadioButton" id="discrete_missing">
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+-                <property name="label" translatable="yes">_Range plus one optional discrete missing value</property>
++                    <property name="label" translatable="yes">_Discrete missing values</property>
+                 <property name="use_underline">True</property>
+                 <property name="focus_on_click">False</property>
+                 <property name="draw_indicator">True</property>
+@@ -1757,125 +1766,116 @@
+               </packing>
+             </child>
+             <child>
+-              <widget class="GtkVBox" id="vbox8">
+-                <property name="visible">True</property>
+-                <property name="spacing">5</property>
+-                <child>
+-                  <widget class="GtkHBox" id="hbox7">
++                  <widget class="GtkHBox" id="hbox10">
+                     <property name="visible">True</property>
+                     <child>
+-                      <widget class="GtkHBox" id="hbox8">
++                      <widget class="GtkHBox" id="hbox5">
+                         <property name="visible">True</property>
++                        <property name="border_width">5</property>
++                        <property name="spacing">5</property>
++                        <property name="homogeneous">True</property>
+                         <child>
+-                          <widget class="GtkLabel" id="label11">
++                          <widget class="GtkEntry" id="mv0">
++                            <property name="width_request">75</property>
+                             <property name="visible">True</property>
+-                            <property name="label" translatable="yes">_Low:</property>
+-                            <property name="use_underline">True</property>
+-                            <property name="mnemonic_widget">mv-low</property>
++                            <property name="can_focus">True</property>
+                           </widget>
+                           <packing>
+                             <property name="expand">False</property>
+                             <property name="fill">False</property>
+-                            <property name="padding">20</property>
+                           </packing>
+                         </child>
+                         <child>
+-                          <widget class="GtkEntry" id="mv-low">
++                          <widget class="GtkEntry" id="mv1">
+                             <property name="width_request">75</property>
+                             <property name="visible">True</property>
+                             <property name="can_focus">True</property>
+                           </widget>
+                           <packing>
+                             <property name="expand">False</property>
++                            <property name="fill">False</property>
+                             <property name="position">1</property>
+                           </packing>
+                         </child>
+-                      </widget>
+-                    </child>
+-                    <child>
+-                      <widget class="GtkHBox" id="hbox9">
+-                        <property name="visible">True</property>
+                         <child>
+-                          <widget class="GtkLabel" id="label12">
++                          <widget class="GtkEntry" id="mv2">
++                            <property name="width_request">75</property>
+                             <property name="visible">True</property>
+-                            <property name="label" translatable="yes">_High:</property>
+-                            <property name="use_underline">True</property>
+-                            <property name="mnemonic_widget">mv-high</property>
++                            <property name="can_focus">True</property>
+                           </widget>
+                           <packing>
+                             <property name="expand">False</property>
+                             <property name="fill">False</property>
++                            <property name="position">2</property>
++                          </packing>
++                        </child>
++                      </widget>
++                      <packing>
++                        <property name="padding">20</property>
+                           </packing>
+                         </child>
+-                        <child>
+-                          <widget class="GtkEntry" id="mv-high">
+-                            <property name="width_request">75</property>
+-                            <property name="visible">True</property>
+-                            <property name="can_focus">True</property>
+                           </widget>
+                           <packing>
+-                            <property name="padding">5</property>
+                             <property name="position">1</property>
+                           </packing>
+                         </child>
+                       </widget>
+                       <packing>
++                <property name="expand">False</property>
+                         <property name="fill">False</property>
+-                        <property name="padding">20</property>
+                         <property name="position">1</property>
+                       </packing>
+                     </child>
+-                    <child>
+-                      <placeholder/>
+-                    </child>
+-                    <child>
+-                      <placeholder/>
+-                    </child>
+                   </widget>
++          <packing>
++            <property name="y_options">GTK_FILL</property>
++          </packing>
+                 </child>
+                 <child>
+-                  <widget class="GtkHBox" id="hbox6">
++          <widget class="GtkVButtonBox" id="vbuttonbox5">
+                     <property name="visible">True</property>
++            <property name="border_width">5</property>
++            <property name="spacing">5</property>
++            <property name="layout_style">GTK_BUTTONBOX_START</property>
+                     <child>
+-                      <widget class="GtkLabel" id="label10">
++              <widget class="GtkButton" id="missing_val_ok">
+                         <property name="visible">True</property>
+-                        <property name="label" translatable="yes">Di_screte value:</property>
+-                        <property name="use_underline">True</property>
+-                        <property name="mnemonic_widget">mv-discrete</property>
++                <property name="can_focus">True</property>
++                <property name="can_default">True</property>
++                <property name="label">gtk-ok</property>
++                <property name="use_stock">True</property>
++                <signal name="clicked" handler="gtk_widget_hide" object="val_labs_dialog"/>
+                       </widget>
+-                      <packing>
+-                        <property name="expand">False</property>
+-                        <property name="fill">False</property>
+-                        <property name="padding">20</property>
+-                      </packing>
+                     </child>
+                     <child>
+-                      <widget class="GtkEntry" id="mv-discrete">
+-                        <property name="width_request">75</property>
++              <widget class="GtkButton" id="missing_val_cancel">
+                         <property name="visible">True</property>
+                         <property name="can_focus">True</property>
+-                      </widget>
+-                      <packing>
+-                        <property name="expand">False</property>
+-                        <property name="position">1</property>
+-                      </packing>
+-                    </child>
++                <property name="can_default">True</property>
++                <property name="label">gtk-cancel</property>
++                <property name="use_stock">True</property>
++                <signal name="clicked" handler="gtk_widget_hide" object="val_labs_dialog"/>
+                   </widget>
+                   <packing>
+                     <property name="position">1</property>
+                   </packing>
+                 </child>
++            <child>
++              <widget class="GtkButton" id="help_button_missing_values">
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="can_default">True</property>
++                <property name="label">gtk-help</property>
++                <property name="use_stock">True</property>
+               </widget>
+               <packing>
+-                <property name="position">1</property>
++                <property name="position">2</property>
+               </packing>
+             </child>
+           </widget>
+           <packing>
++            <property name="left_attach">1</property>
+             <property name="right_attach">2</property>
+-            <property name="top_attach">1</property>
+-            <property name="bottom_attach">2</property>
+-            <property name="x_options">GTK_FILL</property>
+           </packing>
+         </child>
+       </widget>