From 68958f57a550f96c701d0aa86c11ff815b34eb8b Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sat, 30 Sep 2023 11:27:08 -0700
Subject: [PATCH] psppire-import-textfile: Default to using column names from
 imported file.

We speculate that users will find this less surprising.

Suggested by Alan Mead.
---
 src/ui/gui/psppire-import-textfile.c |  2 +-
 src/ui/gui/text-data-import.ui       | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/ui/gui/psppire-import-textfile.c b/src/ui/gui/psppire-import-textfile.c
index 237b240e41..95251c7324 100644
--- a/src/ui/gui/psppire-import-textfile.c
+++ b/src/ui/gui/psppire-import-textfile.c
@@ -230,7 +230,7 @@ render_text_preview_line (GtkTreeViewColumn *tree_column,
 static void
 reset_first_line_page (PsppireImportAssistant *ia)
 {
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ia->variable_names_cb), FALSE);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ia->variable_names_cb), TRUE);
 
   GtkTreeSelection *selection =
     gtk_tree_view_get_selection (GTK_TREE_VIEW (ia->first_line_tree_view));
diff --git a/src/ui/gui/text-data-import.ui b/src/ui/gui/text-data-import.ui
index 7bc38dbc88..9f3b3f0bcd 100644
--- a/src/ui/gui/text-data-import.ui
+++ b/src/ui/gui/text-data-import.ui
@@ -35,28 +35,28 @@
       </packing>
     </child>
     <child>
-      <object class="GtkScrolledWindow" id="first-line-scroller">
+      <object class="GtkCheckButton" id="variable-names">
+        <property name="label" translatable="yes">Line above selected line contains variable names</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="expand">True</property>
+        <property name="expand">False</property>
         <property name="fill">True</property>
         <property name="position">1</property>
       </packing>
     </child>
     <child>
-      <object class="GtkCheckButton" id="variable-names">
-        <property name="label" translatable="yes">Line above selected line contains variable names</property>
+      <object class="GtkScrolledWindow" id="first-line-scroller">
         <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="expand">False</property>
+        <property name="expand">True</property>
         <property name="fill">True</property>
         <property name="position">2</property>
       </packing>
-- 
2.30.2