X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=737b965c116b35d5ac7c214ca465d341c00e3463;hb=f1a02381223dd6d652c590e2a5514967b9448905;hp=d636ab4960781ddc911e0dc813917f9e85de58d4;hpb=92c09e564002d356d20fc1e2e131027ef89f6748;p=pspp-builds.git diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c index d636ab49..737b965c 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,32 +12,36 @@ 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 "relocatable.h" -#include "data-editor.h" - +#include "psppire-data-window.h" #include "psppire.h" - +#include +#include #include #include #include -#include #include #include #include #include #include #include +#include +#include +#include #include #include @@ -46,9 +49,16 @@ #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-output-window.h" + +#include +#include + +#include PsppireDataStore *the_data_store = 0; PsppireVarStore *the_var_store = 0; @@ -58,24 +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_dictionary (struct dictionary *d) +replace_casereader (struct casereader *s) { - psppire_dict_replace_dictionary (the_data_store->dict, d); + psppire_data_store_set_reader (the_data_store, s); } +#define _(msgid) gettext (msgid) +#define N_(msgid) msgid -static void -replace_casereader (struct casereader *s) -{ - struct datasheet *datasheet = datasheet_create (s); - psppire_case_file_replace_datasheet (the_data_store->case_file, - datasheet); -} +const char * output_file_name (void); + void -initialize (void) +initialize (struct command_line_processor *clp, int argc, char **argv) { PsppireDict *dictionary = 0; @@ -85,43 +94,69 @@ initialize (void) bindtextdomain (PACKAGE, locale_dir); - textdomain (PACKAGE); glade_init (); - fmt_init (); - settings_init (); + gsl_set_error_handler_off (); + fn_init (); + outp_init (); + settings_init (&viewer_width, &viewer_length); fh_init (); the_source_stream = create_source_stream ( fn_getenv_default ("STAT_INCLUDE_PATH", include_path) ); - the_dataset = create_dataset (replace_casereader, - 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"); - /* 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); + create_icon_factory (); - proc_set_active_file_data (the_dataset, - datasheet_make_reader (the_data_store->case_file->datasheet)); + { + const char *filename = output_file_name (); + struct string config_string; - create_icon_factory (); + 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); - new_data_window (NULL, NULL); + 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); + + command_line_processor_parse (clp, argc, argv); + + execute_syntax (create_syntax_string_source ("")); + + gtk_widget_show (the_data_window); } @@ -131,88 +166,120 @@ 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) +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; - - GdkPixbuf *pixbuf; - - 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); - - 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); - - 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); + 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); + } + } + + { + /* 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) + ); - 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 (factory, "pspp-stock-select", + gtk_icon_factory_lookup_default (GTK_STOCK_INDEX) + ); + } - 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); + gtk_icon_factory_add_default (factory); +} - 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); + - 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); +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; +} - pixbuf = PIXBUF_NEW_FROM_FILE ("nominal.png"); - icon_set = gtk_icon_set_new_from_pixbuf (pixbuf); - g_object_unref (pixbuf); - gtk_icon_factory_add ( factory, "var-nominal", icon_set); - pixbuf = PIXBUF_NEW_FROM_FILE ("ordinal.png"); - icon_set = gtk_icon_set_new_from_pixbuf (pixbuf); - g_object_unref (pixbuf); - gtk_icon_factory_add ( factory, "var-ordinal", icon_set); +const struct argp non_option_argp = {NULL, parse_non_options, 0, 0, 0, 0, 0}; - pixbuf = PIXBUF_NEW_FROM_FILE ("scale.png"); - icon_set = gtk_icon_set_new_from_pixbuf (pixbuf); - g_object_unref (pixbuf); - gtk_icon_factory_add ( factory, "var-scale", icon_set); - pixbuf = PIXBUF_NEW_FROM_FILE ("string.png"); - icon_set = gtk_icon_set_new_from_pixbuf (pixbuf); - g_object_unref (pixbuf); - gtk_icon_factory_add ( factory, "var-string", icon_set); +const char * +output_file_name (void) +{ + const char *dir = default_output_path (); + static char *filename = NULL; - pixbuf = PIXBUF_NEW_FROM_FILE ("date-scale.png"); - icon_set = gtk_icon_set_new_from_pixbuf (pixbuf); - g_object_unref (pixbuf); - gtk_icon_factory_add ( factory, "var-date-scale", icon_set); + if ( NULL == filename ) + filename = xasprintf ("%s%s", dir, OUTPUT_FILE_NAME); - gtk_icon_factory_add_default (factory); + return filename; } -