X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-window.c;h=ffa9482eb0f4b766c391e32ac7c3ecac9dca3087;hb=66153a44d861ccddf6a176ec5a94ffb959232ad6;hp=4543dc72dcdb092c0f7c653f8e263732bbb06d86;hpb=917906bd153b0a915facd98ccf919db0150219f4;p=pspp-builds.git diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c index 4543dc72..ffa9482e 100644 --- a/src/ui/gui/psppire-data-window.c +++ b/src/ui/gui/psppire-data-window.c @@ -18,6 +18,7 @@ #include #include +#include "executor.h" #include "helper.h" #include "text-data-import-dialog.h" @@ -53,8 +54,8 @@ #include "crosstabs-dialog.h" #include "frequencies-dialog.h" #include "examine-dialog.h" -#include "dict-display.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" @@ -230,12 +231,14 @@ on_filter_change (GObject *o, gint filter_index, gpointer data) else { PsppireVarStore *vs = NULL; + PsppireDict *dict = NULL; struct variable *var ; gchar *text ; g_object_get (de->data_editor, "var-store", &vs, NULL); + g_object_get (vs, "dictionary", &dict, NULL); - var = psppire_dict_get_variable (vs->dict, filter_index); + var = psppire_dict_get_variable (dict, filter_index); text = g_strdup_printf (_("Filter by %s"), var_get_name (var)); @@ -301,11 +304,13 @@ on_weight_change (GObject *o, gint weight_index, gpointer data) { struct variable *var ; PsppireVarStore *vs = NULL; + PsppireDict *dict = NULL; gchar *text; g_object_get (de->data_editor, "var-store", &vs, NULL); - - var = psppire_dict_get_variable (vs->dict, weight_index); + g_object_get (vs, "dictionary", &dict, NULL); + + var = psppire_dict_get_variable (dict, weight_index); text = g_strdup_printf (_("Weight by %s"), var_get_name (var)); @@ -347,11 +352,18 @@ dump_rm (GtkRecentManager *rm) static gboolean load_file (PsppireWindow *de, const gchar *file_name) { + gchar *native_file_name; struct getl_interface *sss; struct string filename; ds_init_empty (&filename); - syntax_gen_string (&filename, ss_cstr (file_name)); + + native_file_name = + convert_glib_filename_to_system_filename (file_name, NULL); + + syntax_gen_string (&filename, ss_cstr (native_file_name)); + + g_free (native_file_name); sss = create_syntax_string_source ("GET FILE=%s.", ds_cstr (&filename)); @@ -359,23 +371,17 @@ load_file (PsppireWindow *de, const gchar *file_name) ds_destroy (&filename); if (execute_syntax (sss) ) - { - psppire_window_set_filename (de, file_name); - return TRUE; - } + return TRUE; 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, @@ -398,18 +404,37 @@ 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); + if ( ! g_path_is_absolute (filename)) + { + gchar *path = + g_build_filename (g_get_current_dir (), filename, NULL); + dir_name = g_path_get_dirname (path); + g_free (path); + } + else + { + dir_name = g_path_get_dirname (filename); + } gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), dir_name); 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: @@ -448,16 +473,18 @@ name_has_suffix (const gchar *name) /* Save DE to file */ static void -save_file (PsppireDataWindow *de) +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 (de, "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)) { @@ -467,22 +494,28 @@ save_file (PsppireDataWindow *de) 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); } @@ -492,7 +525,6 @@ static void insert_case (GtkAction *action, gpointer data) { PsppireDataWindow *dw = PSPPIRE_DATA_WINDOW (data); - psppire_data_editor_insert_case (dw->data_editor); } @@ -504,6 +536,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) @@ -576,7 +648,7 @@ data_save_as_dialog (PsppireDataWindow *de) psppire_window_set_filename (PSPPIRE_WINDOW (de), filename->str); - save_file (de); + save_file (PSPPIRE_WINDOW (de)); g_string_free (filename, TRUE); } @@ -597,7 +669,7 @@ data_save (PsppireWindow *de) const gchar *fn = psppire_window_get_filename (de); if ( NULL != fn) - save_file (PSPPIRE_DATA_WINDOW (de)); + psppire_window_save (de); else data_save_as_dialog (PSPPIRE_DATA_WINDOW (de)); } @@ -689,6 +761,7 @@ static void fonts_activate (GtkMenuItem *menuitem, gpointer data) { PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); + GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (de)); PangoFontDescription *current_font; gchar *font_name; GtkWidget *dialog = @@ -703,8 +776,8 @@ fonts_activate (GtkMenuItem *menuitem, gpointer data) g_free (font_name); gtk_window_set_transient_for (GTK_WINDOW (dialog), - GTK_WINDOW (get_widget_assert (de->builder, - "data_editor"))); + GTK_WINDOW (toplevel)); + if ( GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (dialog)) ) { const gchar *font = gtk_font_selection_dialog_get_font_name @@ -1021,6 +1094,7 @@ static void psppire_data_window_init (PsppireDataWindow *de) { PsppireVarStore *vs; + PsppireDict *dict = NULL; GtkWidget *menubar; GtkWidget *hb ; @@ -1049,15 +1123,6 @@ psppire_data_window_init (PsppireDataWindow *de) connect_help (de->builder); - g_object_ref (menubar); - gtk_widget_unparent (menubar); - - g_object_ref (hb); - gtk_widget_unparent (hb); - - g_object_ref (sb); - gtk_widget_unparent (sb); - gtk_box_pack_start (GTK_BOX (box), menubar, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (box), hb, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (box), GTK_WIDGET (de->data_editor), TRUE, TRUE, 0); @@ -1085,15 +1150,17 @@ psppire_data_window_init (PsppireDataWindow *de) g_assert(vs); /* Traps a possible bug in w32 build */ - g_signal_connect (vs->dict, "weight-changed", + g_object_get (vs, "dictionary", &dict, NULL); + + g_signal_connect (dict, "weight-changed", G_CALLBACK (on_weight_change), de); - g_signal_connect (vs->dict, "filter-changed", + g_signal_connect (dict, "filter-changed", G_CALLBACK (on_filter_change), de); - g_signal_connect (vs->dict, "split-changed", + g_signal_connect (dict, "split-changed", G_CALLBACK (on_split_change), de); @@ -1109,8 +1176,10 @@ psppire_data_window_init (PsppireDataWindow *de) { + GtkWidget *toolbarbutton = get_widget_assert (de->builder, "button-open"); + GtkAction *action_data_open = - resolve_action (de->builder, "file_open_data", "button-open"); + resolve_action (de->builder, "file_open_data", NULL); g_object_set (action_data_open, "tooltip", _("Open a data file"), @@ -1119,6 +1188,9 @@ psppire_data_window_init (PsppireDataWindow *de) g_signal_connect (action_data_open, "activate", G_CALLBACK (open_data_dialog), de); + + g_signal_connect_swapped (toolbarbutton, "clicked", + G_CALLBACK (gtk_action_activate), action_data_open); } @@ -1185,6 +1257,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 = @@ -1585,7 +1679,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 = @@ -1747,28 +1856,29 @@ psppire_data_window_init (PsppireDataWindow *de) de); } - de->data_sheet_variable_popup_menu = - GTK_MENU (create_data_sheet_variable_popup_menu (de)); - - de->var_sheet_variable_popup_menu = - GTK_MENU (create_var_sheet_variable_popup_menu (de)); + { + GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER)); - de->data_sheet_cases_popup_menu = - GTK_MENU (create_data_sheet_cases_popup_menu (de)); + PSPPIRE_WINDOW (de)->menu = + GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar/windows/windows_minimise_all")->parent); + } { - GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER)); + GtkMenu *data_sheet_variable_popup_menu = + GTK_MENU (create_data_sheet_variable_popup_menu (de)); - PSPPIRE_WINDOW (de)->menu = - GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar/windows/windows_minimise_all")->parent); - } + GtkMenu *var_sheet_variable_popup_menu = + GTK_MENU (create_var_sheet_variable_popup_menu (de)); + GtkMenu *data_sheet_cases_popup_menu = + GTK_MENU (create_data_sheet_cases_popup_menu (de)); - g_object_set (de->data_editor, - "datasheet-column-menu", de->data_sheet_variable_popup_menu, - "datasheet-row-menu", de->data_sheet_cases_popup_menu, - "varsheet-row-menu", de->var_sheet_variable_popup_menu, - NULL); + g_object_set (de->data_editor, + "datasheet-column-menu", data_sheet_variable_popup_menu, + "datasheet-row-menu", data_sheet_cases_popup_menu, + "varsheet-row-menu", var_sheet_variable_popup_menu, + NULL); + } gtk_widget_show (GTK_WIDGET (de->data_editor)); gtk_widget_show (box); @@ -1791,6 +1901,6 @@ psppire_data_window_new (void) static void psppire_data_window_iface_init (PsppireWindowIface *iface) { - iface->save = data_save; + iface->save = save_file; iface->load = load_file; }