X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fval-labs-dialog.c;h=42dd0b349c530c3f7a3d3daa5e970b78d541c0b1;hb=14aac9fe7a7efbb6c9bded2ed5969a643cb76645;hp=22f0dcd78f7541524979fd063f13ef7e4f1530d0;hpb=356c1209257f91eb08791e6b9ca72393fca6fcd0;p=pspp-builds.git
diff --git a/src/ui/gui/val-labs-dialog.c b/src/ui/gui/val-labs-dialog.c
index 22f0dcd7..42dd0b34 100644
--- a/src/ui/gui/val-labs-dialog.c
+++ b/src/ui/gui/val-labs-dialog.c
@@ -1,21 +1,18 @@
-/*
- PSPPIRE --- A Graphical User Interface for PSPP
- Copyright (C) 2005 Free Software Foundation
+/* PSPPIRE - a graphical user interface for PSPP.
+ Copyright (C) 2005, 2009 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 Value Labels dialog box,
@@ -28,12 +25,17 @@
#include "helper.h"
#include "val-labs-dialog.h"
#include
-
+#include
+#include "psppire-var-sheet.h"
+#include "psppire-var-store.h"
+#include
struct val_labs_dialog
{
GtkWidget *window;
+ PsppireSheet *vs;
+
/* The variable to be updated */
struct variable *pv;
@@ -272,6 +274,7 @@ on_change (GtkWidget *w, gpointer data)
gtk_widget_set_sensitive (dialog->change_button, FALSE);
repopulate_dialog (dialog);
+ gtk_widget_grab_focus (dialog->value_entry);
return FALSE;
}
@@ -298,6 +301,7 @@ on_add (GtkWidget *w, gpointer data)
gtk_widget_set_sensitive (dialog->add_button, FALSE);
repopulate_dialog (dialog);
+ gtk_widget_grab_focus (dialog->value_entry);
return FALSE;
}
@@ -313,6 +317,7 @@ on_remove (GtkWidget *w, gpointer data)
val_labs_remove (dialog->labs, vl->value);
repopulate_dialog (dialog);
+ gtk_widget_grab_focus (dialog->value_entry);
gtk_widget_set_sensitive (dialog->remove_button, FALSE);
@@ -324,8 +329,7 @@ on_remove (GtkWidget *w, gpointer data)
/* Callback which occurs when a line item is selected in the list of
value--label pairs.*/
static void
-on_select_row (GtkTreeView *treeview,
- gpointer data)
+on_select_row (GtkTreeView *treeview, gpointer data)
{
gchar *labeltext;
struct val_labs_dialog *dialog = data;
@@ -335,6 +339,9 @@ on_select_row (GtkTreeView *treeview,
gchar *const text = value_to_text (vl->value,
*var_get_write_format (dialog->pv));
+ PsppireVarStore *var_store =
+ PSPPIRE_VAR_STORE (psppire_sheet_get_model (dialog->vs));
+
g_signal_handler_block (GTK_ENTRY (dialog->value_entry),
dialog->value_handler_id);
@@ -347,7 +354,10 @@ on_select_row (GtkTreeView *treeview,
g_signal_handler_block (GTK_ENTRY (dialog->label_entry),
dialog->change_handler_id);
- labeltext = pspp_locale_to_utf8 (vl->label, -1, 0);
+
+ labeltext = recode_string (UTF8, psppire_dict_encoding (var_store->dict),
+ vl->label, -1);
+
gtk_entry_set_text (GTK_ENTRY (dialog->label_entry),
labeltext);
g_free (labeltext);
@@ -363,23 +373,23 @@ on_select_row (GtkTreeView *treeview,
/* Create a new dialog box
(there should normally be only one)*/
struct val_labs_dialog *
-val_labs_dialog_create (GladeXML *xml)
+val_labs_dialog_create (GtkWindow *toplevel, PsppireSheet *sheet)
{
GtkTreeViewColumn *column;
GtkCellRenderer *renderer ;
- struct val_labs_dialog *dialog = g_malloc (sizeof (*dialog));
+ GtkBuilder *xml = builder_new ("var-sheet-dialogs.ui");
- connect_help (xml);
+ struct val_labs_dialog *dialog = g_malloc (sizeof (*dialog));
dialog->window = get_widget_assert (xml,"val_labs_dialog");
dialog->value_entry = get_widget_assert (xml,"value_entry");
dialog->label_entry = get_widget_assert (xml,"label_entry");
+ dialog->vs = sheet;
gtk_window_set_transient_for
- (GTK_WINDOW (dialog->window),
- GTK_WINDOW (get_widget_assert (xml, "data_editor")));
+ (GTK_WINDOW (dialog->window), toplevel);
dialog->add_button = get_widget_assert (xml, "val_labs_add");
dialog->remove_button = get_widget_assert (xml, "val_labs_remove");
@@ -399,43 +409,45 @@ val_labs_dialog_create (GladeXML *xml)
gtk_tree_view_append_column (GTK_TREE_VIEW (dialog->treeview), column);
- g_signal_connect (GTK_OBJECT (get_widget_assert (xml, "val_labs_cancel")),
+ g_signal_connect (get_widget_assert (xml, "val_labs_cancel"),
"clicked",
GTK_SIGNAL_FUNC (on_cancel), dialog);
- g_signal_connect (GTK_OBJECT (dialog->window), "delete-event",
+ g_signal_connect (dialog->window, "delete-event",
GTK_SIGNAL_FUNC (on_delete), dialog);
- g_signal_connect (GTK_OBJECT (get_widget_assert (xml, "val_labs_ok")),
+ g_signal_connect (get_widget_assert (xml, "val_labs_ok"),
"clicked",
GTK_SIGNAL_FUNC (val_labs_ok), dialog);
dialog->change_handler_id =
- g_signal_connect (GTK_OBJECT (dialog->label_entry),
+ g_signal_connect (dialog->label_entry,
"changed",
GTK_SIGNAL_FUNC (on_label_entry_change), dialog);
dialog->value_handler_id =
- g_signal_connect (GTK_OBJECT (dialog->value_entry),
+ g_signal_connect (dialog->value_entry,
"changed",
GTK_SIGNAL_FUNC (on_value_entry_change), dialog);
- g_signal_connect (GTK_OBJECT (dialog->change_button),
+ g_signal_connect (dialog->change_button,
"clicked",
GTK_SIGNAL_FUNC (on_change), dialog);
- g_signal_connect (GTK_OBJECT (dialog->treeview), "cursor-changed",
+ g_signal_connect (dialog->treeview, "cursor-changed",
GTK_SIGNAL_FUNC (on_select_row), dialog);
- g_signal_connect (GTK_OBJECT (dialog->remove_button), "clicked",
+ g_signal_connect (dialog->remove_button, "clicked",
GTK_SIGNAL_FUNC (on_remove), dialog);
- g_signal_connect (GTK_OBJECT (dialog->add_button), "clicked",
+ g_signal_connect (dialog->add_button, "clicked",
GTK_SIGNAL_FUNC (on_add), dialog);
dialog->labs = 0;
+ g_object_unref (xml);
+
return dialog;
}
@@ -459,6 +471,9 @@ repopulate_dialog (struct val_labs_dialog *dialog)
GtkTreeIter iter;
+ PsppireVarStore *var_store =
+ PSPPIRE_VAR_STORE (psppire_sheet_get_model (dialog->vs));
+
GtkListStore *list_store = gtk_list_store_new (2,
G_TYPE_STRING,
G_TYPE_DOUBLE);
@@ -487,11 +502,12 @@ repopulate_dialog (struct val_labs_dialog *dialog)
*var_get_write_format (dialog->pv));
gchar *labeltext =
- pspp_locale_to_utf8 (vl->label, -1, 0);
+ recode_string (UTF8,
+ psppire_dict_encoding (var_store->dict),
+ vl->label, -1);
gchar *const text = g_strdup_printf ("%s = \"%s\"",
- vstr, labeltext);
-
+ vstr, labeltext);
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter,
@@ -522,7 +538,7 @@ val_labs_dialog_show (struct val_labs_dialog *dialog)
value_labels = var_get_value_labels (dialog->pv);
if (value_labels)
- dialog->labs = val_labs_copy ( value_labels );
+ dialog->labs = val_labs_clone ( value_labels );
else
dialog->labs = val_labs_create ( var_get_width (dialog->pv));
@@ -530,6 +546,8 @@ val_labs_dialog_show (struct val_labs_dialog *dialog)
gtk_widget_set_sensitive (dialog->change_button, FALSE);
gtk_widget_set_sensitive (dialog->add_button, FALSE);
+ gtk_widget_grab_focus (dialog->value_entry);
+
repopulate_dialog (dialog);
gtk_widget_show (dialog->window);
}