#include <libintl.h>
#include <gsl/gsl_errno.h>
+#include <xalloc.h>
#include <argp.h>
#include <ui/command-line.h>
#include "relocatable.h"
#include <libpspp/getl.h>
#include <language/lexer/lexer.h>
#include <libpspp/version.h>
-#include <output/output.h>
+#include <output/driver.h>
#include <output/journal.h>
#include <language/syntax-string-source.h>
#include <gtk/gtk.h>
#include "psppire-dict.h"
+#include "dict-display.h"
+#include "psppire-selector.h"
+#include "psppire-var-view.h"
#include "psppire-var-store.h"
#include "psppire-data-store.h"
-#include "helper.h"
+#include "executor.h"
#include "message-dialog.h"
#include <ui/syntax-gen.h>
#define N_(msgid) msgid
-const char * output_file_name (void);
void
{
PsppireDict *dictionary = 0;
-
i18n_init ();
preregister_widgets ();
gsl_set_error_handler_off ();
fn_init ();
- outp_init ();
settings_init (&viewer_width, &viewer_length);
fh_init ();
the_source_stream =
create_icon_factory ();
- {
- 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);
-
- ds_destroy (&config_string);
- }
+ psppire_output_window_setup ();
journal_enable ();
textdomain (PACKAGE);
the_recent_mgr = gtk_recent_manager_get_default ();
+ psppire_selector_set_default_selection_func (GTK_TYPE_ENTRY, insert_source_row_into_entry);
+ psppire_selector_set_default_selection_func (PSPPIRE_VAR_VIEW_TYPE, insert_source_row_into_tree_view);
+ psppire_selector_set_default_selection_func (GTK_TYPE_TREE_VIEW, insert_source_row_into_tree_view);
+
the_data_window = psppire_data_window_new ();
command_line_processor_replace_aux (clp, &post_init_argp, the_source_stream);
destroy_source_stream (the_source_stream);
message_dialog_done ();
settings_done ();
- outp_done ();
+ output_close ();
i18n_done ();
}
if ( local_is_utf8)
{
- utf8 = strdup (arg);
+ utf8 = xstrdup (arg);
}
else
{
g_free (utf8);
if ( filename == NULL)
- filename = strdup (arg);
+ filename = xstrdup (arg);
psppire_window_load (PSPPIRE_WINDOW (the_data_window), filename);
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;
-}