projects / pspp / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
GRAPH scatterplot - fixed missing BY variable rendering
[pspp] / src / ui / gui / text-data-import.ui
diff --git a/src/ui/gui/text-data-import.ui b/src/ui/gui/text-data-import.ui
index fc886c2a003ced420c321c1c96d94198b52fa6df..ed2bbc2dd114e62e421704a14ee2c8ed983f5e63 100644 (file)
--- a/src/ui/gui/text-data-import.ui
+++ b/src/ui/gui/text-data-import.ui
@@ -7,7 +7,8 @@
     <property name="border_width">12</property>
     <property name="title" translatable="yes">Importing Textual Data</property>
     <child>
-      <object class="GtkVBox" id="vbox3">
+      <object class="GtkBox" id="vbox3">
+       <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
         <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="orientation">vertical</property>
@@ -18,7 +19,7 @@
             <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">This assistant will guide you through the process of importing data into PSPP from a text file with one line per case,  in which fields are separated by tabs, commas, or other delimiters.
 
-The selected file contains N lines of text.  Only the first M of these will be shown for preview purposes in the following screens.  You may choose below how much of the file should actually be imported.</property>
+           The selected file contains N lines of text.  Only the first M of these will be shown for preview purposes in the following screens.  You may choose below how much of the file should actually be imported.</property>
             <property name="wrap">True</property>
           </object>
           <packing>
@@ -42,10 +43,9 @@ The selected file contains N lines of text.  Only the first M of these will be s
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <object class="GtkTable" id="button-table">
+                      <object class="GtkGrid" id="button-table">
                         <property name="visible">True</property>
-                        <property name="n_rows">3</property>
-                        <property name="n_columns">2</property>
+                       <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
                         <child>
                           <object class="GtkRadioButton" id="import-all-cases">
                             <property name="visible">True</property>
@@ -54,9 +54,6 @@ The selected file contains N lines of text.  Only the first M of these will be s
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
                           </object>
-                          <packing>
-                            <property name="x_options"></property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="import-n-cases">
@@ -67,11 +64,6 @@ The selected file contains N lines of text.  Only the first M of these will be s
                             <property name="draw_indicator">True</property>
                             <property name="group">import-all-cases</property>
                           </object>
-                          <packing>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_options"></property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="import-percent">
@@ -82,11 +74,6 @@ The selected file contains N lines of text.  Only the first M of these will be s
                             <property name="draw_indicator">True</property>
                             <property name="group">import-all-cases</property>
                           </object>
-                          <packing>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                            <property name="x_options"></property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="label1">
@@ -95,8 +82,8 @@ The selected file contains N lines of text.  Only the first M of these will be s
                             <property name="label" translatable="yes">All cases</property>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
+                           <property name="left-attach">1</property>
+                           <property name="top-attach">0</property>
                           </packing>
                         </child>
                         <child>
@@ -129,12 +116,14 @@ The selected file contains N lines of text.  Only the first M of these will be s
       </object>
     </child>
   </object>
+
   <object class="GtkWindow" id="FirstLine">
     <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">12</property>
     <property name="title" translatable="yes">Select Data to Import</property>
     <child>
-      <object class="GtkVBox" id="vbox2">
+      <object class="GtkBox" id="vbox2">
+       <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
         <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="orientation">vertical</property>
@@ -166,6 +155,8 @@ The selected file contains N lines of text.  Only the first M of these will be s
             </child>
           </object>
           <packing>
+           <property name="expand">True</property>
+           <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -186,18 +177,21 @@ The selected file contains N lines of text.  Only the first M of these will be s
       </object>
     </child>
   </object>
+
   <object class="GtkWindow" id="Separators">
     <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">12</property>
     <property name="title" translatable="yes">Choose Separators</property>
     <child>
-      <object class="GtkVBox" id="vbox4">
+      <object class="GtkBox" id="vbox4">
+       <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
         <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="orientation">vertical</property>
         <property name="spacing">12</property>
         <child>
-          <object class="GtkHBox" id="hbox2">
+          <object class="GtkBox" id="hbox2">
+           <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
             <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="spacing">12</property>
