X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=7d9cdf52981c2c424de41ffafd26e4041c08c7b8;hb=debddb2afee6725855f1b44e3bebbb67769def55;hp=85b31d0945ecaf430e5a20b8d411b94e3e943375;hpb=7dade12742b9b957277e0d6c5a9e4d578d71597e;p=pspp diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c index 85b31d0945..7d9cdf5298 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, 2012, 2013 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 @@ -28,11 +28,8 @@ #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" @@ -53,72 +50,78 @@ #include "ui/gui/psppire-syntax-window.h" #include "ui/gui/psppire-selector.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/widgets.h" #include "ui/source-init-opts.h" #include "ui/syntax-gen.h" -#include "ui/gui/icons/icon-names.h" - #include "gl/configmake.h" #include "gl/xalloc.h" #include "gl/relocatable.h" -static void create_icon_factory (void); -static gchar *local_to_filename_encoding (const char *fn); - +void create_icon_factory (void); #define _(msgid) gettext (msgid) #define N_(msgid) msgid - void -initialize (const char *data_file) +register_selection_functions (void) { - 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_init (); - textdomain (PACKAGE); - 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); +} - if (data_file) +bool +initialize (const struct init_source *is) +{ + switch (is->state) { - gchar *filename = local_to_filename_encoding (data_file); - - enum detect_result res = any_reader_may_open (filename); - - /* Check to see if the file is a .sav or a .por file. If not - assume that it is a syntax file */ - if (res == ANY_YES) - open_data_window (NULL, filename, NULL); - else if (res == ANY_NO) - { - create_data_window (); - open_syntax_window (filename, NULL); - } - - g_free (filename); + 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; } - else - create_data_window (); + return FALSE; } @@ -126,217 +129,46 @@ 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_size { int resolution; /* The dimension of the images which will be used */ - size_t n_sizes; /* The number of items in the array below. - This may be zero, in which case the iconset will be wildcarded - (used by default when no non-wildcarded set is available) */ + 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 GtkIconSize menus[] = {GTK_ICON_SIZE_MENU}; -static const GtkIconSize toolbar[] = {GTK_ICON_SIZE_LARGE_TOOLBAR}; +static const GtkIconSize large_toolbar[] = {GTK_ICON_SIZE_LARGE_TOOLBAR}; +static const GtkIconSize small_toolbar[] = {GTK_ICON_SIZE_SMALL_TOOLBAR}; /* We currently have three icon sets viz: 16x16, 24x24 and 32x32 - We use the 16x16 for menus, the 32x32 for the toolbar and - the 24x24 for everything else. + We use the 16x16 for menus, the 32x32 for the large_toolbars and + the 24x24 for small_toolbars. - Exactly one element of the following array should have its 2nd and 3rd - argument as zero. + The order of this array is pertinent. The icons in the sets occuring + earlier in the array will be used a the wildcard (default) icon size, + if such an icon exists. */ static const struct icon_size sizemap[] = -{ - {16, sizeof (menus) / sizeof (GtkIconSize), menus}, - {24, 0, 0}, - {32, sizeof (toolbar) / sizeof (GtkIconSize), toolbar} -}; - - -static void -create_icon_factory (void) -{ - gint c; - GtkIconFactory *factory = gtk_icon_factory_new (); - struct icon_context ctx[2]; - ctx[0] = action_icon_context; - ctx[1] = category_icon_context; - for (c = 0 ; c < 2 ; ++c) { - const struct icon_context *ic = &ctx[c]; - gint i; - for (i = 0 ; i < ic->n_icons ; ++i) - { - GtkIconSet *icon_set = gtk_icon_set_new (); - int r; - for (r = 0 ; r < sizeof (sizemap) / sizeof (sizemap[0]); ++r) - { - int s; - GtkIconSource *source = gtk_icon_source_new (); - gchar *filename = g_strdup_printf ("%s/%s/%dx%d/%s.png", PKGDATADIR, - ic->context_name, - sizemap[r].resolution, sizemap[r].resolution, - ic->icon_name[i]); - const char *relocated_filename = relocate (filename); - - gtk_icon_source_set_filename (source, relocated_filename); - gtk_icon_source_set_size_wildcarded (source, sizemap[r].n_sizes <= 0); - for (s = 0 ; s < sizemap[r].n_sizes ; ++s) - gtk_icon_source_set_size (source, sizemap[r].usage[s]); - if (filename != relocated_filename) - free (CONST_CAST (char *, relocated_filename)); - g_free (filename); - gtk_icon_set_add_source (icon_set, source); - } - - gtk_icon_factory_add (factory, ic->icon_name[i], icon_set); - } - } + {24, sizeof (small_toolbar) / sizeof (GtkIconSize), small_toolbar}, + {16, sizeof (menus) / sizeof (GtkIconSize), menus}, + {32, sizeof (large_toolbar) / sizeof (GtkIconSize), large_toolbar} + }; - { - struct iconmap - { - const gchar *gtk_id; - gchar *pspp_id; - }; - - /* We have our own icons for some things. - But we want the Stock Item to be identical to the Gtk standard - ones in all other respects. - */ - const struct iconmap map[] = { - {GTK_STOCK_NEW, "file-new-document"}, - {GTK_STOCK_QUIT, "file-quit"}, - {GTK_STOCK_SAVE, "file-save-document"}, - {GTK_STOCK_CUT, "edit-cut"}, - {GTK_STOCK_COPY, "edit-copy"}, - {GTK_STOCK_PASTE, "edit-paste"}, - {GTK_STOCK_UNDO, "edit-undo"}, - {GTK_STOCK_REDO, "edit-redo"}, - {GTK_STOCK_DELETE, "edit-delete"}, - {GTK_STOCK_ABOUT, "help-about"}, - {GTK_STOCK_PRINT, "file-print-document"} - }; - - GtkStockItem customised[sizeof (map) / sizeof (map[0])]; - int i; - - for (i = 0; i < sizeof (map) / sizeof (map[0]); ++i) - { - gtk_stock_lookup (map[i].gtk_id, &customised[i]); - customised[i].stock_id = map[i].pspp_id; - } - - - - gtk_stock_add (customised, sizeof (map) / sizeof (map[0])); - } - - { - /* Create our own "pspp-stock-reset" item, using the - GTK_STOCK_REFRESH icon set */ - GtkStockItem items[2] = { - {"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); -} -/* - Convert a filename from the local encoding into "filename" encoding. - The return value will be allocated on the heap. It is the responsibility - of the caller to free it. - */ -static gchar * -local_to_filename_encoding (const char *fn) -{ - 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 (fn); - } - else - { - GError *err = NULL; - utf8 = g_locale_to_utf8 (fn, -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 (fn); - - return filename; -} static void handle_msg (const struct msg *m_, void *lexer_) @@ -361,3 +193,30 @@ psppire_set_lexer (struct lexer *lexer) { msg_set_handler (handle_msg, lexer); } + + +void +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); + + /* 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) + open_data_window (NULL, filename, NULL, NULL); + else if (retval == 0) + { + create_data_window (); + open_syntax_window (filename, NULL); + } + + fh_unref (fh); +}