src/ui/gui/binomial.ui \
src/ui/gui/compute.ui \
src/ui/gui/correlation.ui \
+ src/ui/gui/count.ui \
src/ui/gui/crosstabs.ui \
src/ui/gui/chi-square.ui \
src/ui/gui/descriptives.ui \
src/ui/gui/chi-square-dialog.h \
src/ui/gui/correlation-dialog.c \
src/ui/gui/correlation-dialog.h \
+ src/ui/gui/count-dialog.c \
+ src/ui/gui/count-dialog.h \
src/ui/gui/crosstabs-dialog.c \
src/ui/gui/crosstabs-dialog.h \
src/ui/gui/customentry.c \
--- /dev/null
+/* PSPPIRE - a graphical user interface for PSPP.
+ Copyright (C) 2011 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 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.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+
+#include <config.h>
+
+#include "count-dialog.h"
+
+#include <gtk/gtk.h>
+#include "helper.h"
+#include "psppire-dialog.h"
+#include "psppire-selector.h"
+#include "psppire-val-chooser.h"
+#include "psppire-var-view.h"
+#include "psppire-acr.h"
+#include "dialog-common.h"
+
+#include <ui/syntax-gen.h>
+#include "executor.h"
+
+struct cnt_dialog
+{
+ PsppireDict *dict;
+
+ GtkWidget *dialog;
+
+ GtkListStore *value_list;
+ GtkWidget *chooser;
+
+ GtkWidget *target;
+ GtkWidget *label;
+ GtkWidget *variable_treeview;
+};
+
+/* Callback which gets called when a new row is selected
+ in the acr's variable treeview.
+ We use if to set the togglebuttons and entries to correspond to the
+ selected row.
+*/
+static void
+on_acr_selection_change (GtkTreeSelection *selection, gpointer data)
+{
+ GtkTreeIter iter;
+ struct old_value *ov = NULL;
+ GtkTreeModel *model = NULL;
+ struct cnt_dialog *cnt = data;
+ GValue ov_value = {0};
+
+ if ( ! gtk_tree_selection_get_selected (selection, &model, &iter) )
+ return;
+
+ gtk_tree_model_get_value (GTK_TREE_MODEL (model), &iter,
+ 0, &ov_value);
+
+ ov = g_value_get_boxed (&ov_value);
+ psppire_val_chooser_set_status (PSPPIRE_VAL_CHOOSER (cnt->chooser), ov);
+}
+
+
+
+static char * generate_syntax (const struct cnt_dialog *cnt);
+
+static void values_dialog (struct cnt_dialog *cd);
+
+static void
+refresh (PsppireDialog *dialog, struct cnt_dialog *cnt)
+{
+ GtkTreeModel *vars =
+ gtk_tree_view_get_model (GTK_TREE_VIEW (cnt->variable_treeview));
+
+ gtk_list_store_clear (GTK_LIST_STORE (vars));
+
+ gtk_entry_set_text (GTK_ENTRY (cnt->target), "");
+ gtk_entry_set_text (GTK_ENTRY (cnt->label), "");
+ gtk_list_store_clear (GTK_LIST_STORE (cnt->value_list));
+}
+
+static gboolean
+dialog_state_valid (gpointer data)
+{
+ GtkTreeIter iter;
+ struct cnt_dialog *cnt = data;
+
+ if (! cnt->value_list)
+ return FALSE;
+
+ if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (cnt->value_list), &iter) )
+ return FALSE;
+
+ if (!gtk_tree_model_get_iter_first (gtk_tree_view_get_model (GTK_TREE_VIEW (cnt->variable_treeview)), &iter))
+ return FALSE;
+
+ if (0 == strcmp ("", gtk_entry_get_text (GTK_ENTRY (cnt->target))))
+ return FALSE;
+
+ return TRUE;
+}
+
+void count_dialog (PsppireDataWindow *de)
+{
+ gint response;
+ PsppireVarStore *vs = NULL;
+ struct cnt_dialog cnt;
+
+ GtkBuilder *builder = builder_new ("count.ui");
+
+ GtkWidget *selector = get_widget_assert (builder, "count-selector1");
+
+ GtkWidget *dict_view = get_widget_assert (builder, "dict-view");
+ GtkWidget *button = get_widget_assert (builder, "button1");
+
+ cnt.target = get_widget_assert (builder, "entry1");
+ cnt.label = get_widget_assert (builder, "entry2");
+ cnt.variable_treeview = get_widget_assert (builder, "treeview2");
+
+ g_signal_connect_swapped (button, "clicked", G_CALLBACK (values_dialog), &cnt);
+
+ cnt.value_list = gtk_list_store_new (1,old_value_get_type ());
+
+ cnt.dialog = get_widget_assert (builder, "count-dialog");
+
+ g_signal_connect (cnt.dialog, "refresh", G_CALLBACK (refresh), &cnt);
+
+
+ g_object_get (de->data_editor, "var-store", &vs, NULL);
+
+ g_object_get (vs, "dictionary", &cnt.dict, NULL);
+
+ gtk_window_set_transient_for (GTK_WINDOW (cnt.dialog), GTK_WINDOW (de));
+
+ g_object_set (dict_view, "model", cnt.dict, NULL);
+
+ psppire_selector_set_allow (PSPPIRE_SELECTOR (selector), numeric_only);
+
+ psppire_dialog_set_valid_predicate (PSPPIRE_DIALOG (cnt.dialog),
+ dialog_state_valid, &cnt);
+
+ response = psppire_dialog_run (PSPPIRE_DIALOG (cnt.dialog));
+
+ switch (response)
+ {
+ case GTK_RESPONSE_OK:
+ g_free (execute_syntax_string (de, generate_syntax (&cnt)));
+ break;
+ case PSPPIRE_RESPONSE_PASTE:
+ g_free (paste_syntax_to_window (generate_syntax (&cnt)));
+ break;
+ default:
+ break;
+ }
+
+
+ g_object_unref (builder);
+}
+
+/* A function to set a value in a column in the ACR */
+static gboolean
+set_value (gint col, GValue *val, gpointer data)
+{
+ struct cnt_dialog *cnt = data;
+ PsppireValChooser *vc = PSPPIRE_VAL_CHOOSER (cnt->chooser);
+ struct old_value ov;
+
+ g_assert (col == 0);
+
+ psppire_val_chooser_get_status (vc, &ov);
+
+ g_value_init (val, old_value_get_type ());
+ g_value_set_boxed (val, &ov);
+
+ return TRUE;
+}
+
+
+static void
+values_dialog (struct cnt_dialog *cd)
+{
+ gint response;
+ GtkListStore *local_store = clone_list_store (cd->value_list);
+ GtkBuilder *builder = builder_new ("count.ui");
+
+ GtkWidget *dialog = get_widget_assert (builder, "values-dialog");
+
+ GtkWidget *acr = get_widget_assert (builder, "acr");
+ cd->chooser = get_widget_assert (builder, "value-chooser");
+
+ psppire_acr_set_enabled (PSPPIRE_ACR (acr), TRUE);
+
+ psppire_acr_set_model (PSPPIRE_ACR (acr), local_store);
+ psppire_acr_set_get_value_func (PSPPIRE_ACR (acr), set_value, cd);
+
+ {
+ GtkTreeSelection *sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (PSPPIRE_ACR(acr)->tv));
+ g_signal_connect (sel, "changed",
+ G_CALLBACK (on_acr_selection_change), cd);
+ }
+
+ response = psppire_dialog_run (PSPPIRE_DIALOG (dialog));
+
+ if ( response == PSPPIRE_RESPONSE_CONTINUE )
+ {
+ g_object_unref (cd->value_list);
+ cd->value_list = local_store;
+ }
+ else
+ {
+ g_object_unref (local_store);
+ }
+
+ psppire_dialog_notify_change (PSPPIRE_DIALOG (cd->dialog));
+
+ g_object_unref (builder);
+}
+
+
+
+static char *
+generate_syntax (const struct cnt_dialog *cnt)
+{
+ gchar *text = NULL;
+ const gchar *s = NULL;
+ gboolean ok;
+ GtkTreeIter iter;
+ GString *str = g_string_sized_new (100);
+
+ g_string_append (str, "\nCOUNT ");
+
+ g_string_append (str, gtk_entry_get_text (GTK_ENTRY (cnt->target)));
+
+ g_string_append (str, " =");
+
+ psppire_var_view_append_names (PSPPIRE_VAR_VIEW (cnt->variable_treeview), 0, str);
+
+ g_string_append (str, "(");
+ for (ok = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (cnt->value_list),
+ &iter);
+ ok;
+ ok = gtk_tree_model_iter_next (GTK_TREE_MODEL (cnt->value_list), &iter))
+ {
+ GValue a_value = {0};
+ struct old_value *ov;
+
+ gtk_tree_model_get_value (GTK_TREE_MODEL (cnt->value_list), &iter,
+ 0, &a_value);
+
+ ov = g_value_get_boxed (&a_value);
+
+ g_string_append (str, " ");
+ old_value_append_syntax (str, ov);
+ }
+ g_string_append (str, ").");
+
+
+ s = gtk_entry_get_text (GTK_ENTRY (cnt->label));
+ if (0 != strcmp (s, ""))
+ {
+ struct string ds;
+ ds_init_empty (&ds);
+ g_string_append (str, "\nVARIABLE LABELS ");
+
+ g_string_append (str, gtk_entry_get_text (GTK_ENTRY (cnt->target)));
+
+ g_string_append (str, " ");
+
+ syntax_gen_string (&ds, ss_cstr (s));
+
+ g_string_append (str, ds_cstr (&ds));
+
+ g_string_append (str, ".");
+ ds_destroy (&ds);
+ }
+
+ g_string_append (str, "\nEXECUTE.\n");
+
+ text = str->str;
+
+ g_string_free (str, FALSE);
+
+ return text;
+}
--- /dev/null
+/* PSPPIRE - a graphical user interface for PSPP.
+ Copyright (C) 2011 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 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.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#ifndef __COUNT_DIALOG_H
+#define __COUNT_DIALOG_H
+
+#include "psppire-data-window.h"
+
+void count_dialog (PsppireDataWindow * data);
+
+#endif
--- /dev/null
+<?xml version="1.0"?>
+<interface>
+ <!-- interface-requires psppire 0.0 -->
+ <!-- interface-requires gtk+ 2.12 -->
+ <!-- interface-naming-policy toplevel-contextual -->
+ <object class="PsppireDialog" id="count-dialog">
+ <property name="title" translatable="yes">Count Occurrences of Values within Cases</property>
+ <property name="modal">True</property>
+ <child internal-child="hbox">
+ <object class="GtkHBox" id="dialog-hbox5">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="top_padding">5</property>
+ <property name="bottom_padding">5</property>
+ <property name="left_padding">5</property>
+ <property name="right_padding">5</property>
+ <child>
+ <object class="GtkTable" id="table1">
+ <property name="visible">True</property>
+ <property name="n_rows">4</property>
+ <property name="n_columns">3</property>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">etched-in</property>
+ <child>
+ <object class="PsppireDictView" id="dict-view">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="border_width">5</property>
+ <property name="headers_visible">False</property>
+ <property name="headers_clickable">False</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="PsppireSelector" id="count-selector1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="no_show_all">True</property>
+ <property name="border_width">5</property>
+ <property name="source_widget">dict-view</property>
+ <property name="dest_widget">treeview2</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">etched-in</property>
+ <child>
+ <object class="PsppireVarView" id="treeview2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">False</property>
+ <property name="headers_clickable">False</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Numeric _Variables:</property>
+ <property name="use_markup">True</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">treeview2</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame2">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkEntry" id="entry1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Target Variable:</property>
+ <property name="use_markup">True</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">entry1</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="y_options">GTK_SHRINK</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame3">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment4">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkEntry" id="entry2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Target _Label:</property>
+ <property name="use_markup">True</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">entry2</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="y_options">GTK_SHRINK</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button1">
+ <property name="label" translatable="yes">_Define Values...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_EXPAND</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="PsppireHButtonBox" id="psppire-hbuttonbox1">
+ <property name="visible">True</property>
+ <property name="border_width">5</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <object class="PsppireDialog" id="values-dialog">
+ <property name="title" translatable="yes">Count Values within Cases: Values to Count</property>
+ <property name="modal">True</property>
+ <property name="orientation">Vertical</property>
+ <child internal-child="hbox">
+ <object class="GtkVBox" id="dialog-hbox6">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkHBox" id="hbox1">
+ <property name="visible">True</property>
+ <child>
+ <object class="PsppireValChooser" id="value-chooser">
+ <property name="visible">True</property>
+ <property name="show-else">False</property>
+ <property name="label" translatable="yes">Value</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ <property name="padding">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame-acr">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">etched-in</property>
+ <child>
+ <object class="GtkAlignment" id="alignment-acr">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="PsppireAcr" id="acr">
+ <property name="visible">True</property>
+ <property name="border_width">5</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label-v2c">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Values _to Count:</property>
+ <property name="use_markup">True</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">acr</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="PsppireHButtonBox" id="psppire-hbuttonbox2">
+ <property name="visible">True</property>
+ <property name="border_width">5</property>
+ <property name="buttons">PSPPIRE_BUTTON_CONTINUE_MASK | PSPPIRE_BUTTON_CANCEL_MASK | PSPPIRE_BUTTON_HELP_MASK</property>
+ <property name="default">PSPPIRE_BUTTON_CONTINUE_MASK</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+</interface>
<property name="label" translatable="yes">_Compute...</property>
</object>
</child>
+ <child>
+ <object class="GtkAction" id="transform_count">
+ <property name="name">transform_count</property>
+ <property name="label" translatable="yes">Cou_nt...</property>
+ </object>
+ </child>
<child>
<object class="GtkAction" id="transform_rank">
<property name="name">transform_rank</property>
</menu>
<menu action="transform">
<menuitem action="transform_compute"/>
+ <menuitem action="transform_count"/>
<menuitem action="transform_rank"/>
<separator/>
<menuitem action="transform_recode-same"/>
#include "ui/gui/comments-dialog.h"
#include "ui/gui/compute-dialog.h"
#include "ui/gui/correlation-dialog.h"
+#include "ui/gui/count-dialog.h"
#include "ui/gui/crosstabs-dialog.h"
#include "ui/gui/descriptives-dialog.h"
#include "ui/gui/entry-dialog.h"
connect_action (de, "utilities_comments", G_CALLBACK (comments_dialog));
connect_action (de, "transform_rank", G_CALLBACK (rank_dialog));
+
+ connect_action (de, "transform_count", G_CALLBACK (count_dialog));
connect_action (de, "transform_recode-same", G_CALLBACK (recode_same_dialog));
{
PROP_0,
PROP_IS_STRING,
+ PROP_SHOW_ELSE
};
+enum
+ {
+ VC_VALUE,
+ VC_SYSMIS,
+ VC_MISSING,
+ VC_RANGE,
+ VC_LOW_UP,
+ VC_HIGH_DOWN,
+ VC_ELSE
+ };
+
static void
psppire_val_chooser_set_property (GObject *object,
guint prop_id,
switch (prop_id)
{
+ case PROP_SHOW_ELSE:
+ {
+ gboolean x = g_value_get_boolean (value);
+ gtk_widget_set_visible (GTK_WIDGET (vr->rw[VC_ELSE].rb), x);
+ gtk_widget_set_visible (GTK_WIDGET (vr->rw[VC_ELSE].label), x);
+ }
+ break;
case PROP_IS_STRING:
vr->input_var_is_string = g_value_get_boolean (value);
-
- gtk_widget_set_sensitive (GTK_WIDGET (vr->rw[1].rb), !vr->input_var_is_string);
- gtk_widget_set_sensitive (GTK_WIDGET (vr->rw[2].rb), !vr->input_var_is_string);
- gtk_widget_set_sensitive (GTK_WIDGET (vr->rw[3].rb), !vr->input_var_is_string);
- gtk_widget_set_sensitive (GTK_WIDGET (vr->rw[4].rb), !vr->input_var_is_string);
- gtk_widget_set_sensitive (GTK_WIDGET (vr->rw[5].rb), !vr->input_var_is_string);
+ gtk_widget_set_sensitive (GTK_WIDGET (vr->rw[VC_SYSMIS].rb), !vr->input_var_is_string);
+ gtk_widget_set_sensitive (GTK_WIDGET (vr->rw[VC_MISSING].rb), !vr->input_var_is_string);
+ gtk_widget_set_sensitive (GTK_WIDGET (vr->rw[VC_RANGE].rb), !vr->input_var_is_string);
+ gtk_widget_set_sensitive (GTK_WIDGET (vr->rw[VC_LOW_UP].rb), !vr->input_var_is_string);
+ gtk_widget_set_sensitive (GTK_WIDGET (vr->rw[VC_HIGH_DOWN].rb), !vr->input_var_is_string);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
switch (prop_id)
{
+ case PROP_SHOW_ELSE:
+ {
+ gboolean x =
+ gtk_widget_get_visible (GTK_WIDGET (vr->rw[VC_ELSE].rb));
+ g_value_set_boolean (value, x);
+ }
+ break;
case PROP_IS_STRING:
g_value_set_boolean (value, vr->input_var_is_string);
default:
FALSE,
G_PARAM_READWRITE);
+ GParamSpec *show_else_spec =
+ g_param_spec_boolean ("show-else",
+ "Show Else",
+ "Should the \"All other values\" item be visible",
+ TRUE,
+ G_PARAM_READWRITE);
+
+
parent_class = g_type_class_peek_parent (class);
object_class->set_property = psppire_val_chooser_set_property;
g_object_class_install_property (object_class,
PROP_IS_STRING,
is_string_spec);
+
+ g_object_class_install_property (object_class,
+ PROP_SHOW_ELSE,
+ show_else_spec);
}
for (i = 0; i < n_VAL_CHOOSER_BUTTONS; ++i)
{
struct layout *l = &range_opt[i];
- GtkWidget *label = gtk_label_new (gettext (l->label));
+ vr->rw[i].label = GTK_LABEL (gtk_label_new (gettext (l->label)));
vr->rw[i].rb = GTK_TOGGLE_BUTTON (gtk_radio_button_new (group));
- gtk_widget_set_sensitive (label, FALSE);
- g_signal_connect (vr->rw[i].rb, "toggled", G_CALLBACK (set_sensitivity_from_toggle), label);
+ gtk_widget_set_sensitive (GTK_WIDGET (vr->rw[i].label), FALSE);
+ g_signal_connect (vr->rw[i].rb, "toggled", G_CALLBACK (set_sensitivity_from_toggle), vr->rw[i].label);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_misc_set_alignment (GTK_MISC (vr->rw[i].label), 0, 0.5);
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (vr->rw[i].rb));
row, row + 1);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2,
+ gtk_table_attach_defaults (GTK_TABLE (table), GTK_WIDGET (vr->rw[i].label), 1, 2,
row, row + 1);
++row;
break;
case OV_SYSMIS:
- gtk_toggle_button_set_active (vr->rw[1].rb, TRUE);
+ gtk_toggle_button_set_active (vr->rw[VC_SYSMIS].rb, TRUE);
break;
case OV_MISSING:
- gtk_toggle_button_set_active (vr->rw[2].rb, TRUE);
+ gtk_toggle_button_set_active (vr->rw[VC_MISSING].rb, TRUE);
break;
case OV_RANGE:
{
gchar *str = num_to_string (ov->v.range[0]);
- gtk_toggle_button_set_active (vr->rw[3].rb, TRUE);
- gtk_entry_set_text (vr->rw[3].e1, str);
+ gtk_toggle_button_set_active (vr->rw[VC_RANGE].rb, TRUE);
+ gtk_entry_set_text (vr->rw[VC_RANGE].e1, str);
g_free (str);
str = num_to_string (ov->v.range[1]);
- gtk_entry_set_text (vr->rw[3].e2, str);
+ gtk_entry_set_text (vr->rw[VC_RANGE].e2, str);
g_free (str);
}
break;
{
gchar *str = num_to_string (ov->v.range[1]);
- gtk_toggle_button_set_active (vr->rw[4].rb, TRUE);
+ gtk_toggle_button_set_active (vr->rw[VC_LOW_UP].rb, TRUE);
- gtk_entry_set_text (vr->rw[4].e1, str);
+ gtk_entry_set_text (vr->rw[VC_LOW_UP].e1, str);
g_free (str);
}
{
gchar *str = num_to_string (ov->v.range[0]);
- gtk_toggle_button_set_active (vr->rw[5].rb, TRUE);
+ gtk_toggle_button_set_active (vr->rw[VC_HIGH_DOWN].rb, TRUE);
- gtk_entry_set_text (vr->rw[5].e1, str);
+ gtk_entry_set_text (vr->rw[VC_HIGH_DOWN].e1, str);
g_free (str);
}
break;
case OV_ELSE:
- gtk_toggle_button_set_active (vr->rw[6].rb, TRUE);
+ gtk_toggle_button_set_active (vr->rw[VC_ELSE].rb, TRUE);
break;
default:
struct range_widgets
{
+ GtkLabel *label;
GtkToggleButton *rb;
GtkEntry *e1;
GtkEntry *e2;
/* A function to set a value in a column in the ACR */
-gboolean
+static gboolean
set_value (gint col, GValue *val, gpointer data)
{
struct recode_dialog *rd = data;
projects / pspp / commitdiff