X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fvar-type-dialog.c;h=ea3d2e098a23c5eb464fea1ab596e6c09e4460cc;hb=2d9ee2dd5f5fbaeda0caf5a19ad4f018f4b22bc3;hp=2bee901bb5c7f217cdeda64690526c1e0df00ce5;hpb=bc02bc027697df3207f827de722c26d8cc87e824;p=pspp-builds.git diff --git a/src/ui/gui/var-type-dialog.c b/src/ui/gui/var-type-dialog.c index 2bee901b..ea3d2e09 100644 --- a/src/ui/gui/var-type-dialog.c +++ b/src/ui/gui/var-type-dialog.c @@ -1,21 +1,18 @@ -/* - PSPPIRE --- A Graphical User Interface for PSPP - Copyright (C) 2005, 2006 Free Software Foundation +/* PSPPIRE - a graphical user interface for PSPP. + Copyright (C) 2005, 2006, 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 - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. */ + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ /* This module describes the behaviour of the Variable Type dialog box used @@ -24,19 +21,15 @@ #include #include -#include - #include #include -#include "var-type-dialog.h" - -#include "helper.h" - -#include -#include -#include - +#include "data/data-out.h" +#include "data/settings.h" +#include "data/variable.h" +#include "libpspp/message.h" +#include "ui/gui/builder-wrapper.h" +#include "ui/gui/var-type-dialog.h" struct tgs { @@ -46,7 +39,7 @@ struct tgs struct format_opt { - gchar desc[18]; + gchar desc[21]; struct fmt_spec spec; }; @@ -69,7 +62,8 @@ static const struct format_opt format_option[] = { "mmm yy", {FMT_MOYR, 6, 0} }, { "dd WK yyyy", {FMT_WKYR, 10, 0} }, { "dd WK yy", {FMT_WKYR, 8, 0} }, - { "dd-mmm-yyyy HH:MM", {FMT_DATETIME, 17, 0}} + { "dd-mmm-yyyy HH:MM", {FMT_DATETIME, 17, 0}}, + { "dd-mmm-yyyy HH:MM:SS", {FMT_DATETIME, 20, 0}} }; @@ -128,7 +122,7 @@ static void update_width_decimals (const struct var_type_dialog *dialog); static void set_local_width_decimals (struct var_type_dialog *dialog) { - dialog->fmt_l = * var_get_write_format (dialog->pv); + dialog->fmt_l = * var_get_print_format (dialog->pv); switch (dialog->active_button) { @@ -175,6 +169,7 @@ on_toggle_2 (GtkToggleButton *togglebutton, gpointer user_data) switch (dialog->active_button) { case BUTTON_STRING: + gtk_widget_show (dialog->entry_width); gtk_widget_show (dialog->width_decimals); gtk_widget_hide (dialog->label_decimals); gtk_widget_hide (dialog->entry_decimals); @@ -207,8 +202,8 @@ on_toggle_2 (GtkToggleButton *togglebutton, gpointer user_data) static gint on_var_type_ok_clicked (GtkWidget *w, gpointer data); +static gint hide_dialog (GtkWidget *w, gpointer data); -#define LEN 20 static void add_to_group (GtkWidget *w, gpointer data) @@ -226,11 +221,11 @@ update_width_decimals (const struct var_type_dialog *dialog) g_assert (dialog); text = g_strdup_printf ("%d", dialog->fmt_l.w); - gtk_entry_set_text (GTK_ENTRY(dialog->entry_width), text); + gtk_entry_set_text (GTK_ENTRY (dialog->entry_width), text); g_free (text); text = g_strdup_printf ("%d", dialog->fmt_l.d); - gtk_entry_set_text (GTK_ENTRY(dialog->entry_decimals), text); + gtk_entry_set_text (GTK_ENTRY (dialog->entry_decimals), text); g_free (text); } @@ -246,17 +241,17 @@ preview_custom (GtkWidget *w, gpointer data) if ( dialog->active_button != BUTTON_CUSTOM ) return; - text = gtk_entry_get_text (GTK_ENTRY(dialog->entry_decimals)); + text = gtk_entry_get_text (GTK_ENTRY (dialog->entry_decimals)); dialog->fmt_l.d = atoi (text); - text = gtk_entry_get_text (GTK_ENTRY(dialog->entry_width)); + text = gtk_entry_get_text (GTK_ENTRY (dialog->entry_width)); dialog->fmt_l.w = atoi (text); msg_disable (); if ( ! fmt_check_output (&dialog->fmt_l)) { - gtk_label_set_text (GTK_LABEL(dialog->label_psample), "---"); - gtk_label_set_text (GTK_LABEL(dialog->label_nsample), "---"); + gtk_label_set_text (GTK_LABEL (dialog->label_psample), "---"); + gtk_label_set_text (GTK_LABEL (dialog->label_nsample), "---"); } else { @@ -264,13 +259,13 @@ preview_custom (GtkWidget *w, gpointer data) union value v; v.f = 1234.56; - sample_text = value_to_text (v, dialog->fmt_l); - gtk_label_set_text (GTK_LABEL(dialog->label_psample), sample_text); + sample_text = g_strchug (data_out (&v, NULL, &dialog->fmt_l)); + gtk_label_set_text (GTK_LABEL (dialog->label_psample), sample_text); g_free (sample_text); v.f = -v.f; - sample_text = value_to_text (v, dialog->fmt_l); - gtk_label_set_text (GTK_LABEL(dialog->label_nsample), sample_text); + sample_text = g_strchug (data_out (&v, NULL, &dialog->fmt_l)); + gtk_label_set_text (GTK_LABEL (dialog->label_nsample), sample_text); g_free (sample_text); } msg_enable (); @@ -317,25 +312,27 @@ set_format_type_from_treeview (GtkTreeView *treeview, gpointer data) dialog->fmt_l = custom_format; dialog->fmt_l.type = *(int*) g_value_get_pointer (&the_value); - } - - -/* Create the structure from the XML definitions */ +/* Create the structure */ struct var_type_dialog * -var_type_dialog_create (GladeXML *xml) +var_type_dialog_create (GtkWindow *toplevel) { gint i; struct var_type_dialog *dialog = g_malloc (sizeof (struct var_type_dialog)); - g_assert (xml); + GtkBuilder *xml = builder_new ("var-sheet-dialogs.ui"); dialog->window = get_widget_assert (xml,"var_type_dialog"); + dialog->active_button = -1; - gtk_window_set_transient_for (GTK_WINDOW(dialog->window), - GTK_WINDOW(get_widget_assert (xml, "data_editor"))); + + g_signal_connect (dialog->window, "delete-event", + G_CALLBACK (gtk_widget_hide_on_delete), NULL); + + gtk_window_set_transient_for (GTK_WINDOW (dialog->window), + toplevel); dialog->radioButton[BUTTON_NUMERIC] = get_widget_assert (xml,"radiobutton1"); @@ -371,10 +368,10 @@ var_type_dialog_create (GladeXML *xml) dialog->dollar_window = get_widget_assert (xml, "dollar_window"); dialog->dollar_treeview = - GTK_TREE_VIEW(get_widget_assert (xml, "dollar_treeview")); + GTK_TREE_VIEW (get_widget_assert (xml, "dollar_treeview")); dialog->custom_treeview = - GTK_TREE_VIEW(get_widget_assert (xml, "custom_treeview")); + GTK_TREE_VIEW (get_widget_assert (xml, "custom_treeview")); dialog->ok = get_widget_assert (xml,"var_type_ok"); @@ -394,7 +391,7 @@ var_type_dialog_create (GladeXML *xml) upleasant resizing effects */ GtkSizeGroup *sizeGroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); - gtk_container_foreach (GTK_CONTAINER(get_widget_assert (xml, "middle_box")), + gtk_container_foreach (GTK_CONTAINER (get_widget_assert (xml, "middle_box")), add_to_group, sizeGroup); @@ -403,14 +400,14 @@ var_type_dialog_create (GladeXML *xml) tgs[i].dialog = dialog; tgs[i].button = i; g_signal_connect (dialog->radioButton[i], "toggled", - G_CALLBACK(on_toggle_1), &tgs[i]); + G_CALLBACK (on_toggle_1), &tgs[i]); g_signal_connect (dialog->radioButton[i], "toggled", - G_CALLBACK(on_toggle_2), dialog); + G_CALLBACK (on_toggle_2), dialog); } /* Populate the date format tree view */ - dialog->date_format_treeview = GTK_TREE_VIEW(get_widget_assert (xml, + dialog->date_format_treeview = GTK_TREE_VIEW (get_widget_assert (xml, "date_format_list_view")); renderer = gtk_cell_renderer_text_new (); @@ -436,13 +433,13 @@ var_type_dialog_create (GladeXML *xml) -1); } - gtk_tree_view_set_model (GTK_TREE_VIEW(dialog->date_format_treeview), - GTK_TREE_MODEL(list_store)); + gtk_tree_view_set_model (GTK_TREE_VIEW (dialog->date_format_treeview), + GTK_TREE_MODEL (list_store)); g_object_unref (list_store); - g_signal_connect (GTK_OBJECT(dialog->date_format_treeview), "cursor-changed", - GTK_SIGNAL_FUNC(set_format_from_treeview), dialog); + g_signal_connect (dialog->date_format_treeview, "cursor-changed", + G_CALLBACK (set_format_from_treeview), dialog); /* populate the dollar treeview */ @@ -464,7 +461,7 @@ var_type_dialog_create (GladeXML *xml) for ( i = 0 ; i < sizeof (dollar_format)/sizeof (dollar_format[0]) ; ++i ) { - char *template = fmt_dollar_template (&dollar_format[i]); + char *template = settings_dollar_template (&dollar_format[i]); gtk_list_store_append (list_store, &iter); gtk_list_store_set (list_store, &iter, 0, template, @@ -473,18 +470,18 @@ var_type_dialog_create (GladeXML *xml) free (template); } - gtk_tree_view_set_model (GTK_TREE_VIEW(dialog->dollar_treeview), - GTK_TREE_MODEL(list_store)); + gtk_tree_view_set_model (GTK_TREE_VIEW (dialog->dollar_treeview), + GTK_TREE_MODEL (list_store)); g_object_unref (list_store); - g_signal_connect (GTK_OBJECT(dialog->dollar_treeview), + g_signal_connect (dialog->dollar_treeview, "cursor-changed", - GTK_SIGNAL_FUNC(set_format_from_treeview), dialog); + G_CALLBACK (set_format_from_treeview), dialog); - g_signal_connect_swapped (GTK_OBJECT(dialog->dollar_treeview), + g_signal_connect_swapped (dialog->dollar_treeview, "cursor-changed", - GTK_SIGNAL_FUNC(update_width_decimals), dialog); + G_CALLBACK (update_width_decimals), dialog); /* populate the custom treeview */ @@ -516,39 +513,45 @@ var_type_dialog_create (GladeXML *xml) -1); } - gtk_tree_view_set_model (GTK_TREE_VIEW(dialog->custom_treeview), - GTK_TREE_MODEL(list_store)); + gtk_tree_view_set_model (GTK_TREE_VIEW (dialog->custom_treeview), + GTK_TREE_MODEL (list_store)); g_object_unref (list_store); - g_signal_connect (GTK_OBJECT(dialog->custom_treeview), + g_signal_connect (dialog->custom_treeview, "cursor-changed", - GTK_SIGNAL_FUNC(set_format_type_from_treeview), dialog); + G_CALLBACK (set_format_type_from_treeview), dialog); - g_signal_connect (GTK_OBJECT(dialog->custom_treeview), + g_signal_connect (dialog->custom_treeview, "cursor-changed", - GTK_SIGNAL_FUNC(preview_custom), dialog); + G_CALLBACK (preview_custom), dialog); - g_signal_connect (GTK_OBJECT(dialog->entry_width), + g_signal_connect (dialog->entry_width, "changed", - GTK_SIGNAL_FUNC(preview_custom), dialog); + G_CALLBACK (preview_custom), dialog); - g_signal_connect (GTK_OBJECT(dialog->entry_decimals), + g_signal_connect (dialog->entry_decimals, "changed", - GTK_SIGNAL_FUNC(preview_custom), dialog); + G_CALLBACK (preview_custom), dialog); - /* Connect the OK button */ - g_signal_connect (dialog->ok, "clicked", G_CALLBACK(on_var_type_ok_clicked), + /* Connect to the OK button */ + g_signal_connect (dialog->ok, "clicked", G_CALLBACK (on_var_type_ok_clicked), dialog); + /* And the cancel button */ + g_signal_connect (get_widget_assert (xml, "var_type_cancel") , "clicked", + G_CALLBACK (hide_dialog), + dialog); } + g_object_unref (xml); + return dialog; } @@ -557,7 +560,7 @@ var_type_dialog_create (GladeXML *xml) void var_type_dialog_set_active_button (struct var_type_dialog *dialog, gint b) { - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(dialog->radioButton[b]), + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->radioButton[b]), TRUE); dialog->active_button = b; } @@ -656,29 +659,29 @@ select_treeview_from_format_type (GtkTreeView *treeview, static void var_type_dialog_set_state (struct var_type_dialog *dialog) { - const struct fmt_spec *write_spec ; + const struct fmt_spec *format ; GString *str = g_string_new (""); g_assert (dialog); g_assert (dialog->pv); /* Populate width and decimals */ - write_spec = var_get_write_format (dialog->pv); + format = var_get_print_format (dialog->pv); - g_string_printf (str, "%d", write_spec->d); + g_string_printf (str, "%d", format->d); - gtk_entry_set_text (GTK_ENTRY(dialog->entry_decimals), + gtk_entry_set_text (GTK_ENTRY (dialog->entry_decimals), str->str); - g_string_printf (str, "%d", write_spec->w); + g_string_printf (str, "%d", format->w); - gtk_entry_set_text (GTK_ENTRY(dialog->entry_width), + gtk_entry_set_text (GTK_ENTRY (dialog->entry_width), str->str); g_string_free (str, TRUE); /* Populate the radio button states */ - switch (write_spec->type) + switch (format->type) { case FMT_F: var_type_dialog_set_active_button (dialog, BUTTON_NUMERIC); @@ -701,7 +704,7 @@ var_type_dialog_set_state (struct var_type_dialog *dialog) var_type_dialog_set_active_button (dialog, BUTTON_DOLLAR); gtk_widget_show_all (dialog->width_decimals); - select_treeview_from_format (dialog->dollar_treeview, write_spec); + select_treeview_from_format (dialog->dollar_treeview, format); break; case FMT_DATE: case FMT_EDATE: @@ -719,7 +722,7 @@ var_type_dialog_set_state (struct var_type_dialog *dialog) var_type_dialog_set_active_button (dialog, BUTTON_DATE); gtk_widget_hide (dialog->width_decimals); gtk_widget_show (dialog->date_format_list); - select_treeview_from_format (dialog->date_format_treeview, write_spec); + select_treeview_from_format (dialog->date_format_treeview, format); break; case FMT_CCA: case FMT_CCB: @@ -728,7 +731,7 @@ var_type_dialog_set_state (struct var_type_dialog *dialog) case FMT_CCE: var_type_dialog_set_active_button (dialog, BUTTON_CUSTOM); select_treeview_from_format_type (dialog->custom_treeview, - write_spec->type); + format->type); gtk_widget_show_all (dialog->width_decimals); break; default: @@ -776,19 +779,17 @@ on_var_type_ok_clicked (GtkWidget *w, gpointer data) { gint width = atoi (gtk_entry_get_text - (GTK_ENTRY(dialog->entry_width))); + (GTK_ENTRY (dialog->entry_width))); gint decimals = atoi (gtk_entry_get_text - (GTK_ENTRY(dialog->entry_decimals))); + (GTK_ENTRY (dialog->entry_decimals))); - gint new_type = VAR_NUMERIC; gint new_width = 0; bool result = false; struct fmt_spec spec; switch (dialog->active_button) { case BUTTON_STRING: - new_type = VAR_STRING; new_width = width; result = make_output_format_try (&spec, FMT_A, width, 0); break; @@ -806,14 +807,16 @@ on_var_type_ok_clicked (GtkWidget *w, gpointer data) break; case BUTTON_DATE: case BUTTON_CUSTOM: - g_assert (fmt_check_output (&dialog->fmt_l)); - result = memcpy (&spec, &dialog->fmt_l, sizeof (struct fmt_spec)); + if (! fmt_check_output (&dialog->fmt_l)) + g_critical ("Invalid variable format"); + else + result = memcpy (&spec, &dialog->fmt_l, sizeof (struct fmt_spec)); break; case BUTTON_DOLLAR: result = make_output_format_try (&spec, FMT_DOLLAR, width, decimals); break; default: - g_print ("Unknown variable type: %d\n", dialog->active_button) ; + g_critical ("Unknown variable type: %d", dialog->active_button) ; result = false; break; } @@ -832,10 +835,12 @@ on_var_type_ok_clicked (GtkWidget *w, gpointer data) -gint -on_var_type_cancel_clicked (GtkWidget *w, gpointer data) +static gint +hide_dialog (GtkWidget *w, gpointer data) { - gtk_widget_hide (w); + struct var_type_dialog *dialog = data; + + gtk_widget_hide (dialog->window); return FALSE; }