X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Faggregate-dialog.c;h=e89943b6c4ad027f1c0362d6556ae1930780a9f8;hb=563b6160d2ed20120fbb62410a65e03c28537383;hp=5d477d30c554c172b9e8a1493810962bbd164316;hpb=6f3865480503c571963d8a2d1af858a4d72d4e88;p=pspp diff --git a/src/ui/gui/aggregate-dialog.c b/src/ui/gui/aggregate-dialog.c index 5d477d30c5..e89943b6c4 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, 2012 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,7 @@ #include "dialog-common.h" +#include #include #include @@ -167,6 +168,11 @@ choose_filename (struct aggregate *fd) 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_mime_type (filter, "application/x-spss-por"); @@ -427,11 +433,11 @@ 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 = c_xasprintf ("%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 = c_xasprintf ("%g", arg2); + text = c_xasprintf ("%.*g", DBL_DIG + 1, arg2); gtk_entry_set_text (GTK_ENTRY (agg->summary_arg2_entry), text); g_free (text); @@ -676,10 +682,10 @@ append_summary_spec (const struct aggregate *agg, GtkTreeIter *iter, GString *st ds_put_cstr (&dss, srcvar); if ( arity > 0) - ds_put_c_format (&dss, ", %g", arg1); + ds_put_c_format (&dss, ", %.*g", DBL_DIG + 1, arg1); if ( arity > 1) - ds_put_c_format (&dss, ", %g", arg2); + ds_put_c_format (&dss, ", %.*g", DBL_DIG + 1, arg2); ds_put_cstr (&dss, ")");