gui: Use g_memdup2() instead of deprecated g_memdup().
[pspp] / src / ui / gui / psppire-dialog-action-recode.c
index 3ed1b663e3301afea731534adad26d3983c5bf1e..0087e4403e8b14a62aae8a7feff8abb7c91c76f2 100644 (file)
@@ -1,5 +1,6 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007, 2009, 2010, 2011, 2012, 2014, 2016  Free Software Foundation
+   Copyright (C) 2007, 2009, 2010, 2011, 2012, 2014, 2016,
+   2020  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
@@ -70,9 +71,9 @@ struct new_value
 static struct new_value *
 new_value_copy (struct new_value *nv)
 {
-  struct new_value *copy = g_memdup (nv, sizeof (*copy));
+  struct new_value *copy = g_memdup2 (nv, sizeof (*copy));
 
-  if ( nv->type == NV_STRING )
+  if (nv->type == NV_STRING)
     copy->v.s = xstrdup (nv->v.s);
 
   return copy;
@@ -82,7 +83,7 @@ new_value_copy (struct new_value *nv)
 static void
 new_value_free (struct new_value *nv)
 {
-  if ( nv->type == NV_STRING )
+  if (nv->type == NV_STRING)
     g_free (nv->v.s);
 
   g_free (nv);
@@ -122,12 +123,12 @@ new_value_to_string (const GValue *src, GValue *dest)
     }
 }
 
-static GType
+GType
 new_value_get_type (void)
 {
   static GType t = 0;
 
-  if (t == 0 )
+  if (t == 0)
     {
       t = g_boxed_type_register_static  ("psppire-recode-new-values",
                                         (GBoxedCopyFunc) new_value_copy,
@@ -146,109 +147,13 @@ static void
 on_string_toggled (GtkToggleButton *b, PsppireDialogActionRecode *rd)
 {
   gboolean active;
-  if (! rd->input_var_is_string )
+  if (! rd->input_var_is_string)
     return ;
 
   active = gtk_toggle_button_get_active (b);
   gtk_widget_set_sensitive (rd->convert_button, !active);
 }
 
-/* Name-Label pair */
-struct nlp
-{
-  char *name;
-  char *label;
-};
-
-static struct nlp *
-nlp_create (const char *name, const char *label)
-{
-  struct nlp *nlp = xmalloc (sizeof *nlp);
-
-  nlp->name = g_strdup (name);
-
-  nlp->label = NULL;
-
-  if ( 0 != strcmp ("", label))
-    nlp->label = g_strdup (label);
-
-  return nlp;
-}
-
-static void
-nlp_destroy (gpointer data)
-{
-  struct nlp *nlp = data ;
-  if ( ! nlp )
-    return;
-
-  g_free (nlp->name);
-  g_free (nlp->label);
-  g_free (nlp);
-}
-
-
-/* Callback which gets called when a new row is selected
-   in the variable treeview.
-   It sets the name and label entry widgets to reflect the
-   currently selected row.
- */
-static void
-on_selection_change (GtkTreeSelection *selection, gpointer data)
-{
-  PsppireDialogActionRecode *rd = data;
-
-  GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (rd->variable_treeview));
-
-  GList *rows = gtk_tree_selection_get_selected_rows (selection, &model);
-
-  if ( rows && !rows->next)
-    {
-      /* Exactly one row is selected */
-      struct nlp *nlp;
-      struct variable *var;
-      gboolean ok;
-      GtkTreeIter iter;
-
-      gtk_widget_set_sensitive  (rd->change_button, TRUE);
-      gtk_widget_set_sensitive  (rd->new_name_entry, TRUE);
-      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, 
-                         -1);
-
-      nlp = g_hash_table_lookup (rd->varmap, var);
-
-      if (nlp)
-       {
-         gtk_entry_set_text (GTK_ENTRY (rd->new_name_entry), nlp->name ? nlp->name : "");
-         gtk_entry_set_text (GTK_ENTRY (rd->new_label_entry), nlp->label ? nlp->label : "");
-       }
-      else
-       {
-         gtk_entry_set_text (GTK_ENTRY (rd->new_name_entry), "");
-         gtk_entry_set_text (GTK_ENTRY (rd->new_label_entry), "");
-       }
-    }
-  else
-    {
-      gtk_widget_set_sensitive  (rd->change_button, FALSE);
-      gtk_widget_set_sensitive  (rd->new_name_entry, FALSE);
-      gtk_widget_set_sensitive  (rd->new_label_entry, FALSE);
-
-      gtk_entry_set_text (GTK_ENTRY (rd->new_name_entry), "");
-      gtk_entry_set_text (GTK_ENTRY (rd->new_label_entry), "");
-    }
-
-
-  g_list_foreach (rows, (GFunc) gtk_tree_path_free, NULL);
-  g_list_free (rows);
-}
-
 
 static void
 on_convert_toggled (GtkToggleButton *b, PsppireDialogActionRecode *rd)
@@ -261,52 +166,10 @@ on_convert_toggled (GtkToggleButton *b, PsppireDialogActionRecode *rd)
   gtk_widget_set_sensitive (rd->string_button, !active);
 }
 
