X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fdata-editor.glade;h=ade5f222bf7aeb0a613c0afe6c4e75a3171b76f5;hb=d2a96ae99e49b5264ca68ace469e20fa5e2e605b;hp=abbf9363f89c16e2f5fcdcf014e38a2038a6a822;hpb=68af3306969829d17a05cfab5c9d46cb920b7607;p=pspp

diff --git a/src/ui/gui/data-editor.glade b/src/ui/gui/data-editor.glade
index abbf9363f8..ade5f222bf 100644
--- a/src/ui/gui/data-editor.glade
+++ b/src/ui/gui/data-editor.glade
@@ -72,23 +72,41 @@
                       </widget>
                     </child>
                     <child>
-                      <widget class="GtkImageMenuItem" id="save1">
+                      <widget class="GtkImageMenuItem" id="file_save">
                         <property name="visible">True</property>
-                        <property name="sensitive">False</property>
                         <property name="label">gtk-save</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
-                        <signal name="activate" handler="on_save1_activate"/>
                       </widget>
                     </child>
                     <child>
-                      <widget class="GtkImageMenuItem" id="save_as1">
+                      <widget class="GtkImageMenuItem" id="file_save_as">
                         <property name="visible">True</property>
-                        <property name="sensitive">False</property>
                         <property name="label">gtk-save-as</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
-                        <signal name="activate" handler="on_save_as1_activate"/>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkSeparatorMenuItem" id="separatormenuitem2">
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkMenuItem" id="file_recent-data">
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label" translatable="yes">Recently Used Da_ta</property>
+                        <property name="use_underline">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkMenuItem" id="file_recent-files">
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label" translatable="yes">Recently Used _Files</property>
+                        <property name="use_underline">True</property>
                       </widget>
                     </child>
                     <child>
@@ -102,7 +120,6 @@
                         <property name="label">gtk-quit</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
-                        <signal name="activate" handler="on_quit1_activate"/>
                       </widget>
                     </child>
                   </widget>
@@ -260,7 +277,6 @@
                         <property name="sensitive">False</property>
                         <property name="label" translatable="yes">Insert Variable</property>
                         <property name="use_underline">True</property>
-                        <signal name="activate" handler="on_insert_variable"/>
                       </widget>
                     </child>
                     <child>
@@ -269,7 +285,6 @@
                         <property name="sensitive">False</property>
                         <property name="label" translatable="yes">Insert Cases</property>
                         <property name="use_underline">True</property>
-                        <signal name="activate" handler="on_insert_cases"/>
                       </widget>
                     </child>
                     <child>
@@ -278,7 +293,6 @@
                         <property name="sensitive">False</property>
                         <property name="label" translatable="yes">Go To Case</property>
                         <property name="use_underline">True</property>
-                        <signal name="activate" handler="on_go_to_case_activate"/>
                       </widget>
                     </child>
                     <child>
@@ -288,16 +302,14 @@
                       </widget>
                     </child>
                     <child>
-                      <widget class="GtkMenuItem" id="sort_cases">
+                      <widget class="GtkMenuItem" id="data_sort-cases">
                         <property name="visible">True</property>
-                        <property name="sensitive">False</property>
                         <property name="label" translatable="yes">Sort Cases</property>
                         <property name="use_underline">True</property>
-                        <signal name="activate" handler="on_sort_cases_activate"/>
                       </widget>
                     </child>
                     <child>
-                      <widget class="GtkMenuItem" id="transpose1">
+                      <widget class="GtkMenuItem" id="data_transpose">
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
                         <property name="label" translatable="yes">Transpose</property>
@@ -335,9 +347,8 @@
                       </widget>
                     </child>
                     <child>
-                      <widget class="GtkMenuItem" id="split_file1">
+                      <widget class="GtkMenuItem" id="data_split-file">
                         <property name="visible">True</property>
-                        <property name="sensitive">False</property>
                         <property name="label" translatable="yes">Split File</property>
                         <property name="use_underline">True</property>
                       </widget>
@@ -353,7 +364,6 @@
                     <child>
                       <widget class="GtkMenuItem" id="data_weight-cases">
                         <property name="visible">True</property>
-                        <property name="sensitive">True</property>
                         <property name="label" translatable="yes">Weight Cases</property>
                         <property name="use_underline">True</property>
                       </widget>
@@ -362,12 +372,73 @@
                 </child>
               </widget>
             </child>
