X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-window.c;h=ce048e6a8a7bc5cf2416028f1e587de588d65839;hb=2dc6bd2fcac787b64d5ec6dcbf52b1a0c1e631e0;hp=8eb0a143b5af0060d8682d754e534cd2e3f30c57;hpb=ee125610ee16ec11d9374c1eafd7e8f77d9a870c;p=pspp-builds.git diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c index 8eb0a143..ce048e6a 100644 --- a/src/ui/gui/psppire-data-window.c +++ b/src/ui/gui/psppire-data-window.c @@ -370,15 +370,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 +398,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 +409,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: @@ -508,6 +514,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 +1232,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 =