-static void
-on_change_clicked (GObject *obj, gpointer data)
-{
-  PsppireDialogActionRecode *rd = data;
-  struct variable *var = NULL;
-  struct nlp *nlp;
-
-  GtkTreeModel *model =  gtk_tree_view_get_model (GTK_TREE_VIEW (rd->variable_treeview));
-
-  GtkTreeIter iter;
-  GtkTreeSelection *selection =
-    gtk_tree_view_get_selection (GTK_TREE_VIEW (rd->variable_treeview));
-
-  GList *rows = gtk_tree_selection_get_selected_rows (selection, &model);
-
-  const gchar *dest_var_name =
-    gtk_entry_get_text (GTK_ENTRY (rd->new_name_entry));
-
-  const gchar *dest_var_label =
-    gtk_entry_get_text (GTK_ENTRY (rd->new_label_entry));
-
-  if ( NULL == rows || rows->next != NULL)
-    goto finish;
-
-  gtk_tree_model_get_iter (model, &iter, rows->data);
-
-  gtk_tree_model_get (model, &iter, 0, &var, -1);
-
-  g_hash_table_remove (rd->varmap, var);
-
-  nlp = nlp_create (dest_var_name, dest_var_label);
-
-  g_hash_table_insert (rd->varmap, var, nlp);
-
-  gtk_tree_model_row_changed (model, rows->data, &iter);
-
- finish:
-  g_list_foreach (rows, (GFunc) gtk_tree_path_free, NULL);
-  g_list_free (rows);
-}
-
-
 static void
 focus_value_entry (GtkWidget *w, PsppireDialogActionRecode *rd)
 {
-  if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w)))
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w)))
     gtk_widget_grab_focus (rd->new_value_entry);
 }
 
