Internationalisation.

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

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index 58264d99b0520c1abb4742f7d2b22f6d7b6cf196..3560dbf634e8f107a971fddf88e8740d11b9cd45 100644 (file)
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -18,14 +18,14 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA. */
 
-/*
- * Initial main.c file generated by Glade. Edit as required.
- * Glade will not overwrite this file.
- */
 
 #include <assert.h>
+#include <libintl.h>
+
 #include <libpspp/version.h>
 #include <libpspp/copyleft.h>
+#include <data/settings.h>
+
 #include <getopt.h>
 #include <gtk/gtk.h>
 #include <gtk/gtk.h>
@@ -39,6 +39,7 @@
 #include "data-sheet.h"
 #include "var-sheet.h"
 #include "psppire-case-array.h"
+#include "message-dialog.h"
 
 GladeXML *xml;
 
@@ -50,8 +51,8 @@ PsppireCaseArray *the_cases = 0;
 PsppireDataStore *data_store = 0;
 
 
-static bool parse_command_line (int *argc, char ***argv);
-
+static bool parse_command_line (int *argc, char ***argv, 
+                               gchar **filename, GError **err);
 
 int 
 main(int argc, char *argv[]) 
@@ -61,20 +62,44 @@ main(int argc, char *argv[])
   GtkSheet *var_sheet ; 
   GtkSheet *data_sheet ;
 
-  if ( ! parse_command_line(&argc, &argv) ) 
-    return 0;
+  gchar *filename=0;
+  GError *err = 0;
 
   gtk_init(&argc, &argv);
 
+  /* gtk_init messes with the locale. 
+     So unset the bits we want to control ourselves */
+  setlocale (LC_NUMERIC, "C");
+
+  bindtextdomain (PACKAGE, locale_dir);
+  textdomain (PACKAGE);
+
+  if ( ! parse_command_line(&argc, &argv, &filename, &err) ) 
+    {
+      g_clear_error(&err);
+      return 1;
+    }
+
   glade_init();
 
+
+  settings_init();
+
+  
+
+  /* 
+  set_pspp_locale("da_DK");
+  */
+
+  message_dialog_init();
+
   the_dictionary = psppire_dict_new();
 
   /* Create the model for the var_sheet */
   var_store = psppire_var_store_new(the_dictionary);
 
   /* Create the model for the data sheet */
-  the_cases = psppire_case_array_new(100, 20);
+  the_cases = psppire_case_array_new(100000, 20);
 
   data_store = psppire_data_store_new(the_dictionary, the_cases);
 
@@ -97,11 +122,20 @@ main(int argc, char *argv[])
   
   gtk_sheet_set_model(data_sheet, G_SHEET_MODEL(data_store));
 
+  if (filename)
+    gtk_init_add((GtkFunction)load_system_file, filename);
+  else
+    gtk_init_add((GtkFunction)clear_file, 0);
 
-  gtk_init_add(callbacks_on_init, 0);
+  var_data_selection_init();
 
   /* start the event loop */
   gtk_main();
+
+  message_dialog_done();
+
+  settings_done();
+
   return 0;
 }
 
@@ -110,7 +144,7 @@ main(int argc, char *argv[])
    main().  Returns true if normal execution should proceed,
    false if the command-line indicates that PSPP should exit. */
 static bool
-parse_command_line (int *argc, char ***argv)
+parse_command_line (int *argc, char ***argv, gchar **filename, GError **err)
 {
   static struct option long_options[] =
     {
@@ -130,7 +164,7 @@ parse_command_line (int *argc, char ***argv)
       switch (c)
        {
        case 'h':
-         g_print("Usage: psppire {|--help|--version}\n");
+         g_printerr("Usage: psppire {|--help|--version}\n");
           return false;
        case 'V':
          g_print(version);
@@ -138,9 +172,14 @@ parse_command_line (int *argc, char ***argv)
          g_print(legal);
          return false;
        default:
-         assert (0);
+         return false;
        }
     }
 
+  if ( optind < *argc) 
+    {
+      *filename = (*argv)[optind];
+    }
+
   return true;
 }