X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-window.c;h=500877bdd38470abdda490fb8747746cc00718f6;hb=91fc7d27740431120fac25a2a56d44bd3fc4fb0e;hp=604bd566a5ff2f1bcd7c8707082cc56567f81083;hpb=380110cc2fc8ee8511c2c4a1b3ee1da8a70cdb18;p=pspp diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c index 604bd566a5..500877bdd3 100644 --- a/src/ui/gui/psppire-data-window.c +++ b/src/ui/gui/psppire-data-window.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation + Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,47 +23,43 @@ #include "data/session.h" #include "language/lexer/lexer.h" #include "libpspp/message.h" +#include "libpspp/str.h" #include "ui/gui/aggregate-dialog.h" -#include "ui/gui/binomial-dialog.h" +#include "ui/gui/autorecode-dialog.h" +#include "ui/gui/builder-wrapper.h" #include "ui/gui/chi-square-dialog.h" #include "ui/gui/comments-dialog.h" #include "ui/gui/compute-dialog.h" -#include "ui/gui/correlation-dialog.h" -#include "ui/gui/crosstabs-dialog.h" -#include "ui/gui/descriptives-dialog.h" +#include "ui/gui/count-dialog.h" #include "ui/gui/entry-dialog.h" -#include "ui/gui/examine-dialog.h" #include "ui/gui/executor.h" -#include "ui/gui/factor-dialog.h" #include "ui/gui/find-dialog.h" -#include "ui/gui/frequencies-dialog.h" #include "ui/gui/goto-case-dialog.h" #include "ui/gui/help-menu.h" #include "ui/gui/helper.h" +#include "ui/gui/helper.h" #include "ui/gui/k-related-dialog.h" +#include "ui/gui/npar-two-sample-related.h" #include "ui/gui/oneway-anova-dialog.h" #include "ui/gui/psppire-data-window.h" #include "ui/gui/psppire-syntax-window.h" #include "ui/gui/psppire-window.h" #include "ui/gui/psppire.h" -#include "ui/gui/rank-dialog.h" +#include "ui/gui/runs-dialog.h" +#include "ui/gui/ks-one-sample-dialog.h" #include "ui/gui/recode-dialog.h" -#include "ui/gui/regression-dialog.h" -#include "ui/gui/reliability-dialog.h" -#include "ui/gui/roc-dialog.h" #include "ui/gui/select-cases-dialog.h" -#include "ui/gui/sort-cases-dialog.h" #include "ui/gui/split-file-dialog.h" -#include "ui/gui/t-test-independent-samples-dialog.h" #include "ui/gui/t-test-one-sample.h" #include "ui/gui/t-test-paired-samples.h" #include "ui/gui/text-data-import-dialog.h" #include "ui/gui/transpose-dialog.h" -#include "ui/gui/variable-info-dialog.h" +#include "ui/gui/univariate-dialog.h" #include "ui/gui/weight-cases-dialog.h" #include "ui/syntax-gen.h" #include "gl/c-strcase.h" +#include "gl/c-strcasestr.h" #include "gl/xvasprintf.h" #include @@ -80,6 +76,7 @@ static void psppire_data_window_init (PsppireDataWindow *data_edit static void psppire_data_window_iface_init (PsppireWindowIface *iface); static void psppire_data_window_dispose (GObject *object); +static void psppire_data_window_finalize (GObject *object); static void psppire_data_window_set_property (GObject *object, guint prop_id, const GValue *value, @@ -143,6 +140,7 @@ psppire_data_window_class_init (PsppireDataWindowClass *class) parent_class = g_type_class_peek_parent (class); object_class->dispose = psppire_data_window_dispose; + object_class->finalize = psppire_data_window_finalize; object_class->set_property = psppire_data_window_set_property; object_class->get_property = psppire_data_window_get_property; @@ -359,8 +357,9 @@ name_has_suffix (const gchar *name) static gboolean load_file (PsppireWindow *de, const gchar *file_name) { - gchar *utf8_file_name; struct string filename; + gchar *utf8_file_name; + const char *mime_type; gchar *syntax; bool ok; @@ -378,10 +377,15 @@ load_file (PsppireWindow *de, const gchar *file_name) ok = execute_syntax (PSPPIRE_DATA_WINDOW (de), lex_reader_for_string (syntax)); g_free (syntax); - return ok; -} + mime_type = (name_has_por_suffix (file_name) + ? "application/x-spss-por" + : "application/x-spss-sav"); + add_most_recent (file_name, mime_type); + + return ok; +} /* Save DE to file */ static void @@ -479,6 +483,7 @@ static void data_pick_filename (PsppireWindow *window) { PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (window); + GtkFileFilter *filter = gtk_file_filter_new (); GtkWidget *button_sys; GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Save"), @@ -488,16 +493,15 @@ data_pick_filename (PsppireWindow *window) GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); - GtkFileFilter *filter = gtk_file_filter_new (); + g_object_set (dialog, "local-only", FALSE, NULL); + gtk_file_filter_set_name (filter, _("System Files (*.sav)")); - gtk_file_filter_add_pattern (filter, "*.sav"); - gtk_file_filter_add_pattern (filter, "*.SAV"); + gtk_file_filter_add_mime_type (filter, "application/x-spss-sav"); gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter); filter = gtk_file_filter_new (); gtk_file_filter_set_name (filter, _("Portable Files (*.por) ")); - gtk_file_filter_add_pattern (filter, "*.por"); - gtk_file_filter_add_pattern (filter, "*.POR"); + gtk_file_filter_add_mime_type (filter, "application/x-spss-por"); gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter); filter = gtk_file_filter_new (); @@ -575,7 +579,7 @@ confirm_delete_dataset (PsppireDataWindow *de, gtk_message_dialog_format_secondary_text ( GTK_MESSAGE_DIALOG (dialog), - _("Renaming \"%s\" to \"%s\" will delete destroy the existing " + _("Renaming \"%s\" to \"%s\" will destroy the existing " "dataset named \"%s\". Are you sure that you want to do this?"), old_dataset, new_dataset, existing_dataset); @@ -584,7 +588,7 @@ confirm_delete_dataset (PsppireDataWindow *de, GTK_STOCK_DELETE, GTK_RESPONSE_OK, NULL); - g_object_set (dialog, "icon-name", "psppicon", NULL); + g_object_set (dialog, "icon-name", "pspp", NULL); result = gtk_dialog_run (GTK_DIALOG (dialog)); @@ -756,21 +760,63 @@ on_recent_data_select (GtkMenuShell *menushell, g_free (file); } +static char * +charset_from_mime_type (const char *mime_type) +{ + const char *charset; + struct string s; + const char *p; + + if (mime_type == NULL) + return NULL; + + charset = c_strcasestr (mime_type, "charset="); + if (charset == NULL) + return NULL; + + ds_init_empty (&s); + p = charset + 8; + if (*p == '"') + { + /* Parse a "quoted-string" as defined by RFC 822. */ + for (p++; *p != '\0' && *p != '"'; p++) + { + if (*p != '\\') + ds_put_byte (&s, *p); + else if (*++p != '\0') + ds_put_byte (&s, *p); + } + } + else + { + /* Parse a "token" as defined by RFC 2045. */ + while (*p > 32 && *p < 127 && strchr ("()<>@,;:\\\"/[]?=", *p) == NULL) + ds_put_byte (&s, *p++); + } + if (!ds_is_empty (&s)) + return ds_steal_cstr (&s); + + ds_destroy (&s); + return NULL; +} + static void on_recent_files_select (GtkMenuShell *menushell, gpointer user_data) { + GtkRecentInfo *item; + char *encoding; + GtkWidget *se; gchar *file; - GtkWidget *se ; - - gchar *uri = - gtk_recent_chooser_get_current_uri (GTK_RECENT_CHOOSER (menushell)); - - file = g_filename_from_uri (uri, NULL, NULL); + /* Get the file name and its encoding. */ + item = gtk_recent_chooser_get_current_item (GTK_RECENT_CHOOSER (menushell)); + file = g_filename_from_uri (gtk_recent_info_get_uri (item), NULL, NULL); + encoding = charset_from_mime_type (gtk_recent_info_get_mime_type (item)); + gtk_recent_info_unref (item); - g_free (uri); + se = psppire_syntax_window_new (encoding); - se = psppire_syntax_window_new (NULL); + free (encoding); if ( psppire_window_load (PSPPIRE_WINDOW (se), file) ) gtk_widget_show (se); @@ -781,6 +827,7 @@ on_recent_files_select (GtkMenuShell *menushell, gpointer user_data) } + static void enable_delete_cases (GtkWidget *w, gint case_num, gpointer data) { @@ -856,12 +903,25 @@ connect_action (PsppireDataWindow *dw, const char *action_name, GCallback handler) { GtkAction *action = get_action_assert (dw->builder, action_name); - + g_signal_connect_swapped (action, "activate", handler, dw); return action; } +/* Only a data file with at least one variable can be saved. */ +static void +enable_save (PsppireDataWindow *dw) +{ + PsppireDict *dict = dw->var_store->dictionary; + gboolean enable = psppire_dict_get_var_cnt (dict) > 0; + + gtk_action_set_sensitive (get_action_assert (dw->builder, "file_save"), + enable); + gtk_action_set_sensitive (get_action_assert (dw->builder, "file_save_as"), + enable); +} + /* Initializes as much of a PsppireDataWindow as we can and must before the dataset has been set. @@ -903,6 +963,7 @@ psppire_data_window_finish_init (PsppireDataWindow *de, de->dataset = ds; dict = psppire_dict_new_from_dict (dataset_dict (ds)); de->var_store = psppire_var_store_new (dict); + g_object_unref (dict); de->data_store = psppire_data_store_new (dict); psppire_data_store_set_reader (de->data_store, NULL); @@ -957,6 +1018,13 @@ psppire_data_window_finish_init (PsppireDataWindow *de, G_CALLBACK (on_split_change), de); + g_signal_connect_swapped (dict, "backend-changed", + G_CALLBACK (enable_save), de); + g_signal_connect_swapped (dict, "variable-inserted", + G_CALLBACK (enable_save), de); + g_signal_connect_swapped (dict, "variable-deleted", + G_CALLBACK (enable_save), de); + enable_save (de); connect_action (de, "edit_copy", G_CALLBACK (on_edit_copy)); @@ -964,7 +1032,7 @@ psppire_data_window_finish_init (PsppireDataWindow *de, connect_action (de, "file_new_data", G_CALLBACK (create_data_window)); - connect_action (de, "file_import-text", G_CALLBACK (text_data_import_assistant)); + connect_action (de, "file_import", G_CALLBACK (text_data_import_assistant)); connect_action (de, "file_save", G_CALLBACK (psppire_window_save)); @@ -1007,64 +1075,26 @@ psppire_data_window_finish_init (PsppireDataWindow *de, connect_action (de, "data_transpose", G_CALLBACK (transpose_dialog)); - connect_action (de, "data_select-cases", G_CALLBACK (select_cases_dialog)); - - connect_action (de, "data_sort-cases", G_CALLBACK (sort_cases_dialog)); - connect_action (de, "data_aggregate", G_CALLBACK (aggregate_dialog)); - connect_action (de, "transform_compute", G_CALLBACK (compute_dialog)); - + connect_action (de, "transform_autorecode", G_CALLBACK (autorecode_dialog)); connect_action (de, "edit_find", G_CALLBACK (find_dialog)); - connect_action (de, "data_split-file", G_CALLBACK (split_file_dialog)); - connect_action (de, "data_weight-cases", G_CALLBACK (weight_cases_dialog)); - - - connect_action (de, "utilities_variables", G_CALLBACK (variable_info_dialog)); - connect_action (de, "oneway-anova", G_CALLBACK (oneway_anova_dialog)); - - connect_action (de, "indep-t-test", G_CALLBACK (t_test_independent_samples_dialog)); - connect_action (de, "paired-t-test", G_CALLBACK (t_test_paired_samples_dialog)); - connect_action (de, "one-sample-t-test", G_CALLBACK (t_test_one_sample_dialog)); - connect_action (de, "utilities_comments", G_CALLBACK (comments_dialog)); - - connect_action (de, "transform_rank", G_CALLBACK (rank_dialog)); - + connect_action (de, "transform_count", G_CALLBACK (count_dialog)); connect_action (de, "transform_recode-same", G_CALLBACK (recode_same_dialog)); - connect_action (de, "transform_recode-different", G_CALLBACK (recode_different_dialog)); - - connect_action (de, "analyze_descriptives", G_CALLBACK (descriptives_dialog)); - - connect_action (de, "analyze_frequencies", G_CALLBACK (frequencies_dialog)); - - connect_action (de, "crosstabs", G_CALLBACK (crosstabs_dialog)); - - connect_action (de, "analyze_explore", G_CALLBACK (examine_dialog)); - - connect_action (de, "linear-regression", G_CALLBACK (regression_dialog)); - - connect_action (de, "reliability", G_CALLBACK (reliability_dialog)); - - connect_action (de, "roc-curve", G_CALLBACK (roc_dialog)); - - connect_action (de, "correlation", G_CALLBACK (correlation_dialog)); - - connect_action (de, "factor-analysis", G_CALLBACK (factor_dialog)); - + connect_action (de, "univariate", G_CALLBACK (univariate_dialog)); connect_action (de, "chi-square", G_CALLBACK (chisquare_dialog)); - - connect_action (de, "binomial", G_CALLBACK (binomial_dialog)); - + connect_action (de, "runs", G_CALLBACK (runs_dialog)); + connect_action (de, "ks-one-sample", G_CALLBACK (ks_one_sample_dialog)); connect_action (de, "k-related-samples", G_CALLBACK (k_related_dialog)); - + connect_action (de, "two-related-samples", G_CALLBACK (two_related_dialog)); { GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER)); @@ -1082,13 +1112,14 @@ psppire_data_window_finish_init (PsppireDataWindow *de, GtkWidget *menu_files = gtk_recent_chooser_menu_new_for_manager ( gtk_recent_manager_get_default ()); + g_object_set (menu_data, "show-tips", TRUE, NULL); + g_object_set (menu_files, "show-tips", TRUE, NULL); + { GtkRecentFilter *filter = gtk_recent_filter_new (); - gtk_recent_filter_add_pattern (filter, "*.sav"); - gtk_recent_filter_add_pattern (filter, "*.SAV"); - gtk_recent_filter_add_pattern (filter, "*.por"); - gtk_recent_filter_add_pattern (filter, "*.POR"); + gtk_recent_filter_add_mime_type (filter, "application/x-spss-sav"); + gtk_recent_filter_add_mime_type (filter, "application/x-spss-por"); gtk_recent_chooser_set_sort_type (GTK_RECENT_CHOOSER (menu_data), GTK_RECENT_SORT_MRU); @@ -1226,6 +1257,27 @@ psppire_data_window_dispose (GObject *object) G_OBJECT_CLASS (parent_class)->dispose (object); } +static void +psppire_data_window_finalize (GObject *object) +{ + PsppireDataWindow *dw = PSPPIRE_DATA_WINDOW (object); + + if (dw->dataset) + { + struct dataset *dataset = dw->dataset; + struct session *session = dataset_session (dataset); + + dw->dataset = NULL; + + dataset_set_callbacks (dataset, NULL, NULL); + session_set_active_dataset (session, NULL); + dataset_destroy (dataset); + } + + if (G_OBJECT_CLASS (parent_class)->finalize) + G_OBJECT_CLASS (parent_class)->finalize (object); +} + static void psppire_data_window_set_property (GObject *object, guint prop_id, @@ -1274,10 +1326,7 @@ psppire_data_window_new (struct dataset *ds) if (ds == NULL) { - static int n_datasets; - char *dataset_name; - - dataset_name = xasprintf ("DataSet%d", ++n_datasets); + char *dataset_name = session_generate_dataset_name (the_session); ds = dataset_create (the_session, dataset_name); free (dataset_name); } @@ -1286,7 +1335,6 @@ psppire_data_window_new (struct dataset *ds) dw = GTK_WIDGET ( g_object_new ( psppire_data_window_get_type (), - /* TRANSLATORS: This will form a filename. Please avoid whitespace. */ "description", _("Data Editor"), "dataset", ds, NULL));