@@ -318,7 +181,7 @@ set_acr (PsppireDialogActionRecode *rd)
 {
   const gchar *text;
 
-  if ( !gtk_toggle_button_get_active
+  if (!gtk_toggle_button_get_active
        (GTK_TOGGLE_BUTTON (rd->toggle[BUTTON_NEW_VALUE])))
     {
       psppire_acr_set_enabled (PSPPIRE_ACR (rd->acr), TRUE);
@@ -330,47 +193,12 @@ set_acr (PsppireDialogActionRecode *rd)
   psppire_acr_set_enabled (PSPPIRE_ACR (rd->acr), !g_str_equal (text, ""));
 }
 
-enum {
-  COL_VALUE_OLD,
-  COL_VALUE_NEW,
-  n_COL_VALUES
-};
-
-/* Dialog is valid iff at least one variable has been selected,
-   AND the list of mappings is not empty.
- */
-static gboolean
-dialog_state_valid (gpointer data)
-{
-  GtkTreeIter not_used;
-  PsppireDialogActionRecode *rd = data;
-
-  if ( ! rd->value_map )
-    return FALSE;
-
-  if ( ! gtk_tree_model_get_iter_first (GTK_TREE_MODEL (rd->value_map),
-                                       &not_used) )
-    return FALSE;
-
-  if ( rd->different )
-    {
-      GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (rd->variable_treeview));
-
-      if (g_hash_table_size (rd->varmap) != gtk_tree_model_iter_n_children (model, NULL) )
-       return FALSE;
-    }
-  else
-    {
-      GtkTreeModel *vars =
-       gtk_tree_view_get_model (GTK_TREE_VIEW (rd->variable_treeview));
-
-      if ( !gtk_tree_model_get_iter_first (vars, &not_used))
-       return FALSE;
-    }
-
-  return TRUE;
-}
-
+enum
+  {
+    COL_VALUE_OLD,
+    COL_VALUE_NEW,
+    n_COL_VALUES
+  };
 
 /* Callback which gets called when a new row is selected
    in the acr's variable treeview.
@@ -389,7 +217,7 @@ on_acr_selection_change (GtkTreeSelection *selection, gpointer data)
   struct old_value *ov = NULL;
   struct new_value *nv = NULL;
 
-  if ( ! gtk_tree_selection_get_selected (selection, &model, &iter) )
+  if (! gtk_tree_selection_get_selected (selection, &model, &iter))
     return;
 
 
@@ -468,34 +296,26 @@ set_new_value (GValue *val, const PsppireDialogActionRecode *rd)
   const gchar *text = NULL;
   struct new_value nv;
 
-  if ( gtk_toggle_button_get_active
-       (GTK_TOGGLE_BUTTON (rd->toggle [BUTTON_NEW_VALUE])))
+  if (gtk_toggle_button_get_active
+      (GTK_TOGGLE_BUTTON (rd->toggle [BUTTON_NEW_VALUE])))
     {
       text = gtk_entry_get_text (GTK_ENTRY (rd->new_value_entry));
-
       nv.type = NV_NUMERIC;
-      if (
-         (! rd->different && rd->input_var_is_string) ||
-         ( rd->different &&
-           gtk_toggle_button_get_active
-              (GTK_TOGGLE_BUTTON (rd->string_button)))
-         )
-       {
-         nv.type = NV_STRING;
-       }
 
-      if ( nv.type == NV_STRING )
+      if (PSPPIRE_DIALOG_ACTION_RECODE_CLASS (G_OBJECT_GET_CLASS (rd))->target_is_string (rd))
+       nv.type = NV_STRING;
+
+      if (nv.type == NV_STRING)
        nv.v.s = g_strdup (text);
       else
        nv.v.v = g_strtod (text, 0);
     }
-  else if ( gtk_toggle_button_get_active
+  else if (gtk_toggle_button_get_active
            (GTK_TOGGLE_BUTTON (rd->toggle [BUTTON_NEW_COPY])))
     {
       nv.type = NV_COPY;
     }
-
-  else if ( gtk_toggle_button_get_active
+  else if (gtk_toggle_button_get_active
            (GTK_TOGGLE_BUTTON (rd->toggle [BUTTON_NEW_SYSMIS])))
     {
       nv.type = NV_SYSMIS;
@@ -515,7 +335,7 @@ set_value (gint col, GValue  *val, gpointer data)
 {
   PsppireDialogActionRecode *rd = data;
 
-  switch ( col )
+  switch (col)
     {
     case COL_VALUE_OLD:
       set_old_value (val, rd);
@@ -530,6 +350,16 @@ set_value (gint col, GValue  *val, gpointer data)
   return TRUE;
 }
 
+static void
+set_old_and_new_button_sensitivity (GtkTreeSelection *sel, PsppireDialogActionRecode *rd)
+{
+  GtkTreeModel *model = NULL;
+
+  GList *rows = gtk_tree_selection_get_selected_rows (sel, &model);
+
+  gtk_widget_set_sensitive (rd->old_and_new, rows != NULL);
+}
+
 static void
 run_old_and_new_dialog (PsppireDialogActionRecode *rd)
 {
@@ -540,13 +370,6 @@ run_old_and_new_dialog (PsppireDialogActionRecode *rd)
   psppire_acr_set_model (PSPPIRE_ACR (rd->acr), local_store);
   psppire_acr_set_get_value_func (PSPPIRE_ACR (rd->acr), set_value, rd);
 
-  gtk_window_set_title (GTK_WINDOW (rd->old_and_new_dialog),
-                       rd->different
-                       ? _("Recode into Different Variables: Old and New Values ")
-                       : _("Recode into Same Variables: Old and New Values")
-                       );
-
-
   {
     /* Find the type of the first variable (it's invariant that
        all variables are of the same type) */
@@ -576,7 +399,7 @@ run_old_and_new_dialog (PsppireDialogActionRecode *rd)
   psppire_acr_set_model (PSPPIRE_ACR (rd->acr), NULL);
 
 
-  if ( response == PSPPIRE_RESPONSE_CONTINUE )
+  if (response == PSPPIRE_RESPONSE_CONTINUE)
     {
       g_object_unref (rd->value_map);
       rd->value_map = clone_list_store (local_store);
@@ -588,24 +411,6 @@ run_old_and_new_dialog (PsppireDialogActionRecode *rd)
   psppire_dialog_notify_change (PSPPIRE_DIALOG (pda->dialog));
 }
 
-static void
-on_old_new_show (PsppireDialogActionRecode *rd)
-{
-  gtk_toggle_button_set_active
-    (GTK_TOGGLE_BUTTON (rd->toggle[BUTTON_NEW_VALUE]), TRUE);
-
-  g_signal_emit_by_name (rd->toggle[BUTTON_NEW_VALUE], "toggled");
-
-  g_object_set (rd->toggle[BUTTON_NEW_COPY],
-               "visible", rd->different, NULL);
-
-  g_object_set (rd->new_copy_label,
-               "visible", rd->different, NULL);
-
-  g_object_set (rd->strings_box,
-               "visible", rd->different, NULL);
-}
-
 
 /* Sets the sensitivity of TARGET dependent upon the active status
    of BUTTON */
@@ -620,31 +425,6 @@ toggle_sensitivity (GtkToggleButton *button, GtkWidget *target)
   gtk_widget_set_sensitive (target, state);
 }
 
