Added dialog box for the AUTORECODE command. Closes bug #30009
authorJohn Darrington <john@darrington.wattle.id.au>
Sun, 3 Jul 2011 13:54:27 +0000 (15:54 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Sun, 3 Jul 2011 13:54:27 +0000 (15:54 +0200)
src/ui/gui/automake.mk
src/ui/gui/autorecode-dialog.c [new file with mode: 0644]
src/ui/gui/autorecode-dialog.h [new file with mode: 0644]
src/ui/gui/autorecode.ui [new file with mode: 0644]
src/ui/gui/data-editor.ui
src/ui/gui/psppire-data-window.c

index f02f85bdcd80db6c54d808310ee843920c1a77c8..9f34620016931078dfd2875d484e72f1df27594e 100644 (file)
@@ -4,6 +4,7 @@ include $(top_srcdir)/src/ui/gui/sheet/automake.mk
 
 UI_FILES = \
        src/ui/gui/aggregate.ui \
+       src/ui/gui/autorecode.ui \
        src/ui/gui/binomial.ui \
        src/ui/gui/compute.ui \
        src/ui/gui/correlation.ui \
@@ -121,6 +122,8 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-hbuttonbox.c \
        src/ui/gui/psppire-vbuttonbox.c \
        src/ui/gui/psppire-acr.c \
+       src/ui/gui/autorecode-dialog.c \
+       src/ui/gui/autorecode-dialog.h \
        src/ui/gui/aggregate-dialog.c \
        src/ui/gui/aggregate-dialog.h \
        src/ui/gui/binomial-dialog.c \
diff --git a/src/ui/gui/autorecode-dialog.c b/src/ui/gui/autorecode-dialog.c
new file mode 100644 (file)
index 0000000..6780bc7
--- /dev/null
@@ -0,0 +1,404 @@
+/* PSPPIRE - a graphical user interface for PSPP.
+   Copyright (C) 2011  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
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+
+#include <config.h>
+
+#include "dialog-common.h"
+#include "autorecode-dialog.h"
+#include "psppire-selector.h"
+#include "psppire-dictview.h"
+#include "psppire-var-ptr.h"
+#include "psppire-dialog.h"
+
+#include "psppire-data-window.h"
+#include "psppire-var-view.h"
+
+#include "executor.h"
+#include "helper.h"
+
+#include <gtk/gtk.h>
+
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
+
+/* Name-Label pair */
+struct nlp
+{
+  char *name;
+  char *label;
+};
+
+struct autorecode
+{
+  PsppireDict *dict;
+  GtkWidget *change_button;
+  GtkWidget *new_name_entry;
+  GtkWidget *var_view;
+
+  /* A hash table of struct nlp's indexed by variable */
+  GHashTable *varmap;
+
+  GtkWidget *ascending;
+  GtkWidget *group;
+  GtkWidget *blank;
+};
+
+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 ( label != NULL && 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);
+}
+
+static void
+on_change_clicked (GObject *obj, gpointer data)
+{
+  struct autorecode *rd = data;
+  struct variable *var = NULL;
+  struct nlp *nlp;
+  GtkTreeModel *model = GTK_TREE_MODEL (PSPPIRE_VAR_VIEW (rd->var_view)->list);
+  GtkTreeIter iter;
+  GtkTreeSelection *selection =
+    gtk_tree_view_get_selection (GTK_TREE_VIEW (rd->var_view));
+
+  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));
+
+  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, NULL);
+
+  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 char * generate_syntax (const struct autorecode *rd);
+
+
+static void
+refresh (PsppireDialog *dialog, struct autorecode *rd)
+{
+  GtkTreeModel *target_list = gtk_tree_view_get_model (GTK_TREE_VIEW (rd->var_view));
+
+  gtk_entry_set_text (GTK_ENTRY (rd->new_name_entry), "");
+  gtk_widget_set_sensitive  (rd->new_name_entry, FALSE);
+  gtk_widget_set_sensitive  (rd->change_button, FALSE);
+
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rd->ascending), TRUE);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rd->group), FALSE);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rd->blank), FALSE);
+
+  if (rd->varmap )
+    g_hash_table_remove_all (rd->varmap);
+
+  gtk_list_store_clear (GTK_LIST_STORE (target_list));
+}
+
+
+static gboolean
+dialog_state_valid (gpointer data)
+{
+  struct autorecode *rd = data;
+
+  GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (rd->var_view));
+
+  if (g_hash_table_size (rd->varmap) != gtk_tree_model_iter_n_children (model, NULL) )
+    return FALSE;
+
+ return TRUE;
+}
+
+
+static void
+on_entry_change (struct autorecode *rd)
+{
+  gboolean valid = TRUE;
+  const char *text = gtk_entry_get_text (GTK_ENTRY (rd->new_name_entry));
+
+  if ( 0 == strcmp ("", text))
+    valid = FALSE;
+  else if (psppire_dict_lookup_var (rd->dict, text))
+    valid = FALSE;
+  else
+    {
+      GHashTableIter iter;
+      gpointer key, value;
+
+      g_hash_table_iter_init (&iter, rd->varmap);
+      while (g_hash_table_iter_next (&iter, &key, &value)) 
+       {
+         struct nlp *nlp = value;
+         
+         if ( 0 == strcmp (nlp->name, text))
+           {
+             valid = FALSE;
+             break;
+           }
+
+       }
+    }
+
+  gtk_widget_set_sensitive  (rd->change_button, valid);
+}
+
+/* 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)
+{
+  struct autorecode *rd = data;
+  GtkTreeModel *model = GTK_TREE_MODEL (PSPPIRE_VAR_VIEW (rd->var_view)->list);
+  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->new_name_entry, TRUE);
+      gtk_widget_set_sensitive  (rd->change_button, TRUE);      
+
+
+      ok = gtk_tree_model_get_iter (model, &iter, (GtkTreePath*) rows->data);
+
+      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 : "");
+      else
+       gtk_entry_set_text (GTK_ENTRY (rd->new_name_entry), "");
+    }
+  else
+    {
+      gtk_entry_set_text (GTK_ENTRY (rd->new_name_entry), "");
+      gtk_widget_set_sensitive  (rd->new_name_entry, FALSE);
+      gtk_widget_set_sensitive  (rd->change_button, FALSE);
+    }
+
+  g_list_foreach (rows, (GFunc) gtk_tree_path_free, NULL);
+  g_list_free (rows);
+}
+
+static void
+render_new_var_name (GtkTreeViewColumn *tree_column,
+                    GtkCellRenderer *cell,
+                    GtkTreeModel *tree_model,
+                    GtkTreeIter *iter,
+                    gpointer data)
+{
+  struct nlp *nlp = NULL;
+  struct autorecode *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);
+}
+
+
+
+/* Pops up the Autorecode dialog box */
+void
+autorecode_dialog (PsppireDataWindow *de)
+{
+  struct autorecode rd;
+  gint response;
+
+  GtkBuilder *xml = builder_new ("autorecode.ui");
+  PsppireVarStore *vs;
+
+  GtkWidget *dialog = get_widget_assert   (xml, "autorecode-dialog");
+  GtkWidget *source = get_widget_assert   (xml, "dict-view");
+
+  rd.var_view = get_widget_assert   (xml, "var-view");
+
+  rd.new_name_entry = get_widget_assert (xml, "entry1");
+  rd.change_button = get_widget_assert (xml, "button1");
+  rd.ascending = get_widget_assert (xml, "radiobutton1");
+  rd.group = get_widget_assert (xml, "checkbutton1");
+  rd.blank = get_widget_assert (xml, "checkbutton2");
+
+    {
+      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,
+                                              &rd, NULL);
+
+      gtk_tree_view_append_column (GTK_TREE_VIEW (rd.var_view), col);
+
+
+      col = gtk_tree_view_get_column (GTK_TREE_VIEW (rd.var_view), 0);
+
+      g_object_set (col, "title", _("Old"), NULL);
+
+      g_object_set (rd.var_view, "headers-visible", TRUE, NULL);
+
+      rd.varmap = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, nlp_destroy);
+
+
+      sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (rd.var_view));
+
+
+      g_signal_connect (sel, "changed",
+                       G_CALLBACK (on_selection_change), &rd);
+
+      g_signal_connect (rd.change_button, "clicked",
+                       G_CALLBACK (on_change_clicked),  &rd);
+
+      g_signal_connect_swapped (rd.new_name_entry, "changed",
+                       G_CALLBACK (on_entry_change),  &rd);
+
+    }
+
+  g_object_get (de->data_editor, "var-store", &vs, NULL);
+
+  gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
+
+  g_object_get (vs, "dictionary", &rd.dict, NULL);
+  g_object_set (source, "model", rd.dict, NULL);
+
+
+  g_signal_connect (dialog, "refresh", G_CALLBACK (refresh),  &rd);
+
+  psppire_dialog_set_valid_predicate (PSPPIRE_DIALOG (dialog),
+                                     dialog_state_valid, &rd);
+
+  response = psppire_dialog_run (PSPPIRE_DIALOG (dialog));
+
+
+  switch (response)
+    {
+    case GTK_RESPONSE_OK:
+      g_free (execute_syntax_string (de, generate_syntax (&rd)));
+      break;
+    case PSPPIRE_RESPONSE_PASTE:
+      g_free (paste_syntax_to_window (generate_syntax (&rd)));
+      break;
+    default:
+      break;
+    }
+
+  g_object_unref (xml);
+}
+
+
+\f
+
+static char *
+generate_syntax (const struct autorecode *rd)
+{
+  GHashTableIter iter;
+  gpointer key, value;
+  gchar *text;
+  GString *string = g_string_new ("AUTORECODE");
+
+  g_string_append (string, "\n\tVARIABLES =");
+
+  g_hash_table_iter_init (&iter, rd->varmap);
+  while (g_hash_table_iter_next (&iter, &key, &value)) 
+  {
+    struct variable *var = key;
+    g_string_append (string, " ");
+    g_string_append (string, var_get_name (var));
+  }
+
+  g_string_append (string, " INTO");
+
+  g_hash_table_iter_init (&iter, rd->varmap);
+  while (g_hash_table_iter_next (&iter, &key, &value)) 
+  {
+    struct nlp *nlp  = value;
+    g_string_append (string, " ");
+    g_string_append (string, nlp->name);
+  }
+
+  if ( ! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->ascending)))
+    g_string_append (string, "\n\t/DESCENDING");
+
+  if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->group)))
+    g_string_append (string, "\n\t/GROUP");
+
+  if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->blank)))
+    g_string_append (string, "\n\t/BLANK");
+
+  g_string_append (string, ".\n");
+
+  text = string->str;
+
+  g_string_free (string, FALSE);
+
+  return text;
+}
diff --git a/src/ui/gui/autorecode-dialog.h b/src/ui/gui/autorecode-dialog.h
new file mode 100644 (file)
index 0000000..7127b00
--- /dev/null
@@ -0,0 +1,24 @@
+/* PSPPIRE - a graphical user interface for PSPP.
+   Copyright (C) 2011  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
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+
+#ifndef AUTORECODE_H
+#define AUTORECODE_H 1
+
+#include "psppire-data-window.h"
+
+void autorecode_dialog (PsppireDataWindow *de);
+
+#endif
diff --git a/src/ui/gui/autorecode.ui b/src/ui/gui/autorecode.ui
new file mode 100644 (file)
index 0000000..9b4a2e8
--- /dev/null
@@ -0,0 +1,291 @@
+<?xml version="1.0"?>
+<interface>
+  <!-- interface-requires psppire 0.0 -->
+  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-naming-policy project-wide -->
+  <object class="PsppireDialog" id="autorecode-dialog">
+    <property name="title" translatable="yes">Automatic Recode</property>
+    <property name="modal">True</property>
+    <child internal-child="hbox">
+      <object class="GtkHBox" id="dialog-hbox1">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <object class="GtkVBox" id="vbox1">
+            <property name="visible">True</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkTable" id="table1">
+                <property name="visible">True</property>
+                <property name="n_rows">3</property>
+                <property name="n_columns">3</property>
+                <property name="row_spacing">5</property>
+                <child>
+                  <object class="GtkScrolledWindow" id="scrolledwindow1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="hscrollbar_policy">never</property>
+                    <property name="vscrollbar_policy">automatic</property>
+                    <property name="shadow_type">in</property>
+                    <child>
+                      <object class="PsppireDictView" id="dict-view">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="has_tooltip">True</property>
+                        <property name="border_width">5</property>
+                        <property name="headers_visible">False</property>
+                        <property name="headers_clickable">False</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="bottom_attach">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="PsppireSelector" id="psppire-selector1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="border_width">5</property>
+                    <property name="source_widget">dict-view</property>
+                    <property name="dest_widget">var-view</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="x_options"></property>
+                    <property name="y_options">GTK_EXPAND</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkFrame" id="frame1">
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
+                    <child>
+                      <object class="GtkAlignment" id="alignment1">
+                        <property name="visible">True</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkScrolledWindow" id="scrolledwindow2">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="hscrollbar_policy">automatic</property>
+                            <property name="vscrollbar_policy">automatic</property>
+                            <property name="shadow_type">in</property>
+                            <child>
+                              <object class="PsppireVarView" id="var-view">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="border_width">5</property>
+                                <property name="headers_clickable">False</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="label1">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Variable -&gt; New Name</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="right_attach">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkFrame" id="frame2">
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <child>
+                      <object class="GtkAlignment" id="alignment2">
+                        <property name="visible">True</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkHButtonBox" id="hbuttonbox1">
+                            <property name="visible">True</property>
+                            <child>
+                              <object class="GtkRadioButton" id="radiobutton1">
+                                <property name="label" translatable="yes">_Lowest value</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkRadioButton" id="radiobutton2">
+                                <property name="label" translatable="yes">_Highest value</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                                <property name="group">radiobutton1</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="label2">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Recode starting from</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="right_attach">3</property>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkTable" id="table2">
+                    <property name="visible">True</property>
+                    <property name="n_rows">2</property>
+                    <property name="n_columns">2</property>
+                    <property name="column_spacing">3</property>
+                    <child>
+                      <object class="GtkLabel" id="label3">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_New Name</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">entry1</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" id="entry1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="invisible_char">&#x25CF;</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="button1">
+                        <property name="label" translatable="yes">_Add New Name</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="use_underline">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="right_attach">3</property>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+              <packing>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkVButtonBox" id="vbuttonbox1">
+                <property name="visible">True</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkCheckButton" id="checkbutton1">
+                    <property name="label" translatable="yes">_Use the same recoding scheme for all variables</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="checkbutton2">
+                    <property name="label" translatable="yes">Treat _blank string values as missing</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="PsppireVButtonBox" id="psppire-vbuttonbox1">
+            <property name="visible">True</property>
+            <property name="border_width">5</property>
+            <property name="default">PSPPIRE_BUTTON_GOTO_MASK</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
index 83241ce556f82dc4c36edadc8c02966537d408f1..52a34131d3793db8d927b5a1178cd318325730bf 100644 (file)
             <property name="label" translatable="yes">Ran_k Cases...</property>
           </object>
         </child>
+        <child>
+          <object class="GtkAction" id="transform_autorecode">
+            <property name="name">transform_autorecode</property>
+            <property name="label" translatable="yes">Auto_matic Recode...</property>
+          </object>
+        </child>
         <child>
           <object class="GtkAction" id="transform_recode-same">
             <property name="name">transform_recode-same</property>
           <menuitem action="transform_compute"/>
           <menuitem action="transform_count"/>
           <menuitem action="transform_rank"/>
+          <menuitem action="transform_autorecode"/>
           <separator/>
           <menuitem action="transform_recode-same"/>
           <menuitem action="transform_recode-different"/>
index 647d073bf993d7cebdf27d45332597492680dd5f..0ed974e0b3553fc46a3b5baf6cfb2e380a1cb4c8 100644 (file)
@@ -25,6 +25,7 @@
 #include "libpspp/message.h"
 #include "libpspp/str.h"
 #include "ui/gui/aggregate-dialog.h"
+#include "ui/gui/autorecode-dialog.h"
 #include "ui/gui/binomial-dialog.h"
 #include "ui/gui/chi-square-dialog.h"
 #include "ui/gui/comments-dialog.h"
@@ -1068,6 +1069,8 @@ psppire_data_window_finish_init (PsppireDataWindow *de,
 
   connect_action (de, "transform_compute", G_CALLBACK (compute_dialog));
 
+  connect_action (de, "transform_autorecode", G_CALLBACK (autorecode_dialog));
+
   connect_action (de, "edit_find", G_CALLBACK (find_dialog));
 
   connect_action (de, "data_split-file", G_CALLBACK (split_file_dialog));