X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fdata-editor.c;h=3cecdd71e7baa614af5a42596bb42e572e3d51bf;hb=e6ae2a61e5356694c09f48da74407f8054a04e8d;hp=07588770146b130d9ac1bea33fe61c11f3465b72;hpb=3f159627d3b80706e58a54be2431c3edbc5333dc;p=pspp-builds.git diff --git a/src/ui/gui/data-editor.c b/src/ui/gui/data-editor.c index 07588770..3cecdd71 100644 --- a/src/ui/gui/data-editor.c +++ b/src/ui/gui/data-editor.c @@ -30,7 +30,10 @@ #include "helper.h" #include "about.h" #include "psppire-dialog.h" -#include "psppire-var-select.h" +#include "psppire-selector.h" +#include "weight-cases-dialog.h" +#include "transpose-dialog.h" +#include "dict-display.h" #define _(msgid) gettext (msgid) #define N_(msgid) msgid @@ -38,13 +41,12 @@ #include "data-editor.h" #include "syntax-editor.h" #include +#include #include "window-manager.h" #include "psppire-data-store.h" #include "psppire-var-store.h" -#include "weight-cases-dialog.h" - static void register_data_editor_actions (struct data_editor *de); static void insert_variable (GtkCheckMenuItem *m, gpointer data); @@ -111,8 +113,6 @@ disable_edit_clear (GtkWidget *w, gint x, gint y, gpointer data) return FALSE; } -static void weight_cases_dialog (GObject *o, gpointer data); - /* Create a new data editor. @@ -136,6 +136,8 @@ new_data_editor (void) 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); @@ -159,10 +161,21 @@ new_data_editor (void) _("Weight cases by variable"), "pspp-weight-cases"); - g_signal_connect (de->invoke_weight_cases_dialog, "activate", G_CALLBACK (weight_cases_dialog), de); + + de->invoke_transpose_dialog = + gtk_action_new ("transpose-dialog", + _("Transpose"), + _("Transpose the cases with the variables"), + NULL); + + + g_signal_connect (de->invoke_transpose_dialog, "activate", + G_CALLBACK (transpose_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"), @@ -211,6 +224,9 @@ new_data_editor (void) get_widget_assert (de->xml, "data_weight-cases") ); + gtk_action_connect_proxy (de->invoke_transpose_dialog, + get_widget_assert (de->xml, "data_transpose") + ); g_signal_connect (get_widget_assert (de->xml,"help_about"), "activate", @@ -739,90 +755,6 @@ on_weight_change (GObject *o, gint weight_index, gpointer data) } } -static void -weight_cases_dialog (GObject *o, gpointer data) -{ - gint response; - struct data_editor *de = data; - GtkSheet *var_sheet = - GTK_SHEET (get_widget_assert (de->xml, "variable_sheet")); - - - GladeXML *xml = glade_xml_new (PKGDATADIR "/psppire.glade", - "weight-cases-dialog", NULL); - - - GtkWidget *treeview = get_widget_assert (xml, "treeview"); - GtkWidget *entry = get_widget_assert (xml, "entry1"); - - - PsppireVarStore *vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet)); - - PsppireVarSelect *select = psppire_var_select_new (treeview, - entry, vs->dict); - - - PsppireDialog *dialog = create_weight_dialog (select, xml); - - response = psppire_dialog_run (dialog); - - g_object_unref (xml); - - switch (response) - { - case GTK_RESPONSE_OK: - { - struct getl_interface *sss ; - const GList *list = psppire_var_select_get_variables (select); - - g_assert ( g_list_length ((GList *)list) <= 1 ); - - if ( list == NULL) - { - sss = create_syntax_string_source ("WEIGHT OFF."); - } - else - { - struct variable *var = list->data; - - sss = create_syntax_string_source ("WEIGHT BY %s.\n", - var_get_name (var)); - } - - execute_syntax (sss); - } - break; - case PSPPIRE_RESPONSE_PASTE: - { - struct syntax_editor *se = (struct syntax_editor *) window_create (WINDOW_SYNTAX, NULL); - - const GList *list = psppire_var_select_get_variables (select); - - g_assert ( g_list_length ((GList *)list) <= 1 ); - - if ( list == NULL) - { - gtk_text_buffer_insert_at_cursor (se->buffer, "WEIGHT OFF.", -1); - } - else - { - struct variable *var = list->data; - - gchar *text = g_strdup_printf ("WEIGHT BY %s.", - var_get_name (var)); - - gtk_text_buffer_insert_at_cursor (se->buffer, - text, -1); - - g_free (text); - } - } - break; - default: - break; - } -} - @@ -907,22 +839,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); } @@ -1019,14 +957,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); } @@ -1067,13 +1010,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); }