Reworked settings so as to use one large struct instead of lots of static

[pspp-builds.git] / src / ui / gui / psppire.c

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index 2f209a08953539f25a38ac74a3aa0d07e491bcab..07557fed5136d3c1230b1ae6e1ab3a6b306d7908 100644 (file)
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -16,6 +16,7 @@
 
 #include <config.h>
 
+#include <locale.h>
 #include <assert.h>
 #include <libintl.h>
 #include <gsl/gsl_errno.h>
@@ -68,6 +69,10 @@ replace_casereader (struct casereader *s)
   psppire_data_store_set_case_file (the_data_store, pcf);
 }
 
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
+
+
 void
 initialize (void)
 {
@@ -79,12 +84,10 @@ initialize (void)
 
   bindtextdomain (PACKAGE, locale_dir);
 
-  textdomain (PACKAGE);
 
   glade_init ();
 
   gsl_set_error_handler_off ();
-  fmt_init ();
   fn_init ();
   outp_init ();
   settings_init (&viewer_width, &viewer_length);
@@ -120,6 +123,7 @@ initialize (void)
   unlink (OUTPUT_FILE_NAME);
 
   journal_enable ();
+  textdomain (PACKAGE);
 
   new_data_window (NULL, NULL);
 }
@@ -135,6 +139,7 @@ de_initialize (void)
 }
 
 
+
 struct icon_info
 {
   const char *file_name;
@@ -184,6 +189,27 @@ create_icon_factory (void)
        }
     }
 
+
+  {
+    /* Create our own "pspp-stock-reset" item, using the
+       GTK_STOCK_REFRESH icon set */
+
+    GtkStockItem items[] = {
+      {"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)
+                         );
+
+    gtk_icon_factory_add (factory, "pspp-stock-select", 
+                         gtk_icon_factory_lookup_default (GTK_STOCK_INDEX)
+                         );
+  }
+
   gtk_icon_factory_add_default (factory);
 }