GET DATA/TYPE=TXT: Remove ESCAPE subcommand and make its behavior default.

[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 a7a393ea115c251407f77b19e22010805a5ce624..28f13e2bdcf1600aa495d5405fae5ecea0377d42 100644 (file)
--- a/src/ui/gui/text-data-import.ui
+++ b/src/ui/gui/text-data-import.ui
@@ -42,10 +42,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 +53,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 +63,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 +73,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 +81,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>
@@ -158,7 +144,7 @@ The selected file contains N lines of text.  Only the first M of these will be s
             <property name="hscrollbar_policy">automatic</property>
             <property name="vscrollbar_policy">automatic</property>
             <child>
-              <object class="GtkTreeView" id="first-line">
+              <object class="PsppSheetView" id="first-line">
                 <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>
@@ -424,23 +410,8 @@ The selected file contains N lines of text.  Only the first M of these will be s
                         <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>
@@ -508,7 +479,7 @@ The selected file contains N lines of text.  Only the first M of these will be s
                     <property name="hscrollbar_policy">automatic</property>
                     <property name="vscrollbar_policy">automatic</property>
                     <child>
-                      <object class="GtkTreeView" id="fields">
+                      <object class="PsppSheetView" id="fields">
                         <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>
@@ -621,7 +592,7 @@ The selected file contains N lines of text.  Only the first M of these will be s
                         <property name="hscrollbar_policy">automatic</property>
                         <property name="vscrollbar_policy">automatic</property>
                         <child>
-                          <object class="GtkTreeView" id="data">
+                          <object class="PsppSheetView" id="data">
                             <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>