X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=a3f6a2aff67d9ebebafd0261c2d08ffb8968b96d;hb=refs%2Fbuilds%2F20140205030510%2Fpspp;hp=a183aa6751a0a16a178a2cd231ca7979fc9b1c89;hpb=280548cf45cc2fa308c76ebee7aa62cc9a0b168c;p=pspp diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c index a183aa6751..a3f6a2aff6 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 @@ -65,7 +65,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,12 +88,11 @@ initialize (const char *data_file) bind_textdomain_codeset (PACKAGE, "UTF-8"); - inject_renamed_icons (); create_icon_factory (); psppire_output_window_setup (); - journal_enable (); + journal_init (); textdomain (PACKAGE); psppire_selector_set_default_selection_func (GTK_TYPE_ENTRY, insert_source_row_into_entry); @@ -105,11 +103,13 @@ initialize (const char *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,57 +148,31 @@ psppire_quit (void) gtk_main_quit (); } -static void -inject_renamed_icon (const char *icon, const char *substitute) +struct icon_size { - 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; + 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) */ + const GtkIconSize *usage; /* An array determining for what the icon set is used */ +}; - 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); - } - } - } -} +static const GtkIconSize menus[] = {GTK_ICON_SIZE_MENU}; +static const GtkIconSize toolbar[] = {GTK_ICON_SIZE_LARGE_TOOLBAR}; -/* 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"); - } -} +/* 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. -struct icon_size + Exactly one element of the following array should have its 2nd and 3rd + argument as zero. +*/ +static const struct icon_size sizemap[] = { - int resolution; - GtkIconSize size; -}; - - -static const struct icon_size sizes[] = { - {16, GTK_ICON_SIZE_MENU}, - {24, GTK_ICON_SIZE_LARGE_TOOLBAR} + {16, sizeof (menus) / sizeof (GtkIconSize), menus}, + {24, 0, 0}, + {32, sizeof (toolbar) / sizeof (GtkIconSize), toolbar} }; @@ -207,28 +181,33 @@ create_icon_factory (void) { gint c; GtkIconFactory *factory = gtk_icon_factory_new (); - struct icon_context xx[2]; - xx[0] = action_icon_context; - xx[1] = category_icon_context; + 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 = &xx[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 (sizes) / sizeof (sizes[0]); ++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, - sizes[r].resolution, sizes[r].resolution, + sizemap[r].resolution, sizemap[r].resolution, ic->icon_name[i]); - - gtk_icon_source_set_filename (source, filename); - gtk_icon_source_set_size_wildcarded (source, FALSE); - gtk_icon_source_set_size (source, sizes[r].size); + 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); } @@ -249,14 +228,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])];