src/ui/gui/psppire-conf.c: Use GError instead of strerror.

[pspp] / src / ui / gui / psppire-import-assistant.c

diff --git a/src/ui/gui/psppire-import-assistant.c b/src/ui/gui/psppire-import-assistant.c
index e8b64d8c5811c96e197d45f2c3c7ee0bc619664f..a968431d865bf043759adbdafc8368c5c504cfa4 100644 (file)
--- a/src/ui/gui/psppire-import-assistant.c
+++ b/src/ui/gui/psppire-import-assistant.c
@@ -527,8 +527,11 @@ prepare_sheet_spec_page (PsppireImportAssistant *ia)
   GtkWidget *sheet_entry = get_widget_assert (builder, "sheet-entry");
   GtkWidget *readnames_checkbox = get_widget_assert (builder, "readnames-checkbox");
 
-  gtk_combo_box_set_model (GTK_COMBO_BOX (sheet_entry),
-                          psppire_spreadsheet_model_new (ia->spreadsheet));
+  GtkTreeModel *model = psppire_spreadsheet_model_new (ia->spreadsheet);
+  gtk_combo_box_set_model (GTK_COMBO_BOX (sheet_entry), model);
+
+  gint items = gtk_tree_model_iter_n_children (model, NULL);
+  gtk_widget_set_sensitive (sheet_entry, items > 1);
 
   gtk_combo_box_set_active (GTK_COMBO_BOX (sheet_entry), 0);
 
@@ -652,6 +655,11 @@ chooser_page_reset (PsppireImportAssistant *ia, GtkWidget *page)
 }
 
 
+static void
+on_file_activated (GtkFileChooser *chooser, PsppireImportAssistant *ia)
+{
+  gtk_assistant_next_page (GTK_ASSISTANT (ia));
+}
 
 static void
 chooser_page_create (PsppireImportAssistant *ia)
@@ -660,6 +668,8 @@ chooser_page_create (PsppireImportAssistant *ia)
 
   GtkWidget *chooser = gtk_file_chooser_widget_new (GTK_FILE_CHOOSER_ACTION_OPEN);
 
+  g_signal_connect (chooser, "file-activated", G_CALLBACK (on_file_activated), ia);
+
   g_object_set_data (G_OBJECT (chooser), "on-forward", chooser_page_leave);
   g_object_set_data (G_OBJECT (chooser), "on-reset",   chooser_page_reset);
   g_object_set_data (G_OBJECT (chooser), "on-entering",chooser_page_enter);