projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gui: Redo var sheet, data sheet, text import with PsppSheetView.
[pspp]
/
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 0af805912da167444ece82f14bd079c03f054da9..ad28681105573a441a71099f3b59cef2504a767e 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, 2009 Free Software Foundation
+ Copyright (C) 2005, 2009
, 2010, 2011, 2012
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
@@
-22,20
+22,23
@@
#include <string.h>
#include <string.h>
-#include "
hel
per.h"
+#include "
builder-wrap
per.h"
#include "val-labs-dialog.h"
#include <data/value-labels.h>
#include <data/format.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>
#include "psppire-var-store.h"
#include <libpspp/i18n.h>
+#include "helper.h"
+
+#include <gettext.h>
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
+
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;
@@
-71,9
+74,9
@@
on_label_entry_change (GtkEntry *entry, gpointer data)
text = gtk_entry_get_text (GTK_ENTRY (dialog->value_entry));
text = gtk_entry_get_text (GTK_ENTRY (dialog->value_entry));
- text_to_value (text,
&v,
- *var_get_write_format (dialog->pv));
-
+ text_to_value (text,
+ dialog->pv,
+ &v);
if (val_labs_find (dialog->labs, &v))
{
if (val_labs_find (dialog->labs, &v))
{
@@
-85,6
+88,8
@@
on_label_entry_change (GtkEntry *entry, gpointer data)
gtk_widget_set_sensitive (dialog->change_button, FALSE);
gtk_widget_set_sensitive (dialog->add_button, TRUE);
}
gtk_widget_set_sensitive (dialog->change_button, FALSE);
gtk_widget_set_sensitive (dialog->add_button, TRUE);
}
+
+ value_destroy (&v, var_get_width (dialog->pv));
}
}
@@
-141,8
+146,9
@@
on_value_entry_change (GtkEntry *entry, gpointer data)
const gchar *text = gtk_entry_get_text (GTK_ENTRY (dialog->value_entry));
union value v;
const gchar *text = gtk_entry_get_text (GTK_ENTRY (dialog->value_entry));
union value v;
- text_to_value (text, &v,
- *var_get_write_format (dialog->pv));
+ text_to_value (text,
+ dialog->pv,
+ &v);
g_signal_handler_block (GTK_ENTRY (dialog->label_entry),
g_signal_handler_block (GTK_ENTRY (dialog->label_entry),
@@
-166,6
+172,8
@@
on_value_entry_change (GtkEntry *entry, gpointer data)
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);
+
+ value_destroy (&v, var_get_width (dialog->pv));
}
}
@@
-180,7
+188,7
@@
val_labs_ok (GtkWidget *w, gpointer data)
val_labs_destroy (dialog->labs);
val_labs_destroy (dialog->labs);
- dialog->labs =
0
;
+ dialog->labs =
NULL
;
gtk_widget_hide (dialog->window);
gtk_widget_hide (dialog->window);
@@
-194,7
+202,7
@@
val_labs_cancel (struct val_labs_dialog *dialog)
{
val_labs_destroy (dialog->labs);
{
val_labs_destroy (dialog->labs);
- dialog->labs =
0
;
+ dialog->labs =
NULL
;
gtk_widget_hide (dialog->window);
}
gtk_widget_hide (dialog->window);
}
@@
-202,14
+210,12
@@
val_labs_cancel (struct val_labs_dialog *dialog)
/* Callback for when the Value Labels dialog is closed using
the Cancel button.*/
/* Callback for when the Value Labels dialog is closed using
the Cancel button.*/
-static
gint
+static
void
on_cancel (GtkWidget *w, gpointer data)
{
struct val_labs_dialog *dialog = data;
val_labs_cancel (dialog);
on_cancel (GtkWidget *w, gpointer data)
{
struct val_labs_dialog *dialog = data;
val_labs_cancel (dialog);
-
- return FALSE;
}
}
@@
-251,14
+257,18
@@
get_selected_tuple (struct val_labs_dialog *dialog,
if (valuep != NULL)
*valuep = value;
if (label != NULL)
if (valuep != NULL)
*valuep = value;
if (label != NULL)
- *label = val_labs_find (dialog->labs, &value);
+ {
+ struct val_lab *vl = val_labs_lookup (dialog->labs, &value);
+ if (vl != NULL)
+ *label = val_lab_get_escaped_label (vl);
+ }
}
static void repopulate_dialog (struct val_labs_dialog *dialog);
/* Callback which occurs when the "Change" button is clicked */
}
static void repopulate_dialog (struct val_labs_dialog *dialog);
/* Callback which occurs when the "Change" button is clicked */
-static
gint
+static
void
on_change (GtkWidget *w, gpointer data)
{
struct val_labs_dialog *dialog = data;
on_change (GtkWidget *w, gpointer data)
{
struct val_labs_dialog *dialog = data;
@@
-267,8
+277,9
@@
on_change (GtkWidget *w, gpointer data)
union value v;
union value v;
- text_to_value (val_text, &v,
- *var_get_write_format (dialog->pv));
+ text_to_value (val_text,
+ dialog->pv,
+ &v);
val_labs_replace (dialog->labs, &v,
gtk_entry_get_text (GTK_ENTRY (dialog->label_entry)));
val_labs_replace (dialog->labs, &v,
gtk_entry_get_text (GTK_ENTRY (dialog->label_entry)));
@@
-278,11
+289,11
@@
on_change (GtkWidget *w, gpointer data)
repopulate_dialog (dialog);
gtk_widget_grab_focus (dialog->value_entry);
repopulate_dialog (dialog);
gtk_widget_grab_focus (dialog->value_entry);
-
return FALSE
;
+
value_destroy (&v, var_get_width (dialog->pv))
;
}
/* Callback which occurs when the "Add" button is clicked */
}
/* Callback which occurs when the "Add" button is clicked */
-static
gint
+static
void
on_add (GtkWidget *w, gpointer data)
{
struct val_labs_dialog *dialog = data;
on_add (GtkWidget *w, gpointer data)
{
struct val_labs_dialog *dialog = data;
@@
-291,31
+302,31
@@
on_add (GtkWidget *w, gpointer data)
const gchar *text = gtk_entry_get_text (GTK_ENTRY (dialog->value_entry));
const gchar *text = gtk_entry_get_text (GTK_ENTRY (dialog->value_entry));
- text_to_value (text, &v,
- *var_get_write_format (dialog->pv));
-
-
- if ( ! val_labs_add (dialog->labs, &v,
- gtk_entry_get_text
- ( GTK_ENTRY (dialog->label_entry)) ) )
- return FALSE;
+ text_to_value (text,
+ dialog->pv,
+ &v);
- gtk_widget_set_sensitive (dialog->add_button, FALSE);
+ if (val_labs_add (dialog->labs, &v,
+ gtk_entry_get_text
+ ( GTK_ENTRY (dialog->label_entry)) ) )
+ {
+ gtk_widget_set_sensitive (dialog->add_button, FALSE);
- repopulate_dialog (dialog);
- gtk_widget_grab_focus (dialog->value_entry);
+ repopulate_dialog (dialog);
+ gtk_widget_grab_focus (dialog->value_entry);
+ }
-
return FALSE
;
+
value_destroy (&v, var_get_width (dialog->pv))
;
}
/* Callback which occurs when the "Remove" button is clicked */
}
/* Callback which occurs when the "Remove" button is clicked */
-static
gint
+static
void
on_remove (GtkWidget *w, gpointer data)
{
struct val_labs_dialog *dialog = data;
union value value;
on_remove (GtkWidget *w, gpointer data)
{
struct val_labs_dialog *dialog = data;
union value value;
-
const
struct val_lab *vl;
+ struct val_lab *vl;
get_selected_tuple (dialog, &value, NULL);
vl = val_labs_lookup (dialog->labs, &value);
get_selected_tuple (dialog, &value, NULL);
vl = val_labs_lookup (dialog->labs, &value);
@@
-326,8
+337,6
@@
on_remove (GtkWidget *w, gpointer data)
gtk_widget_grab_focus (dialog->value_entry);
gtk_widget_set_sensitive (dialog->remove_button, FALSE);
gtk_widget_grab_focus (dialog->value_entry);
gtk_widget_set_sensitive (dialog->remove_button, FALSE);
-
- return FALSE;
}
}
@@
-337,19
+346,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;
union value value;
struct val_labs_dialog *dialog = data;
union value value;
- const char *label;
+ const char *label
= NULL
;
gchar *text;
gchar *text;
- PsppireVarStore *var_store =
- PSPPIRE_VAR_STORE (psppire_sheet_get_model (dialog->vs));
-
get_selected_tuple (dialog, &value, &label);
get_selected_tuple (dialog, &value, &label);
- text = value_to_text (value,
*var_get_write_format (dialog->pv)
);
+ text = value_to_text (value,
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);
@@
-364,12
+369,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),
- 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);
@@
-382,7
+383,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
, PsppireSheet *sheet
)
+val_labs_dialog_create (GtkWindow *toplevel)
{
GtkTreeViewColumn *column;
{
GtkTreeViewColumn *column;
@@
-395,7
+396,6
@@
val_labs_dialog_create (GtkWindow *toplevel, PsppireSheet *sheet)
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);
@@
-420,40
+420,40
@@
val_labs_dialog_create (GtkWindow *toplevel, PsppireSheet *sheet)
g_signal_connect (get_widget_assert (xml, "val_labs_cancel"),
"clicked",
g_signal_connect (get_widget_assert (xml, "val_labs_cancel"),
"clicked",
- G
TK_SIGNAL_FUNC
(on_cancel), dialog);
+ G
_CALLBACK
(on_cancel), dialog);
g_signal_connect (dialog->window, "delete-event",
g_signal_connect (dialog->window, "delete-event",
- G
TK_SIGNAL_FUNC
(on_delete), dialog);
+ G
_CALLBACK
(on_delete), dialog);
g_signal_connect (get_widget_assert (xml, "val_labs_ok"),
"clicked",
g_signal_connect (get_widget_assert (xml, "val_labs_ok"),
"clicked",
- G
TK_SIGNAL_FUNC
(val_labs_ok), dialog);
+ G
_CALLBACK
(val_labs_ok), dialog);
dialog->change_handler_id =
g_signal_connect (dialog->label_entry,
"changed",
dialog->change_handler_id =
g_signal_connect (dialog->label_entry,
"changed",
- G
TK_SIGNAL_FUNC
(on_label_entry_change), dialog);
+ G
_CALLBACK
(on_label_entry_change), dialog);
dialog->value_handler_id =
g_signal_connect (dialog->value_entry,
"changed",
dialog->value_handler_id =
g_signal_connect (dialog->value_entry,
"changed",
- G
TK_SIGNAL_FUNC
(on_value_entry_change), dialog);
+ G
_CALLBACK
(on_value_entry_change), dialog);
g_signal_connect (dialog->change_button,
"clicked",
g_signal_connect (dialog->change_button,
"clicked",
- G
TK_SIGNAL_FUNC
(on_change), dialog);
+ G
_CALLBACK
(on_change), dialog);
g_signal_connect (dialog->treeview, "cursor-changed",
g_signal_connect (dialog->treeview, "cursor-changed",
- G
TK_SIGNAL_FUNC
(on_select_row), dialog);
+ G
_CALLBACK
(on_select_row), dialog);
g_signal_connect (dialog->remove_button, "clicked",
g_signal_connect (dialog->remove_button, "clicked",
- G
TK_SIGNAL_FUNC
(on_remove), dialog);
+ G
_CALLBACK
(on_remove), dialog);
g_signal_connect (dialog->add_button, "clicked",
g_signal_connect (dialog->add_button, "clicked",
- G
TK_SIGNAL_FUNC
(on_add), dialog);
+ G
_CALLBACK
(on_add), dialog);
- dialog->labs =
0
;
+ dialog->labs =
NULL
;
g_object_unref (xml);
g_object_unref (xml);
@@
-481,9
+481,6
@@
repopulate_dialog (struct val_labs_dialog *dialog)
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);
@@
-508,16
+505,10
@@
repopulate_dialog (struct val_labs_dialog *dialog)
const struct val_lab *vl = labels[i];
gchar *const vstr =
const struct val_lab *vl = labels[i];
gchar *const vstr =
- value_to_text (vl->value,
- *var_get_write_format (dialog->pv));
-
- gchar *labeltext =
- recode_string (UTF8,
- psppire_dict_encoding (var_store->dict),
- val_lab_get_label (vl), -1);
+ value_to_text (vl->value, dialog->pv);
- gchar *const text = g_strdup_printf (
"%s = \"%s\""
,
-
vstr, labeltext
);
+ gchar *const text = g_strdup_printf (
_("%s = `%s'"), vstr
,
+
val_lab_get_escaped_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,
@@
-525,7
+516,6
@@
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);
}