Missing Values Dialog: replace deprecated widgets

diff --git a/src/ui/gui/missing-val-dialog.ui b/src/ui/gui/missing-val-dialog.ui
index 9fd43d801977fa65af3792d1742de173c801e456..4bf2b27f68693a7d3ce5c9b679b2f0b6b2aca6bf 100644 (file)
--- a/src/ui/gui/missing-val-dialog.ui
+++ b/src/ui/gui/missing-val-dialog.ui
@@ -1,221 +1,246 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
 <interface>
-  <!-- interface-requires gtk+ 2.12 -->
-  <!-- interface-naming-policy project-wide -->
-  <object class="GtkVBox" id="missing-values-dialog">
+  <requires lib="gtk+" version="3.0"/>
+  <requires lib="psppire" version="0.0"/>
+  <object class="GtkBox" id="missing-values-dialog">
     <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="margin_left">5</property>
+    <property name="margin_right">5</property>
+    <property name="margin_top">5</property>
+    <property name="margin_bottom">5</property>
     <property name="orientation">vertical</property>
     <property name="spacing">12</property>
     <child>
       <object class="GtkFrame" id="frame9">
-       <property name="visible">True</property>
-       <property name="label_xalign">0</property>
-       <property name="shadow_type">none</property>
-       <child>
-         <object class="GtkAlignment" id="alignment4">
-           <property name="visible">True</property>
-           <property name="left_padding">12</property>
-           <child>
-             <placeholder/>
-           </child>
-         </object>
-       </child>
-       <child type="label">
-         <object class="GtkRadioButton" id="no_missing">
-           <property name="label" translatable="yes">_No missing values</property>
-           <property name="visible">True</property>
-           <property name="can_focus">True</property>
-           <property name="receives_default">False</property>
-           <property name="use_underline">True</property>
-           <property name="active">True</property>
-           <property name="draw_indicator">True</property>
-         </object>
-       </child>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">none</property>
+        <child>
+          <object class="GtkEventBox" id="eventbox1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+        </child>
+        <child type="label">
+          <object class="GtkRadioButton" id="no_missing">
+            <property name="label" translatable="yes">_No missing values</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="use_underline">True</property>
+            <property name="xalign">0.5</property>
+            <property name="active">True</property>
+            <property name="draw_indicator">True</property>
+          </object>
+        </child>
       </object>
       <packing>
-       <property name="position">0</property>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
       </packing>
     </child>
     <child>
-      <object class="GtkFrame" id="frame4">
-       <property name="visible">True</property>
-       <property name="label_xalign">0</property>
-       <property name="shadow_type">none</property>
-       <child>
-             <object class="GtkHBox" id="hbox5">
-               <property name="visible">True</property>
-               <property name="border_width">5</property>
-               <property name="spacing">6</property>
-               <property name="margin-start">12</property>
-               <property name="homogeneous">True</property>
-               <child>
-                 <object class="GtkEntry" id="mv0">
-                   <property name="width_request">75</property>
-                   <property name="visible">True</property>
-                   <property name="can_focus">True</property>
-                 </object>
-                 <packing>
-                   <property name="expand">False</property>
-                   <property name="fill">False</property>
-                   <property name="position">0</property>
-                 </packing>
-               </child>
-               <child>
-                 <object class="GtkEntry" id="mv1">
-                   <property name="width_request">75</property>
-                   <property name="visible">True</property>
-                   <property name="can_focus">True</property>
-                 </object>
-                 <packing>
-                   <property name="expand">False</property>
-                   <property name="fill">False</property>
-                   <property name="position">1</property>
-                 </packing>
-               </child>
-               <child>
-                 <object class="GtkEntry" id="mv2">
-                   <property name="width_request">75</property>
-                   <property name="visible">True</property>
-                   <property name="can_focus">True</property>
-                 </object>
-                 <packing>
-                   <property name="expand">False</property>
-                   <property name="fill">False</property>
-                   <property name="position">2</property>
-                 </packing>
-               </child>
-             </object>
-       </child>
-       <child type="label">
-         <object class="GtkRadioButton" id="discrete_missing">
-           <property name="label" translatable="yes">_Discrete missing values</property>
-           <property name="visible">True</property>
-           <property name="can_focus">True</property>
-           <property name="receives_default">False</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>
-         </object>
-       </child>
+      <object class="PsppireHButtonBox" id="hbuttonbox">
+        <property name="visible">True</property>
+        <property name="can_focus">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="border_width">5</property>
+        <property name="buttons">PSPPIRE_BUTTON_OK_MASK | PSPPIRE_BUTTON_CANCEL_MASK | PSPPIRE_BUTTON_HELP_MASK</property>
       </object>
       <packing>
-       <property name="position">1</property>
+        <property name="expand">False</property>
+        <property name="fill">False</property>
+        <property name="pack_type">end</property>
+        <property name="position">1</property>
       </packing>
     </child>
     <child>
