X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=61042efe546cdedaf59470764312c6fa5e817361;hb=173d1687aea88e0e5e1b1d8615ed68ebefb15d08;hp=e424e212468e0c0a052e6cb201f395cffa239a8e;hpb=68b73d179454af3151156c62c2e27804019900d2;p=pspp diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c index e424e21246..61042efe54 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, 2010 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,39 +16,51 @@ #include +#include "ui/gui/psppire.h" + #include +#include +#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 "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 "output-viewer.h" +#include "data/casereader.h" +#include "data/datasheet.h" +#include "data/file-handle-def.h" +#include "data/file-name.h" +#include "data/por-file-reader.h" +#include "data/procedure.h" +#include "data/settings.h" +#include "data/sys-file-reader.h" +#include "language/lexer/lexer.h" +#include "language/syntax-string-source.h" +#include "libpspp/getl.h" +#include "libpspp/i18n.h" +#include "libpspp/message.h" +#include "libpspp/version.h" +#include "output/driver.h" +#include "output/journal.h" +#include "output/message-item.h" +#include "ui/gui/dict-display.h" +#include "ui/gui/executor.h" +#include "ui/gui/psppire-data-store.h" +#include "ui/gui/psppire-data-window.h" +#include "ui/gui/psppire-dict.h" +#include "ui/gui/psppire-output-window.h" +#include "ui/gui/psppire-selector.h" +#include "ui/gui/psppire-var-store.h" +#include "ui/gui/psppire-var-view.h" +#include "ui/gui/psppire-window-register.h" +#include "ui/gui/psppire.h" +#include "ui/gui/widgets.h" +#include "ui/source-init-opts.h" +#include "ui/syntax-gen.h" + +#include "gl/configmake.h" +#include "gl/xalloc.h" +#include "gl/relocatable.h" + +GtkRecentManager *the_recent_mgr = 0; PsppireDataStore *the_data_store = 0; PsppireVarStore *the_var_store = 0; @@ -57,44 +69,40 @@ static void create_icon_factory (void); struct source_stream *the_source_stream ; struct dataset * the_dataset = NULL; +static GtkWidget *the_data_window; + +static void handle_msg (const struct msg *); +static void load_data_file (const char *); 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 source_stream *ss, const char *data_file) { 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 (); - fn_init (); - outp_init (); + gsl_set_error_handler_off (); settings_init (); 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); + the_source_stream = ss; + msg_init (ss, handle_msg); dictionary = psppire_dict_new_from_dict (dataset_dict (the_dataset)); @@ -108,15 +116,25 @@ 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")); + psppire_output_window_setup (); + + 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); - unlink (OUTPUT_FILE_NAME); + the_data_window = psppire_data_window_new (); + if (data_file != NULL) + load_data_file (data_file); - new_data_window (NULL, NULL); + execute_syntax (create_syntax_string_source ("")); + + gtk_widget_show (the_data_window); } @@ -124,9 +142,28 @@ void de_initialize (void) { destroy_source_stream (the_source_stream); - message_dialog_done (); settings_done (); - outp_done (); + output_close (); + i18n_done (); +} + + +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 (); } @@ -179,6 +216,89 @@ 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 void +load_data_file (const char *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); +} + +static void +handle_msg (const struct msg *m) +{ + message_item_submit (message_item_create (m)); +}