X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fval-labs-dialog.c;h=4b575d9779799b7d5850d683dd57afe17ba98a66;hb=a5097a183f00ab2d2dc538ba7094a4696e2fea04;hp=22f0dcd78f7541524979fd063f13ef7e4f1530d0;hpb=356c1209257f91eb08791e6b9ca72393fca6fcd0;p=pspp-builds.git

diff --git a/src/ui/gui/val-labs-dialog.c b/src/ui/gui/val-labs-dialog.c
index 22f0dcd7..4b575d97 100644
--- a/src/ui/gui/val-labs-dialog.c
+++ b/src/ui/gui/val-labs-dialog.c
@@ -1,21 +1,18 @@
-/*
-    PSPPIRE --- A Graphical User Interface for PSPP
-    Copyright (C) 2005  Free Software Foundation
+/* PSPPIRE - a graphical user interface for PSPP.
+   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
-    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 <http://www.gnu.org/licenses/>. */
 
 
 /*  This module describes the behaviour of the Value Labels dialog box,
@@ -28,12 +25,17 @@
 #include "helper.h"
 #include "val-labs-dialog.h"
 #include <data/value-labels.h>
-
+#include <data/format.h>
+#include "psppire-var-sheet.h"
+#include "psppire-var-store.h"
+#include <libpspp/i18n.h>
 
 struct val_labs_dialog
 {
   GtkWidget *window;
 
+  PsppireVarStore *var_store;
+
   /* The variable to be updated */
   struct variable *pv;
 
@@ -70,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);
@@ -132,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;
 
@@ -140,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));
 
 
@@ -149,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);
@@ -225,14 +229,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);
 
@@ -242,12 +247,13 @@ 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);
 }
 
 
@@ -264,14 +270,16 @@ 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;
 }
@@ -287,10 +295,11 @@ 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;
@@ -298,6 +307,7 @@ on_add (GtkWidget *w, gpointer data)
   gtk_widget_set_sensitive (dialog->add_button, FALSE);
 
   repopulate_dialog (dialog);
+  gtk_widget_grab_focus (dialog->value_entry);
 
   return FALSE;
 }
@@ -308,11 +318,16 @@ 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);
 
@@ -324,16 +339,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 *const text = value_to_text (vl->value,
-				    *var_get_write_format (dialog->pv));
+  gchar *text;
+
+  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);
@@ -347,10 +363,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);
@@ -363,23 +378,23 @@ on_select_row                  (GtkTreeView *treeview,
 /* Create a new dialog box
    (there should  normally be only one)*/
 struct val_labs_dialog *
-val_labs_dialog_create (GladeXML *xml)
+val_labs_dialog_create (GtkWindow *toplevel, PsppireVarStore *var_store)
 {
   GtkTreeViewColumn *column;
 
   GtkCellRenderer *renderer ;
 
-  struct val_labs_dialog *dialog = g_malloc (sizeof (*dialog));
+  GtkBuilder *xml = builder_new ("var-sheet-dialogs.ui");
 
-  connect_help (xml);
+  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");
 
   gtk_window_set_transient_for
-    (GTK_WINDOW (dialog->window),
-     GTK_WINDOW (get_widget_assert (xml, "data_editor")));
+    (GTK_WINDOW (dialog->window), toplevel);
 
   dialog->add_button = get_widget_assert (xml, "val_labs_add");
   dialog->remove_button = get_widget_assert (xml, "val_labs_remove");
@@ -399,43 +414,45 @@ val_labs_dialog_create (GladeXML *xml)
 
   gtk_tree_view_append_column (GTK_TREE_VIEW (dialog->treeview), column);
 
-  g_signal_connect (GTK_OBJECT (get_widget_assert (xml, "val_labs_cancel")),
+  g_signal_connect (get_widget_assert (xml, "val_labs_cancel"),
 		   "clicked",
 		   GTK_SIGNAL_FUNC (on_cancel), dialog);
 
-  g_signal_connect (GTK_OBJECT (dialog->window), "delete-event",
+  g_signal_connect (dialog->window, "delete-event",
 		    GTK_SIGNAL_FUNC (on_delete), dialog);
 
-  g_signal_connect (GTK_OBJECT (get_widget_assert (xml, "val_labs_ok")),
+  g_signal_connect (get_widget_assert (xml, "val_labs_ok"),
 		   "clicked",
 		   GTK_SIGNAL_FUNC (val_labs_ok), dialog);
 
   dialog->change_handler_id =
-    g_signal_connect (GTK_OBJECT (dialog->label_entry),
+    g_signal_connect (dialog->label_entry,
 		     "changed",
 		     GTK_SIGNAL_FUNC (on_label_entry_change), dialog);
 
   dialog->value_handler_id  =
-    g_signal_connect (GTK_OBJECT (dialog->value_entry),
+    g_signal_connect (dialog->value_entry,
 		     "changed",
 		     GTK_SIGNAL_FUNC (on_value_entry_change), dialog);
 
-  g_signal_connect (GTK_OBJECT (dialog->change_button),
+  g_signal_connect (dialog->change_button,
 		   "clicked",
 		   GTK_SIGNAL_FUNC (on_change), dialog);
 
 
-  g_signal_connect (GTK_OBJECT (dialog->treeview), "cursor-changed",
+  g_signal_connect (dialog->treeview, "cursor-changed",
 		   GTK_SIGNAL_FUNC (on_select_row), dialog);
 
-  g_signal_connect (GTK_OBJECT (dialog->remove_button), "clicked",
+  g_signal_connect (dialog->remove_button, "clicked",
 		   GTK_SIGNAL_FUNC (on_remove), dialog);
 
-  g_signal_connect (GTK_OBJECT (dialog->add_button), "clicked",
+  g_signal_connect (dialog->add_button, "clicked",
 		   GTK_SIGNAL_FUNC (on_add), dialog);
 
   dialog->labs = 0;
 
+  g_object_unref (xml);
+
   return dialog;
 }
 
@@ -454,8 +471,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;
 
@@ -476,22 +494,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,
@@ -499,10 +513,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));
@@ -522,7 +536,7 @@ val_labs_dialog_show (struct val_labs_dialog *dialog)
   value_labels = var_get_value_labels (dialog->pv);
 
   if (value_labels)
-    dialog->labs = val_labs_copy ( value_labels );
+    dialog->labs = val_labs_clone ( value_labels );
   else
     dialog->labs = val_labs_create ( var_get_width (dialog->pv));
 
@@ -530,6 +544,8 @@ val_labs_dialog_show (struct val_labs_dialog *dialog)
   gtk_widget_set_sensitive (dialog->change_button, FALSE);
   gtk_widget_set_sensitive (dialog->add_button, FALSE);
 
+  gtk_widget_grab_focus (dialog->value_entry);
+
   repopulate_dialog (dialog);
   gtk_widget_show (dialog->window);
 }