X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=8a23346ce788667f611a5dede2ac4dd1cfff0b34;hb=ca259adce7a069f58545de7511e17d73c9e0a868;hp=b874d393cf6df29b7709cf13f9398c0a043953a1;hpb=70c7494a0b0a9e6ce90c271f65095bc474b775ee;p=pspp-builds.git diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c index b874d393..8a23346c 100644 --- a/src/ui/gui/psppire.c +++ b/src/ui/gui/psppire.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2004, 2005, 2006 Free Software Foundation + Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,19 +16,24 @@ #include +#include #include #include +#include +#include +#include #include "relocatable.h" -#include "data-editor.h" +#include "psppire-data-window.h" #include "psppire.h" +#include "widgets.h" +#include #include #include #include #include -#include #include #include #include @@ -37,18 +42,23 @@ #include #include #include +#include #include -#include #include "psppire-dict.h" #include "psppire-var-store.h" #include "psppire-data-store.h" #include "helper.h" -#include "data-sheet.h" -#include "var-sheet.h" #include "message-dialog.h" +#include + +#include "psppire-window-register.h" +#include "psppire-output-window.h" -#include "output-viewer.h" +#include +#include + +#include PsppireDataStore *the_data_store = 0; PsppireVarStore *the_var_store = 0; @@ -58,17 +68,23 @@ 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) { - PsppireCaseFile *pcf = psppire_case_file_new (s); - - psppire_data_store_set_case_file (the_data_store, pcf); + psppire_data_store_set_reader (the_data_store, s); } +#define _(msgid) gettext (msgid) +#define N_(msgid) msgid + + +const char * output_file_name (void); + + void -initialize (void) +initialize (struct command_line_processor *clp, int argc, char **argv) { PsppireDict *dictionary = 0; @@ -78,11 +94,10 @@ initialize (void) bindtextdomain (PACKAGE, locale_dir); - textdomain (PACKAGE); - glade_init (); + preregister_widgets (); - fmt_init (); + gsl_set_error_handler_off (); fn_init (); outp_init (); settings_init (&viewer_width, &viewer_length); @@ -109,17 +124,39 @@ initialize (void) 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=50 " - "width=" OUTPUT_LINE_WIDTH_str " 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 (OUTPUT_FILE_NAME); + unlink (filename); + + ds_destroy (&config_string); + } 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); - new_data_window (NULL, NULL); + command_line_processor_parse (clp, argc, argv); + + execute_syntax (create_syntax_string_source ("")); + + gtk_widget_show (the_data_window); } @@ -133,6 +170,25 @@ 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 { const char *file_name; @@ -182,6 +238,66 @@ create_icon_factory (void) } } + { + /* Create our own "pspp-stock-reset" item, using the + GTK_STOCK_REFRESH icon set */ + + GtkStockItem items[] = { + {"pspp-stock-reset", N_("_Reset"), 0, 0, PACKAGE}, + {"pspp-stock-select", N_("_Select"), 0, 0, PACKAGE} + }; + + + gtk_stock_add (items, 2); + gtk_icon_factory_add (factory, "pspp-stock-reset", + gtk_icon_factory_lookup_default (GTK_STOCK_REFRESH) + ); + + gtk_icon_factory_add (factory, "pspp-stock-select", + gtk_icon_factory_lookup_default (GTK_STOCK_INDEX) + ); + } + gtk_icon_factory_add_default (factory); } + + +static error_t +parse_non_options (int key, char *arg, struct argp_state *state) +{ + struct source_stream *ss = state->input; + + if ( NULL == ss ) + return 0; + + switch (key) + { + case ARGP_KEY_ARG: + { + psppire_data_window_load_file (PSPPIRE_DATA_WINDOW (the_data_window), + arg); + break; + } + default: + return ARGP_ERR_UNKNOWN; + } + return 0; +} + + +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; +}