X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=8491851383f4405805bbf71d0a35d5e172500b29;hb=82cdb6b894ba84fad617196cdba815c9aa15605f;hp=bd123970e5df9ca801400ad23aa4e48e3f392ff0;hpb=d908f52b818f4fdf2ab23797756812ec2986bd2b;p=pspp-builds.git diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c index bd123970..84918513 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,43 +12,59 @@ 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 "psppire-data-window.h" #include "psppire.h" +#include "widgets.h" - +#include +#include #include #include #include -#include #include #include #include #include #include #include +#include +#include +#include #include -#include #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 "data-sheet.h" -#include "var-sheet.h" +#include "executor.h" #include "message-dialog.h" +#include + +#include "psppire-window-register.h" +#include "psppire-output-window.h" +#include +#include + +#include + +GtkRecentManager *the_recent_mgr = 0; PsppireDataStore *the_data_store = 0; PsppireVarStore *the_var_store = 0; @@ -58,59 +73,96 @@ 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 + + + + void -initialize (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 */ - setlocale (LC_NUMERIC, "C"); - - bindtextdomain (PACKAGE, locale_dir); - - textdomain (PACKAGE); + i18n_init (); - glade_init (); + preregister_widgets (); - 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 (NULL, NULL); + the_dataset = create_dataset (); message_dialog_init (the_source_stream); 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 (); - new_data_window (NULL, NULL); + { + 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); + } + + 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); + 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); } @@ -120,88 +172,189 @@ de_initialize (void) destroy_source_stream (the_source_stream); message_dialog_done (); settings_done (); + outp_done (); + i18n_done (); } -#define PIXBUF_NEW_FROM_FILE(FILE) \ - gdk_pixbuf_new_from_file (relocate (PKGDATADIR "/" FILE), 0) - - static void -create_icon_factory (void) +func (gpointer key, gpointer value, gpointer data) { - GtkIconFactory *factory = gtk_icon_factory_new (); + gboolean rv; + PsppireWindow *window = PSPPIRE_WINDOW (value); - GtkIconSet *icon_set; + g_signal_emit_by_name (window, "delete-event", 0, &rv); +} - GdkPixbuf *pixbuf; +void +psppire_quit (void) +{ + PsppireWindowRegister *reg = psppire_window_register_new (); + psppire_window_register_foreach (reg, func, NULL); - 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); + gtk_main_quit (); +} - 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); +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"} + }; - 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); +static void +create_icon_factory (void) +{ + gint i; + GtkIconFactory *factory = gtk_icon_factory_new (); - 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); + 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 ("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 (factory, "pspp-stock-select", + gtk_icon_factory_lookup_default (GTK_STOCK_INDEX) + ); + } - 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); + gtk_icon_factory_add_default (factory); +} - 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); + - 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); +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: + { + gchar *filename = NULL; + gchar *utf8 = NULL; + const gchar *local_encoding = NULL; + gsize written = -1; + const gboolean local_is_utf8 = g_get_charset (&local_encoding); + + /* There seems to be no Glib function to convert from local encoding + to filename encoding. Therefore it has to be done in two steps: + the intermediate encoding is UTF8. + + Either step could fail. However, in many cases the file can still + be loaded even if the conversion fails. So in those cases, after showing + a warning, we simply copy the locally encoded filename to the destination + and hope for the best. + */ + + if ( local_is_utf8) + { + utf8 = xstrdup (arg); + } + else + { + GError *err = NULL; + utf8 = g_locale_to_utf8 (arg, -1, NULL, &written, &err); + if ( NULL == utf8) + { + g_warning ("Cannot convert filename from local encoding \"%s\" to UTF-8: %s", + local_encoding, + err->message); + g_clear_error (&err); + } + } + + if ( NULL != utf8) + { + GError *err = NULL; + filename = g_filename_from_utf8 (utf8, written, NULL, NULL, &err); + if ( NULL == filename) + { + g_warning ("Cannot convert filename from UTF8 to filename encoding: %s", + err->message); + g_clear_error (&err); + } + } + + g_free (utf8); + + if ( filename == NULL) + filename = xstrdup (arg); + + psppire_window_load (PSPPIRE_WINDOW (the_data_window), filename); + + g_free (filename); + break; + } + default: + return ARGP_ERR_UNKNOWN; + } + return 0; +} - 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); - 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); +const struct argp non_option_argp = {NULL, parse_non_options, 0, 0, 0, 0, 0}; - 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); - 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); +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); - gtk_icon_factory_add_default (factory); + return filename; } -