X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=02415d68bc3df8a6250d0a115f622c52de6c787f;hb=775941da1289c0c3de3895e61cc6e787c6591686;hp=7caa47c8cc91e5475a3994d8bfb807b835e44c5c;hpb=cf63d499efd5e6ca3a7dcc6386b3b87bd31bfda9;p=pspp-builds.git diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c index 7caa47c8..02415d68 100644 --- a/src/ui/gui/psppire.c +++ b/src/ui/gui/psppire.c @@ -1,10 +1,9 @@ -/* - PSPPIRE --- A Graphical User Interface for PSPP +/* PSPPIRE - a graphical user interface for PSPP. Copyright (C) 2004, 2005, 2006 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,97 +12,76 @@ 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 +#include +#include +#include "relocatable.h" #include "data-editor.h" -#include -#include +#include "psppire.h" + +#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" +#include -PsppireDataStore *the_data_store = 0; +#include "output-viewer.h" +#include +#include -static bool parse_command_line (int *argc, char ***argv, - gchar **filename, GError **err); - - -#define _(msgid) gettext (msgid) -#define N_(msgid) msgid - -static void -give_help(void) -{ - static struct msg m = { - MSG_GENERAL, - MSG_NOTE, - {0, -1}, - 0, - }; - - if (! m.text) - m.text=g_strdup(_("Sorry. The help system hasn't yet been implemented.")); - - popup_message(&m); -} +#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; -int -main(int argc, char *argv[]) +static void +replace_casereader (struct casereader *s) { - struct casefile_factory *factory; - PsppireDict *dictionary = 0; - - - GtkWidget *data_editor ; - GtkSheet *var_sheet ; - GtkSheet *data_sheet ; - - gchar *filename=0; - GError *err = 0; - gchar *vers; + psppire_data_store_set_reader (the_data_store, s); +} - gtk_init(&argc, &argv); - if ( (vers = gtk_check_version(GTK_MAJOR_VERSION, - GTK_MINOR_VERSION, - GTK_MICRO_VERSION)) ) - { - g_critical(vers); - } +#define _(msgid) gettext (msgid) +#define N_(msgid) msgid +void +initialize (struct command_line_processor *clp, int argc, char **argv) +{ + PsppireDict *dictionary = 0; /* gtk_init messes with the locale. So unset the bits we want to control ourselves */ @@ -111,176 +89,204 @@ main(int argc, char *argv[]) bindtextdomain (PACKAGE, locale_dir); - textdomain (PACKAGE); - if ( ! parse_command_line(&argc, &argv, &filename, &err) ) - { - g_clear_error(&err); - return 0; - } - - glade_init(); + 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); + 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"); + bind_textdomain_codeset (PACKAGE, "UTF-8"); /* Create the model for the var_sheet */ - the_var_store = psppire_var_store_new(dictionary); - + the_var_store = psppire_var_store_new (dictionary); the_data_store = psppire_data_store_new (dictionary); + replace_casereader (NULL); - create_icon_factory(); -#if 0 - /* load the interface */ - data_editor_xml = glade_xml_new(PKGDATADIR "/data-editor.glade", NULL, NULL); - if ( !data_editor_xml ) return 1; + create_icon_factory (); - data_editor = get_widget_assert(data_editor_xml, "data_editor"); + outp_configure_driver_line ( + ss_cstr ("gui:ascii:screen:squeeze=on headers=off top-margin=0 " + "bottom-margin=0 paginate=off length=auto width=auto " + "emphasis=none " + "output-file=\"" OUTPUT_FILE_NAME "\" append=yes")); - /* connect the signals in the interface */ - glade_xml_signal_autoconnect(data_editor_xml); + unlink (OUTPUT_FILE_NAME); - var_sheet = GTK_SHEET(get_widget_assert(data_editor_xml, "variable_sheet")); - data_sheet = GTK_SHEET(get_widget_assert(data_editor_xml, "data_sheet")); + journal_enable (); + textdomain (PACKAGE); - gtk_sheet_set_model(var_sheet, G_SHEET_MODEL(the_var_store)); + /* Ignore alarm clock signals */ + signal (SIGALRM, SIG_IGN); - gtk_sheet_set_model(data_sheet, G_SHEET_MODEL(the_data_store)); + command_line_processor_replace_aux (clp, &post_init_argp, the_source_stream); + command_line_processor_replace_aux (clp, &non_option_argp, the_source_stream); - var_data_selection_init(); + command_line_processor_parse (clp, argc, argv); - { - GList *helps = glade_xml_get_widget_prefix(data_editor_xml, "help_button_"); + new_data_window (NULL, NULL); - GList *i; - for ( i = g_list_first(helps); i ; i = g_list_next(i)) - g_signal_connect(GTK_WIDGET(i->data), "clicked", give_help, 0); - } + execute_syntax (create_syntax_string_source ("")); +} -#endif - new_data_window (NULL, NULL); +void +de_initialize (void) +{ + destroy_source_stream (the_source_stream); + message_dialog_done (); + settings_done (); + outp_done (); +} - /* start the event loop */ - gtk_main(); - destroy_source_stream (the_source_stream); - message_dialog_done(); - settings_done(); +struct icon_info +{ + const char *file_name; + const gchar *id; +}; - return 0; -} +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"} + }; -/* 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 void +create_icon_factory (void) { - static struct option long_options[] = - { - {"help", no_argument, NULL, 'h'}, - {"version", no_argument, NULL, 'V'}, - {0, 0, 0, 0}, - }; - - int c; + gint i; + GtkIconFactory *factory = gtk_icon_factory_new (); - for (;;) + for (i = 0 ; i < sizeof (icons) / sizeof(icons[0]); ++i) { - c = getopt_long (*argc, *argv, "hV", long_options, NULL); - if (c == -1) - break; + GError *err = NULL; + GdkPixbuf *pixbuf = + gdk_pixbuf_new_from_file (relocate (icons[i].file_name), &err); - switch (c) + if ( pixbuf ) { - 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; + 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); } } - if ( optind < *argc) - { - *filename = (*argv)[optind]; - } - - return true; -} + { + /* 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} + }; -void -create_icon_factory (void) -{ - GtkIconFactory *factory = gtk_icon_factory_new(); + gtk_stock_add (items, 2); + gtk_icon_factory_add (factory, "pspp-stock-reset", + gtk_icon_factory_lookup_default (GTK_STOCK_REFRESH) + ); - GtkIconSet *icon_set; + gtk_icon_factory_add (factory, "pspp-stock-select", + gtk_icon_factory_lookup_default (GTK_STOCK_INDEX) + ); + } - GdkPixbuf *pixbuf; + gtk_icon_factory_add_default (factory); +} - pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/value-labels.png", 0); - icon_set = gtk_icon_set_new_from_pixbuf (pixbuf); - g_object_unref (pixbuf); - gtk_icon_factory_add ( factory, "pspp-value-labels", icon_set); + - pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/weight-cases.png", 0); - icon_set = gtk_icon_set_new_from_pixbuf (pixbuf); - g_object_unref (pixbuf); - gtk_icon_factory_add ( factory, "pspp-weight-cases", icon_set); +static error_t +parse_non_options (int key, char *arg, struct argp_state *state) +{ + struct source_stream *ss = state->input; - pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/goto-variable.png", 0); - icon_set = gtk_icon_set_new_from_pixbuf (pixbuf); - g_object_unref (pixbuf); - gtk_icon_factory_add ( factory, "pspp-goto-variable", icon_set); + if ( NULL == ss ) + return 0; - pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/insert-variable.png", 0); - icon_set = gtk_icon_set_new_from_pixbuf (pixbuf); - g_object_unref (pixbuf); - gtk_icon_factory_add ( factory, "pspp-insert-variable", icon_set); + 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; - pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/insert-case.png", 0); - icon_set = gtk_icon_set_new_from_pixbuf (pixbuf); - g_object_unref (pixbuf); - gtk_icon_factory_add ( factory, "pspp-insert-case", icon_set); + close: + fclose (fp); - pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/split-file.png", 0); - icon_set = gtk_icon_set_new_from_pixbuf (pixbuf); - g_object_unref (pixbuf); - gtk_icon_factory_add ( factory, "pspp-split-file", icon_set); + syntax_gen_string (&syntax, ss_cstr (arg)); + ds_put_cstr (&syntax, "."); - pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/select-cases.png", 0); - icon_set = gtk_icon_set_new_from_pixbuf (pixbuf); - g_object_unref (pixbuf); - gtk_icon_factory_add ( factory, "pspp-select-cases", icon_set); + getl_append_source (ss, + create_syntax_string_source (ds_cstr (&syntax)), + GETL_BATCH, + ERRMODE_CONTINUE); - gtk_icon_factory_add_default (factory); + 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};