Relocate the locale directory.

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

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index ff155d68fe71cc66e97dff9572a06435adae7045..a7b22037b868e7d523726c8f80faab41ebe1acc8 100644 (file)
--- 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  Free Software Foundation
+   Copyright (C) 2004, 2005, 2006, 2009  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
@@ -16,8 +16,10 @@
 
 #include <config.h>
 
+#include <locale.h>
 #include <assert.h>
 #include <libintl.h>
+#include <gsl/gsl_errno.h>
 
 #include "relocatable.h"
 
@@ -28,7 +30,6 @@
 #include <data/casereader.h>
 #include <data/datasheet.h>
 #include <data/file-handle-def.h>
-#include <data/format.h>
 #include <data/settings.h>
 #include <data/file-name.h>
 #include <data/procedure.h>
@@ -44,8 +45,6 @@
 #include "psppire-var-store.h"
 #include "psppire-data-store.h"
 #include "helper.h"
-#include "data-sheet.h"
-#include "var-sheet.h"
 #include "message-dialog.h"
 
 #include "output-viewer.h"
@@ -67,6 +66,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)
 {
@@ -76,16 +79,15 @@ initialize (void)
      So unset the bits we want to control ourselves */
   setlocale (LC_NUMERIC, "C");
 
-  bindtextdomain (PACKAGE, locale_dir);
+  bindtextdomain (PACKAGE, relocate (locale_dir));
 
-  textdomain (PACKAGE);
 
   glade_init ();
 
-  fmt_init ();
+  gsl_set_error_handler_off ();
   fn_init ();
   outp_init ();
-  settings_init ();
+  settings_init (&viewer_width, &viewer_length);
   fh_init ();
   the_source_stream =
     create_source_stream (
@@ -109,15 +111,28 @@ initialize (void)
 
   create_icon_factory ();
 
-  outp_configure_driver_line (
-    ss_cstr ("gui:ascii:screen:squeeze=on headers=off top-margin=0 "
-             "bottom-margin=0 paginate=off length=50 "
-            "width=" OUTPUT_LINE_WIDTH_str " emphasis=none "
-             "output-file=\"" OUTPUT_FILE_NAME "\" append=yes"));
+  {
+    const char *filename = output_file_name ();
+
+    struct string config_string;
 
-  unlink (OUTPUT_FILE_NAME);
+    ds_init_empty (&config_string);
+
+    ds_put_format (&config_string,
+                  "gui:ascii:screen:squeeze=on headers=off top-margin=0 "
+                  "bottom-margin=0 paginate=off length=auto width=auto "
+                  "emphasis=none "
+                  "output-file=\"%s\" append=yes", filename);
+
+    outp_configure_driver_line (ds_ss (&config_string));
+
+    unlink (filename);
+
+    ds_destroy (&config_string);
+  }
 
   journal_enable ();
+  textdomain (PACKAGE);
 
   new_data_window (NULL, NULL);
 }
@@ -133,6 +148,7 @@ de_initialize (void)
 }
 
 
+
 struct icon_info
 {
   const char *file_name;
@@ -182,6 +198,26 @@ 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);
 }