X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fweight-cases-dialog.c;h=b3087159f941adf7d16b7d2dc1d66f7165ee38d5;hb=66153a44d861ccddf6a176ec5a94ffb959232ad6;hp=3eb1808dc7087c49a50cfa852c12ef607ad714c5;hpb=a10cebe053263d7e936b6533a3dbf5ac2f0586a1;p=pspp-builds.git
diff --git a/src/ui/gui/weight-cases-dialog.c b/src/ui/gui/weight-cases-dialog.c
index 3eb1808d..b3087159 100644
--- a/src/ui/gui/weight-cases-dialog.c
+++ b/src/ui/gui/weight-cases-dialog.c
@@ -1,38 +1,37 @@
-/*
- PSPPIRE --- A Graphical User Interface for PSPP
- Copyright (C) 2007 Free Software Foundation
+/* PSPPIRE - a graphical user interface for PSPP.
+ Copyright (C) 2007 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 . */
#include
#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
-#include "syntax-editor.h"
+#include "helper.h"
#include
-#include
-/* FIXME: These shouldn't be here */
-#include
+#include
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
+
+
#include "psppire-var-store.h"
static void
@@ -60,10 +59,43 @@ 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)
+{
+ const struct variable *var = dict_get_weight (wcd->dict->dict);
+
+ if ( ! var )
+ {
+ gtk_entry_set_text (wcd->entry, "");
+ gtk_label_set_text (wcd->status, _("Do not weight cases"));
+ gtk_toggle_button_set_active (wcd->off, TRUE);
+ }
+ else
+ {
+ gchar *text =
+ g_strdup_printf (_("Weight cases by %s"), var_get_name (var));
+
+ gtk_entry_set_text (wcd->entry, var_get_name (var));
+ gtk_label_set_text (wcd->status, text);
+ g_free (text);
+ gtk_toggle_button_set_active (wcd->on, TRUE);
+ }
+ g_signal_emit_by_name (wcd->entry, "activate");
+}
-static gchar * generate_syntax (PsppireDict *, GtkEntry *);
+
+static gchar * generate_syntax (const struct weight_cases_dialog *wcd);
/* Pops up the Weight Cases dialog box */
@@ -71,12 +103,10 @@ void
weight_cases_dialog (GObject *o, gpointer data)
{
gint response;
- struct data_editor *de = data;
- PsppireDict *dict;
- struct variable *var;
+ PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
+ struct weight_cases_dialog wcd;
- GladeXML *xml = glade_xml_new (PKGDATADIR "/psppire.glade",
- "weight-cases-dialog", NULL);
+ GtkBuilder *xml = builder_new ("psppire.ui");
GtkWidget *dialog = get_widget_assert (xml, "weight-cases-dialog");
GtkWidget *source = get_widget_assert (xml, "weight-cases-treeview");
@@ -85,13 +115,14 @@ weight_cases_dialog (GObject *o, gpointer data)
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");
- GtkSheet *var_sheet =
- GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
+ PsppireVarStore *vs = NULL;
- PsppireVarStore *vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet));
+ g_object_get (de->data_editor, "var-store", &vs, NULL);
+ g_object_get (vs, "dictionary", &wcd.dict, NULL);
- dict = vs->dict;
+ 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),
@@ -100,26 +131,28 @@ weight_cases_dialog (GObject *o, gpointer data)
g_signal_connect (selector, "de-selected", G_CALLBACK (on_deselect),
radiobutton1);
- attach_dictionary_to_treeview (GTK_TREE_VIEW (source),
- dict,
- GTK_SELECTION_SINGLE,
- var_is_numeric
- );
+
+ g_object_set (source, "dictionary", wcd.dict,
+ "selection-mode", GTK_SELECTION_SINGLE,
+ "predicate", var_is_numeric,
+ NULL);
psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
source,
entry,
insert_source_row_into_entry,
- is_currently_in_entry
+ is_currently_in_entry,
+ NULL
);
- var = dict_get_weight (dict->dict);
- if ( ! var )
- gtk_entry_set_text (GTK_ENTRY (entry), "");
- else
- gtk_entry_set_text (GTK_ENTRY (entry), var_get_name (var));
- g_signal_emit_by_name (entry, "activate");
+
+ wcd.entry = GTK_ENTRY (entry);
+ wcd.status = GTK_LABEL (status);
+ wcd.off = GTK_TOGGLE_BUTTON (radiobutton1);
+ wcd.on = GTK_TOGGLE_BUTTON (radiobutton2);
+
+ g_signal_connect (dialog, "refresh", G_CALLBACK (refresh), &wcd);
response = psppire_dialog_run (PSPPIRE_DIALOG (dialog));
@@ -129,7 +162,7 @@ weight_cases_dialog (GObject *o, gpointer data)
{
case GTK_RESPONSE_OK:
{
- gchar *syntax = generate_syntax (dict, GTK_ENTRY (entry));
+ gchar *syntax = generate_syntax (&wcd);
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
@@ -138,13 +171,8 @@ weight_cases_dialog (GObject *o, gpointer data)
break;
case PSPPIRE_RESPONSE_PASTE:
{
- gchar *syntax = generate_syntax (dict, GTK_ENTRY (entry));
-
- struct syntax_editor *se =
- (struct syntax_editor *) window_create (WINDOW_SYNTAX, NULL);
-
- gtk_text_buffer_insert_at_cursor (se->buffer, syntax, -1);
-
+ gchar *syntax = generate_syntax (&wcd);
+ paste_syntax_in_new_window (syntax);
g_free (syntax);
}
break;
@@ -155,13 +183,13 @@ weight_cases_dialog (GObject *o, gpointer data)
static gchar *
-generate_syntax (PsppireDict *dict, GtkEntry *entry)
+generate_syntax (const struct weight_cases_dialog *wcd)
{
gchar *syntax;
- const gchar *text = gtk_entry_get_text (entry);
+ const gchar *text = gtk_entry_get_text (wcd->entry);
- struct variable *var = psppire_dict_lookup_var (dict, text);
+ struct variable *var = psppire_dict_lookup_var (wcd->dict, text);
if ( var == NULL)
syntax = g_strdup ("WEIGHT OFF.");