From: John Darrington <john@darrington.wattle.id.au>
Date: Sat, 23 Mar 2013 16:10:25 +0000 (+0100)
Subject: Merge remote branch 'origin/master' into import-gui
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=504ee72af2e3f4df358ca45b8acb847affdb85cb;hp=-c;p=pspp

Merge remote branch 'origin/master' into import-gui

Conflicts:
	src/ui/gui/automake.mk
	src/ui/gui/page-assistant.c
	src/ui/gui/page-file.c
	src/ui/gui/text-data-import-dialog.c
---

504ee72af2e3f4df358ca45b8acb847affdb85cb
diff --combined src/ui/gui/text-data-import-dialog.c
index 597f65127e,d535734d08..662caba809
--- a/src/ui/gui/text-data-import-dialog.c
+++ b/src/ui/gui/text-data-import-dialog.c
@@@ -19,7 -19,6 +19,7 @@@
  #include "ui/gui/text-data-import-dialog.h"
  
  #include "page-intro.h"
 +#include "page-sheet-spec.h"
  #include "page-first-line.h"
  #include "page-separators.h"
  #include "page-formats.h"
@@@ -78,7 -77,6 +78,7 @@@ text_data_import_assistant (PsppireData
  {
    GtkWindow *parent_window = GTK_WINDOW (dw);
    struct import_assistant *ia = init_assistant (parent_window);
 +  struct sheet_spec_page *ssp ;
  
    if (!init_file (ia, parent_window))
      {
@@@ -86,18 -84,11 +86,18 @@@
        return;
      }
  
 +  ssp = ia->sheet_spec;
  
 +  if (ia->spreadsheet)
 +    {
 +      ia->sheet_spec = sheet_spec_page_create (ia);
 +    }
 +  else
      {
        ia->intro = intro_page_create (ia);
        ia->separators = separators_page_create (ia);
        ia->first_line = first_line_page_create (ia);
 +      printf ("%s:%d %p\n", __FILE__, __LINE__, ia->intro);
      }
    ia->formats = formats_page_create (ia);
  
@@@ -132,7 -123,6 +132,7 @@@
        break;
      }
  
 +  if (ssp) 
      {
        destroy_formats_page (ia);
        destroy_separators_page (ia);
@@@ -233,7 -223,6 +233,7 @@@ generate_syntax (const struct import_as
  {
    struct string s = DS_EMPTY_INITIALIZER;
  
 +  if (ia->spreadsheet == NULL)
      {
        syntax_gen_pspp (&s,
  		       "GET DATA"
@@@ -243,7 -232,7 +243,6 @@@
        if (ia->file.encoding && strcmp (ia->file.encoding, "Auto"))
  	syntax_gen_pspp (&s, "  /ENCODING=%sq\n", ia->file.encoding);
  
--
        intro_append_syntax (ia->intro, &s);
  
  
@@@ -256,11 -245,7 +255,11 @@@
        formats_append_syntax (ia, &s);
        apply_dict (ia->dict, &s);
      }
 -
 +  else
 +    {
 +      return sheet_spec_gen_syntax (ia);
 +    }
- 
++  
    return ds_cstr (&s);
  }