@@ -213,182 +207,186 @@ The selected file contains N lines of text.  Only the first M of these will be s
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <object class="GtkTable" id="table1">
-                        <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="n_rows">4</property>
-                        <property name="n_columns">3</property>
-                        <property name="column_spacing">6</property>
-                        <property name="row_spacing">6</property>
-                        <child>
-                          <object class="GtkEntry" id="custom-entry">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">3</property>
-                            <property name="top_attach">3</property>
-                            <property name="bottom_attach">4</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="custom-cb">
-                            <property name="label" translatable="yes">C_ustom</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">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="use_underline">True</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="top_attach">3</property>
-                            <property name="bottom_attach">4</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="slash">
-                            <property name="label" translatable="yes">Slas_h (/)</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">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="use_underline">True</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="right_attach">3</property>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="semicolon">
-                            <property name="label" translatable="yes">Semicolo_n (;)</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">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="use_underline">True</property>
-                            <property name="draw_indicator">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>
-                        <child>
-                          <object class="GtkCheckButton" id="pipe">
-                            <property name="label" translatable="yes">P_ipe (|)</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">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="use_underline">True</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="hyphen">
-                            <property name="label" translatable="yes">H_yphen (-)</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">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="use_underline">True</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="right_attach">3</property>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="comma">
-                            <property name="label" translatable="yes">Co_mma (,)</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">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="use_underline">True</property>
-                            <property name="draw_indicator">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="GtkCheckButton" id="colon">
-                            <property name="label" translatable="yes">_Colon (:)</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">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="use_underline">True</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="bang">
-                            <property name="label" translatable="yes">Ban_g (!)</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">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="use_underline">True</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="right_attach">3</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="tab">
-                            <property name="label" translatable="yes">Ta_b</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">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="use_underline">True</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="space">
-                            <property name="label" translatable="yes">_Space</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">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="use_underline">True</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
+                     <object class="GtkGrid" id="table1">
+                       <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="row_spacing">6</property>
+                       <property name="column_spacing">6</property>
+                       <child>
+                         <object class="GtkEntry" id="custom-entry">
+                           <property name="visible">True</property>
+                           <property name="can_focus">True</property>
+                           <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                         </object>
+                         <packing>
+                           <property name="left_attach">1</property>
+                           <property name="top_attach">3</property>
+                           <property name="width">2</property>
+                         </packing>
+                       </child>
+                       <child>
+                         <object class="GtkCheckButton" id="custom-cb">
+                           <property name="label" translatable="yes">C_ustom</property>
+                           <property name="visible">True</property>
+                           <property name="can_focus">True</property>
+                           <property name="receives_default">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="use_underline">True</property>
+                           <property name="xalign">0.5</property>
+                           <property name="draw_indicator">True</property>
+                         </object>
+                         <packing>
+                           <property name="left_attach">0</property>
+                           <property name="top_attach">3</property>
+                         </packing>
+                       </child>
+                       <child>
+                         <object class="GtkCheckButton" id="slash">
+                           <property name="label" translatable="yes">Slas_h (/)</property>
+                           <property name="visible">True</property>
+                           <property name="can_focus">True</property>
+                           <property name="receives_default">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="use_underline">True</property>
+                           <property name="xalign">0.5</property>
+                           <property name="draw_indicator">True</property>
+                         </object>
+                         <packing>
+                           <property name="left_attach">2</property>
+                           <property name="top_attach">2</property>
+                         </packing>
+                       </child>
+                       <child>
+                         <object class="GtkCheckButton" id="semicolon">
+                           <property name="label" translatable="yes">Semicolo_n (;)</property>
+                           <property name="visible">True</property>
+                           <property name="can_focus">True</property>
+                           <property name="receives_default">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="use_underline">True</property>
+                           <property name="xalign">0.5</property>
+                           <property name="draw_indicator">True</property>
+                         </object>
+                         <packing>
+                           <property name="left_attach">1</property>
+                           <property name="top_attach">2</property>
+                         </packing>
+                       </child>
+                       <child>
+                         <object class="GtkCheckButton" id="pipe">
+                           <property name="label" translatable="yes">P_ipe (|)</property>
+                           <property name="visible">True</property>
+                           <property name="can_focus">True</property>
+                           <property name="receives_default">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="use_underline">True</property>
+                           <property name="xalign">0.5</property>
+                           <property name="draw_indicator">True</property>
+                         </object>
+                         <packing>
+                           <property name="left_attach">0</property>
+                           <property name="top_attach">2</property>
+                         </packing>
+                       </child>
+                       <child>
+                         <object class="GtkCheckButton" id="hyphen">
+                           <property name="label" translatable="yes">H_yphen (-)</property>
+                           <property name="visible">True</property>
+                           <property name="can_focus">True</property>
+                           <property name="receives_default">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="use_underline">True</property>
+                           <property name="xalign">0.5</property>
+                           <property name="draw_indicator">True</property>
+                         </object>
+                         <packing>
+                           <property name="left_attach">2</property>
+                           <property name="top_attach">1</property>
+                         </packing>
+                       </child>
+                       <child>
+                         <object class="GtkCheckButton" id="comma">
+                           <property name="label" translatable="yes">Co_mma (,)</property>
+                           <property name="visible">True</property>
+                           <property name="can_focus">True</property>
+                           <property name="receives_default">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="use_underline">True</property>
+                           <property name="xalign">0.5</property>
+                           <property name="draw_indicator">True</property>
+                         </object>
+                         <packing>
+                           <property name="left_attach">1</property>
+                           <property name="top_attach">1</property>
+                         </packing>
+                       </child>
+                       <child>
+                         <object class="GtkCheckButton" id="colon">
+                           <property name="label" translatable="yes">_Colon (:)</property>
+                           <property name="visible">True</property>
+                           <property name="can_focus">True</property>
+                           <property name="receives_default">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="use_underline">True</property>
+                           <property name="xalign">0.5</property>
+                           <property name="draw_indicator">True</property>
+                         </object>
+                         <packing>
+                           <property name="left_attach">0</property>
+                           <property name="top_attach">1</property>
+                         </packing>
+                       </child>
+                       <child>
+                         <object class="GtkCheckButton" id="bang">
+                           <property name="label" translatable="yes">Ban_g (!)</property>
+                           <property name="visible">True</property>
+                           <property name="can_focus">True</property>
+                           <property name="receives_default">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="use_underline">True</property>
+                           <property name="xalign">0.5</property>
+                           <property name="draw_indicator">True</property>
+                         </object>
+                         <packing>
+                           <property name="left_attach">2</property>
+                           <property name="top_attach">0</property>
+                         </packing>
+                       </child>
+                       <child>
+                         <object class="GtkCheckButton" id="tab">
+                           <property name="label" translatable="yes">Ta_b</property>
+                           <property name="visible">True</property>
+                           <property name="can_focus">True</property>
+                           <property name="receives_default">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="use_underline">True</property>
+                           <property name="xalign">0.5</property>
+                           <property name="draw_indicator">True</property>
+                         </object>
+                         <packing>
+                           <property name="left_attach">1</property>
+                           <property name="top_attach">0</property>
+                         </packing>
+                       </child>
+                       <child>
+                         <object class="GtkCheckButton" id="space">
+                           <property name="label" translatable="yes">_Space</property>
+                           <property name="visible">True</property>
+                           <property name="can_focus">True</property>
+                           <property name="receives_default">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="use_underline">True</property>
+                           <property name="xalign">0.5</property>
+                           <property name="draw_indicator">True</property>
+                         </object>
+                         <packing>
+                           <property name="left_attach">0</property>
+                           <property name="top_attach">0</property>
+                         </packing>
+                       </child>
+                     </object>
+                   </child>
                   </object>
                 </child>
                 <child type="label">
