Merge commit 'origin/master' into charset

[pspp-builds.git] / src / ui / gui / psppire-data-window.c

diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c
index 8eb0a143b5af0060d8682d754e534cd2e3f30c57..52ec0d49b25db95eedcdff6f2924e9b7196e75dd 100644 (file)
--- a/src/ui/gui/psppire-data-window.c
+++ b/src/ui/gui/psppire-data-window.c
@@ -54,6 +54,7 @@
 #include "frequencies-dialog.h"
 #include "examine-dialog.h"
 #include "regression-dialog.h"
+#include "reliability-dialog.h"
 #include "oneway-anova-dialog.h"
 #include "t-test-independent-samples-dialog.h"
 #include "t-test-one-sample.h"
@@ -370,15 +371,12 @@ load_file (PsppireWindow *de, const gchar *file_name)
   return FALSE;
 }
 
-
-/* Callback for the data_open action.
-   Prompts for a filename and opens it */
-static void
-open_data_dialog (GtkAction *action, PsppireWindow *de)
+static GtkWidget *
+sysfile_chooser_dialog (PsppireWindow *toplevel)
 {
   GtkWidget *dialog =
     gtk_file_chooser_dialog_new (_("Open"),
-                                GTK_WINDOW (de),
+                                GTK_WINDOW (toplevel),
                                 GTK_FILE_CHOOSER_ACTION_OPEN,
                                 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
                                 GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
@@ -401,11 +399,10 @@ open_data_dialog (GtkAction *action, PsppireWindow *de)
   gtk_file_filter_add_pattern (filter, "*");
   gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
 
-
   {
     gchar *dir_name;
     gchar *filename = NULL;
-    g_object_get (de, "filename", &filename, NULL);
+    g_object_get (toplevel, "filename", &filename, NULL);
 
     dir_name = g_path_get_dirname (filename);
     gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog),
@@ -413,6 +410,16 @@ open_data_dialog (GtkAction *action, PsppireWindow *de)
     free (dir_name);
   }
 
+  return dialog;
+}
+
+/* Callback for the data_open action.
+   Prompts for a filename and opens it */
+static void
+open_data_dialog (GtkAction *action, PsppireWindow *de)
+{
+  GtkWidget *dialog = sysfile_chooser_dialog (de);
+
   switch (gtk_dialog_run (GTK_DIALOG (dialog)))
     {
     case GTK_RESPONSE_ACCEPT:
@@ -453,15 +460,16 @@ name_has_suffix (const gchar *name)
 static void
 save_file (PsppireWindow *w)
 {
-  gchar *fn = NULL;
+  gchar *native_file_name = NULL;
+  gchar *file_name = NULL;
   GString *fnx;
   struct getl_interface *sss;
-  struct string file_name ;
+  struct string filename ;
   PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (w);
 
-  g_object_get (w, "filename", &fn, NULL);
+  g_object_get (w, "filename", &file_name, NULL);
 
-  fnx = g_string_new (fn);
+  fnx = g_string_new (file_name);
 
   if ( ! name_has_suffix (fnx->str))
     {
@@ -471,22 +479,28 @@ save_file (PsppireWindow *w)
        g_string_append (fnx, ".sav");
     }
 
-  ds_init_empty (&file_name);
-  syntax_gen_string (&file_name, ss_cstr (fnx->str));
-  g_string_free (fnx, FALSE);
+  ds_init_empty (&filename);
+
+  native_file_name =
+    convert_glib_filename_to_system_filename (fnx->str, NULL);
+
+  g_string_free (fnx, TRUE);
+
+  syntax_gen_string (&filename, ss_cstr (native_file_name));
+  g_free (native_file_name);
 
   if ( de->save_as_portable )
     {
       sss = create_syntax_string_source ("EXPORT OUTFILE=%s.",
-                                        ds_cstr (&file_name));
+                                        ds_cstr (&filename));
     }
   else
     {
       sss = create_syntax_string_source ("SAVE OUTFILE=%s.",
-                                        ds_cstr (&file_name));
+                                        ds_cstr (&filename));
     }
 
-  ds_destroy (&file_name);
+  ds_destroy (&filename);
 
   execute_syntax (sss);
 }
@@ -508,6 +522,46 @@ on_insert_variable (GtkAction *action, gpointer data)
 }
 
 
+static void
+display_dict (PsppireDataWindow *de)
+{
+
+  struct getl_interface *sss =
+    create_syntax_string_source ("DISPLAY DICTIONARY.");
+
+  execute_syntax (sss);
+}
+
+static void
+sysfile_info (PsppireDataWindow *de)
+{
+  GtkWidget *dialog = sysfile_chooser_dialog (PSPPIRE_WINDOW (de));
+
+  if  ( GTK_RESPONSE_ACCEPT == gtk_dialog_run (GTK_DIALOG (dialog)))
+    {
+      struct string filename;
+      struct getl_interface *sss;
+      gchar *file_name =
+       gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
+
+      gchar *native_file_name =
+       convert_glib_filename_to_system_filename (file_name, NULL);
+
+      ds_init_empty (&filename);
+
+      syntax_gen_string (&filename, ss_cstr (native_file_name));
+
+      g_free (native_file_name);
+
+      sss = create_syntax_string_source ("SYSFILE INFO %s.",
+                                        ds_cstr (&filename));
+      execute_syntax (sss);
+    }
+
+  gtk_widget_destroy (dialog);
+}
+
+
 /* Callback for data_save_as action. Prompt for a filename and save */
 static void
 data_save_as_dialog (PsppireDataWindow *de)
@@ -1186,6 +1240,28 @@ psppire_data_window_init (PsppireDataWindow *de)
   }
 
 
+  {
+    GtkAction *action_info_working_file =
+      resolve_action (de->builder,
+                     "file_information_working-file", NULL);
+
+
+    g_signal_connect_swapped (action_info_working_file, "activate",
+                     G_CALLBACK (display_dict), de);
+  }
+
+
+  {
+    GtkAction *action_info_external_file =
+      resolve_action (de->builder,
+                     "file_information_external-file", NULL);
+
+
+    g_signal_connect_swapped (action_info_external_file, "activate",
+                     G_CALLBACK (sysfile_info), de);
+  }
+
+
 
   {
     GtkAction *value_labels_action =
@@ -1586,7 +1662,22 @@ psppire_data_window_init (PsppireDataWindow *de)
                      G_CALLBACK (regression_dialog), de);
   }
 
-  { 
+  {
+    GtkAction *invoke_reliability_dialog =
+      resolve_action (de->builder, "reliability", NULL);
+
+    g_object_set (invoke_reliability_dialog,
+                 "tooltip", _("Reliability Analysis"),
+                 "stock-id", "pspp-reliability",
+                 NULL
+                 );
+
+    g_signal_connect (invoke_reliability_dialog, "activate",
+                     G_CALLBACK (reliability_dialog), de);
+  }
+
+
+  {
     GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER));
 
     GtkWidget *recent_data =