+            <child>
+              <widget class="GtkMenuItem" id="transform">
+                <property name="visible">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="label" translatable="yes">_Transform</property>
+                <property name="use_underline">True</property>
+                <child>
+                  <widget class="GtkMenu" id="menu2">
+                    <property name="visible">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <child>
+                      <widget class="GtkMenuItem" id="transform_compute">
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label" translatable="yes">_Compute</property>
+                        <property name="use_underline">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkMenuItem" id="transform_rank">
+                        <property name="visible">True</property>
+                        <property name="sensitive">False</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label" translatable="yes">Ran_k Cases</property>
+                        <property name="use_underline">True</property>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkMenuItem" id="utilities">
+                <property name="visible">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="label" translatable="yes">_Utilities</property>
+                <property name="use_underline">True</property>
+                <child>
+                  <widget class="GtkMenu" id="menu1">
+                    <property name="visible">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <child>
+                      <widget class="GtkMenuItem" id="utilities_variables">
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label" translatable="yes">_Variables</property>
+                        <property name="use_underline">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkMenuItem" id="utilities_comments">
+                        <property name="visible">True</property>
+                        <property name="sensitive">False</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label" translatable="yes">Data File _Comments</property>
+                        <property name="use_underline">True</property>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+            </child>
             <child>
               <widget class="GtkMenuItem" id="windows">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">_Windows</property>
                 <property name="use_underline">True</property>
-                <signal name="activate" handler="on_Windows_activate"/>
                 <child>
                   <widget class="GtkMenu" id="Windows_menu">
                     <child>
@@ -375,7 +446,6 @@
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">_Minimise All Windows</property>
                         <property name="use_underline">True</property>
-                        <signal name="activate" handler="on_minimiseall_activate"/>
                       </widget>
                     </child>
                   </widget>
@@ -401,7 +471,6 @@
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">_About</property>
                         <property name="use_underline">True</property>
-                        <signal name="activate" handler="on_about1_activate"/>
                       </widget>
                     </child>
                   </widget>
@@ -424,7 +493,6 @@
                 <child>
                   <widget class="GtkToolButton" id="button-open">
                     <property name="visible">True</property>
-                    <property name="sensitive">False</property>
                     <property name="tooltip" translatable="yes">Open</property>
                     <property name="stock_id">gtk-open</property>
                   </widget>
@@ -435,10 +503,8 @@
                 <child>
                   <widget class="GtkToolButton" id="button-save">
                     <property name="visible">True</property>
-                    <property name="sensitive">False</property>
                     <property name="tooltip" translatable="yes">Save</property>
                     <property name="stock_id">gtk-save</property>
-                    <signal name="clicked" handler="on_save1_activate"/>
                   </widget>
                   <packing>
                     <property name="expand">False</property>
@@ -446,7 +512,6 @@
                 </child>
                 <child>
                   <widget class="GtkToolButton" id="button-print">
-                    <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="tooltip" translatable="yes">Print</property>
                     <property name="stock_id">gtk-print</property>
@@ -455,9 +520,19 @@
                     <property name="expand">False</property>
                   </packing>
                 </child>
+                <child>
+                  <widget class="GtkToolButton" id="button-recent">
+                    <property name="sensitive">False</property>
+                    <property name="tooltip" translatable="yes">Recall</property>
+                    <property name="stock_id">pspp-recent-dialogs</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                  </packing>
+                </child>
                 <child>
                   <widget class="GtkSeparatorToolItem" id="separatortoolitem1">
-                    <property name="visible">True</property>
+                    <property name="visible">False</property>
                   </widget>
                   <packing>
                     <property name="expand">False</property>
@@ -466,7 +541,6 @@
                 </child>
                 <child>
                   <widget class="GtkToolButton" id="button-undo">
-                    <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="tooltip" translatable="yes">Undo</property>
                     <property name="stock_id">gtk-undo</property>
@@ -477,7 +551,6 @@
                 </child>
                 <child>
                   <widget class="GtkToolButton" id="button-redo">
-                    <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="tooltip" translatable="yes">Redo</property>
                     <property name="stock_id">gtk-redo</property>
@@ -501,7 +574,6 @@
                     <property name="sensitive">False</property>
                     <property name="tooltip" translatable="yes">Go To Case</property>
                     <property name="stock_id">gtk-jump-to</property>