@@ -416,40 +414,21 @@ The selected file contains N lines of text.  Only the first M of these will be s
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <object class="GtkTable" id="table2">
+                      <object class="GtkGrid" id="table2">
                         <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="n_rows">2</property>
-                        <property name="n_columns">2</property>
                         <property name="column_spacing">6</property>
                         <property name="row_spacing">6</property>
                         <child>
-                          <object class="GtkCheckButton" id="escape">
-                            <property name="label" translatable="yes">Doubled quote mark treated as escape</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">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="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <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>
-                          <object class="GtkComboBoxEntry" id="quote-combo">
+                          <object class="GtkComboBox" id="quote-combo">
+                            <property name="has-entry">True</property>
                             <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="has_frame">False</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="x_options"></property>
-                            <property name="y_options"></property>
+                            <property name="width">1</property>
                           </packing>
                         </child>
                         <child>
@@ -462,8 +441,8 @@ The selected file contains N lines of text.  Only the first M of these will be s
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
-                            <property name="x_options"></property>
-                            <property name="y_options">GTK_FILL</property>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">0</property>
                           </packing>
                         </child>
                       </object>
@@ -529,17 +508,21 @@ The selected file contains N lines of text.  Only the first M of these will be s
           </object>
           <packing>
             <property name="position">1</property>
+           <property name="expand">True</property>
+           <property name="fill">True</property>
           </packing>
         </child>
       </object>
     </child>
   </object>
+
   <object class="GtkWindow" id="Formats">
     <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">12</property>
     <property name="title" translatable="yes">Adjust Variable Formats</property>
     <child>
-      <object class="GtkVBox" id="vbox5">
+      <object class="GtkBox" id="vbox5">
+       <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
         <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="orientation">vertical</property>
@@ -558,7 +541,8 @@ The selected file contains N lines of text.  Only the first M of these will be s
           </packing>
         </child>
         <child>
