X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=9ed7d15becb3e4757006d6bbfcc95238eb2c605e;hb=76f722cdfd6475f8ae2d98139ea596adfcdb47be;hp=1b11c11996a1e03c4ff642e8810fb1e8ab1b9c9f;hpb=eea449691e75dfc2af4fd5d6670ab155b813a13e;p=pspp diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c index 1b11c11996..9ed7d15bec 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 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,91 +45,121 @@ #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 "ui/gui/icons/icon-names.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; - static void create_icon_factory (void); -struct dataset * the_dataset = NULL; - -static GtkWidget *the_data_window; - -static void load_data_file (const char *); - -static void -replace_casereader (struct casereader *s) -{ - psppire_data_store_set_reader (the_data_store, s); -} - #define _(msgid) gettext (msgid) #define N_(msgid) msgid - - -void -initialize (const char *data_file) +bool +initialize (const struct init_source *is) { - PsppireDict *dictionary = 0; - - i18n_init (); - - preregister_widgets (); - - gsl_set_error_handler_off (); - settings_init (); - fh_init (); - - the_dataset = dataset_create (); - psppire_set_lexer (NULL); - - 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 (); - - psppire_output_window_setup (); - - journal_enable (); - textdomain (PACKAGE); - - - the_recent_mgr = gtk_recent_manager_get_default (); + 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: + 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) + { + const gchar *local_encoding = NULL; + g_get_charset (&local_encoding); - 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); + struct file_handle *fh = fh_create_file (NULL, is->file, local_encoding, fh_default_properties ()); + const char *filename = fh_get_file_name (fh); - the_data_window = psppire_data_window_new (); - if (data_file != NULL) - load_data_file (data_file); + int retval = any_reader_detect (fh, NULL); - execute_const_syntax_string (PSPPIRE_DATA_WINDOW (the_data_window), ""); + /* 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); + } - gtk_widget_show (the_data_window); + fh_unref (fh); + } + else + { + create_data_window (); + } + return TRUE; + } + break; + default: + return TRUE; + break; + } + return FALSE; } @@ -137,16 +167,10 @@ void de_initialize (void) { settings_done (); - output_close (); + output_engine_pop (); i18n_done (); } -PsppireDataWindow * -psppire_default_data_window (void) -{ - return PSPPIRE_DATA_WINDOW (the_data_window); -} - static void func (gpointer key, gpointer value, gpointer data) { @@ -165,67 +189,137 @@ psppire_quit (void) gtk_main_quit (); } - -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 GtkIconSize menus[] = {GTK_ICON_SIZE_MENU}; +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 large_toolbars and + the 24x24 for small_toolbars. + + 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}, + {32, sizeof (large_toolbar) / sizeof (GtkIconSize), large_toolbar} +}; -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; + 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) + { + gboolean wildcarded = FALSE; + 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); + 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); + + 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); + + 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); + } + } - for (i = 0 ; i < sizeof (icons) / sizeof(icons[0]); ++i) + { + struct iconmap { - GError *err = NULL; - GdkPixbuf *pixbuf = - gdk_pixbuf_new_from_file (relocate (icons[i].file_name), &err); + const gchar *gtk_id; + gchar *pspp_id; + }; - 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); - } + /* 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[] = { + 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) ); @@ -237,64 +331,8 @@ create_icon_factory (void) 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_, void *lexer_)