-static void
-render_new_var_name (GtkTreeViewColumn *tree_column,
-                    GtkCellRenderer *cell,
-                    GtkTreeModel *tree_model,
-                    GtkTreeIter *iter,
-                    gpointer data)
-{
-  struct nlp *nlp = NULL;
-  PsppireDialogActionRecode *rd = data;
-
-  struct variable *var = NULL;
-
-  gtk_tree_model_get (tree_model, iter, 
-                     0, &var,
-                     -1);
-
-  nlp = g_hash_table_lookup (rd->varmap, var);
-
-  if ( nlp )
-    g_object_set (cell, "text", nlp->name, NULL);
-  else
-    g_object_set (cell, "text", "", NULL);
-}
-
-
 
 \f
 
@@ -653,8 +433,8 @@ psppire_dialog_action_recode_class_init (PsppireDialogActionRecodeClass *class);
 
 G_DEFINE_TYPE (PsppireDialogActionRecode, psppire_dialog_action_recode, PSPPIRE_TYPE_DIALOG_ACTION);
 
-static void
-refresh (PsppireDialogAction *rd_)
+void
+psppire_dialog_action_recode_refresh (PsppireDialogAction *rd_)
 {
   PsppireDialogActionRecode *rd = PSPPIRE_DIALOG_ACTION_RECODE (rd_);
 
@@ -666,188 +446,129 @@ refresh (PsppireDialogAction *rd_)
   gtk_widget_set_sensitive (rd->change_button, FALSE);
   gtk_widget_set_sensitive (rd->new_name_entry, FALSE);
   gtk_widget_set_sensitive (rd->new_label_entry, FALSE);
-
-  if ( rd->different && rd->varmap )
-    g_hash_table_remove_all (rd->varmap);
+  gtk_widget_set_sensitive (rd->old_and_new, FALSE);
 
   gtk_list_store_clear (GTK_LIST_STORE (rd->value_map));
 }
 
 
