PsppireKeypad: Correct the attachment of buttons to the grid.

[pspp] / src / ui / gui / weight-cases-dialog.c

diff --git a/src/ui/gui/weight-cases-dialog.c b/src/ui/gui/weight-cases-dialog.c
index 8b46ca5e8d7c988cfb1f2bd2649c55e92dd28fee..af2740abaf95f165dc429fdfaa0ef0f46e479b7b 100644 (file)
--- a/src/ui/gui/weight-cases-dialog.c
+++ b/src/ui/gui/weight-cases-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007  Free Software Foundation
+   Copyright (C) 2007, 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
@@ -19,11 +19,11 @@
 #include "weight-cases-dialog.h"
 #include "psppire-selector.h"
 #include "psppire-dialog.h"
-#include "helper.h"
-#include "data-editor.h"
+#include "executor.h"
+#include "psppire-data-window.h"
 #include "dict-display.h"
-#include <language/syntax-string-source.h>
-#include "syntax-editor.h"
+#include "builder-wrapper.h"
+#include "helper.h"
 
 #include <gtk/gtk.h>
 
@@ -32,22 +32,31 @@
 #define N_(msgid) msgid
 
 
-#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);
 }
 
 
@@ -59,15 +68,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)
 {
@@ -100,52 +100,40 @@ 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;
-  struct data_editor *de = data;
   struct weight_cases_dialog wcd;
 
-  GtkBuilder *xml = builder_new ("psppire.ui");
+  GtkBuilder *xml = builder_new ("weight.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");
 
-  PsppireVarStore *vs = NULL;
+  GtkWidget *selector = get_widget_assert (xml, "weight-cases-selector");
 
-  g_object_get (de->data_editor, "var-store", &vs,  NULL);
+  g_object_get (de->data_editor, "dictionary", &wcd.dict, NULL);
 
-  gtk_window_set_transient_for (GTK_WINDOW (dialog), de->parent.window);
+  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);
+  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);
 
-  attach_dictionary_to_treeview (GTK_TREE_VIEW (source),
-                                vs->dict,
-                                GTK_SELECTION_SINGLE,
-                                var_is_numeric
-                                );
+  psppire_selector_set_filter_func (PSPPIRE_SELECTOR (selector),
+                                   is_currently_in_entry);
 
-  psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
-                                source,
-                                entry,
-                                insert_source_row_into_entry,
-                                is_currently_in_entry,
-                                NULL
-                                );
-
-
-  wcd.dict = vs->dict;
   wcd.entry = GTK_ENTRY (entry);
   wcd.status = GTK_LABEL (status);
   wcd.off = GTK_TOGGLE_BUTTON (radiobutton1);
@@ -160,25 +148,10 @@ weight_cases_dialog (GObject *o, gpointer data)
   switch (response)
     {
     case GTK_RESPONSE_OK:
-      {
-       gchar *syntax = generate_syntax (&wcd);
-       struct getl_interface *sss = create_syntax_string_source (syntax);
-       execute_syntax (sss);
-
-       g_free (syntax);
-      }
+      g_free (execute_syntax_string (de, generate_syntax (&wcd)));
       break;
     case PSPPIRE_RESPONSE_PASTE:
-      {
-       gchar *syntax = generate_syntax (&wcd);
-
-       struct syntax_editor *se =
-         (struct syntax_editor *) window_create (WINDOW_SYNTAX, NULL);
-
-       gtk_text_buffer_insert_at_cursor (se->buffer, syntax, -1);
-
-       g_free (syntax);
-      }
+      g_free (paste_syntax_to_window (generate_syntax (&wcd)));
       break;
     default:
       break;