projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
simplify weighting
[pspp]
/
src
/
ui
/
gui
/
psppire-dialog-action-recode-same.c
diff --git
a/src/ui/gui/psppire-dialog-action-recode-same.c
b/src/ui/gui/psppire-dialog-action-recode-same.c
index d55745fbf993a7d64b6fe213251e56c07eda54a4..7b48a808a789dc318a496b7d7a93f990e712668c 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-recode-same.c
+++ b/
src/ui/gui/psppire-dialog-action-recode-same.c
@@
-43,7
+43,7
@@
difx_variable_treeview_is_populated (PsppireDialogActionRecode *rd)
GtkTreeModel *vars =
gtk_tree_view_get_model (GTK_TREE_VIEW (rd->variable_treeview));
GtkTreeModel *vars =
gtk_tree_view_get_model (GTK_TREE_VIEW (rd->variable_treeview));
- if (
!gtk_tree_model_get_iter_first (vars, ¬_used))
+ if (!gtk_tree_model_get_iter_first (vars, ¬_used))
return FALSE;
return TRUE;
return FALSE;
return TRUE;
@@
-58,12
+58,12
@@
dialog_state_valid (gpointer data)
{
PsppireDialogActionRecode *rd = data;
GtkTreeIter not_used;
{
PsppireDialogActionRecode *rd = data;
GtkTreeIter not_used;
-
- if (
! rd->value_map
)
+
+ if (
! rd->value_map
)
return FALSE;
return FALSE;
- if (
! gtk_tree_model_get_iter_first (GTK_TREE_MODEL (rd->value_map),
- ¬_used)
)
+ if (! gtk_tree_model_get_iter_first (GTK_TREE_MODEL (rd->value_map),
+ ¬_used))
return FALSE;
return difx_variable_treeview_is_populated (rd);
return FALSE;
return difx_variable_treeview_is_populated (rd);
@@
-96,17
+96,17
@@
on_old_new_show (PsppireDialogActionRecode *rd)
gtk_widget_hide (rd->strings_box);
}
gtk_widget_hide (rd->strings_box);
}
-static
void
-psppire_dialog_action_recode_same_activate (PsppireDialogAction *a)
+static
GtkBuilder *
+psppire_dialog_action_recode_same_activate (PsppireDialogAction *a
, GVariant *param
)
{
PsppireDialogActionRecode *act = PSPPIRE_DIALOG_ACTION_RECODE (a);
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
{
PsppireDialogActionRecode *act = PSPPIRE_DIALOG_ACTION_RECODE (a);
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
- psppire_dialog_action_recode_pre_activate (act, NULL);
+
GtkBuilder *xml =
psppire_dialog_action_recode_pre_activate (act, NULL);
gtk_window_set_title (GTK_WINDOW (pda->dialog),
_("Recode into Same Variables"));
gtk_window_set_title (GTK_WINDOW (pda->dialog),
_("Recode into Same Variables"));
-
+
g_signal_connect_swapped (act->old_and_new_dialog, "show",
G_CALLBACK (on_old_new_show), act);
g_signal_connect_swapped (act->old_and_new_dialog, "show",
G_CALLBACK (on_old_new_show), act);
@@
-114,11
+114,13
@@
psppire_dialog_action_recode_same_activate (PsppireDialogAction *a)
_("Recode into Same Variables: Old and New Values"));
gtk_widget_hide (act->output_variable_box);
_("Recode into Same Variables: Old and New Values"));
gtk_widget_hide (act->output_variable_box);
-
+
psppire_dialog_action_set_refresh (pda, refresh);
psppire_dialog_action_set_valid_predicate (pda,
dialog_state_valid);
psppire_dialog_action_set_refresh (pda, refresh);
psppire_dialog_action_set_valid_predicate (pda,
dialog_state_valid);
+
+ return xml;
}
static void
}
static void
@@
-142,7
+144,7
@@
target_is_string (const PsppireDialogActionRecode *rd)
static void
psppire_dialog_action_recode_same_class_init (PsppireDialogActionRecodeSameClass *class)
{
static void
psppire_dialog_action_recode_same_class_init (PsppireDialogActionRecodeSameClass *class)
{
-
psppire_dialog_action_set_activation (class, psppire_dialog_action_recode_same_activate)
;
+
PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_recode_same_activate
;
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = same_generate_syntax;
PSPPIRE_DIALOG_ACTION_RECODE_CLASS (class)->target_is_string = target_is_string;
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = same_generate_syntax;
PSPPIRE_DIALOG_ACTION_RECODE_CLASS (class)->target_is_string = target_is_string;