projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Store variable names, labels and value labels as UTF8.
[pspp-builds.git]
/
src
/
ui
/
gui
/
val-labs-dialog.c
diff --git
a/src/ui/gui/val-labs-dialog.c
b/src/ui/gui/val-labs-dialog.c
index 7e558eec3f8fb62fe5cf88fda95fda02a5ebc890..0b87d8bb648b8fc823e43fb0bce4b076ddec0723 100644
(file)
--- a/
src/ui/gui/val-labs-dialog.c
+++ b/
src/ui/gui/val-labs-dialog.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2005 Free Software Foundation
+ 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
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
@@
-25,12
+25,17
@@
#include "helper.h"
#include "val-labs-dialog.h"
#include <data/value-labels.h>
#include "helper.h"
#include "val-labs-dialog.h"
#include <data/value-labels.h>
-
+#include <data/format.h>
+#include "psppire-var-sheet.h"
+#include "psppire-var-store.h"
+#include <libpspp/i18n.h>
struct val_labs_dialog
{
GtkWidget *window;
struct val_labs_dialog
{
GtkWidget *window;
+ PsppireSheet *vs;
+
/* The variable to be updated */
struct variable *pv;
/* The variable to be updated */
struct variable *pv;
@@
-70,7
+75,7
@@
on_label_entry_change (GtkEntry *entry, gpointer data)
*var_get_write_format (dialog->pv));
*var_get_write_format (dialog->pv));
- if (
val_labs_find (dialog->labs, v)
)
+ if (
val_labs_find (dialog->labs, &v)
)
{
gtk_widget_set_sensitive (dialog->change_button, TRUE);
gtk_widget_set_sensitive (dialog->add_button, FALSE);
{
gtk_widget_set_sensitive (dialog->change_button, TRUE);
gtk_widget_set_sensitive (dialog->add_button, FALSE);
@@
-129,7
+134,7
@@
select_treeview_from_value (GtkTreeView *treeview, union value *val)
static void
on_value_entry_change (GtkEntry *entry, gpointer data)
{
static void
on_value_entry_change (GtkEntry *entry, gpointer data)
{
- char *s;
+ c
onst c
har *s;
struct val_labs_dialog *dialog = data;
struct val_labs_dialog *dialog = data;
@@
-146,7
+151,7
@@
on_value_entry_change (GtkEntry *entry, gpointer data)
gtk_entry_set_text (GTK_ENTRY (dialog->label_entry),"");
gtk_entry_set_text (GTK_ENTRY (dialog->label_entry),"");
- if ( (s = val_labs_find (dialog->labs, v)) )
+ if ( (s = val_labs_find (dialog->labs,
&
v)) )
{
gtk_entry_set_text (GTK_ENTRY (dialog->label_entry), s);
gtk_widget_set_sensitive (dialog->add_button, FALSE);
{
gtk_entry_set_text (GTK_ENTRY (dialog->label_entry), s);
gtk_widget_set_sensitive (dialog->add_button, FALSE);
@@
-222,14
+227,15
@@
on_delete (GtkWidget *w, GdkEvent *e, gpointer data)
/* Return the value-label pair currently selected in the dialog box */
/* Return the value-label pair currently selected in the dialog box */
-static struct val_lab *
-get_selected_tuple (struct val_labs_dialog *dialog)
+static void
+get_selected_tuple (struct val_labs_dialog *dialog,
+ union value *valuep, const char **label)
{
GtkTreeView *treeview = GTK_TREE_VIEW (dialog->treeview);
{
GtkTreeView *treeview = GTK_TREE_VIEW (dialog->treeview);
- static struct val_lab vl;
GtkTreeIter iter ;
GValue the_value = {0};
GtkTreeIter iter ;
GValue the_value = {0};
+ union value value;
GtkTreeSelection* sel = gtk_tree_view_get_selection (treeview);
GtkTreeSelection* sel = gtk_tree_view_get_selection (treeview);
@@
-239,12
+245,13
@@
get_selected_tuple (struct val_labs_dialog *dialog)
gtk_tree_model_get_value (model, &iter, 1, &the_value);
gtk_tree_model_get_value (model, &iter, 1, &the_value);
- v
l.v
alue.f = g_value_get_double (&the_value);
+ value.f = g_value_get_double (&the_value);
g_value_unset (&the_value);
g_value_unset (&the_value);
- vl.label = val_labs_find (dialog->labs, vl.value);
-
- return &vl;
+ if (valuep != NULL)
+ *valuep = value;
+ if (label != NULL)
+ *label = val_labs_find (dialog->labs, &value);
}
}
@@
-263,12
+270,13
@@
on_change (GtkWidget *w, gpointer data)
text_to_value (val_text, &v,
*var_get_write_format (dialog->pv));
text_to_value (val_text, &v,
*var_get_write_format (dialog->pv));
- val_labs_replace (dialog->labs, v,
+ val_labs_replace (dialog->labs,
&
v,
gtk_entry_get_text (GTK_ENTRY (dialog->label_entry)));
gtk_widget_set_sensitive (dialog->change_button, FALSE);
repopulate_dialog (dialog);
gtk_entry_get_text (GTK_ENTRY (dialog->label_entry)));
gtk_widget_set_sensitive (dialog->change_button, FALSE);
repopulate_dialog (dialog);
+ gtk_widget_grab_focus (dialog->value_entry);
return FALSE;
}
return FALSE;
}
@@
-287,7
+295,7
@@
on_add (GtkWidget *w, gpointer data)
*var_get_write_format (dialog->pv));
*var_get_write_format (dialog->pv));
- if ( ! val_labs_add (dialog->labs, v,
+ if ( ! val_labs_add (dialog->labs,
&
v,
gtk_entry_get_text
( GTK_ENTRY (dialog->label_entry)) ) )
return FALSE;
gtk_entry_get_text
( GTK_ENTRY (dialog->label_entry)) ) )
return FALSE;
@@
-295,6
+303,7
@@
on_add (GtkWidget *w, gpointer data)
gtk_widget_set_sensitive (dialog->add_button, FALSE);
repopulate_dialog (dialog);
gtk_widget_set_sensitive (dialog->add_button, FALSE);
repopulate_dialog (dialog);
+ gtk_widget_grab_focus (dialog->value_entry);
return FALSE;
}
return FALSE;
}
@@
-305,11
+314,16
@@
on_remove (GtkWidget *w, gpointer data)
{
struct val_labs_dialog *dialog = data;
{
struct val_labs_dialog *dialog = data;
- struct val_lab *vl = get_selected_tuple (dialog);
+ union value value;
+ const struct val_lab *vl;
- val_labs_remove (dialog->labs, vl->value);
+ get_selected_tuple (dialog, &value, NULL);
+ vl = val_labs_lookup (dialog->labs, &value);
+ if (vl != NULL)
+ val_labs_remove (dialog->labs, vl);
repopulate_dialog (dialog);
repopulate_dialog (dialog);
+ gtk_widget_grab_focus (dialog->value_entry);
gtk_widget_set_sensitive (dialog->remove_button, FALSE);
gtk_widget_set_sensitive (dialog->remove_button, FALSE);
@@
-321,16
+335,17
@@
on_remove (GtkWidget *w, gpointer data)
/* Callback which occurs when a line item is selected in the list of
value--label pairs.*/
static void
/* 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;
struct val_labs_dialog *dialog = data;
- struct val_lab * vl = get_selected_tuple (dialog);
+ union value value;
+ const char *label = NULL;
- gchar *const text = value_to_text (vl->value,
- *var_get_write_format (dialog->pv));
+ gchar *text;
+
+ get_selected_tuple (dialog, &value, &label);
+ text = value_to_text (value, *var_get_write_format (dialog->pv));
g_signal_handler_block (GTK_ENTRY (dialog->value_entry),
dialog->value_handler_id);
g_signal_handler_block (GTK_ENTRY (dialog->value_entry),
dialog->value_handler_id);
@@
-344,10
+359,9
@@
on_select_row (GtkTreeView *treeview,
g_signal_handler_block (GTK_ENTRY (dialog->label_entry),
dialog->change_handler_id);
g_signal_handler_block (GTK_ENTRY (dialog->label_entry),
dialog->change_handler_id);
- labeltext = pspp_locale_to_utf8 (vl->label, -1, 0);
+
gtk_entry_set_text (GTK_ENTRY (dialog->label_entry),
gtk_entry_set_text (GTK_ENTRY (dialog->label_entry),
- labeltext);
- g_free (labeltext);
+ label);
g_signal_handler_unblock (GTK_ENTRY (dialog->label_entry),
dialog->change_handler_id);
g_signal_handler_unblock (GTK_ENTRY (dialog->label_entry),
dialog->change_handler_id);
@@
-360,23
+374,23
@@
on_select_row (GtkTreeView *treeview,
/* Create a new dialog box
(there should normally be only one)*/
struct val_labs_dialog *
/* Create a new dialog box
(there should normally be only one)*/
struct val_labs_dialog *
-val_labs_dialog_create (G
ladeXML *xml
)
+val_labs_dialog_create (G
tkWindow *toplevel, PsppireSheet *sheet
)
{
GtkTreeViewColumn *column;
GtkCellRenderer *renderer ;
{
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->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_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");
dialog->add_button = get_widget_assert (xml, "val_labs_add");
dialog->remove_button = get_widget_assert (xml, "val_labs_remove");
@@
-396,43
+410,45
@@
val_labs_dialog_create (GladeXML *xml)
gtk_tree_view_append_column (GTK_TREE_VIEW (dialog->treeview), column);
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);
"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);
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 =
"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 =
"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);
"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);
"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);
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);
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;
GTK_SIGNAL_FUNC (on_add), dialog);
dialog->labs = 0;
+ g_object_unref (xml);
+
return dialog;
}
return dialog;
}
@@
-451,8
+467,9
@@
val_labs_dialog_set_target_variable (struct val_labs_dialog *dialog,
static void
repopulate_dialog (struct val_labs_dialog *dialog)
{
static void
repopulate_dialog (struct val_labs_dialog *dialog)
{
- struct val_labs_iterator *vli = 0;
- struct val_lab *vl;
+ const struct val_lab **labels;
+ size_t n_labels;
+ size_t i;
GtkTreeIter iter;
GtkTreeIter iter;
@@
-473,22
+490,18
@@
repopulate_dialog (struct val_labs_dialog *dialog)
g_signal_handler_unblock (GTK_ENTRY (dialog->label_entry),
dialog->change_handler_id);
g_signal_handler_unblock (GTK_ENTRY (dialog->label_entry),
dialog->change_handler_id);
-
- for (vl = val_labs_first_sorted (dialog->labs, &vli);
- vl;
- vl = val_labs_next (dialog->labs, &vli))
+ labels = val_labs_sorted (dialog->labs);
+ n_labels = val_labs_count (dialog->labs);
+ for (i = 0; i < n_labels; i++)
{
{
+ const struct val_lab *vl = labels[i];
gchar *const vstr =
value_to_text (vl->value,
*var_get_write_format (dialog->pv));
gchar *const vstr =
value_to_text (vl->value,
*var_get_write_format (dialog->pv));
- gchar *labeltext =
- pspp_locale_to_utf8 (vl->label, -1, 0);
-
gchar *const text = g_strdup_printf ("%s = \"%s\"",
gchar *const text = g_strdup_printf ("%s = \"%s\"",
- vstr, labeltext);
-
+ vstr, val_lab_get_label (vl));
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter,
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter,
@@
-496,10
+509,10
@@
repopulate_dialog (struct val_labs_dialog *dialog)
1, vl->value.f,
-1);
1, vl->value.f,
-1);
- g_free (labeltext);
g_free (text);
g_free (vstr);
}
g_free (text);
g_free (vstr);
}
+ free (labels);
gtk_tree_view_set_model (GTK_TREE_VIEW (dialog->treeview),
GTK_TREE_MODEL (list_store));
gtk_tree_view_set_model (GTK_TREE_VIEW (dialog->treeview),
GTK_TREE_MODEL (list_store));
@@
-527,6
+540,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_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);
}
repopulate_dialog (dialog);
gtk_widget_show (dialog->window);
}