-
-static void
-psppire_dialog_action_recode_activate (PsppireDialogAction *a)
+GtkBuilder *
+psppire_dialog_action_recode_pre_activate (PsppireDialogActionRecode *act,
+                                          void (*populate_treeview) (PsppireDialogActionRecode *))
 {
-  PsppireDialogActionRecode *act = PSPPIRE_DIALOG_ACTION_RECODE (a);
-  PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
+  PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (act);
 
-  GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
-  GtkBuilder *xml = g_hash_table_lookup (thing, a);
-  if (!xml)
-    {
-      xml = builder_new ("recode.ui");
-      g_hash_table_insert (thing, a, xml);
+  GtkBuilder *xml = builder_new ("recode.ui");
 
-      pda->dialog = get_widget_assert   (xml, "recode-dialog");
-      pda->source = get_widget_assert   (xml, "treeview1");
+  pda->dialog = get_widget_assert   (xml, "recode-dialog");
+  pda->source = get_widget_assert   (xml, "treeview1");
 
-  
-      GtkWidget *selector = get_widget_assert (xml, "psppire-selector1");
-      GtkWidget *oldandnew = get_widget_assert (xml, "button1");
 
+  GtkWidget *selector = get_widget_assert (xml, "psppire-selector1");
+  act->old_and_new  = get_widget_assert (xml, "button1");
 
-      GtkWidget *output_variable_box = get_widget_assert (xml,"frame4");
+  act->output_variable_box = get_widget_assert (xml,"frame4");
 
-      act->change_button = get_widget_assert (xml, "change-button");
-      act->varmap = NULL;
-      act->variable_treeview =   get_widget_assert (xml, "treeview2");
-      act->new_name_entry = get_widget_assert (xml, "dest-name-entry");
-      act->new_label_entry = get_widget_assert (xml, "dest-label-entry");
+  act->change_button = get_widget_assert (xml, "change-button");
+  act->variable_treeview =   get_widget_assert (xml, "treeview2");
+  act->new_name_entry = get_widget_assert (xml, "dest-name-entry");
+  act->new_label_entry = get_widget_assert (xml, "dest-label-entry");
 
-      act->value_map = gtk_list_store_new (2,
-                                          old_value_get_type (),
-                                          new_value_get_type ());
+  act->value_map = gtk_list_store_new (2,
+                                      old_value_get_type (),
+                                      new_value_get_type ());
 
-      if (act->different)
-       gtk_window_set_title (GTK_WINDOW (pda->dialog),
-                             _("Recode into Different Variables"));
-      else
-       gtk_window_set_title (GTK_WINDOW (pda->dialog),
-                             _("Recode into Same Variables"));
+  if (populate_treeview)
+    populate_treeview (act);
 
-      g_object_set (output_variable_box, "visible", act->different, NULL);
+  psppire_selector_set_allow (PSPPIRE_SELECTOR (selector), homogeneous_types);
 
-      if (act->different)
-       {
-         GtkTreeSelection *sel;
-
-         GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
-
-         GtkTreeViewColumn *col = gtk_tree_view_column_new_with_attributes (_("New"),
-                                                                            renderer,
-                                                                            "text", NULL,
-                                                                            NULL);
-
-         gtk_tree_view_column_set_cell_data_func (col, renderer,
-                                                  render_new_var_name,
-                                                  act, NULL);
-
-
-         gtk_tree_view_append_column (GTK_TREE_VIEW (act->variable_treeview), col);
-
-
-         col = gtk_tree_view_get_column (GTK_TREE_VIEW (act->variable_treeview), 0);
-
-         g_object_set (col, "title", _("Old"), NULL);
-
-         g_object_set (act->variable_treeview, "headers-visible", TRUE, NULL);
-
-         act->varmap = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, nlp_destroy);
-
-         sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (act->variable_treeview));
-
-         g_signal_connect (sel, "changed",
-                           G_CALLBACK (on_selection_change), act);
-
-         g_signal_connect (act->change_button, "clicked",
-                           G_CALLBACK (on_change_clicked),  act);
-       }
-
-      
-      psppire_selector_set_allow (PSPPIRE_SELECTOR (selector), homogeneous_types);
-
-      /* Set up the Old & New Values subdialog */
-      {
-       act->string_button = get_widget_assert (xml, "checkbutton1");
-       act->width_entry   = get_widget_assert (xml, "spinbutton1");
+  /* Set up the Old & New Values subdialog */
+  {
+    act->string_button = get_widget_assert (xml, "checkbutton1");
+    act->width_entry   = get_widget_assert (xml, "spinbutton1");
 
-       act->convert_button = get_widget_assert (xml, "checkbutton2");
+    act->convert_button = get_widget_assert (xml, "checkbutton2");
 
-       act->old_value_chooser = get_widget_assert (xml, "val-chooser");
+    act->old_value_chooser = get_widget_assert (xml, "val-chooser");
 
-       act->new_value_entry = get_widget_assert (xml, "entry1");
+    act->new_value_entry = get_widget_assert (xml, "entry1");
 
 
-       act->toggle[BUTTON_NEW_VALUE]  = get_widget_assert (xml, "radiobutton1");
-       act->toggle[BUTTON_NEW_SYSMIS] = get_widget_assert (xml, "radiobutton2");
-       act->toggle[BUTTON_NEW_COPY]   = get_widget_assert (xml, "radiobutton3");
+    act->toggle[BUTTON_NEW_VALUE]  = get_widget_assert (xml, "radiobutton1");
+    act->toggle[BUTTON_NEW_SYSMIS] = get_widget_assert (xml, "radiobutton2");
+    act->toggle[BUTTON_NEW_COPY]   = get_widget_assert (xml, "radiobutton3");
 
-       act->new_copy_label = get_widget_assert (xml, "label3");
-       act->strings_box    = get_widget_assert (xml, "table3");
+    act->new_copy_label = get_widget_assert (xml, "label3");
+    act->strings_box    = get_widget_assert (xml, "table3");
 
-       act->old_and_new_dialog =
-         PSPPIRE_DIALOG (get_widget_assert (xml, "old-new-values-dialog"));
+    act->old_and_new_dialog =
+      PSPPIRE_DIALOG (get_widget_assert (xml, "old-new-values-dialog"));
 
-       act->acr = get_widget_assert (xml, "psppire-acr1");
+    act->acr = get_widget_assert (xml, "psppire-acr1");
 
-       g_signal_connect_swapped (act->toggle[BUTTON_NEW_VALUE], "toggled",
-                                 G_CALLBACK (set_acr), act);
+    g_signal_connect_swapped (act->toggle[BUTTON_NEW_VALUE], "toggled",
+                             G_CALLBACK (set_acr), act);
 
-       g_signal_connect_after (act->toggle[BUTTON_NEW_VALUE], "toggled",
-                               G_CALLBACK (focus_value_entry), act);
+    g_signal_connect_after (act->toggle[BUTTON_NEW_VALUE], "toggled",
+                           G_CALLBACK (focus_value_entry), act);
 
-       g_signal_connect_swapped (act->new_value_entry, "changed",
-                                 G_CALLBACK (set_acr), act);
+    g_signal_connect_swapped (act->new_value_entry, "changed",
+                             G_CALLBACK (set_acr), act);
 
-       {
-         GtkTreeSelection *sel;
-         /* Remove the ACR's default column.  We don't like it */
-         GtkTreeViewColumn *column = gtk_tree_view_get_column (PSPPIRE_ACR(act->acr)->tv, 0);
-         gtk_tree_view_remove_column (PSPPIRE_ACR (act->acr)->tv, column);
+    {
+      GtkTreeSelection *sel;
+      /* Remove the ACR's default column.  We don't like it */
+      GtkTreeViewColumn *column = gtk_tree_view_get_column (PSPPIRE_ACR(act->acr)->tv, 0);
+      gtk_tree_view_remove_column (PSPPIRE_ACR (act->acr)->tv, column);
 
 
-         column =
-           gtk_tree_view_column_new_with_attributes (_("Old"),
-                                                     gtk_cell_renderer_text_new (),
-                                                     "text", 0,
-                                                     NULL);
+      column =
+       gtk_tree_view_column_new_with_attributes (_("Old"),
+                                                 gtk_cell_renderer_text_new (),
+                                                 "text", 0,
+                                                 NULL);
 
-         gtk_tree_view_append_column (PSPPIRE_ACR (act->acr)->tv, column);
+      gtk_tree_view_append_column (PSPPIRE_ACR (act->acr)->tv, column);
 
-         column =
-           gtk_tree_view_column_new_with_attributes (_("New"),
-                                                     gtk_cell_renderer_text_new (),
-                                                     "text", 1,
-                                                     NULL);
+      column =
+       gtk_tree_view_column_new_with_attributes (_("New"),
+                                                 gtk_cell_renderer_text_new (),
+                                                 "text", 1,
+                                                 NULL);
 
-         gtk_tree_view_append_column (PSPPIRE_ACR(act->acr)->tv, column);
-         g_object_set (PSPPIRE_ACR (act->acr)->tv, "headers-visible", TRUE, NULL);
+      gtk_tree_view_append_column (PSPPIRE_ACR(act->acr)->tv, column);
+      g_object_set (PSPPIRE_ACR (act->acr)->tv, "headers-visible", TRUE, NULL);
 
 
-         sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (PSPPIRE_ACR(act->acr)->tv));
-         g_signal_connect (sel, "changed",
-                           G_CALLBACK (on_acr_selection_change), act);
-       }
+      sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (PSPPIRE_ACR(act->acr)->tv));
+      g_signal_connect (sel, "changed",
+                       G_CALLBACK (on_acr_selection_change), act);
+    }
 
 
-       g_signal_connect_swapped (oldandnew, "clicked",
-                                 G_CALLBACK (run_old_and_new_dialog), act);
+    g_signal_connect_swapped (act->old_and_new, "clicked",
+                             G_CALLBACK (run_old_and_new_dialog), act);
 
 
-       g_signal_connect (act->toggle[BUTTON_NEW_VALUE], "toggled",
-                         G_CALLBACK (toggle_sensitivity), act->new_value_entry);
+    GtkTreeSelection *sel =
+      gtk_tree_view_get_selection (GTK_TREE_VIEW (act->variable_treeview));
+    g_signal_connect (sel, "changed",
+                      G_CALLBACK (set_old_and_new_button_sensitivity), act);
 
