X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fvar-type-dialog.c;h=f196e554f9d0c224ee6bfc5a268814e566472050;hb=d7965d19e72e6ba63fa807b2ea27adaedc9da109;hp=bee65de8edc44e7febee965eeb030562f6f30c71;hpb=a9acce47d67e0ab35ce1690e4f1b1ac0121c2d78;p=pspp-builds.git

diff --git a/src/ui/gui/var-type-dialog.c b/src/ui/gui/var-type-dialog.c
index bee65de8..f196e554 100644
--- a/src/ui/gui/var-type-dialog.c
+++ b/src/ui/gui/var-type-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-    Copyright (C) 2005, 2006  Free Software Foundation
+    Copyright (C) 2005, 2006, 2010  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
@@ -21,7 +21,6 @@
 #include <config.h>
 
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 
 #include <stdlib.h>
 #include <string.h>
@@ -263,12 +262,12 @@ preview_custom (GtkWidget *w, gpointer data)
       union value v;
       v.f = 1234.56;
 
-      sample_text = value_to_text (v, dialog->fmt_l);
+      sample_text = value_to_text (v, dialog->vs->dictionary, 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);
+      sample_text = value_to_text (v, dialog->vs->dictionary, dialog->fmt_l);
       gtk_label_set_text (GTK_LABEL (dialog->label_nsample), sample_text);
       g_free (sample_text);
     }
@@ -316,29 +315,29 @@ 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, PsppireVarStore *vs)
 {
   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->vs = vs;
 
   dialog->window = get_widget_assert (xml,"var_type_dialog");
+  dialog->active_button = -1;
 
 
   g_signal_connect (dialog->window, "delete-event",
 		    G_CALLBACK (gtk_widget_hide_on_delete), NULL);
 
   gtk_window_set_transient_for (GTK_WINDOW (dialog->window),
-			       GTK_WINDOW (get_widget_assert (xml, "data_editor")));
+				toplevel);
 
   dialog->radioButton[BUTTON_NUMERIC] =
     get_widget_assert (xml,"radiobutton1");
@@ -444,8 +443,8 @@ var_type_dialog_create (GladeXML *xml)
 
   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 */
@@ -467,7 +466,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,
@@ -481,13 +480,13 @@ var_type_dialog_create (GladeXML *xml)
 
   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 */
@@ -525,24 +524,24 @@ var_type_dialog_create (GladeXML *xml)
   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 to the OK button */
@@ -554,10 +553,10 @@ var_type_dialog_create (GladeXML *xml)
   g_signal_connect (get_widget_assert (xml, "var_type_cancel") , "clicked",
 		    G_CALLBACK (hide_dialog),
 		    dialog);
-
-
   }
 
+  g_object_unref (xml);
+
   return dialog;
 }
 
@@ -790,14 +789,12 @@ on_var_type_ok_clicked (GtkWidget *w, gpointer data)
     gint decimals = atoi (gtk_entry_get_text
 			 (GTK_ENTRY (dialog->entry_decimals)));
 
-    gint new_type = VAL_NUMERIC;
     gint new_width = 0;
     bool result = false;
     struct fmt_spec spec;
     switch (dialog->active_button)
       {
       case BUTTON_STRING:
-	new_type = VAL_STRING;
 	new_width = width;
 	result = make_output_format_try (&spec, FMT_A, width, 0);
 	break;