-                    <signal name="clicked" handler="on_go_to_case_activate"/>
                   </widget>
                   <packing>
                     <property name="expand">False</property>
@@ -510,7 +582,6 @@
                 <child>
                   <widget class="GtkToolButton" id="button-goto-variable">
                     <property name="visible">True</property>
-                    <property name="sensitive">False</property>
                     <property name="tooltip" translatable="yes">Variables</property>
                     <property name="use_underline">True</property>
                     <property name="stock_id">pspp-goto-variable</property>
@@ -555,7 +626,6 @@
                     <property name="tooltip" translatable="yes">Insert Case</property>
                     <property name="use_underline">True</property>
                     <property name="stock_id">pspp-insert-case</property>
-                    <signal name="clicked" handler="on_insert_case_clicked"/>
                   </widget>
                   <packing>
                     <property name="expand">False</property>
@@ -585,7 +655,6 @@
                 <child>
                   <widget class="GtkToolButton" id="button-split-file">
                     <property name="visible">True</property>
-                    <property name="sensitive">False</property>
                     <property name="tooltip" translatable="yes">Split File</property>
                     <property name="use_underline">True</property>
                     <property name="stock_id">pspp-split-file</property>
@@ -597,7 +666,6 @@
                 <child>
                   <widget class="GtkToolButton" id="button-weight-cases">
                     <property name="visible">True</property>
-                    <property name="sensitive">True</property>
                     <property name="tooltip" translatable="yes">Weight Cases</property>
                     <property name="use_underline">True</property>
                     <property name="stock_id">pspp-weight-cases</property>
@@ -633,7 +701,6 @@
                     <property name="tooltip" translatable="yes">Value Labels</property>
                     <property name="use_underline">True</property>
                     <property name="stock_id">pspp-value-labels</property>
-                    <signal name="toggled" handler="on_togglebutton_value_labels_toggled"/>
                   </widget>
                   <packing>
                     <property name="expand">False</property>
@@ -641,7 +708,6 @@
                 </child>
                 <child>
                   <widget class="GtkToolButton" id="button-use-sets">
-                    <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="tooltip" translatable="yes">Use Sets</property>
                     <property name="use_underline">True</property>
@@ -675,25 +741,25 @@
                     <property name="n_rows">1</property>
                     <property name="n_columns">2</property>
                     <child>
-                      <widget class="GtkEntry" id="cell_ref_entry">
+                      <widget class="GtkEntry" id="datum_entry">
                         <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>
                     <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>
@@ -1230,9 +1296,9 @@
                       <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="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>
@@ -1271,12 +1337,12 @@
                 </child>
                 <child>
                   <widget class="GtkLabel" id="decimals_label">
-                        <property name="visible">True</property>
+                    <property name="visible">True</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="justify">GTK_JUSTIFY_RIGHT</property>
+                  </widget>
+                  <packing>
                     <property name="top_attach">1</property>
                     <property name="bottom_attach">2</property>
                     <property name="x_options">GTK_FILL</property>
@@ -1315,7 +1381,6 @@
                 <property name="can_default">True</property>
                 <property name="label">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_var_type_cancel_clicked" object="var_type_dialog"/>
               </widget>
               <packing>
                 <property name="position">1</property>
@@ -1369,8 +1434,8 @@
                     <property name="row_spacing">5</property>
                     <child>
                       <widget class="GtkScrolledWindow" id="scrolledwindow3">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                        <property name="visible">True</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>
@@ -1408,13 +1473,13 @@
                                 <property name="width_request">85</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                          </widget>
-                          <packing>
+                              </widget>
+                              <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
                                 <property name="padding">1</property>
-                          </packing>
-                        </child>
+                              </packing>
+                            </child>
                           </widget>
                           <packing>
                             <property name="left_attach">1</property>
@@ -1438,17 +1503,17 @@
                         </child>
                         <child>
                           <widget class="GtkLabel" id="label6">
-                                <property name="visible">True</property>
+                            <property name="visible">True</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">Value Label:</property>
-                              </widget>
-                              <packing>
+                          </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"></property>
-                              </packing>
-                            </child>
+                          </packing>
+                        </child>
                         <child>
                           <widget class="GtkLabel" id="label5">
                             <property name="visible">True</property>
@@ -1472,9 +1537,9 @@
                         <property name="border_width">5</property>
                         <child>
                           <widget class="GtkButton" id="val_labs_add">
