Merge commit 'HEAD'; commit 'savannah/master'

Conflicts:

	src/ui/gui/crosstabs-dialog.c
	src/ui/gui/goto-case-dialog.c
	src/ui/gui/helper.c
	src/ui/gui/output-viewer.c
	src/ui/gui/output-viewer.h
	src/ui/gui/psppire.c
	src/ui/gui/regression-dialog.c

diff --cc src/ui/gui/automake.mk
Simple merge

diff --cc src/ui/gui/comments-dialog.c
index 34c9957d4fea4ea659f56b7e02e9e91b090dc2df,f425fac2364d2d285429b6fdd48a4db9485d2b8d..49d143cb6c51f379df11ad5172c789fada53a7f6
--- 1/src/ui/gui/comments-dialog.c
--- 2/src/ui/gui/comments-dialog.c
+++ b/src/ui/gui/comments-dialog.c
@@@ -96,10 -94,10 +95,10 @@@ comments_dialog (GObject *o, gpointer d
  {
    GtkTextIter iter;
    gint response ;
 -  struct data_editor *de = data;
 +  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
    struct comment_dialog cd;
  
-   GladeXML *xml = XML_NEW ("psppire.glade");
+   GtkBuilder *xml = builder_new ("psppire.ui");
  
    GtkWidget *dialog = get_widget_assert (xml, "comments-dialog");
    GtkWidget *textview = get_widget_assert (xml, "comments-textview1");

diff --cc src/ui/gui/compute-dialog.c
Simple merge

diff --cc src/ui/gui/crosstabs-dialog.c
index 9654a27ccf90364a368cd89937999e9f8c39167b,2c50b461844d38de4587e1bcc9fcad01212b4d04..a3498d1f6d72c4b70b72a46ccc6569721898c29e
--- 1/src/ui/gui/crosstabs-dialog.c
--- 2/src/ui/gui/crosstabs-dialog.c
+++ b/src/ui/gui/crosstabs-dialog.c
@@@ -23,13 -23,13 +23,13 @@@
  #include <stdlib.h>
  
  #include <language/syntax-string-source.h>
 -#include <ui/gui/data-editor.h>
 +#include <ui/gui/psppire-data-window.h>
  #include <ui/gui/dialog-common.h>
  #include <ui/gui/dict-display.h>
- #include <ui/gui/helper.h>
+ #include "helper.h"
  #include <ui/gui/psppire-dialog.h>
  #include <ui/gui/psppire-var-store.h>
 -#include <ui/gui/syntax-editor.h>
 +#include <ui/gui/helper.h>
  
  #include "gettext.h"
  #define _(msgid) gettext (msgid)
@@@ -385,15 -385,13 +385,15 @@@ voi
  crosstabs_dialog (GObject *o, gpointer data)
  {
    gint response;
 -  struct data_editor *de = data;
 -
    struct crosstabs_dialog cd;
  
-   GladeXML *xml = XML_NEW ("crosstabs.glade");
+   GtkBuilder *xml = builder_new ("crosstabs.ui");
 +
    PsppireVarStore *vs = NULL;
  
 +  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
 +
 +
    GtkWidget *dialog = get_widget_assert   (xml, "crosstabs-dialog");
    GtkWidget *source = get_widget_assert   (xml, "dict-treeview");
    GtkWidget *dest_rows =   get_widget_assert   (xml, "rows");

diff --cc src/ui/gui/examine-dialog.c
Simple merge

diff --cc src/ui/gui/find-dialog.c
index ad9bf842efb447c9afa17927665a78da3bc9575e,985e73fbc321f8dc5793a2dab193f4edc634a19a..130b25cfafe54db8f73eca358dada6da80f77b41
--- 1/src/ui/gui/find-dialog.c
--- 2/src/ui/gui/find-dialog.c
+++ b/src/ui/gui/find-dialog.c
@@@ -52,10 -51,10 +51,10 @@@ which match particular strings *
  
  struct find_dialog
  {
-   GladeXML *xml;
+   GtkBuilder *xml;
    PsppireDict *dict;
    struct datasheet *data;
 -  struct data_editor *de;
 +  PsppireDataWindow *de;
    GtkWidget *variable_entry;
    GtkWidget *value_entry;
    GtkWidget *value_labels_checkbox;

diff --cc src/ui/gui/frequencies-dialog.c
Simple merge

diff --cc src/ui/gui/goto-case-dialog.c
index 57db586511f27992fc7b569da1564f0c6c479434,a22b5cb0ebe4077f202de1a35931950b13822118..9a523943b1c5686e639d4df34b56530d4f1b55a5
--- 1/src/ui/gui/goto-case-dialog.c
--- 2/src/ui/gui/goto-case-dialog.c
+++ b/src/ui/gui/goto-case-dialog.c
@@@ -24,7 -24,7 +24,7 @@@
  
  
  static void
- refresh (const PsppireDataWindow *de, GladeXML *xml)
 -refresh (const struct data_editor *de, GtkBuilder *xml)
++refresh (const PsppireDataWindow *de, GtkBuilder *xml)
  {
    PsppireDataStore *ds = NULL;
    casenumber case_count ;
@@@ -43,8 -43,8 +43,8 @@@ voi
  goto_case_dialog (GObject *o, gpointer data)
  {
    gint response;
-   GladeXML *xml = XML_NEW ("psppire.glade");
+   GtkBuilder *xml = builder_new ("psppire.ui");
 -  struct data_editor *de = data;
 +  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
  
    GtkWidget *dialog = get_widget_assert   (xml, "goto-case-dialog");
  

diff --cc src/ui/gui/helper.c
index 12003e2ac23f8a48ec17a348c8aaca970921dd67,fc9105d75921456a8f94ea41e1246d7065c59a55..6a3a0f9e6ce0b83ee360f62ca9f790205084da7e
--- 1/src/ui/gui/helper.c
--- 2/src/ui/gui/helper.c
+++ b/src/ui/gui/helper.c
@@@ -300,13 -320,3 +322,12 @@@ clone_list_store (const GtkListStore *s
  
  
  
- 
 +void
 +paste_syntax_in_new_window (const gchar *syntax)
 +{
 +  GtkWidget *se = psppire_syntax_window_new ();
 +
 +  gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1);
 +
 +  gtk_widget_show (se);
 +}

diff --cc src/ui/gui/helper.h
Simple merge

diff --cc src/ui/gui/oneway-anova-dialog.c
index 45e888074cb586cc74f7de93fde4daedce62051a,59b65b4a2487dfc1ce793381d407cc1e6cb402f9..d41b2760aa97630510ca82315ae96c1b1eb1f87c
--- 1/src/ui/gui/oneway-anova-dialog.c
--- 2/src/ui/gui/oneway-anova-dialog.c
+++ b/src/ui/gui/oneway-anova-dialog.c
@@@ -166,9 -166,9 +166,9 @@@ oneway_anova_dialog (GObject *o, gpoint
    ow.dict = vs->dict;
  
    ow.dialog =
-     GTK_WINDOW (get_widget_assert (xml, "oneway-anova-dialog"));
+     GTK_WINDOW (get_widget_assert (builder, "oneway-anova-dialog"));
  
 -  gtk_window_set_transient_for (ow.dialog, de->parent.window);
 +  gtk_window_set_transient_for (ow.dialog, GTK_WINDOW (de));
  
    attach_dictionary_to_treeview (GTK_TREE_VIEW (dict_view),
                                 vs->dict,

diff --cc src/ui/gui/psppire-data-store.c
Simple merge

diff --cc src/ui/gui/psppire.c
index 62117a01bc0bbfc779476da08d3117a0913d59ad,9dd3b71372f6334fea60115c325aa35724353f06..bdd5ad5332f4062d4b0bf6927a42ea2b57223d30
--- 1/src/ui/gui/psppire.c
--- 2/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@@ -80,6 -77,6 +79,10 @@@ replace_casereader (struct casereader *
  #define _(msgid) gettext (msgid)
  #define N_(msgid) msgid
  
++
++const char * output_file_name (void);
++
++
  void
  initialize (struct command_line_processor *clp, int argc, char **argv)
  {
@@@ -119,24 -116,33 +122,33 @@@
    the_data_store = psppire_data_store_new (dictionary);
    replace_casereader (NULL);
  
 -
 -
    create_icon_factory ();
  
-   outp_configure_driver_line (
-     ss_cstr ("gui:ascii:screen:squeeze=on headers=off top-margin=0 "
-              "bottom-margin=0 paginate=off length=auto width=auto "
-            "emphasis=none "
-              "output-file=\"" OUTPUT_FILE_NAME "\" append=yes"));
+   {
+     const char *filename = output_file_name ();
+ 
+     struct string config_string;
+ 
+     ds_init_empty (&config_string);
+ 
+     ds_put_format (&config_string,
+                  "gui:ascii:screen:squeeze=on headers=off top-margin=0 "
+                  "bottom-margin=0 paginate=off length=auto width=auto "
+                  "emphasis=none "
+                  "output-file=\"%s\" append=yes", filename);
+ 
+     outp_configure_driver_line (ds_ss (&config_string));
+ 
+     unlink (filename);
  
-   unlink (OUTPUT_FILE_NAME);
+     ds_destroy (&config_string);
+   }
  
    journal_enable ();
    textdomain (PACKAGE);
  
-   /* Ignore alarm clock signals */
-   signal (SIGALRM, SIG_IGN);
- 
 +  the_data_window = psppire_data_window_new ();
 +
    command_line_processor_replace_aux (clp, &post_init_argp, the_source_stream);
    command_line_processor_replace_aux (clp, &non_option_argp, the_source_stream);
  
@@@ -295,3 -298,3 +307,17 @@@ parse_non_options (int key, char *arg, 
  
  
  const struct argp non_option_argp = {NULL, parse_non_options, 0, 0, 0, 0, 0};
++
++
++const char *
++output_file_name (void)
++{
++  const char *dir = default_output_path ();
++  static char *filename = NULL;
++
++  if ( NULL == filename )
++    filename = xasprintf ("%s%s", dir, OUTPUT_FILE_NAME);
++
++
++  return filename;
++}

diff --cc src/ui/gui/rank-dialog.c
Simple merge

diff --cc src/ui/gui/recode-dialog.c
index 642dae02d4a01283276c86356618b79cf7689603,9d1ad79d6efcc4e29ef87e27bcc24b2d1be0d225..859737f63e7d4d7895c1347f2a585c60d28cb5ab
--- 1/src/ui/gui/recode-dialog.c
--- 2/src/ui/gui/recode-dialog.c
+++ b/src/ui/gui/recode-dialog.c
@@@ -963,40 -962,40 +962,40 @@@ recode_dialog (PsppireDataWindow *de, g
  
    /* Set up the Old & New Values subdialog */
    {
-     rd.string_button = get_widget_assert (xml, "checkbutton1");
-     rd.width_entry   = get_widget_assert (xml, "spinbutton1");
+     rd.string_button = get_widget_assert (builder, "checkbutton1");
+     rd.width_entry   = get_widget_assert (builder, "spinbutton1");
  
-     rd.convert_button           = get_widget_assert (xml, "checkbutton2");
+     rd.convert_button           = get_widget_assert (builder, "checkbutton2");
  
-     rd.ov_range_lower_entry = get_widget_assert (xml, "entry5");
-     rd.ov_range_upper_entry  = get_widget_assert (xml, "entry3");
-     rd.ov_low_up_entry       = get_widget_assert (xml, "entry6");
-     rd.ov_high_down_entry    = get_widget_assert (xml, "entry7");
+     rd.ov_range_lower_entry = get_widget_assert (builder, "entry5");
+     rd.ov_range_upper_entry  = get_widget_assert (builder, "entry3");
+     rd.ov_low_up_entry       = get_widget_assert (builder, "entry6");
+     rd.ov_high_down_entry    = get_widget_assert (builder, "entry7");
  
-     rd.new_value_entry = get_widget_assert (xml, "entry1");
-     rd.ov_value_entry  = get_widget_assert (xml, "entry2");
+     rd.new_value_entry = get_widget_assert (builder, "entry1");
+     rd.ov_value_entry  = get_widget_assert (builder, "entry2");
  
-     rd.toggle[BUTTON_NEW_VALUE]  = get_widget_assert (xml, "radiobutton1");
-     rd.toggle[BUTTON_NEW_SYSMIS] = get_widget_assert (xml, "radiobutton2");
-     rd.toggle[BUTTON_NEW_COPY]   = get_widget_assert (xml, "radiobutton3");
-     rd.toggle[BUTTON_OLD_VALUE]  = get_widget_assert (xml, "radiobutton4");
-     rd.toggle[BUTTON_OLD_SYSMIS] = get_widget_assert (xml, "radiobutton6");
-     rd.toggle[BUTTON_OLD_MISSING]= get_widget_assert (xml, "radiobutton7");
-     rd.toggle[BUTTON_OLD_RANGE]  = get_widget_assert (xml, "radiobutton8");
-     rd.toggle[BUTTON_OLD_LOW_UP] = get_widget_assert (xml, "radiobutton10");
-     rd.toggle[BUTTON_OLD_HIGH_DOWN] = get_widget_assert (xml, "radiobutton5");
-     rd.toggle[BUTTON_OLD_ELSE]   = get_widget_assert (xml, "radiobutton11");
+     rd.toggle[BUTTON_NEW_VALUE]  = get_widget_assert (builder, "radiobutton1");
+     rd.toggle[BUTTON_NEW_SYSMIS] = get_widget_assert (builder, "radiobutton2");
+     rd.toggle[BUTTON_NEW_COPY]   = get_widget_assert (builder, "radiobutton3");
+     rd.toggle[BUTTON_OLD_VALUE]  = get_widget_assert (builder, "radiobutton4");
+     rd.toggle[BUTTON_OLD_SYSMIS] = get_widget_assert (builder, "radiobutton6");
+     rd.toggle[BUTTON_OLD_MISSING]= get_widget_assert (builder, "radiobutton7");
+     rd.toggle[BUTTON_OLD_RANGE]  = get_widget_assert (builder, "radiobutton8");
+     rd.toggle[BUTTON_OLD_LOW_UP] = get_widget_assert (builder, "radiobutton10");
+     rd.toggle[BUTTON_OLD_HIGH_DOWN] = get_widget_assert (builder, "radiobutton5");
+     rd.toggle[BUTTON_OLD_ELSE]   = get_widget_assert (builder, "radiobutton11");
  
-     rd.new_copy_label = get_widget_assert (xml, "label3");
-     rd.strings_box    = get_widget_assert (xml, "table3");
+     rd.new_copy_label = get_widget_assert (builder, "label3");
+     rd.strings_box    = get_widget_assert (builder, "table3");
  
      rd.old_and_new_dialog =
-       PSPPIRE_DIALOG (get_widget_assert (xml, "old-new-values-dialog"));
+       PSPPIRE_DIALOG (get_widget_assert (builder, "old-new-values-dialog"));
  
      gtk_window_set_transient_for (GTK_WINDOW (rd.old_and_new_dialog),
 -                                de->parent.window);
 +                                GTK_WINDOW (de));
  
-     rd.acr = PSPPIRE_ACR (get_widget_assert (xml, "psppire-acr1"));
+     rd.acr = PSPPIRE_ACR (get_widget_assert (builder, "psppire-acr1"));
  
      g_signal_connect_swapped (rd.toggle[BUTTON_NEW_VALUE], "toggled",
                      G_CALLBACK (set_acr), &rd);

diff --cc src/ui/gui/regression-dialog.c
index b0c11b0798dc8d591594055f7b5cb8fdd14c169b,3e0e0fbc1d226d5815a57b6ea1d6845757661020..2d8aca3ebc6a5d074e3a329211d25c530df83f2e
--- 1/src/ui/gui/regression-dialog.c
--- 2/src/ui/gui/regression-dialog.c
+++ b/src/ui/gui/regression-dialog.c
@@@ -223,11 -223,11 +223,10 @@@ voi
  regression_dialog (GObject *o, gpointer data)
  {
    gint response;
 -  struct data_editor *de = data;
 -
    struct regression_dialog rd;
  
-   GladeXML *xml = XML_NEW ("regression.glade");
+   GtkBuilder *xml = builder_new ("regression.ui");
 +  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
- 
    PsppireVarStore *vs;
  
    GtkWidget *dialog = get_widget_assert   (xml, "regression-dialog");

diff --cc src/ui/gui/select-cases-dialog.c
index 58b2879d07fe79cfdfa7d774d3b833fd22d11bb3,143f7a6d7f122f31144361e7e5513dd571c87a24..d953308a09fbe8b27c92c84ff54c045e8eac4e27
--- 1/src/ui/gui/select-cases-dialog.c
--- 2/src/ui/gui/select-cases-dialog.c
+++ b/src/ui/gui/select-cases-dialog.c
@@@ -18,10 -18,9 +18,9 @@@
  
  #include "select-cases-dialog.h"
  #include <gtk/gtk.h>
- #include <glade/glade.h>
  #include "helper.h"
  #include "psppire-dialog.h"
 -#include "data-editor.h"
 +#include "psppire-data-window.h"
  #include "dialog-common.h"
  #include "dict-display.h"
  #include "widget-io.h"

diff --cc src/ui/gui/sort-cases-dialog.c
Simple merge

diff --cc src/ui/gui/split-file-dialog.c
Simple merge

diff --cc src/ui/gui/t-test-independent-samples-dialog.c
Simple merge

diff --cc src/ui/gui/t-test-one-sample.c
Simple merge

diff --cc src/ui/gui/t-test-paired-samples.c
index 58b68b2ff2f652d387f34d1d7394e33e20f8437f,ec7096035bb68b7f61f25a62e0006d7255bed331..ca1d776a7294f6bed0b91060e4be8f7878ef4b2c
--- 1/src/ui/gui/t-test-paired-samples.c
--- 2/src/ui/gui/t-test-paired-samples.c
+++ b/src/ui/gui/t-test-paired-samples.c
@@@ -17,10 -17,9 +17,9 @@@
  
  #include <config.h>
  #include <gtk/gtk.h>
- #include <glade/glade.h>
  #include <language/syntax-string-source.h>
  
 -#include "data-editor.h"
 +#include "psppire-data-window.h"
  
  #include "psppire-dict.h"
  #include "psppire-var-store.h"

diff --cc src/ui/gui/transpose-dialog.c
index 9e8c18f44e2ac601bb9a56bca1ab245b78dce963,272ef1b3934daaa4f07043dc3dc2f5a5d9e04a8d..09756d3738919bc40f2f314b3d4d924a7a287499
--- 1/src/ui/gui/transpose-dialog.c
--- 2/src/ui/gui/transpose-dialog.c
+++ b/src/ui/gui/transpose-dialog.c
@@@ -80,9 -79,9 +79,9 @@@ voi
  transpose_dialog (GObject *o, gpointer data)
  {
    gint response ;
 -  struct data_editor *de = data;
 +  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
  
-   GladeXML *xml = XML_NEW ("psppire.glade");
+   GtkBuilder *xml = builder_new ("psppire.ui");
  
    PsppireVarStore *vs = NULL;
  

diff --cc src/ui/gui/variable-info-dialog.c
Simple merge

diff --cc src/ui/gui/weight-cases-dialog.c
index 9d103e1c97c8e6b58023afd88be4fbdf00e1ff43,8b46ca5e8d7c988cfb1f2bd2649c55e92dd28fee..a464646fe7742eeacf0c0ece78467710c0ad5de8
--- 1/src/ui/gui/weight-cases-dialog.c
--- 2/src/ui/gui/weight-cases-dialog.c
+++ b/src/ui/gui/weight-cases-dialog.c
@@@ -20,13 -20,12 +20,12 @@@
  #include "psppire-selector.h"
  #include "psppire-dialog.h"
  #include "helper.h"
 -#include "data-editor.h"
 +#include "psppire-data-window.h"
  #include "dict-display.h"
  #include <language/syntax-string-source.h>
 -#include "syntax-editor.h"
 +#include "helper.h"
  
  #include <gtk/gtk.h>
- #include <glade/glade.h>
  
  #include <gettext.h>
  #define _(msgid) gettext (msgid)
@@@ -104,10 -103,10 +103,10 @@@ voi
  weight_cases_dialog (GObject *o, gpointer data)
  {
    gint response;
 -  struct data_editor *de = data;
 +  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
    struct weight_cases_dialog wcd;
  
-   GladeXML *xml = XML_NEW ("psppire.glade");
+   GtkBuilder *xml = builder_new ("psppire.ui");
  
    GtkWidget *dialog = get_widget_assert (xml, "weight-cases-dialog");
    GtkWidget *source = get_widget_assert (xml, "weight-cases-treeview");