X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=ed6d29a3150606d5c42d46357a27e48f6a93a798;hb=890a97adb0e898a80d1fb758714565ed9ce7e143;hp=85b31d0945ecaf430e5a20b8d411b94e3e943375;hpb=7dade12742b9b957277e0d6c5a9e4d578d71597e;p=pspp diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c index 85b31d0945..ed6d29a315 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 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 @@ -29,10 +29,8 @@ #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,6 +51,7 @@ #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" @@ -73,52 +72,92 @@ static gchar *local_to_filename_encoding (const char *fn); #define N_(msgid) msgid -void -initialize (const char *data_file) +bool +initialize (const struct init_source *is) { - 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); - - if (data_file) + 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: + create_icon_factory (); + break; + case 10: + psppire_output_window_setup (); + break; + case 11: + journal_init (); + break; + case 12: + textdomain (PACKAGE); + break; + case 13: + /* FIXME: This should be implemented with a GtkInterface */ + 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); + break; + case 14: + { + if (is->file) + { + gchar *filename = local_to_filename_encoding (is->file); + + int retval = any_reader_detect (filename, 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); + } + g_free (filename); + } + else + { + create_data_window (); + } + return TRUE; + } + break; + default: + return TRUE; + break; } - else - create_data_window (); + return FALSE; } @@ -126,7 +165,7 @@ void de_initialize (void) { settings_done (); - output_close (); + output_engine_pop (); i18n_done (); } @@ -151,28 +190,28 @@ psppire_quit (void) 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[] = { + {24, sizeof (small_toolbar) / sizeof (GtkIconSize), small_toolbar}, {16, sizeof (menus) / sizeof (GtkIconSize), menus}, - {24, 0, 0}, - {32, sizeof (toolbar) / sizeof (GtkIconSize), toolbar} + {32, sizeof (large_toolbar) / sizeof (GtkIconSize), large_toolbar} }; @@ -190,6 +229,7 @@ create_icon_factory (void) gint i; for (i = 0 ; i < ic->n_icons ; ++i) { + gboolean wildcarded = FALSE; GtkIconSet *icon_set = gtk_icon_set_new (); int r; for (r = 0 ; r < sizeof (sizemap) / sizeof (sizemap[0]); ++r) @@ -201,15 +241,28 @@ create_icon_factory (void) sizemap[r].resolution, sizemap[r].resolution, ic->icon_name[i]); const char *relocated_filename = relocate (filename); + GFile *gf = g_file_new_for_path (relocated_filename); + if (g_file_query_exists (gf, NULL)) + { + gtk_icon_source_set_filename (source, relocated_filename); + if (!wildcarded) + { + gtk_icon_source_set_size_wildcarded (source, TRUE); + wildcarded = TRUE; + } + } + g_object_unref (gf); - 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); + + if ( gtk_icon_source_get_filename (source)) + gtk_icon_set_add_source (icon_set, source); + + gtk_icon_source_free (source); } gtk_icon_factory_add (factory, ic->icon_name[i], icon_set);