X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=eb8fddbe98d486631284f972801aa735cfb4f070;hb=80595f6de2ea8f0b64756d76c7ac3c89a1abbbb8;hp=a3f6a2aff67d9ebebafd0261c2d08ffb8968b96d;hpb=e12c4fd7aa872268da1380e02a6d82e4222e8b26;p=pspp

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index a3f6a2aff6..eb8fddbe98 100644
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -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"
@@ -81,6 +82,7 @@ initialize (const char *data_file)
   preregister_widgets ();
 
   gsl_set_error_handler_off ();
+  output_engine_push ();
   settings_init ();
   fh_init ();
 
@@ -95,9 +97,11 @@ 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)
     {
@@ -126,7 +130,7 @@ void
 de_initialize (void)
 {
   settings_done ();
-  output_close ();
+  output_engine_pop ();
   i18n_done ();
 }
 
@@ -151,28 +155,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 +194,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 +206,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);