X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=67ace893386b2854b9157115e7f71646636dda67;hb=e16d30a43af6ada7b8846f48a55eb3cb8f4e5f22;hp=6e7c6e0a5ea05d25e149bea74eef9415fc031f5b;hpb=e1afbdf98986678c42673ecb76224790f355926a;p=pspp

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index 6e7c6e0a5e..67ace89338 100644
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -71,6 +71,8 @@ give_help(void)
 
 PsppireVarStore *var_store = 0;
 
+void create_icon_factory (void);
+
 int 
 main(int argc, char *argv[]) 
 {
@@ -103,18 +105,14 @@ main(int argc, char *argv[])
   if ( ! parse_command_line(&argc, &argv, &filename, &err) ) 
     {
       g_clear_error(&err);
-      return 1;
+      return 0;
     }
 
-
   glade_init();
 
 
-  settings_init();
 
-  /* 
-  set_pspp_locale("da_DK");
-  */
+  settings_init();
 
   message_dialog_init();
 
@@ -127,6 +125,8 @@ main(int argc, char *argv[])
 
   data_store = psppire_data_store_new(the_dictionary);
 
+  create_icon_factory();
+
   /* load the interface */
   xml = glade_xml_new(PKGDATADIR "/psppire.glade", NULL, NULL);
 
@@ -197,12 +197,12 @@ parse_command_line (int *argc, char ***argv, gchar **filename, GError **err)
       switch (c)
 	{
 	case 'h':
-	  g_printerr("Usage: psppire {|--help|--version}\n");
+	  g_print ("Usage: psppire {|--help|--version}\n");
           return false;
 	case 'V':
-	  g_print(version);
-	  g_print("\n");
-	  g_print(legal);
+	  g_print (version);
+	  g_print ("\n");
+	  g_print (legal);
 	  return false;
 	default:
 	  return false;
@@ -218,3 +218,50 @@ parse_command_line (int *argc, char ***argv, gchar **filename, GError **err)
 }
 
 
+
+void 
+create_icon_factory (void)
+{
+  GtkIconFactory *factory = gtk_icon_factory_new();
+
+  GtkIconSet *icon_set;
+  
+  GdkPixbuf *pixbuf;
+
+  pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/value-labels.png", 0);
+  icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
+  g_object_unref (pixbuf);
+  gtk_icon_factory_add ( factory, "pspp-value-labels", icon_set);
+
+  pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/weight-cases.png", 0);
+  icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
+  g_object_unref (pixbuf);
+  gtk_icon_factory_add ( factory, "pspp-weight-cases", icon_set);
+
+  pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/goto-variable.png", 0);
+  icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
+  g_object_unref (pixbuf);
+  gtk_icon_factory_add ( factory, "pspp-goto-variable", icon_set);
+
+  pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/insert-variable.png", 0);
+  icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
+  g_object_unref (pixbuf);
+  gtk_icon_factory_add ( factory, "pspp-insert-variable", icon_set);
+
+  pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/insert-case.png", 0);
+  icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
+  g_object_unref (pixbuf);
+  gtk_icon_factory_add ( factory, "pspp-insert-case", icon_set);
+
+  pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/split-file.png", 0);
+  icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
+  g_object_unref (pixbuf);
+  gtk_icon_factory_add ( factory, "pspp-split-file", icon_set);
+
+  pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/select-cases.png", 0);
+  icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
+  g_object_unref (pixbuf);
+  gtk_icon_factory_add ( factory, "pspp-select-cases", icon_set);
+
+  gtk_icon_factory_add_default (factory);
+}