-       g_signal_connect (act->string_button, "toggled",
-                         G_CALLBACK (toggle_sensitivity), act->width_entry);
+    g_signal_connect (act->toggle[BUTTON_NEW_VALUE], "toggled",
+                     G_CALLBACK (toggle_sensitivity), act->new_value_entry);
 
-       g_signal_connect (act->string_button, "toggled",
-                         G_CALLBACK (on_string_toggled), act);
+    g_signal_connect (act->string_button, "toggled",
+                     G_CALLBACK (toggle_sensitivity), act->width_entry);
 
-       g_signal_connect (act->convert_button, "toggled",
-                         G_CALLBACK (on_convert_toggled), act);
+    g_signal_connect (act->string_button, "toggled",
+                     G_CALLBACK (on_string_toggled), act);
 
-       g_signal_connect_swapped (act->old_and_new_dialog, "show",
-                                 G_CALLBACK (on_old_new_show), act);
-      }
+    g_signal_connect (act->convert_button, "toggled",
+                     G_CALLBACK (on_convert_toggled), act);
     }
-
-  psppire_dialog_action_set_refresh (pda, refresh);
-
-  psppire_dialog_action_set_valid_predicate (pda,
-                                       dialog_state_valid);
-
-  if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_recode_parent_class)->activate)
-    PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_recode_parent_class)->activate (pda);
+  return xml;
 }
 
 /* Generate a syntax fragment for NV and append it to STR */
