X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fweight-cases-dialog.c;h=fc50aea944b56889a7dd31009a31047fbbee4df2;hb=b6088c04a2380078af7ce9c18b6ba52a0f6b38cf;hp=9d103e1c97c8e6b58023afd88be4fbdf00e1ff43;hpb=4c4f035bfad520dc54f0d5a9e30e36d4fb009efc;p=pspp

diff --git a/src/ui/gui/weight-cases-dialog.c b/src/ui/gui/weight-cases-dialog.c
index 9d103e1c97..fc50aea944 100644
--- a/src/ui/gui/weight-cases-dialog.c
+++ b/src/ui/gui/weight-cases-dialog.c
@@ -19,14 +19,13 @@
 #include "weight-cases-dialog.h"
 #include "psppire-selector.h"
 #include "psppire-dialog.h"
-#include "helper.h"
+#include "executor.h"
 #include "psppire-data-window.h"
 #include "dict-display.h"
 #include <language/syntax-string-source.h>
 #include "helper.h"
 
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 
 #include <gettext.h>
 #define _(msgid) gettext (msgid)
@@ -35,20 +34,31 @@
 
 #include "psppire-var-store.h"
 
+struct weight_cases_dialog
+{
+  PsppireDict *dict;
+  GtkEntry *entry;
+  GtkLabel *status;
+  GtkToggleButton *off;
+  GtkToggleButton *on;
+};
+
 static void
 on_select (PsppireSelector *sel, gpointer data)
 {
-  GtkRadioButton *radiobutton2 = data;
+  struct weight_cases_dialog *wcd = data;
 
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radiobutton2), TRUE);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (wcd->on), TRUE);
+  gtk_widget_set_sensitive (GTK_WIDGET (wcd->on), TRUE);
 }
 
 static void
 on_deselect (PsppireSelector *sel, gpointer data)
 {
-  GtkRadioButton *radiobutton1 = data;
+  struct weight_cases_dialog *wcd = data;
 
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radiobutton1), TRUE);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (wcd->off), TRUE);
+  gtk_widget_set_sensitive (GTK_WIDGET (wcd->on), FALSE);
 }
 
 
@@ -60,15 +70,6 @@ on_toggle (GtkToggleButton *button, gpointer data)
     gtk_entry_set_text (entry, "");
 }
 
-struct weight_cases_dialog
-{
-  PsppireDict *dict;
-  GtkEntry *entry;
-  GtkLabel *status;
-  GtkToggleButton *off;
-  GtkToggleButton *on;
-};
-
 static void
 refresh (PsppireDialog *dialog, const struct weight_cases_dialog *wcd)
 {
@@ -101,52 +102,43 @@ static gchar * generate_syntax (const struct weight_cases_dialog *wcd);
 
 /* Pops up the Weight Cases dialog box */
 void
-weight_cases_dialog (GObject *o, gpointer data)
+weight_cases_dialog (PsppireDataWindow *de)
 {
   gint response;
-  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
   struct weight_cases_dialog wcd;
 
-  GladeXML *xml = XML_NEW ("psppire.glade");
+  GtkBuilder *xml = builder_new ("psppire.ui");
 
   GtkWidget *dialog = get_widget_assert (xml, "weight-cases-dialog");
   GtkWidget *source = get_widget_assert (xml, "weight-cases-treeview");
   GtkWidget *entry = get_widget_assert (xml, "weight-cases-entry");
-  GtkWidget *selector = get_widget_assert (xml, "weight-cases-selector");
   GtkWidget *radiobutton1 = get_widget_assert (xml,
 					       "weight-cases-radiobutton1");
   GtkWidget *radiobutton2 = get_widget_assert (xml, "radiobutton2");
   GtkWidget *status  = get_widget_assert (xml, "weight-status-label");
 
+  GtkWidget *selector = get_widget_assert (xml, "weight-cases-selector");
+
   PsppireVarStore *vs = NULL;
 
   g_object_get (de->data_editor, "var-store", &vs,  NULL);
+  g_object_get (vs, "dictionary", &wcd.dict, NULL);
 
   gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
 
   g_signal_connect (radiobutton1, "toggled", G_CALLBACK (on_toggle), entry);
-  g_signal_connect (selector, "selected", G_CALLBACK (on_select),
-		    radiobutton2);
-
-  g_signal_connect (selector, "de-selected", G_CALLBACK (on_deselect),
-		    radiobutton1);
-
-  attach_dictionary_to_treeview (GTK_TREE_VIEW (source),
-				 vs->dict,
-				 GTK_SELECTION_SINGLE,
-				 var_is_numeric
-				 );
 
-  psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
-				 source,
-				 entry,
-				 insert_source_row_into_entry,
-				 is_currently_in_entry,
-				 NULL
-				 );
+  g_signal_connect (selector, "selected", G_CALLBACK (on_select), &wcd);
+  g_signal_connect (selector, "de-selected", G_CALLBACK (on_deselect), &wcd);
+  
+  g_object_set (source, "model", wcd.dict,
+				 "selection-mode", GTK_SELECTION_SINGLE,
+				 "predicate", var_is_numeric,
+				 NULL);
 
+  psppire_selector_set_filter_func (PSPPIRE_SELECTOR (selector),
+				    is_currently_in_entry);
 
-  wcd.dict = vs->dict;
   wcd.entry = GTK_ENTRY (entry);
   wcd.status = GTK_LABEL (status);
   wcd.off = GTK_TOGGLE_BUTTON (radiobutton1);
@@ -172,7 +164,7 @@ weight_cases_dialog (GObject *o, gpointer data)
     case PSPPIRE_RESPONSE_PASTE:
       {
 	gchar *syntax = generate_syntax (&wcd);
-        paste_syntax_in_new_window (syntax);
+        paste_syntax_to_window (syntax);
 	g_free (syntax);
       }
       break;