-      <object class="GtkFrame" id="frame10">
-       <property name="visible">True</property>
-       <property name="label_xalign">0</property>
-       <property name="shadow_type">none</property>
-       <child>
-             <object class="GtkTable" id="table1">
-               <property name="visible">True</property>
-               <property name="n_rows">3</property>
-               <property name="n_columns">2</property>
-               <property name="column_spacing">6</property>
-               <property name="row_spacing">6</property>
-               <property name="margin-start">12</property>
-               <child>
-                 <object 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>
-                 </object>
-               </child>
-               <child>
-                 <object class="GtkEntry" id="mv-low">
-                   <property name="width_request">75</property>
-                   <property name="visible">True</property>
-                   <property name="can_focus">True</property>
-                 </object>
-                 <packing>
-                   <property name="left_attach">1</property>
-                   <property name="right_attach">2</property>
-                 </packing>
-               </child>
-               <child>
-                 <object class="GtkLabel" id="label12">
-                   <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>
-                 </object>
-                 <packing>
-                   <property name="top_attach">1</property>
-                   <property name="bottom_attach">2</property>
-                 </packing>
-               </child>
-               <child>
-                 <object class="GtkEntry" id="mv-high">
-                   <property name="width_request">75</property>
-                   <property name="visible">True</property>
-                   <property name="can_focus">True</property>
-                 </object>
-                 <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>
-                 </packing>
-               </child>
-               <child>
-                 <object class="GtkLabel" id="label10">
-                   <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>
-                 </object>
-                 <packing>
-                   <property name="top_attach">2</property>
-                   <property name="bottom_attach">3</property>
-                 </packing>
-               </child>
-               <child>
-                 <object class="GtkEntry" id="mv-discrete">
-                   <property name="width_request">75</property>
-                   <property name="visible">True</property>
-                   <property name="can_focus">True</property>
-                 </object>
-                 <packing>
-                   <property name="left_attach">1</property>
-                   <property name="right_attach">2</property>
-                   <property name="top_attach">2</property>
-                   <property name="bottom_attach">3</property>
-                 </packing>
-               </child>
-         </object>
-       </child>
-       <child type="label">
-         <object class="GtkRadioButton" id="range_missing">
-           <property name="label" translatable="yes">_Range plus one optional discrete missing value</property>
-           <property name="visible">True</property>
-           <property name="can_focus">True</property>
-           <property name="receives_default">False</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>
-         </object>
-       </child>
+      <object class="GtkFrame" id="frame4">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">none</property>
+        <child>
+          <object class="GtkBox" id="hbox5">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_left">12</property>
+            <property name="margin_start">12</property>
+            <property name="border_width">5</property>
+            <property name="spacing">6</property>
+            <property name="homogeneous">True</property>
+            <child>
+              <object class="GtkEntry" id="mv0">
+                <property name="width_request">75</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="mv1">
+                <property name="width_request">75</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="mv2">
+                <property name="width_request">75</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+        </child>
+        <child type="label">
+          <object class="GtkRadioButton" id="discrete_missing">
+            <property name="label" translatable="yes">_Discrete missing values</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="use_underline">True</property>
+            <property name="focus_on_click">False</property>
+            <property name="xalign">0</property>
+            <property name="draw_indicator">True</property>
+            <property name="group">no_missing</property>
+          </object>
+        </child>
       </object>
       <packing>
-       <property name="position">2</property>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
+        <property name="position">2</property>
       </packing>
     </child>
     <child>
-      <object class="PsppireHButtonBox" id="hbuttonbox">
-       <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="border_width">5</property>
-       <property name="buttons">PSPPIRE_BUTTON_CANCEL_MASK | PSPPIRE_BUTTON_OK_MASK | PSPPIRE_BUTTON_HELP_MASK</property>
+      <object class="GtkFrame" id="frame10">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">none</property>
+        <child>
+          <object class="GtkGrid" id="table1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_left">12</property>
+            <property name="margin_start">12</property>
+            <property name="row_spacing">6</property>
+            <property name="column_spacing">6</property>
+            <child>
+              <object class="GtkLabel" id="label11">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">_Low:</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">mv-low</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="mv-low">
+                <property name="width_request">75</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label12">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">_High:</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">mv-high</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="mv-high">
+                <property name="width_request">75</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label10">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Di_screte value:</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">mv-discrete</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="mv-discrete">
+                <property name="width_request">75</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">2</property>
+              </packing>
+            </child>
+          </object>
+        </child>
+        <child type="label">
+          <object class="GtkRadioButton" id="range_missing">
+            <property name="label" translatable="yes">_Range plus one optional discrete missing value</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="use_underline">True</property>
+            <property name="focus_on_click">False</property>
+            <property name="xalign">0</property>
+            <property name="draw_indicator">True</property>
+            <property name="group">no_missing</property>
+          </object>
+        </child>
       </object>
       <packing>
-       <property name="expand">False</property>
-       <property name="fill">False</property>
-       <property name="pack_type">end</property>
-       <property name="position">1</property>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">3</property>
       </packing>
     </child>
   </object>