projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 'master' into 'psppsheet'.
[pspp]
/
src
/
ui
/
gui
/
recode-dialog.c
diff --git
a/src/ui/gui/recode-dialog.c
b/src/ui/gui/recode-dialog.c
index 012b2f26c1689b394edf039f85178d479a5ea100..05984dd44b368af9684b167fd66b0420ff0881f4 100644
(file)
--- a/
src/ui/gui/recode-dialog.c
+++ b/
src/ui/gui/recode-dialog.c
@@
-37,7
+37,6
@@
#include <ui/gui/builder-wrapper.h>
#include "helper.h"
#include <ui/gui/psppire-dialog.h>
#include <ui/gui/builder-wrapper.h>
#include "helper.h"
#include <ui/gui/psppire-dialog.h>
-#include <ui/gui/psppire-var-store.h>
#include "psppire-val-chooser.h"
#include "psppire-val-chooser.h"
@@
-452,6
+451,7
@@
on_selection_change (GtkTreeSelection *selection, gpointer data)
gtk_widget_set_sensitive (rd->new_label_entry, TRUE);
ok = gtk_tree_model_get_iter (model, &iter, (GtkTreePath*) rows->data);
gtk_widget_set_sensitive (rd->new_label_entry, TRUE);
ok = gtk_tree_model_get_iter (model, &iter, (GtkTreePath*) rows->data);
+ g_return_if_fail (ok);
gtk_tree_model_get (model, &iter,
0, &var,
gtk_tree_model_get (model, &iter,
0, &var,
@@
-550,6
+550,14
@@
on_change_clicked (GObject *obj, gpointer data)
}
}
+static void
+focus_value_entry (GtkWidget *w, struct recode_dialog *rd)
+{
+ if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w)))
+ gtk_widget_grab_focus (rd->new_value_entry);
+}
+
+
/* Callback for the new_value_entry and new_value_togglebutton widgets.
It's used to enable/disable the acr. */
static void
/* Callback for the new_value_entry and new_value_togglebutton widgets.
It's used to enable/disable the acr. */
static void
@@
-611,9
+619,6
@@
recode_dialog (PsppireDataWindow *de, gboolean diff)
GtkWidget *output_variable_box = get_widget_assert (builder,"frame4");
GtkWidget *output_variable_box = get_widget_assert (builder,"frame4");
- PsppireVarStore *vs = NULL;
- g_object_get (de->data_editor, "var-store", &vs, NULL);
-
rd.change_button = get_widget_assert (builder, "change-button");
rd.varmap = NULL;
rd.dialog = get_widget_assert (builder, "recode-dialog");
rd.change_button = get_widget_assert (builder, "change-button");
rd.varmap = NULL;
rd.dialog = get_widget_assert (builder, "recode-dialog");
@@
-622,7
+627,7
@@
recode_dialog (PsppireDataWindow *de, gboolean diff)
rd.new_name_entry = get_widget_assert (builder, "dest-name-entry");
rd.new_label_entry = get_widget_assert (builder, "dest-label-entry");
rd.new_name_entry = get_widget_assert (builder, "dest-name-entry");
rd.new_label_entry = get_widget_assert (builder, "dest-label-entry");
- g_object_get (
vs
, "dictionary", &rd.dict, NULL);
+ g_object_get (
de->data_editor
, "dictionary", &rd.dict, NULL);
rd.value_map = gtk_list_store_new (2,
old_value_get_type (),
rd.value_map = gtk_list_store_new (2,
old_value_get_type (),
@@
-713,6
+718,9
@@
recode_dialog (PsppireDataWindow *de, gboolean diff)
g_signal_connect_swapped (rd.toggle[BUTTON_NEW_VALUE], "toggled",
G_CALLBACK (set_acr), &rd);
g_signal_connect_swapped (rd.toggle[BUTTON_NEW_VALUE], "toggled",
G_CALLBACK (set_acr), &rd);
+ g_signal_connect_after (rd.toggle[BUTTON_NEW_VALUE], "toggled",
+ G_CALLBACK (focus_value_entry), &rd);
+
g_signal_connect_swapped (rd.new_value_entry, "changed",
G_CALLBACK (set_acr), &rd);
g_signal_connect_swapped (rd.new_value_entry, "changed",
G_CALLBACK (set_acr), &rd);