X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fval-labs-dialog.c;h=765be7fd16d71765cf59322f0f5e7370af66c8c2;hb=04b418d95b3a0394fc7726087be7fa331d98b944;hp=f6d0ab738b74270f508dab07ac82e6e852d132cf;hpb=df63b7b8aec3bd284ba2c4e62f1fc30924fe2c5b;p=pspp-builds.git diff --git a/src/ui/gui/val-labs-dialog.c b/src/ui/gui/val-labs-dialog.c index f6d0ab73..765be7fd 100644 --- a/src/ui/gui/val-labs-dialog.c +++ b/src/ui/gui/val-labs-dialog.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2005 Free Software Foundation + Copyright (C) 2005, 2009 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 @@ -26,12 +26,16 @@ #include "val-labs-dialog.h" #include #include - +#include "psppire-var-sheet.h" +#include "psppire-var-store.h" +#include struct val_labs_dialog { GtkWidget *window; + PsppireVarStore *var_store; + /* The variable to be updated */ struct variable *pv; @@ -68,10 +72,11 @@ on_label_entry_change (GtkEntry *entry, gpointer data) text = gtk_entry_get_text (GTK_ENTRY (dialog->value_entry)); text_to_value (text, &v, + dialog->var_store->dict, *var_get_write_format (dialog->pv)); - if ( val_labs_find (dialog->labs, v) ) + if (val_labs_find (dialog->labs, &v)) { gtk_widget_set_sensitive (dialog->change_button, TRUE); gtk_widget_set_sensitive (dialog->add_button, FALSE); @@ -130,7 +135,7 @@ select_treeview_from_value (GtkTreeView *treeview, union value *val) static void on_value_entry_change (GtkEntry *entry, gpointer data) { - char *s; + const char *s; struct val_labs_dialog *dialog = data; @@ -138,6 +143,7 @@ on_value_entry_change (GtkEntry *entry, gpointer data) union value v; text_to_value (text, &v, + dialog->var_store->dict, *var_get_write_format (dialog->pv)); @@ -147,7 +153,7 @@ on_value_entry_change (GtkEntry *entry, gpointer data) gtk_entry_set_text (GTK_ENTRY (dialog->label_entry),""); - if ( (s = val_labs_find (dialog->labs, v)) ) + if ( (s = val_labs_find (dialog->labs, &v)) ) { gtk_entry_set_text (GTK_ENTRY (dialog->label_entry), s); gtk_widget_set_sensitive (dialog->add_button, FALSE); @@ -198,14 +204,12 @@ val_labs_cancel (struct val_labs_dialog *dialog) /* Callback for when the Value Labels dialog is closed using the Cancel button.*/ -static gint +static void on_cancel (GtkWidget *w, gpointer data) { struct val_labs_dialog *dialog = data; val_labs_cancel (dialog); - - return FALSE; } @@ -223,14 +227,15 @@ on_delete (GtkWidget *w, GdkEvent *e, gpointer data) /* Return the value-label pair currently selected in the dialog box */ -static struct val_lab * -get_selected_tuple (struct val_labs_dialog *dialog) +static void +get_selected_tuple (struct val_labs_dialog *dialog, + union value *valuep, const char **label) { GtkTreeView *treeview = GTK_TREE_VIEW (dialog->treeview); - static struct val_lab vl; GtkTreeIter iter ; GValue the_value = {0}; + union value value; GtkTreeSelection* sel = gtk_tree_view_get_selection (treeview); @@ -240,19 +245,20 @@ get_selected_tuple (struct val_labs_dialog *dialog) gtk_tree_model_get_value (model, &iter, 1, &the_value); - vl.value.f = g_value_get_double (&the_value); + value.f = g_value_get_double (&the_value); g_value_unset (&the_value); - vl.label = val_labs_find (dialog->labs, vl.value); - - return &vl; + if (valuep != NULL) + *valuep = value; + if (label != NULL) + *label = val_labs_find (dialog->labs, &value); } static void repopulate_dialog (struct val_labs_dialog *dialog); /* Callback which occurs when the "Change" button is clicked */ -static gint +static void on_change (GtkWidget *w, gpointer data) { struct val_labs_dialog *dialog = data; @@ -262,21 +268,20 @@ on_change (GtkWidget *w, gpointer data) union value v; text_to_value (val_text, &v, + dialog->var_store->dict, *var_get_write_format (dialog->pv)); - val_labs_replace (dialog->labs, v, + val_labs_replace (dialog->labs, &v, gtk_entry_get_text (GTK_ENTRY (dialog->label_entry))); gtk_widget_set_sensitive (dialog->change_button, FALSE); repopulate_dialog (dialog); gtk_widget_grab_focus (dialog->value_entry); - - return FALSE; } /* Callback which occurs when the "Add" button is clicked */ -static gint +static void on_add (GtkWidget *w, gpointer data) { struct val_labs_dialog *dialog = data; @@ -286,38 +291,39 @@ on_add (GtkWidget *w, gpointer data) const gchar *text = gtk_entry_get_text (GTK_ENTRY (dialog->value_entry)); text_to_value (text, &v, + dialog->var_store->dict, *var_get_write_format (dialog->pv)); - if ( ! val_labs_add (dialog->labs, v, + if ( ! val_labs_add (dialog->labs, &v, gtk_entry_get_text ( GTK_ENTRY (dialog->label_entry)) ) ) - return FALSE; + return ; gtk_widget_set_sensitive (dialog->add_button, FALSE); repopulate_dialog (dialog); gtk_widget_grab_focus (dialog->value_entry); - - return FALSE; } /* Callback which occurs when the "Remove" button is clicked */ -static gint +static void on_remove (GtkWidget *w, gpointer data) { struct val_labs_dialog *dialog = data; - struct val_lab *vl = get_selected_tuple (dialog); + union value value; + const struct val_lab *vl; - val_labs_remove (dialog->labs, vl->value); + get_selected_tuple (dialog, &value, NULL); + vl = val_labs_lookup (dialog->labs, &value); + if (vl != NULL) + val_labs_remove (dialog->labs, vl); repopulate_dialog (dialog); gtk_widget_grab_focus (dialog->value_entry); gtk_widget_set_sensitive (dialog->remove_button, FALSE); - - return FALSE; } @@ -325,16 +331,17 @@ on_remove (GtkWidget *w, gpointer data) /* Callback which occurs when a line item is selected in the list of value--label pairs.*/ static void -on_select_row (GtkTreeView *treeview, - gpointer data) +on_select_row (GtkTreeView *treeview, gpointer data) { - gchar *labeltext; struct val_labs_dialog *dialog = data; - struct val_lab * vl = get_selected_tuple (dialog); + union value value; + const char *label = NULL; + + gchar *text; - gchar *const text = value_to_text (vl->value, - *var_get_write_format (dialog->pv)); + get_selected_tuple (dialog, &value, &label); + text = value_to_text (value, dialog->var_store->dict, *var_get_write_format (dialog->pv)); g_signal_handler_block (GTK_ENTRY (dialog->value_entry), dialog->value_handler_id); @@ -348,10 +355,9 @@ on_select_row (GtkTreeView *treeview, g_signal_handler_block (GTK_ENTRY (dialog->label_entry), dialog->change_handler_id); - labeltext = pspp_locale_to_utf8 (vl->label, -1, 0); + gtk_entry_set_text (GTK_ENTRY (dialog->label_entry), - labeltext); - g_free (labeltext); + label); g_signal_handler_unblock (GTK_ENTRY (dialog->label_entry), dialog->change_handler_id); @@ -364,7 +370,7 @@ on_select_row (GtkTreeView *treeview, /* Create a new dialog box (there should normally be only one)*/ struct val_labs_dialog * -val_labs_dialog_create (GtkWindow *toplevel) +val_labs_dialog_create (GtkWindow *toplevel, PsppireVarStore *var_store) { GtkTreeViewColumn *column; @@ -374,6 +380,7 @@ val_labs_dialog_create (GtkWindow *toplevel) struct val_labs_dialog *dialog = g_malloc (sizeof (*dialog)); + dialog->var_store = var_store; dialog->window = get_widget_assert (xml,"val_labs_dialog"); dialog->value_entry = get_widget_assert (xml,"value_entry"); dialog->label_entry = get_widget_assert (xml,"label_entry"); @@ -401,38 +408,38 @@ val_labs_dialog_create (GtkWindow *toplevel) g_signal_connect (get_widget_assert (xml, "val_labs_cancel"), "clicked", - GTK_SIGNAL_FUNC (on_cancel), dialog); + G_CALLBACK (on_cancel), dialog); g_signal_connect (dialog->window, "delete-event", - GTK_SIGNAL_FUNC (on_delete), dialog); + G_CALLBACK (on_delete), dialog); g_signal_connect (get_widget_assert (xml, "val_labs_ok"), "clicked", - GTK_SIGNAL_FUNC (val_labs_ok), dialog); + G_CALLBACK (val_labs_ok), dialog); dialog->change_handler_id = g_signal_connect (dialog->label_entry, "changed", - GTK_SIGNAL_FUNC (on_label_entry_change), dialog); + G_CALLBACK (on_label_entry_change), dialog); dialog->value_handler_id = g_signal_connect (dialog->value_entry, "changed", - GTK_SIGNAL_FUNC (on_value_entry_change), dialog); + G_CALLBACK (on_value_entry_change), dialog); g_signal_connect (dialog->change_button, "clicked", - GTK_SIGNAL_FUNC (on_change), dialog); + G_CALLBACK (on_change), dialog); g_signal_connect (dialog->treeview, "cursor-changed", - GTK_SIGNAL_FUNC (on_select_row), dialog); + G_CALLBACK (on_select_row), dialog); g_signal_connect (dialog->remove_button, "clicked", - GTK_SIGNAL_FUNC (on_remove), dialog); + G_CALLBACK (on_remove), dialog); g_signal_connect (dialog->add_button, "clicked", - GTK_SIGNAL_FUNC (on_add), dialog); + G_CALLBACK (on_add), dialog); dialog->labs = 0; @@ -456,8 +463,9 @@ val_labs_dialog_set_target_variable (struct val_labs_dialog *dialog, static void repopulate_dialog (struct val_labs_dialog *dialog) { - struct val_labs_iterator *vli = 0; - struct val_lab *vl; + const struct val_lab **labels; + size_t n_labels; + size_t i; GtkTreeIter iter; @@ -478,22 +486,18 @@ repopulate_dialog (struct val_labs_dialog *dialog) g_signal_handler_unblock (GTK_ENTRY (dialog->label_entry), dialog->change_handler_id); - - for (vl = val_labs_first_sorted (dialog->labs, &vli); - vl; - vl = val_labs_next (dialog->labs, &vli)) + labels = val_labs_sorted (dialog->labs); + n_labels = val_labs_count (dialog->labs); + for (i = 0; i < n_labels; i++) { + const struct val_lab *vl = labels[i]; gchar *const vstr = - value_to_text (vl->value, + value_to_text (vl->value, dialog->var_store->dict, *var_get_write_format (dialog->pv)); - gchar *labeltext = - pspp_locale_to_utf8 (vl->label, -1, 0); - gchar *const text = g_strdup_printf ("%s = \"%s\"", - vstr, labeltext); - + vstr, val_lab_get_label (vl)); gtk_list_store_append (list_store, &iter); gtk_list_store_set (list_store, &iter, @@ -501,10 +505,10 @@ repopulate_dialog (struct val_labs_dialog *dialog) 1, vl->value.f, -1); - g_free (labeltext); g_free (text); g_free (vstr); } + free (labels); gtk_tree_view_set_model (GTK_TREE_VIEW (dialog->treeview), GTK_TREE_MODEL (list_store));