#include <ui/command-line.h>
#include "relocatable.h"
-#include "data-editor.h"
+#include "psppire-data-window.h"
#include "psppire.h"
#include <libpspp/getl.h>
#include "message-dialog.h"
#include <ui/syntax-gen.h>
-#include "output-viewer.h"
+
+#include "psppire-output-window.h"
#include <data/sys-file-reader.h>
#include <data/por-file-reader.h>
struct source_stream *the_source_stream ;
struct dataset * the_dataset = NULL;
+static GtkWidget *the_data_window;
static void
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)
{
the_data_store = psppire_data_store_new (dictionary);
replace_casereader (NULL);
-
-
create_icon_factory ();
{
journal_enable ();
textdomain (PACKAGE);
+ 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);
}
ERRMODE_CONTINUE);
ds_destroy (&syntax);
+
+ psppire_window_set_filename (the_data_window, arg);
+
break;
}
default:
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;
+}