Fixed the refresh button on the dialogs.

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

diff --git a/src/ui/gui/data-editor.c b/src/ui/gui/data-editor.c
index 0d60b9cd7dcb842164c6a9b2fd6608504572ed45..111a8327c313d9f24e04dddf8c0a57b564340949 100644 (file)
--- a/src/ui/gui/data-editor.c
+++ b/src/ui/gui/data-editor.c
@@ -32,7 +32,9 @@
 #include "psppire-dialog.h"
 #include "psppire-selector.h"
 #include "weight-cases-dialog.h"
+#include "split-file-dialog.h"
 #include "transpose-dialog.h"
+#include "sort-cases-dialog.h"
 #include "dict-display.h"
 
 #define _(msgid) gettext (msgid)
@@ -41,6 +43,7 @@
 #include "data-editor.h"
 #include "syntax-editor.h"
 #include <language/syntax-string-source.h>
+#include <libpspp/syntax-gen.h>
 #include "window-manager.h"
 
 #include "psppire-data-store.h"
@@ -128,13 +131,14 @@ new_data_editor (void)
 
   e = (struct editor_window *) de;
 
-  de->xml = glade_xml_new (PKGDATADIR "/data-editor.glade", NULL, NULL);
-
+  de->xml = XML_NEW ("data-editor.glade");
 
   var_sheet = GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
 
   vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet));
 
+  g_assert(vs); /* Traps a possible bug in win32 build */
+
   g_signal_connect (vs->dict, "weight-changed",
                    G_CALLBACK (on_weight_change),
                    de);
@@ -173,6 +177,28 @@ new_data_editor (void)
                    G_CALLBACK (transpose_dialog), de);
 
 
+
+  de->invoke_split_file_dialog =
+    gtk_action_new ("split-file-dialog",
+                   _("Split"),
+                   _("Split the active file"),
+                   "pspp-split-file");
+
+  g_signal_connect (de->invoke_split_file_dialog, "activate",
+                   G_CALLBACK (split_file_dialog), de);
+
+
+
+  de->invoke_sort_cases_dialog =
+    gtk_action_new ("sort-cases-dialog",
+                   _("Sort"),
+                   _("Sort cases in the active file"),
+                   "pspp-sort-cases");
+
+  g_signal_connect (de->invoke_sort_cases_dialog, "activate",
+                   G_CALLBACK (sort_cases_dialog), de);
+
+
   e->window = GTK_WINDOW (get_widget_assert (de->xml, "data_editor"));
 
   g_signal_connect_swapped (get_widget_assert (de->xml,"file_new_data"),
@@ -225,6 +251,15 @@ new_data_editor (void)
                            get_widget_assert (de->xml, "data_transpose")
                            );
 
+  gtk_action_connect_proxy (de->invoke_split_file_dialog,
+                           get_widget_assert (de->xml, "data_split-file")
+                           );
+
+  gtk_action_connect_proxy (de->invoke_sort_cases_dialog,
+                           get_widget_assert (de->xml, "data_sort-cases")
+                           );
+
+
   g_signal_connect (get_widget_assert (de->xml,"help_about"),
                    "activate",
                    G_CALLBACK (about_new),
@@ -315,6 +350,10 @@ new_data_editor (void)
                            get_widget_assert (de->xml, "button-weight-cases")
                            );
 
+  gtk_action_connect_proxy (de->invoke_split_file_dialog,
+                           get_widget_assert (de->xml, "button-split-file")
+                           );
+
   g_signal_connect (get_widget_assert (de->xml, "file_quit"),
                    "activate",
                    G_CALLBACK (file_quit), de);
@@ -836,22 +875,28 @@ static void
 save_file (struct data_editor *de)
 {
   struct getl_interface *sss;
+  struct string file_name ;
 
   g_assert (de->file_name);
 
+  ds_init_cstr (&file_name, de->file_name);
+  gen_quoted_string (&file_name);
+
   if ( de->save_as_portable )
     {
       append_filename_suffix (de, ".por");
-      sss = create_syntax_string_source ("EXPORT OUTFILE='%s'.",
-                                        de->file_name);
+      sss = create_syntax_string_source ("EXPORT OUTFILE=%s.",
+                                        ds_cstr (&file_name));
     }
   else
     {
       append_filename_suffix (de, ".sav");
-      sss = create_syntax_string_source ("SAVE OUTFILE='%s'.",
-                                        de->file_name);
+      sss = create_syntax_string_source ("SAVE OUTFILE=%s.",
+                                        ds_cstr (&file_name));
     }
 
+  ds_destroy (&file_name);
+
   execute_syntax (sss);
 }
 
@@ -948,14 +993,19 @@ data_save_as_dialog (GtkAction *action, struct data_editor *de)
 /* Callback for data_new action.
    Performs the NEW FILE command */
 static void
-new_file (GtkAction *action, struct editor_window *de)
+new_file (GtkAction *action, struct editor_window *e)
 {
+  struct data_editor *de = (struct data_editor *) e;
+
   struct getl_interface *sss =
     create_syntax_string_source ("NEW FILE.");
 
   execute_syntax (sss);
 
-  default_window_name (de);
+  g_free (de->file_name);
+  de->file_name = NULL;
+
+  default_window_name (e);
 }
 
 
@@ -996,13 +1046,20 @@ open_data_dialog (GtkAction *action, struct data_editor *de)
     case GTK_RESPONSE_ACCEPT:
       {
        struct getl_interface *sss;
+       struct string filename;
        g_free (de->file_name);
        de->file_name =
          gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
 
-       sss = create_syntax_string_source ("GET FILE='%s'.", de->file_name);
+       ds_init_cstr (&filename, de->file_name);
+
+       gen_quoted_string (&filename);
+
+       sss = create_syntax_string_source ("GET FILE=%s.",
+                                          ds_cstr (&filename));
 
        execute_syntax (sss);
+       ds_destroy (&filename);
 
        window_set_name_from_filename (e, de->file_name);
       }