X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=9dd3b71372f6334fea60115c325aa35724353f06;hb=6d077bbfd3230959846621bbfb1447410e17dd8c;hp=f6bf1de36cdd7346360d69bd8315228b977125e5;hpb=1d5a97ba2afec23855a8294ff2814ab052f6777a;p=pspp-builds.git diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c index f6bf1de3..9dd3b713 100644 --- a/src/ui/gui/psppire.c +++ b/src/ui/gui/psppire.c @@ -1,10 +1,9 @@ -/* - PSPPIRE --- A Graphical User Interface for PSPP - Copyright (C) 2004, 2005, 2006 Free Software Foundation +/* PSPPIRE - a graphical user interface for PSPP. + Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation - This program is free software; you can redistribute it and/or modify + 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 - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -13,275 +12,289 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. */ + along with this program. If not, see . */ #include +#include #include #include +#include -#include "progname.h" +#include +#include #include "relocatable.h" #include "data-editor.h" +#include "psppire.h" -#include -#include +#include +#include +#include +#include #include -#include -#include -#include #include #include #include #include #include -#include +#include +#include +#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 "flexifile-factory.h" - -PsppireDataStore *the_data_store = 0; +#include +#include "output-viewer.h" -static bool parse_command_line (int *argc, char ***argv, - gchar **filename, GError **err); +#include +#include +#include +PsppireDataStore *the_data_store = 0; PsppireVarStore *the_var_store = 0; -void create_icon_factory (void); +static void create_icon_factory (void); struct source_stream *the_source_stream ; struct dataset * the_dataset = NULL; -static void -replace_dictionary (struct dictionary *d) -{ - psppire_dict_replace_dictionary (the_data_store->dict, - d); -} - static void -replace_flexifile (struct case_source *s) +replace_casereader (struct casereader *s) { - if ( NULL == s ) - psppire_case_file_replace_flexifile (the_data_store->case_file, - (struct flexifile *) flexifile_create (0)); - else - { - if ( ! case_source_is_class (s, &storage_source_class)) - return ; - - psppire_case_file_replace_flexifile (the_data_store->case_file, - (struct flexifile *) - storage_source_get_casefile (s)); - } + psppire_data_store_set_reader (the_data_store, s); } +#define _(msgid) gettext (msgid) +#define N_(msgid) msgid -int -main (int argc, char *argv[]) +void +initialize (struct command_line_processor *clp, int argc, char **argv) { - struct casefile_factory *factory; PsppireDict *dictionary = 0; - gchar *filename=0; - GError *err = 0; - gchar *vers; - - set_program_name (argv[0]); - - if ( ! gtk_parse_args (&argc, &argv) ) - { - perror ("Error parsing arguments"); - exit (1); - } - - if ( (vers = gtk_check_version (GTK_MAJOR_VERSION, - GTK_MINOR_VERSION, - GTK_MICRO_VERSION)) ) - { - g_critical (vers); - } - - /* gtk_init messes with the locale. So unset the bits we want to control ourselves */ setlocale (LC_NUMERIC, "C"); bindtextdomain (PACKAGE, locale_dir); - textdomain (PACKAGE); - - if ( ! parse_command_line (&argc, &argv, &filename, &err) ) - { - g_clear_error (&err); - return 0; - } glade_init (); - fmt_init (); - settings_init (); + gsl_set_error_handler_off (); + fn_init (); + outp_init (); + settings_init (&viewer_width, &viewer_length); fh_init (); - factory = flexifile_factory_create (); - the_source_stream = create_source_stream ( + the_source_stream = + create_source_stream ( fn_getenv_default ("STAT_INCLUDE_PATH", include_path) ); - the_dataset = create_dataset (factory, - replace_flexifile, - replace_dictionary); + the_dataset = create_dataset (); + message_dialog_init (the_source_stream); - dictionary = psppire_dict_new_from_dict ( - dataset_dict (the_dataset) - ); + dictionary = psppire_dict_new_from_dict (dataset_dict (the_dataset)); bind_textdomain_codeset (PACKAGE, "UTF-8"); - gdk_init (&argc, &argv); - /* Create the model for the var_sheet */ the_var_store = psppire_var_store_new (dictionary); - the_data_store = psppire_data_store_new (dictionary); + replace_casereader (NULL); + - proc_set_source (the_dataset, - storage_source_create (the_data_store->case_file->flexifile) - ); create_icon_factory (); - new_data_window (NULL, NULL); + { + const char *filename = output_file_name (); - /* start the event loop */ - gtk_main (); + struct string config_string; - destroy_source_stream (the_source_stream); - message_dialog_done (); + ds_init_empty (&config_string); - settings_done (); + 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); - return 0; -} + outp_configure_driver_line (ds_ss (&config_string)); + unlink (filename); -/* Parses the command line specified by ARGC and ARGV as received by - main (). Returns true if normal execution should proceed, - false if the command-line indicates that PSPP should exit. */ -static bool -parse_command_line (int *argc, char ***argv, gchar **filename, GError **err) -{ - static struct option long_options[] = - { - {"help", no_argument, NULL, 'h'}, - {"version", no_argument, NULL, 'V'}, - {0, 0, 0, 0}, - }; + ds_destroy (&config_string); + } + + journal_enable (); + textdomain (PACKAGE); - int c; + command_line_processor_replace_aux (clp, &post_init_argp, the_source_stream); + command_line_processor_replace_aux (clp, &non_option_argp, the_source_stream); - for (;;) - { - c = getopt_long (*argc, *argv, "hV", long_options, NULL); - if (c == -1) - break; + command_line_processor_parse (clp, argc, argv); - switch (c) - { - case 'h': - g_print ("Usage: psppire {|--help|--version}\n"); - return false; - case 'V': - g_print (version); - g_print ("\n"); - g_print (legal); - return false; - default: - return false; - } - } + new_data_window (NULL, NULL); + + execute_syntax (create_syntax_string_source ("")); +} - if ( optind < *argc) - { - *filename = (*argv)[optind]; - } - return true; +void +de_initialize (void) +{ + destroy_source_stream (the_source_stream); + message_dialog_done (); + settings_done (); + outp_done (); } -#define PIXBUF_NEW_FROM_FILE(FILE) \ - gdk_pixbuf_new_from_file (relocate (PKGDATADIR "/" FILE), 0) -void +struct icon_info +{ + const char *file_name; + const gchar *id; +}; + + +static const struct icon_info icons[] = + { + {PKGDATADIR "/value-labels.png", "pspp-value-labels"}, + {PKGDATADIR "/weight-cases.png", "pspp-weight-cases"}, + {PKGDATADIR "/goto-variable.png", "pspp-goto-variable"}, + {PKGDATADIR "/insert-variable.png", "pspp-insert-variable"}, + {PKGDATADIR "/insert-case.png", "pspp-insert-case"}, + {PKGDATADIR "/split-file.png", "pspp-split-file"}, + {PKGDATADIR "/select-cases.png", "pspp-select-cases"}, + {PKGDATADIR "/recent-dialogs.png", "pspp-recent-dialogs"}, + {PKGDATADIR "/nominal.png", "var-nominal"}, + {PKGDATADIR "/ordinal.png", "var-ordinal"}, + {PKGDATADIR "/scale.png", "var-scale"}, + {PKGDATADIR "/string.png", "var-string"}, + {PKGDATADIR "/date-scale.png", "var-date-scale"} + }; + +static void create_icon_factory (void) { + gint i; GtkIconFactory *factory = gtk_icon_factory_new (); - GtkIconSet *icon_set; + for (i = 0 ; i < sizeof (icons) / sizeof(icons[0]); ++i) + { + GError *err = NULL; + GdkPixbuf *pixbuf = + gdk_pixbuf_new_from_file (relocate (icons[i].file_name), &err); + + if ( pixbuf ) + { + GtkIconSet *icon_set = gtk_icon_set_new_from_pixbuf (pixbuf); + g_object_unref (pixbuf); + gtk_icon_factory_add ( factory, icons[i].id, icon_set); + } + else + { + g_warning ("Cannot create icon: %s", err->message); + g_clear_error (&err); + } + } - GdkPixbuf *pixbuf; + { + /* Create our own "pspp-stock-reset" item, using the + GTK_STOCK_REFRESH icon set */ - pixbuf = PIXBUF_NEW_FROM_FILE ("value-labels.png"); - icon_set = gtk_icon_set_new_from_pixbuf (pixbuf); - g_object_unref (pixbuf); - gtk_icon_factory_add ( factory, "pspp-value-labels", icon_set); + GtkStockItem items[] = { + {"pspp-stock-reset", N_("_Reset"), 0, 0, PACKAGE}, + {"pspp-stock-select", N_("_Select"), 0, 0, PACKAGE} + }; - pixbuf = PIXBUF_NEW_FROM_FILE ("weight-cases.png"); - icon_set = gtk_icon_set_new_from_pixbuf (pixbuf); - g_object_unref (pixbuf); - gtk_icon_factory_add ( factory, "pspp-weight-cases", icon_set); - pixbuf = PIXBUF_NEW_FROM_FILE ("goto-variable.png"); - icon_set = gtk_icon_set_new_from_pixbuf (pixbuf); - g_object_unref (pixbuf); - gtk_icon_factory_add ( factory, "pspp-goto-variable", icon_set); + gtk_stock_add (items, 2); + gtk_icon_factory_add (factory, "pspp-stock-reset", + gtk_icon_factory_lookup_default (GTK_STOCK_REFRESH) + ); - pixbuf = PIXBUF_NEW_FROM_FILE ("insert-variable.png"); - icon_set = gtk_icon_set_new_from_pixbuf (pixbuf); - g_object_unref (pixbuf); - gtk_icon_factory_add ( factory, "pspp-insert-variable", icon_set); + gtk_icon_factory_add (factory, "pspp-stock-select", + gtk_icon_factory_lookup_default (GTK_STOCK_INDEX) + ); + } - pixbuf = PIXBUF_NEW_FROM_FILE ("insert-case.png"); - icon_set = gtk_icon_set_new_from_pixbuf (pixbuf); - g_object_unref (pixbuf); - gtk_icon_factory_add ( factory, "pspp-insert-case", icon_set); + gtk_icon_factory_add_default (factory); +} - pixbuf = PIXBUF_NEW_FROM_FILE ("split-file.png"); - icon_set = gtk_icon_set_new_from_pixbuf (pixbuf); - g_object_unref (pixbuf); - gtk_icon_factory_add ( factory, "pspp-split-file", icon_set); + - pixbuf = PIXBUF_NEW_FROM_FILE ("select-cases.png"); - icon_set = gtk_icon_set_new_from_pixbuf (pixbuf); - g_object_unref (pixbuf); - gtk_icon_factory_add ( factory, "pspp-select-cases", icon_set); +static error_t +parse_non_options (int key, char *arg, struct argp_state *state) +{ + struct source_stream *ss = state->input; - pixbuf = PIXBUF_NEW_FROM_FILE ("recent-dialogs.png"); - icon_set = gtk_icon_set_new_from_pixbuf (pixbuf); - g_object_unref (pixbuf); - gtk_icon_factory_add ( factory, "pspp-recent-dialogs", icon_set); + if ( NULL == ss ) + return 0; + switch (key) + { + 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); - gtk_icon_factory_add_default (factory); + 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); + break; + } + default: + return ARGP_ERR_UNKNOWN; + } + return 0; } + +const struct argp non_option_argp = {NULL, parse_non_options, 0, 0, 0, 0, 0};