X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=af61eeefc188f70cb79507a55e3972fd9cbdb371;hb=0f447caa885d8f0fd8c30d4440556d9b6abb99ea;hp=80983e01b31099203f56d13cd58488cc9aae2395;hpb=119d57cbddc317d9bde6831787026c84a6e7415f;p=pspp diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c index 80983e01b3..af61eeefc1 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, 2009, 2010, 2011 Free Software Foundation + Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011, 2012, 2013, 2014, 2016 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,20 +16,20 @@ #include + #include #include #include #include #include +#include "data/any-reader.h" #include "data/casereader.h" #include "data/dataset.h" #include "data/datasheet.h" #include "data/file-handle-def.h" -#include "data/file-name.h" -#include "data/por-file-reader.h" +#include "data/session.h" #include "data/settings.h" -#include "data/sys-file-reader.h" #include "language/lexer/lexer.h" #include "libpspp/i18n.h" @@ -45,64 +45,83 @@ #include "ui/gui/psppire-data-store.h" #include "ui/gui/psppire-data-window.h" #include "ui/gui/psppire-dict.h" +#include "ui/gui/psppire.h" #include "ui/gui/psppire-output-window.h" +#include "ui/gui/psppire-syntax-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-means-layer.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; - -static void create_icon_factory (void); -static void load_data_file (PsppireDataWindow *, const char *); +void create_icon_factory (void); #define _(msgid) gettext (msgid) #define N_(msgid) msgid - void -initialize (const char *data_file) +register_selection_functions (void) { - PsppireDataWindow *data_window; - - i18n_init (); - - preregister_widgets (); - - gsl_set_error_handler_off (); - settings_init (); - fh_init (); - - psppire_set_lexer (NULL); - - bind_textdomain_codeset (PACKAGE, "UTF-8"); - - create_icon_factory (); - - 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); + psppire_selector_set_default_selection_func (PSPPIRE_TYPE_MEANS_LAYER, insert_source_row_into_layers); +} - data_window = psppire_default_data_window (); - if (data_file != NULL) - load_data_file (data_window, data_file); - execute_const_syntax_string (data_window, ""); +bool +initialize (const struct init_source *is) +{ + switch (is->state) + { + case 0: + i18n_init (); + break; + case 1: + preregister_widgets (); + break; + case 2: + gsl_set_error_handler_off (); + break; + case 3: + output_engine_push (); + break; + case 4: + settings_init (); + break; + case 5: + fh_init (); + break; + case 6: + psppire_set_lexer (NULL); + break; + case 7: + bind_textdomain_codeset (PACKAGE, "UTF-8"); + break; + case 8: + if ( ! gtk_parse_args (is->argc, is->argv) ) + { + perror ("Error parsing arguments"); + exit (1); + } + break; + case 9: + journal_init (); + break; + case 10: + textdomain (PACKAGE); + break; + default: + return TRUE; + break; + } + return FALSE; } @@ -110,159 +129,23 @@ void de_initialize (void) { settings_done (); - output_close (); + output_engine_pop (); 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) +psppire_quit (GApplication *app) { - PsppireWindowRegister *reg = psppire_window_register_new (); - psppire_window_register_foreach (reg, func, NULL); - - gtk_main_quit (); + g_application_quit (app); } - -struct icon_info +struct icon_size { - const char *file_name; - const gchar *id; + int resolution; /* The dimension of the images which will be used */ + size_t n_sizes; /* The number of items in the array below. */ + const GtkIconSize *usage; /* An array determining for what the icon set is used */ }; - - -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 (); - - 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) - ); - - 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 (PsppireDataWindow *window, 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 (window), filename); - - g_free (filename); -} - static void handle_msg (const struct msg *m_, void *lexer_) { @@ -286,3 +169,32 @@ psppire_set_lexer (struct lexer *lexer) { msg_set_handler (handle_msg, lexer); } + + +GtkWindow * +psppire_preload_file (const gchar *file) +{ + const gchar *local_encoding = "UTF-8"; + + struct file_handle *fh = fh_create_file (NULL, + file, + local_encoding, + fh_default_properties ()); + const char *filename = fh_get_file_name (fh); + + int retval = any_reader_detect (fh, NULL); + + GtkWindow *w = NULL; + /* Check to see if the file is a .sav or a .por file. If not + assume that it is a syntax file */ + if (retval == 1) + w = open_data_window (NULL, filename, NULL, NULL); + else if (retval == 0) + { + create_data_window (); + w = open_syntax_window (filename, NULL); + } + + fh_unref (fh); + return w; +}