@@ -877,8 +598,11 @@ new_value_append_syntax (struct string *dds, const struct new_value *nv)
 }
 
 
-static char *
-generate_syntax (PsppireDialogAction *act)
+char *
+psppire_dialog_action_recode_generate_syntax (const PsppireDialogAction *act,
+                                             void (*append_string_decls) (const PsppireDialogActionRecode *, struct string *),
+                                             void (*append_into_clause) (const PsppireDialogActionRecode *, struct string *),
+                                             void (*append_new_value_labels) (const PsppireDialogActionRecode *, struct string *))
 {
   PsppireDialogActionRecode *rd = PSPPIRE_DIALOG_ACTION_RECODE (act);
   gboolean ok;
@@ -888,27 +612,7 @@ generate_syntax (PsppireDialogAction *act)
 
   ds_init_empty (&dds);
 
-
-  /* Declare new string variables if applicable */
-  if ( rd->different &&
-       gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->string_button)))
-    {
-      GHashTableIter iter;
-
-      struct variable *var = NULL;
-      struct nlp *nlp = NULL;
-
-      g_hash_table_iter_init (&iter, rd->varmap);
-      while (g_hash_table_iter_next (&iter, (void**) &var, (void**) &nlp))
-       {
-         ds_put_cstr (&dds, "\nSTRING ");
-         ds_put_cstr (&dds, nlp->name);
-         ds_put_c_format (&dds, " (A%d).",
-                                 (int)
-                                 gtk_spin_button_get_value (GTK_SPIN_BUTTON (rd->width_entry) )
-                                 );
-       }
-    }
+  append_string_decls (rd, &dds);
 
   ds_put_cstr (&dds, "\nRECODE ");
 
