projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/stable'
[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 42dd0b349c530c3f7a3d3daa5e970b78d541c0b1..4b575d9779799b7d5850d683dd57afe17ba98a66 100644
(file)
--- a/
src/ui/gui/val-labs-dialog.c
+++ b/
src/ui/gui/val-labs-dialog.c
@@
-34,7
+34,7
@@
struct val_labs_dialog
{
GtkWidget *window;
{
GtkWidget *window;
- Psppire
Sheet *vs
;
+ Psppire
VarStore *var_store
;
/* The variable to be updated */
struct variable *pv;
/* The variable to be updated */
struct variable *pv;
@@
-72,10
+72,11
@@
on_label_entry_change (GtkEntry *entry, gpointer data)
text = gtk_entry_get_text (GTK_ENTRY (dialog->value_entry));
text_to_value (text, &v,
text = gtk_entry_get_text (GTK_ENTRY (dialog->value_entry));
text_to_value (text, &v,
+ dialog->var_store->dict,
*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);
@@
-134,7
+135,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;
@@
-142,6
+143,7
@@
on_value_entry_change (GtkEntry *entry, gpointer data)
union value v;
text_to_value (text, &v,
union value v;
text_to_value (text, &v,
+ dialog->var_store->dict,
*var_get_write_format (dialog->pv));
*var_get_write_format (dialog->pv));
@@
-151,7
+153,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);
@@
-227,14
+229,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);
@@
-244,12
+247,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);
}
}
@@
-266,9
+270,10
@@
on_change (GtkWidget *w, gpointer data)
union value v;
text_to_value (val_text, &v,
union value v;
text_to_value (val_text, &v,
+ dialog->var_store->dict,
*var_get_write_format (dialog->pv));
*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);
gtk_entry_get_text (GTK_ENTRY (dialog->label_entry)));
gtk_widget_set_sensitive (dialog->change_button, FALSE);
@@
-290,10
+295,11
@@
on_add (GtkWidget *w, gpointer data)
const gchar *text = gtk_entry_get_text (GTK_ENTRY (dialog->value_entry));
text_to_value (text, &v,
const gchar *text = gtk_entry_get_text (GTK_ENTRY (dialog->value_entry));
text_to_value (text, &v,
+ dialog->var_store->dict,
*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;
@@
-312,9
+318,13
@@
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);
gtk_widget_grab_focus (dialog->value_entry);
repopulate_dialog (dialog);
gtk_widget_grab_focus (dialog->value_entry);
@@
-331,16
+341,15
@@
on_remove (GtkWidget *w, gpointer data)
static void
on_select_row (GtkTreeView *treeview, gpointer data)
{
static void
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;
- PsppireVarStore *var_store =
-
PSPPIRE_VAR_STORE (psppire_sheet_get_model (dialog->vs
));
+ get_selected_tuple (dialog, &value, &label);
+
text = value_to_text (value, dialog->var_store->dict, *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);
@@
-355,12
+364,8
@@
on_select_row (GtkTreeView *treeview, gpointer data)
dialog->change_handler_id);
dialog->change_handler_id);
- labeltext = recode_string (UTF8, psppire_dict_encoding (var_store->dict),
- vl->label, -1);
-
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);
@@
-373,7
+378,7
@@
on_select_row (GtkTreeView *treeview, gpointer data)
/* 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 (GtkWindow *toplevel, Psppire
Sheet *sheet
)
+val_labs_dialog_create (GtkWindow *toplevel, Psppire
VarStore *var_store
)
{
GtkTreeViewColumn *column;
{
GtkTreeViewColumn *column;
@@
-383,10
+388,10
@@
val_labs_dialog_create (GtkWindow *toplevel, PsppireSheet *sheet)
struct val_labs_dialog *dialog = g_malloc (sizeof (*dialog));
struct val_labs_dialog *dialog = g_malloc (sizeof (*dialog));
+ dialog->var_store = var_store;
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 (dialog->window), toplevel);
gtk_window_set_transient_for
(GTK_WINDOW (dialog->window), toplevel);
@@
-466,14
+471,12
@@
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;
- 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);
GtkListStore *list_store = gtk_list_store_new (2,
G_TYPE_STRING,
G_TYPE_DOUBLE);
@@
-491,23
+494,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 =
gchar *const vstr =
- value_to_text (vl->value,
+ value_to_text (vl->value,
dialog->var_store->dict,
*var_get_write_format (dialog->pv));
*var_get_write_format (dialog->pv));
- gchar *labeltext =
- recode_string (UTF8,
- psppire_dict_encoding (var_store->dict),
- vl->label, -1);
-
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,
@@
-515,10
+513,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));