X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Faggregate-dialog.c;h=65addea3e20cef3101465cfdfa8bb182bf299363;hb=ed208cf009043f0bf319a4e919c279d5b1401f36;hp=207bbd4d8d884826e08464a73d6524504aaeb0b3;hpb=1aed96f34f5ebae51e58c96f95ba486299c73f8b;p=pspp diff --git a/src/ui/gui/aggregate-dialog.c b/src/ui/gui/aggregate-dialog.c index 207bbd4d8d..65addea3e2 100644 --- a/src/ui/gui/aggregate-dialog.c +++ b/src/ui/gui/aggregate-dialog.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2010, 2011 Free Software Foundation + Copyright (C) 2010, 2011, 2012, 2013, 2014 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 @@ -18,6 +18,8 @@ #include "dialog-common.h" +#include +#include #include #include @@ -35,6 +37,7 @@ #include "dict-display.h" #include "executor.h" +#include "builder-wrapper.h" #include "helper.h" #include @@ -92,15 +95,6 @@ struct aggregate static char * generate_syntax (const struct aggregate *rd); -/* Makes widget W's sensitivity follow the active state of TOGGLE */ -static void -sensitive_if_active (GtkToggleButton *toggle, GtkWidget *w) -{ - gboolean active = gtk_toggle_button_get_active (toggle); - - gtk_widget_set_sensitive (w, active); -} - static void update_arguments (struct aggregate *agg); @@ -159,25 +153,30 @@ choose_filename (struct aggregate *fd) GtkFileFilter *filter; GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Aggregate destination file"), - GTK_WINDOW (fd->de), - GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, - NULL); + GTK_WINDOW (fd->de), + GTK_FILE_CHOOSER_ACTION_SAVE, + _("Cancel"), GTK_RESPONSE_CANCEL, + _("Save"), GTK_RESPONSE_ACCEPT, + NULL); + + g_object_set (dialog, "local-only", FALSE, NULL); gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE); filter = gtk_file_filter_new (); 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, _("Compressed System Files (*.zsav)")); + gtk_file_filter_add_pattern (filter, "*.zsav"); 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); @@ -226,6 +225,7 @@ populate_combo_model (GtkComboBox *cb) gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (cb), renderer, "text", 0); gtk_combo_box_set_model (GTK_COMBO_BOX (cb), GTK_TREE_MODEL (list)); + g_object_unref (list); } @@ -434,33 +434,18 @@ on_acr_change (const struct aggregate *agg, GtkTreeView *tv) gtk_entry_set_text (GTK_ENTRY (agg->summary_var_label_entry), label); gtk_entry_set_text (GTK_ENTRY (agg->summary_sv_entry), srcvar); - text = g_strdup_printf ("%g", arg1); + text = c_xasprintf ("%.*g", DBL_DIG + 1, arg1); gtk_entry_set_text (GTK_ENTRY (agg->summary_arg1_entry), text); g_free (text); - text = g_strdup_printf ("%g", arg2); + text = c_xasprintf ("%.*g", DBL_DIG + 1, arg2); gtk_entry_set_text (GTK_ENTRY (agg->summary_arg2_entry), text); g_free (text); - gtk_combo_box_set_active (GTK_COMBO_BOX (agg->function_combo), f_idx); } -/* Set the pane to 50% of its maximum size */ -static void -set_initial_pos (GtkPaned *pane) -{ - int max_pos; - g_object_get (pane, - "max-position", &max_pos, - NULL); - - gtk_paned_set_position (pane, max_pos); -} - - - /* Pops up the Aggregate dialog box */ void aggregate_dialog (PsppireDataWindow *dw) @@ -468,8 +453,6 @@ aggregate_dialog (PsppireDataWindow *dw) struct aggregate fd; gint response; - PsppireVarStore *vs; - GtkWidget *dialog ; GtkWidget *source ; @@ -527,13 +510,14 @@ aggregate_dialog (PsppireDataWindow *dw) G_TYPE_DOUBLE); psppire_acr_set_model (PSPPIRE_ACR (fd.summary_acr), list); + g_object_unref (list); psppire_acr_set_get_value_func (PSPPIRE_ACR (fd.summary_acr), get_summary_spec, &fd); column = gtk_tree_view_get_column (PSPPIRE_ACR (fd.summary_acr)->tv, 0); - l = gtk_tree_view_column_get_cell_renderers (column); + l = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (column)); cell_renderer = l->data; @@ -554,7 +538,6 @@ aggregate_dialog (PsppireDataWindow *dw) g_signal_connect_swapped (fd.summary_arg2_entry, "changed", G_CALLBACK (update_acr), &fd); - g_signal_connect (fd.pane, "realize", G_CALLBACK (set_initial_pos), &fd); g_signal_connect_swapped (fd.function_combo, "changed", @@ -564,11 +547,9 @@ aggregate_dialog (PsppireDataWindow *dw) g_signal_connect_swapped (dialog, "refresh", G_CALLBACK (refresh), &fd); - g_object_get (fd.de->data_editor, "var-store", &vs, NULL); - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (fd.de)); - g_object_get (vs, "dictionary", &fd.dict, NULL); + g_object_get (fd.de->data_editor, "dictionary", &fd.dict, NULL); g_object_set (source, "model", fd.dict, NULL); @@ -579,7 +560,7 @@ aggregate_dialog (PsppireDataWindow *dw) dialog_state_valid, &fd); g_signal_connect (fd.filename_radiobutton, "toggled", - G_CALLBACK (sensitive_if_active), fd.filename_box ); + G_CALLBACK (set_sensitivity_from_toggle), fd.filename_box ); g_signal_connect_swapped (fd.filename_button, "clicked", G_CALLBACK (choose_filename), &fd); @@ -633,8 +614,8 @@ static void append_summary_spec (const struct aggregate *agg, GtkTreeIter *iter, GString *string) { GtkTreeIter combo_iter; - const char *varname; - const char *funcname; + char *varname = NULL; + char *funcname = NULL; GtkTreeModel *acr_model = GTK_TREE_MODEL (PSPPIRE_ACR (agg->summary_acr)->list_store); GtkTreeModel *combo_model = gtk_combo_box_get_model (GTK_COMBO_BOX (agg->function_combo)); @@ -645,8 +626,8 @@ append_summary_spec (const struct aggregate *agg, GtkTreeIter *iter, GString *st double arg1, arg2; int arity; enum agr_src_vars has_src_vars; - const gchar *label ; - const gchar *srcvar ; + gchar *label = NULL; + gchar *srcvar = NULL; gtk_tree_model_get (acr_model, iter, SUMMARY_COL_VARNAME, &varname, @@ -681,18 +662,28 @@ append_summary_spec (const struct aggregate *agg, GtkTreeIter *iter, GString *st if ( has_src_vars != AGR_SV_NO) { - g_string_append (string, " ("); + struct string dss; + ds_init_cstr (&dss, " ("); - g_string_append (string, srcvar); + ds_put_cstr (&dss, srcvar); if ( arity > 0) - g_string_append_printf (string, ", %g", arg1); + ds_put_c_format (&dss, ", %.*g", DBL_DIG + 1, arg1); if ( arity > 1) - g_string_append_printf (string, ", %g", arg2); + ds_put_c_format (&dss, ", %.*g", DBL_DIG + 1, arg2); + + ds_put_cstr (&dss, ")"); - g_string_append (string, ")"); + g_string_append (string, ds_cstr (&dss)); + + ds_destroy (&dss); } + + free (label); + free (srcvar); + free (varname); + free (funcname); }