X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=dbba57b69d6d0063866ba3b295eceba1f0fb0a62;hb=4cf49191fb83586ae05ed9613ce229417c106055;hp=9dd3b71372f6334fea60115c325aa35724353f06;hpb=6d077bbfd3230959846621bbfb1447410e17dd8c;p=pspp

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index 9dd3b71372..dbba57b69d 100644
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -25,8 +25,9 @@
 #include <ui/command-line.h>
 #include "relocatable.h"
 
-#include "data-editor.h"
+#include "psppire-data-window.h"
 #include "psppire.h"
+#include "widgets.h"
 
 #include <libpspp/getl.h>
 #include <unistd.h>
@@ -44,7 +45,6 @@
 #include <language/syntax-string-source.h>
 
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 #include "psppire-dict.h"
 #include "psppire-var-store.h"
 #include "psppire-data-store.h"
@@ -52,13 +52,15 @@
 #include "message-dialog.h"
 #include <ui/syntax-gen.h>
 
-#include "output-viewer.h"
+#include "psppire-window-register.h"
+#include "psppire-output-window.h"
 
 #include <data/sys-file-reader.h>
 #include <data/por-file-reader.h>
 
 #include <ui/source-init-opts.h>
 
+GtkRecentManager *the_recent_mgr = 0;
 PsppireDataStore *the_data_store = 0;
 PsppireVarStore *the_var_store = 0;
 
@@ -67,6 +69,7 @@ static void create_icon_factory (void);
 struct source_stream *the_source_stream ;
 struct dataset * the_dataset = NULL;
 
+static GtkWidget *the_data_window;
 
 static void
 replace_casereader (struct casereader *s)
@@ -77,6 +80,10 @@ replace_casereader (struct casereader *s)
 #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)
 {
@@ -89,7 +96,7 @@ initialize (struct command_line_processor *clp, int argc, char **argv)
   bindtextdomain (PACKAGE, locale_dir);
 
 
-  glade_init ();
+  preregister_widgets ();
 
   gsl_set_error_handler_off ();
   fn_init ();
@@ -116,8 +123,6 @@ initialize (struct command_line_processor *clp, int argc, char **argv)
   the_data_store = psppire_data_store_new (dictionary);
   replace_casereader (NULL);
 
-
-
   create_icon_factory ();
 
   {
@@ -143,14 +148,19 @@ initialize (struct command_line_processor *clp, int argc, char **argv)
   journal_enable ();
   textdomain (PACKAGE);
 
+
+  the_recent_mgr = gtk_recent_manager_get_default ();
+
+  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);
 
   command_line_processor_parse (clp, argc, argv);
 
-  new_data_window (NULL, NULL);
-
   execute_syntax (create_syntax_string_source (""));
+
+  gtk_widget_show (the_data_window);
 }
 
 
@@ -164,6 +174,24 @@ de_initialize (void)
 }
 
 
+static void
+func (gpointer key, gpointer value, gpointer data)
+{
+  gboolean rv;
+  PsppireWindow *window = PSPPIRE_WINDOW (value);
+
+  g_signal_emit_by_name (window, "delete-event", 0, &rv);
+}
+
+void
+psppire_quit (void)
+{
+  PsppireWindowRegister *reg = psppire_window_register_new ();
+  psppire_window_register_foreach (reg, func, NULL);
+
+  gtk_main_quit ();
+}
+
 
 struct icon_info
 {
@@ -251,43 +279,8 @@ parse_non_options (int key, char *arg, struct argp_state *state)
     {
     case ARGP_KEY_ARG:
       {
-	struct string syntax;
-	FILE *fp = fopen (arg, "r");
-	if (NULL == fp)
-	  {
-	    const int errnum = errno;
-	    fprintf (state->err_stream, _("Cannot open %s: %s.\n"),
-		     arg, strerror (errnum));
-	    return 0;
-	  }
-	if ( sfm_detect (fp))
-	  {
-	    ds_init_cstr (&syntax, "GET FILE=");
-	    goto close;
-	  }
-	rewind (fp);
-	if (pfm_detect (fp))
-	  {
-	    ds_init_cstr (&syntax, "IMPORT FILE=");
-	    goto close;
-	  }
-
-	fclose (fp);
-	msg (ME, _("%s is neither a system nor portable file"), arg);
-	break;
-
-      close:
-	fclose (fp);
-
-	syntax_gen_string (&syntax, ss_cstr (arg));
-	ds_put_cstr (&syntax, ".");
-
-	getl_append_source (ss,
-			    create_syntax_string_source (ds_cstr (&syntax)),
-			    GETL_BATCH,
-			    ERRMODE_CONTINUE);
-
-	ds_destroy (&syntax);
+	psppire_data_window_load_file (PSPPIRE_DATA_WINDOW (the_data_window),
+				       arg);
 	break;
       }
     default:
@@ -298,3 +291,17 @@ parse_non_options (int key, char *arg, struct argp_state *state)
 
 
 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;
+}