-          <object class="GtkVPaned" id="vpaned1">
+          <object class="GtkPaned" id="vpaned1">
+            <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -648,17 +632,21 @@ The selected file contains N lines of text.  Only the first M of these will be s
           </object>
           <packing>
             <property name="position">1</property>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
           </packing>
         </child>
       </object>
     </child>
   </object>
+
   <object class="GtkWindow" id="Sheet">
     <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">12</property>
     <property name="title" translatable="yes">Importing Spreadsheet Data</property>
     <child>
-      <object class="GtkVBox" id="vbox1">
+      <object class="GtkBox" id="vbox1">
+       <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
         <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="orientation">vertical</property>
@@ -691,101 +679,97 @@ The selected file contains N lines of text.  Only the first M of these will be s
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <object class="GtkTable" id="table3">
-                        <property name="visible">True</property>
-                        <property name="n_rows">3</property>
-                        <property name="n_columns">2</property>
-                        <child>
-                          <object class="GtkEntry" id="cell-range-entry">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="invisible_char">&#x25CF;</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkComboBox" id="sheet-entry">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                     <object class="GtkGrid" id="table3">
+                       <property name="visible">True</property>
+                       <property name="can_focus">False</property>
+                       <child>
+                         <object class="GtkEntry" id="cell-range-entry">
+                           <property name="visible">True</property>
+                           <property name="can_focus">True</property>
+                           <property name="invisible_char">●</property>
+                         </object>
+                         <packing>
+                           <property name="left_attach">1</property>
+                           <property name="top_attach">0</property>
+                         </packing>
+                       </child>
+                       <child>
+                         <object class="GtkComboBox" id="sheet-entry">
+                           <property name="visible">True</property>
+                           <property name="can_focus">True</property>
                            <property name="active">0</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>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="cell-range-label">
-                            <property name="visible">True</property>
-                            <property name="xalign">1</property>
-                            <property name="label" translatable="yes">_Cells: </property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">cell-range-entry</property>
-                          </object>
-                          <packing>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="sheet-label">
-                            <property name="visible">True</property>
-                            <property name="xalign">1</property>
-                            <property name="label" translatable="yes">_Sheet Index: </property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">sheet-entry</property>
-                          </object>
-                          <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>
-                        <child>
-                          <object class="GtkCheckButton" id="readnames-checkbox">
-                            <property name="label" translatable="yes">Use first row as _variable names</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="image_position">right</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label4">
-                    <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">&lt;b&gt;Cells to Import&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
+                         </object>
+                         <packing>
+                           <property name="left_attach">1</property>
+                           <property name="top_attach">1</property>
+                         </packing>
+                       </child>
+                       <child>
+                         <object class="GtkLabel" id="cell-range-label">
+                           <property name="visible">True</property>
+                           <property name="can_focus">False</property>
+                           <property name="xalign">1</property>
+                           <property name="label" translatable="yes">_Cells: </property>
+                           <property name="use_underline">True</property>
+                           <property name="mnemonic_widget">cell-range-entry</property>
+                         </object>
+                         <packing>
+                           <property name="left_attach">0</property>
+                           <property name="top_attach">0</property>
+                         </packing>
+                       </child>
+                       <child>
+                         <object class="GtkLabel" id="sheet-label">
+                           <property name="visible">True</property>
+                           <property name="can_focus">False</property>
+                           <property name="xalign">1</property>
+                           <property name="label" translatable="yes">_Sheet Index: </property>
+                           <property name="use_underline">True</property>
+                           <property name="mnemonic_widget">sheet-entry</property>
+                         </object>
+                         <packing>
+                           <property name="left_attach">0</property>
+                           <property name="top_attach">1</property>
+                         </packing>
+                       </child>
+                       <child>
+                         <object class="GtkCheckButton" id="readnames-checkbox">
+                           <property name="label" translatable="yes">Use first row as _variable names</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="image_position">right</property>
+                           <property name="draw_indicator">True</property>
+                         </object>
+                         <packing>
+                           <property name="left_attach">0</property>
+                           <property name="top_attach">2</property>
+                           <property name="width">2</property>
+                         </packing>
+                       </child>
+                     </object>
+                   </child>
+                 </object>
+               </child>
+               <child type="label">
+                 <object class="GtkLabel" id="label4">
+                   <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">&lt;b&gt;Cells to Import&lt;/b&gt;</property>
+                   <property name="use_markup">True</property>
+                 </object>
+               </child>
+             </object>
+           </child>
+         </object>
+         <packing>
+           <property name="expand">False</property>
+           <property name="fill">False</property>
+           <property name="position">1</property>
+         </packing>
+       </child>
       </object>
     </child>
   </object>
Unnamed repository; edit this file to name it for gitweb.