X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fval-labs-dialog.c;h=5b4f7cffba98f0f73b43c56acd2b0f5fcd86f26b;hb=bea8b007855970c07083dbec5b5cc90f33990957;hp=4b575d9779799b7d5850d683dd57afe17ba98a66;hpb=a5097a183f00ab2d2dc538ba7094a4696e2fea04;p=pspp diff --git a/src/ui/gui/val-labs-dialog.c b/src/ui/gui/val-labs-dialog.c index 4b575d9779..5b4f7cffba 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, 2009 Free Software Foundation + Copyright (C) 2005, 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 @@ -22,20 +22,22 @@ #include -#include "helper.h" +#include "builder-wrapper.h" #include "val-labs-dialog.h" #include #include -#include "psppire-var-sheet.h" -#include "psppire-var-store.h" #include +#include "helper.h" + +#include +#define _(msgid) gettext (msgid) +#define N_(msgid) msgid + struct val_labs_dialog { GtkWidget *window; - PsppireVarStore *var_store; - /* The variable to be updated */ struct variable *pv; @@ -71,10 +73,9 @@ 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)); - + text_to_value (text, + dialog->pv, + &v); if (val_labs_find (dialog->labs, &v)) { @@ -86,6 +87,8 @@ on_label_entry_change (GtkEntry *entry, gpointer data) gtk_widget_set_sensitive (dialog->change_button, FALSE); gtk_widget_set_sensitive (dialog->add_button, TRUE); } + + value_destroy (&v, var_get_width (dialog->pv)); } @@ -142,9 +145,9 @@ on_value_entry_change (GtkEntry *entry, gpointer data) const gchar *text = gtk_entry_get_text (GTK_ENTRY (dialog->value_entry)); union value v; - text_to_value (text, &v, - dialog->var_store->dict, - *var_get_write_format (dialog->pv)); + text_to_value (text, + dialog->pv, + &v); g_signal_handler_block (GTK_ENTRY (dialog->label_entry), @@ -168,6 +171,8 @@ on_value_entry_change (GtkEntry *entry, gpointer data) g_signal_handler_unblock (GTK_ENTRY (dialog->label_entry), dialog->change_handler_id); + + value_destroy (&v, var_get_width (dialog->pv)); } @@ -182,7 +187,7 @@ val_labs_ok (GtkWidget *w, gpointer data) val_labs_destroy (dialog->labs); - dialog->labs = 0; + dialog->labs = NULL; gtk_widget_hide (dialog->window); @@ -196,7 +201,7 @@ val_labs_cancel (struct val_labs_dialog *dialog) { val_labs_destroy (dialog->labs); - dialog->labs = 0; + dialog->labs = NULL; gtk_widget_hide (dialog->window); } @@ -204,14 +209,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; } @@ -253,14 +256,18 @@ get_selected_tuple (struct val_labs_dialog *dialog, if (valuep != NULL) *valuep = value; if (label != NULL) - *label = val_labs_find (dialog->labs, &value); + { + struct val_lab *vl = val_labs_lookup (dialog->labs, &value); + if (vl != NULL) + *label = val_lab_get_escaped_label (vl); + } } 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; @@ -269,9 +276,9 @@ 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)); + text_to_value (val_text, + dialog->pv, + &v); val_labs_replace (dialog->labs, &v, gtk_entry_get_text (GTK_ENTRY (dialog->label_entry))); @@ -281,11 +288,11 @@ on_change (GtkWidget *w, gpointer data) repopulate_dialog (dialog); gtk_widget_grab_focus (dialog->value_entry); - return FALSE; + value_destroy (&v, var_get_width (dialog->pv)); } /* 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; @@ -294,32 +301,31 @@ 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)); - + text_to_value (text, + dialog->pv, + &v); - if ( ! val_labs_add (dialog->labs, &v, - gtk_entry_get_text - ( GTK_ENTRY (dialog->label_entry)) ) ) - return FALSE; - - gtk_widget_set_sensitive (dialog->add_button, FALSE); + if (val_labs_add (dialog->labs, &v, + gtk_entry_get_text + ( GTK_ENTRY (dialog->label_entry)) ) ) + { + gtk_widget_set_sensitive (dialog->add_button, FALSE); - repopulate_dialog (dialog); - gtk_widget_grab_focus (dialog->value_entry); + repopulate_dialog (dialog); + gtk_widget_grab_focus (dialog->value_entry); + } - return FALSE; + value_destroy (&v, var_get_width (dialog->pv)); } /* 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; union value value; - const struct val_lab *vl; + struct val_lab *vl; get_selected_tuple (dialog, &value, NULL); vl = val_labs_lookup (dialog->labs, &value); @@ -330,8 +336,6 @@ on_remove (GtkWidget *w, gpointer data) gtk_widget_grab_focus (dialog->value_entry); gtk_widget_set_sensitive (dialog->remove_button, FALSE); - - return FALSE; } @@ -349,7 +353,7 @@ on_select_row (GtkTreeView *treeview, gpointer data) gchar *text; get_selected_tuple (dialog, &value, &label); - text = value_to_text (value, dialog->var_store->dict, *var_get_write_format (dialog->pv)); + text = value_to_text (value, dialog->pv); g_signal_handler_block (GTK_ENTRY (dialog->value_entry), dialog->value_handler_id); @@ -378,7 +382,7 @@ on_select_row (GtkTreeView *treeview, gpointer data) /* Create a new dialog box (there should normally be only one)*/ struct val_labs_dialog * -val_labs_dialog_create (GtkWindow *toplevel, PsppireVarStore *var_store) +val_labs_dialog_create (GtkWindow *toplevel) { GtkTreeViewColumn *column; @@ -388,7 +392,6 @@ val_labs_dialog_create (GtkWindow *toplevel, PsppireVarStore *var_store) 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"); @@ -416,40 +419,40 @@ val_labs_dialog_create (GtkWindow *toplevel, PsppireVarStore *var_store) 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; + dialog->labs = NULL; g_object_unref (xml); @@ -501,11 +504,10 @@ repopulate_dialog (struct val_labs_dialog *dialog) const struct val_lab *vl = labels[i]; gchar *const vstr = - value_to_text (vl->value, dialog->var_store->dict, - *var_get_write_format (dialog->pv)); + value_to_text (vl->value, dialog->pv); - gchar *const text = g_strdup_printf ("%s = \"%s\"", - vstr, val_lab_get_label (vl)); + gchar *const text = g_strdup_printf (_("%s = `%s'"), vstr, + val_lab_get_escaped_label (vl)); gtk_list_store_append (list_store, &iter); gtk_list_store_set (list_store, &iter,