X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=src%2Fui%2Fgui%2Fvar-type-dialog.c;h=44afc84e816dd47d18f8264e76a9cf9d1d5a462d;hb=1f9780e0184a3115d87783fdcfa39f89877a775e;hp=bd4571283c271512638daed7575e786a885e8a37;hpb=ccab19f8edbd7561990940a06c9d2c2732a697c4;p=pspp-builds.git
diff --git a/src/ui/gui/var-type-dialog.c b/src/ui/gui/var-type-dialog.c
index bd457128..44afc84e 100644
--- a/src/ui/gui/var-type-dialog.c
+++ b/src/ui/gui/var-type-dialog.c
@@ -1,21 +1,18 @@
-/*
- PSPPIRE --- A Graphical User Interface for PSPP
+/* PSPPIRE - a graphical user interface for PSPP.
Copyright (C) 2005, 2006 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 . */
/* This module describes the behaviour of the Variable Type dialog box used
@@ -24,7 +21,6 @@
#include
#include
-#include
#include
#include
@@ -176,6 +172,7 @@ on_toggle_2 (GtkToggleButton *togglebutton, gpointer user_data)
switch (dialog->active_button)
{
case BUTTON_STRING:
+ gtk_widget_show (dialog->entry_width);
gtk_widget_show (dialog->width_decimals);
gtk_widget_hide (dialog->label_decimals);
gtk_widget_hide (dialog->entry_decimals);
@@ -326,7 +323,7 @@ set_format_type_from_treeview (GtkTreeView *treeview, gpointer data)
/* Create the structure from the XML definitions */
struct var_type_dialog *
-var_type_dialog_create (GladeXML *xml)
+var_type_dialog_create (GtkBuilder *xml)
{
gint i;
struct var_type_dialog *dialog = g_malloc (sizeof (struct var_type_dialog));
@@ -334,6 +331,7 @@ var_type_dialog_create (GladeXML *xml)
g_assert (xml);
dialog->window = get_widget_assert (xml,"var_type_dialog");
+ dialog->active_button = -1;
g_signal_connect (dialog->window, "delete-event",
@@ -446,7 +444,7 @@ var_type_dialog_create (GladeXML *xml)
g_object_unref (list_store);
- g_signal_connect (GTK_OBJECT (dialog->date_format_treeview), "cursor-changed",
+ g_signal_connect (dialog->date_format_treeview, "cursor-changed",
GTK_SIGNAL_FUNC (set_format_from_treeview), dialog);
@@ -469,7 +467,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,
@@ -483,11 +481,11 @@ 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_signal_connect_swapped (GTK_OBJECT (dialog->dollar_treeview),
+ g_signal_connect_swapped (dialog->dollar_treeview,
"cursor-changed",
GTK_SIGNAL_FUNC (update_width_decimals), dialog);
@@ -527,22 +525,22 @@ 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_signal_connect (GTK_OBJECT (dialog->custom_treeview),
+ g_signal_connect (dialog->custom_treeview,
"cursor-changed",
GTK_SIGNAL_FUNC (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_signal_connect (GTK_OBJECT (dialog->entry_decimals),
+ g_signal_connect (dialog->entry_decimals,
"changed",
GTK_SIGNAL_FUNC (preview_custom), dialog);
@@ -792,14 +790,14 @@ on_var_type_ok_clicked (GtkWidget *w, gpointer data)
gint decimals = atoi (gtk_entry_get_text
(GTK_ENTRY (dialog->entry_decimals)));
- gint new_type = VAR_NUMERIC;
+ 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 = VAR_STRING;
+ new_type = VAL_STRING;
new_width = width;
result = make_output_format_try (&spec, FMT_A, width, 0);
break;