-                        <property name="visible">True</property>
+                            <property name="visible">True</property>
                             <property name="sensitive">False</property>
-                        <property name="can_focus">True</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>
@@ -1545,7 +1610,6 @@
                 <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>
             </child>
             <child>
@@ -1555,7 +1619,6 @@
                 <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>
@@ -1631,60 +1694,60 @@
                             <property name="label" translatable="yes">_Low:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">mv-low</property>
-              </widget>
-              <packing>
+                          </widget>
+                          <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
                             <property name="padding">20</property>
-              </packing>
-            </child>
-            <child>
+                          </packing>
+                        </child>
+                        <child>
                           <widget class="GtkEntry" id="mv-low">
                             <property name="width_request">75</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-              </widget>
-              <packing>
+                            <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>
-          </widget>
-        </child>
-        <child>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
                       <widget class="GtkHBox" id="hbox9">
-            <property name="visible">True</property>
-            <child>
+                        <property name="visible">True</property>
+                        <child>
                           <widget class="GtkLabel" id="label12">
-                <property name="visible">True</property>
+                            <property name="visible">True</property>
                             <property name="label" translatable="yes">_High:</property>
-                <property name="use_underline">True</property>
+                            <property name="use_underline">True</property>
                             <property name="mnemonic_widget">mv-high</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-              </packing>
-            </child>
-            <child>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</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="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="fill">False</property>
+                        <property name="fill">False</property>
                         <property name="padding">20</property>
                         <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
+                      </packing>
+                    </child>
+                    <child>
                       <placeholder/>
                     </child>
                     <child>
@@ -1694,49 +1757,49 @@
                 </child>
                 <child>
                   <widget class="GtkHBox" id="hbox6">
-                        <property name="visible">True</property>
-                        <child>
+                    <property name="visible">True</property>
+                    <child>
                       <widget class="GtkLabel" id="label10">
-                            <property name="visible">True</property>
+                        <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>
-                          </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
                         <property name="padding">20</property>
-                          </packing>
-                        </child>
-                        <child>
+                      </packing>
+                    </child>
+                    <child>
                       <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="position">1</property>
-                          </packing>
-                        </child>
-                          </widget>
-                          <packing>
-                    <property name="position">1</property>
-                          </packing>
-                        </child>
+                        <property name="width_request">75</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
                       </widget>
                       <packing>
-                <property name="position">1</property>
+                        <property name="expand">False</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                   </widget>
                   <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
             <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>
+          </packing>
+        </child>
         <child>
           <widget class="GtkVBox" id="vbox5">
             <property name="visible">True</property>
@@ -1753,27 +1816,27 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-          </packing>
-        </child>
-        <child>
-              <widget class="GtkVBox" id="vbox6">
-            <property name="visible">True</property>
-            <child>
-                  <widget class="GtkRadioButton" id="discrete_missing">
-                <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="fill">False</property>
               </packing>
             </child>
             <child>
+              <widget class="GtkVBox" id="vbox6">
+                <property name="visible">True</property>
+                <child>
+                  <widget class="GtkRadioButton" id="discrete_missing">
+                    <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="fill">False</property>
+                  </packing>
+                </child>
+                <child>
                   <widget class="GtkHBox" id="hbox10">
                     <property name="visible">True</property>
                     <child>
@@ -1820,54 +1883,52 @@
                       </widget>
                       <packing>
                         <property name="padding">20</property>
-                          </packing>
-                        </child>
-                          </widget>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </widget>
-                      <packing>
-                <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
                       </packing>
                     </child>
                   </widget>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </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>
+        </child>
+        <child>
           <widget class="GtkVButtonBox" id="vbuttonbox5">
-                    <property name="visible">True</property>
+            <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>
+            <child>
               <widget class="GtkButton" id="missing_val_ok">
-                        <property name="visible">True</property>
+                <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"/>
-                      </widget>
-                    </child>
-                    <child>
+              </widget>
+            </child>
+            <child>
               <widget class="GtkButton" id="missing_val_cancel">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                <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"/>
-                  </widget>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
             <child>
               <widget class="GtkButton" id="help_button_missing_values">
                 <property name="visible">True</property>
@@ -1940,7 +2001,7 @@
                 <property name="can_default">True</property>
                 <property name="label">gtk-ok</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-5</property>
+                <property name="response_id">5</property>
               </widget>
             </child>
           </widget>