X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fdata-editor.c;h=b2c506ddfa644597a166485055465110b8396a54;hb=cecaf561d11939de82a6598324376b8cf8225fd5;hp=9aa6501be01a9d54b15746b9adf3415beb008543;hpb=9491a8bd354152d3a228e1bf041c7ad6228750d7;p=pspp-builds.git diff --git a/src/ui/gui/data-editor.c b/src/ui/gui/data-editor.c index 9aa6501b..b2c506dd 100644 --- a/src/ui/gui/data-editor.c +++ b/src/ui/gui/data-editor.c @@ -30,7 +30,15 @@ #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 "split-file-dialog.h" +#include "transpose-dialog.h" +#include "sort-cases-dialog.h" +#include "compute-dialog.h" +#include "comments-dialog.h" +#include "variable-info-dialog.h" +#include "dict-display.h" #define _(msgid) gettext (msgid) #define N_(msgid) msgid @@ -38,20 +46,18 @@ #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); /* Switch between the VAR SHEET and the DATA SHEET */ -enum {PAGE_DATA_SHEET = 0, PAGE_VAR_SHEET}; static gboolean click2column (GtkWidget *w, gint col, gpointer data); @@ -111,7 +117,55 @@ disable_edit_clear (GtkWidget *w, gint x, gint y, gpointer data) return FALSE; } -static void weight_cases_dialog (GObject *o, gpointer data); +static void open_data_file (const gchar *, struct data_editor *); + + + +#if RECENT_LISTS_AVAILABLE + +static void +on_recent_data_select (GtkMenuShell *menushell, gpointer user_data) +{ + gchar *file; + + struct data_editor *de = user_data; + + gchar *uri = + gtk_recent_chooser_get_current_uri (GTK_RECENT_CHOOSER (menushell)); + + file = g_filename_from_uri (uri, NULL, NULL); + + g_free (uri); + + open_data_file (file, de); + + g_free (file); +} + +static void +on_recent_files_select (GtkMenuShell *menushell, gpointer user_data) +{ + gchar *file; + + struct syntax_editor *se ; + + gchar *uri = + gtk_recent_chooser_get_current_uri (GTK_RECENT_CHOOSER (menushell)); + + file = g_filename_from_uri (uri, NULL, NULL); + + g_free (uri); + + se = (struct syntax_editor *) + window_create (WINDOW_SYNTAX, file); + + load_editor_from_file (se, file, NULL); + + g_free (file); +} + +#endif + /* @@ -129,13 +183,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); @@ -159,10 +214,70 @@ 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); + + + + 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); + + + de->invoke_compute_dialog = + gtk_action_new ("compute-dialog", + _("Compute"), + _("Compute new values for a variable"), + "pspp-compute"); + + g_signal_connect (de->invoke_compute_dialog, "activate", + G_CALLBACK (compute_dialog), de); + + de->invoke_comments_dialog = + gtk_action_new ("commments-dialog", + _("Data File Comments"), + _("Commentary text for the data file"), + NULL); + + g_signal_connect (de->invoke_comments_dialog, "activate", + G_CALLBACK (comments_dialog), de); + + de->invoke_variable_info_dialog = + gtk_action_new ("variable-info-dialog", + _("Variables"), + _("Jump to Variable"), + "pspp-goto-variable"); + + g_signal_connect (de->invoke_variable_info_dialog, "activate", + G_CALLBACK (variable_info_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"), @@ -175,6 +290,48 @@ new_data_editor (void) G_CALLBACK (gtk_action_activate), de->action_data_open); + + + + +#if RECENT_LISTS_AVAILABLE + { + GtkRecentManager *rm = gtk_recent_manager_get_default (); + GtkWidget *recent_data = get_widget_assert (de->xml, "file_recent-data"); + GtkWidget *recent_files = get_widget_assert (de->xml, "file_recent-files"); + + GtkWidget *menu = gtk_recent_chooser_menu_new_for_manager (rm); + + GtkRecentFilter *filter = gtk_recent_filter_new (); + + gtk_recent_filter_add_pattern (filter, "*.sav"); + gtk_recent_filter_add_pattern (filter, "*.SAV"); + + gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (menu), filter); + + gtk_widget_set_sensitive (recent_data, TRUE); + g_signal_connect (menu, "selection-done", + G_CALLBACK (on_recent_data_select), de); + + gtk_menu_item_set_submenu (GTK_MENU_ITEM (recent_data), menu); + + + filter = gtk_recent_filter_new (); + menu = gtk_recent_chooser_menu_new_for_manager (rm); + + gtk_recent_filter_add_pattern (filter, "*.sps"); + gtk_recent_filter_add_pattern (filter, "*.SPS"); + + gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (menu), filter); + + gtk_widget_set_sensitive (recent_files, TRUE); + g_signal_connect (menu, "selection-done", + G_CALLBACK (on_recent_files_select), de); + + gtk_menu_item_set_submenu (GTK_MENU_ITEM (recent_files), menu); + } +#endif + g_signal_connect (get_widget_assert (de->xml,"file_new_syntax"), "activate", G_CALLBACK (new_syntax_window), @@ -211,6 +368,29 @@ 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") + ); + + 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") + ); + + gtk_action_connect_proxy (de->invoke_compute_dialog, + get_widget_assert (de->xml, "transform_compute") + ); + + gtk_action_connect_proxy (de->invoke_comments_dialog, + get_widget_assert (de->xml, "utilities_comments") + ); + + gtk_action_connect_proxy (de->invoke_variable_info_dialog, + get_widget_assert (de->xml, "utilities_variables") + ); g_signal_connect (get_widget_assert (de->xml,"help_about"), "activate", @@ -298,10 +478,18 @@ new_data_editor (void) get_widget_assert (de->xml, "button-save") ); + gtk_action_connect_proxy (de->invoke_variable_info_dialog, + get_widget_assert (de->xml, "button-goto-variable") + ); + gtk_action_connect_proxy (de->invoke_weight_cases_dialog, 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); @@ -660,7 +848,7 @@ on_split_change (PsppireDict *dict, gpointer data) { gint i; GString *text; - struct variable *const * split_vars = dict_get_split_vars (dict->dict); + const struct variable *const * split_vars = dict_get_split_vars (dict->dict); text = g_string_new (_("Split by ")); @@ -739,96 +927,12 @@ 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; - } -} - static void data_save_as_dialog (GtkAction *, struct data_editor *de); static void new_file (GtkAction *, struct editor_window *de); -static void open_data_dialog (GtkAction *, struct editor_window *de); +static void open_data_dialog (GtkAction *, struct data_editor *de); static void data_save (GtkAction *action, struct data_editor *e); @@ -907,22 +1011,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,25 +1129,52 @@ 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); +} + + +static void +open_data_file (const gchar *file_name, struct data_editor *de) +{ + struct getl_interface *sss; + struct string filename; + + ds_init_cstr (&filename, 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 ((struct editor_window *) de, file_name); } /* Callback for the data_open action. Prompts for a filename and opens it */ static void -open_data_dialog (GtkAction *action, struct editor_window *de) +open_data_dialog (GtkAction *action, struct data_editor *de) { + struct editor_window *e = (struct editor_window *) de; + GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Open"), - GTK_WINDOW (de->window), + GTK_WINDOW (e->window), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, @@ -1064,17 +1201,24 @@ open_data_dialog (GtkAction *action, struct editor_window *de) { case GTK_RESPONSE_ACCEPT: { - struct getl_interface *sss; - gchar *file_name = + 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'.", file_name); + open_data_file (de->file_name, de); - execute_syntax (sss); +#if RECENT_LISTS_AVAILABLE + { + GtkRecentManager *manager = gtk_recent_manager_get_default(); + gchar *uri = g_filename_to_uri (de->file_name, NULL, NULL); - window_set_name_from_filename (de, file_name); + if ( ! gtk_recent_manager_add_item (manager, uri)) + g_warning ("Could not add item %s to recent list\n",uri); + + g_free (uri); + } +#endif - g_free (file_name); } break; default: @@ -1083,7 +1227,3 @@ open_data_dialog (GtkAction *action, struct editor_window *de) gtk_widget_destroy (dialog); } - - - -