X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=9fe010525a36f1bd775a0f9657607fcc3e173e43;hb=e9bebe68e0285273d0e37af5d548a9b2c26951e1;hp=91640fe9cf0fed7c16e8bb2512c7d4c6ed78b1b7;hpb=876da2249715aa8495343d8a9b1dd9b4a08fc91d;p=pspp diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c index 91640fe9cf..9fe010525a 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 @@ -53,6 +53,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" @@ -65,7 +66,6 @@ #include "gl/xalloc.h" #include "gl/relocatable.h" -static void inject_renamed_icons (void); static void create_icon_factory (void); static gchar *local_to_filename_encoding (const char *fn); @@ -89,7 +89,6 @@ initialize (const char *data_file) bind_textdomain_codeset (PACKAGE, "UTF-8"); - inject_renamed_icons (); create_icon_factory (); psppire_output_window_setup (); @@ -97,19 +96,23 @@ initialize (const char *data_file) journal_init (); textdomain (PACKAGE); + /* 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); if (data_file) { 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 ( any_reader_may_open (filename)) - open_data_window (NULL, filename, NULL); - else + if (res == ANY_YES) + open_data_window (NULL, filename, NULL, NULL); + else if (res == ANY_NO) { create_data_window (); open_syntax_window (filename, NULL); @@ -148,73 +151,31 @@ psppire_quit (void) gtk_main_quit (); } -static void -inject_renamed_icon (const char *icon, const char *substitute) -{ - GtkIconTheme *theme = gtk_icon_theme_get_default (); - if (!gtk_icon_theme_has_icon (theme, icon) - && gtk_icon_theme_has_icon (theme, substitute)) - { - gint *sizes = gtk_icon_theme_get_icon_sizes (theme, substitute); - gint *p; - - for (p = sizes; *p != 0; p++) - { - gint size = *p; - GdkPixbuf *pb; - - pb = gtk_icon_theme_load_icon (theme, substitute, size, 0, NULL); - if (pb != NULL) - { - GdkPixbuf *copy = gdk_pixbuf_copy (pb); - if (copy != NULL) - gtk_icon_theme_add_builtin_icon (icon, size, copy); - } - } - } -} - -/* Avoid a bug in GTK+ 2.22 that can cause a segfault at startup time. Earlier - and later versions of GTK+ do not have the bug. Bug #31511. - - Based on this patch against Inkscape: - https://launchpadlibrarian.net/60175914/copy_renamed_icons.patch */ -static void -inject_renamed_icons (void) -{ - if (gtk_major_version == 2 && gtk_minor_version == 22) - { - inject_renamed_icon ("gtk-file", "document-x-generic"); - inject_renamed_icon ("gtk-directory", "folder"); - } -} - - 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} }; @@ -232,6 +193,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) @@ -243,15 +205,26 @@ 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_factory_add (factory, ic->icon_name[i], icon_set); @@ -270,14 +243,17 @@ create_icon_factory (void) 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_ABOUT, "help-about"}, - {GTK_STOCK_PRINT, "file-print-document"} + {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])];