@@ -916,7 +620,7 @@ generate_syntax (PsppireDialogAction *act)
 
   ds_put_cstr (&dds, "\n\t");
 
-  if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->convert_button)))
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->convert_button)))
     {
       ds_put_cstr (&dds, "(CONVERT) ");
     }
@@ -950,52 +654,11 @@ generate_syntax (PsppireDialogAction *act)
       g_value_unset (&nv_value);
     }
 
-
-  if ( rd->different )
-    {
-
-      GtkTreeIter iter;
-      ds_put_cstr (&dds, "\n\tINTO ");
-
-      for (ok = psppire_var_view_get_iter_first (PSPPIRE_VAR_VIEW (rd->variable_treeview), &iter);
-          ok;
-          ok = psppire_var_view_get_iter_next (PSPPIRE_VAR_VIEW (rd->variable_treeview), &iter))
-         {
-           struct nlp *nlp = NULL;
-           const struct variable *var = psppire_var_view_get_variable (PSPPIRE_VAR_VIEW (rd->variable_treeview), 0, &iter);
-
-           nlp = g_hash_table_lookup (rd->varmap, var);
-           
-           ds_put_cstr (&dds, nlp->name);
-           ds_put_cstr (&dds, " ");
-         }
-    }
+  append_into_clause (rd, &dds);
 
   ds_put_cstr (&dds, ".");
 
-  /* If applicable, set labels for the new variables. */
-  if ( rd->different )
-    {
-      GHashTableIter iter;
-
-      struct variable *var = NULL;
-      struct nlp *nlp = NULL;
-
-      g_hash_table_iter_init (&iter, rd->varmap);
-      while (g_hash_table_iter_next (&iter, (void**) &var, (void**) &nlp))
-       {
-         if (nlp->label)
-           {
-             struct string sl;
-             ds_init_empty (&sl);
-             syntax_gen_string (&sl, ss_cstr (nlp->label));
-             ds_put_c_format (&dds, "\nVARIABLE LABELS %s %s.",
-                                     nlp->name, ds_cstr (&sl));
-
-             ds_destroy (&sl);
-           }
-       }
-    }
+  append_new_value_labels (rd, &dds);
 
   ds_put_cstr (&dds, "\nEXECUTE.\n");
 
@@ -1008,75 +671,9 @@ generate_syntax (PsppireDialogAction *act)
 }
 
 
-enum
-{
-  PROP_0,
-  PROP_DIFF
-};
-
-static void
-__set_property (GObject         *object,
-               guint            prop_id,
-               const GValue    *value,
-               GParamSpec      *pspec)
-{
-  PsppireDialogActionRecode *act = PSPPIRE_DIALOG_ACTION_RECODE (object);
-
-  switch (prop_id)
-    {
-    case PROP_DIFF:
-      act->different = g_value_get_boolean (value);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    };
-}
-
-
-static void
-__get_property (GObject         *object,
-               guint            prop_id,
-               GValue          *value,
-               GParamSpec      *pspec)
-{
-  PsppireDialogActionRecode *act = PSPPIRE_DIALOG_ACTION_RECODE (object);
-
-  switch (prop_id)
-    {
-    case PROP_DIFF:
-      g_value_set_boolean (value, act->different);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    };
-}
-
-
 static void
 psppire_dialog_action_recode_class_init (PsppireDialogActionRecodeClass *class)
 {
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-
-  psppire_dialog_action_set_activation (class, psppire_dialog_action_recode_activate);
-
-  PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
-
-  GParamSpec *diff_spec =
-    g_param_spec_boolean ("recode-to-new-variable",
-                         "Recode to New Variable",
-                         "True iff the new values should be placed in a new variable",
-                         FALSE,
-                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-
-
-  object_class->set_property = __set_property;
-  object_class->get_property = __get_property;
-  
-  g_object_class_install_property (object_class,
-                                   PROP_DIFF,
-                                   diff_spec);
 }