Fixed a lot of internationalisation issues.

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

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index d18788150fbb97eb5f66edac01ffebe1efade87d..4d77cb3d1bfe13cbfdab1b6ea17b505522cdbdb1 100644 (file)
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -24,6 +24,8 @@
  */
 
 #include <assert.h>
+#include <libintl.h>
+
 #include <libpspp/version.h>
 #include <libpspp/copyleft.h>
 #include <getopt.h>
@@ -39,6 +41,7 @@
 #include "data-sheet.h"
 #include "var-sheet.h"
 #include "psppire-case-array.h"
+#include "message-dialog.h"
 
 GladeXML *xml;
 
@@ -50,26 +53,56 @@ 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);
+
+static void
+i18n_init (void) 
+{
+#if ENABLE_NLS
+#if HAVE_LC_MESSAGES
+  setlocale (LC_MESSAGES, "");
+#endif
+  setlocale (LC_MONETARY, "");
+  bindtextdomain (PACKAGE, locale_dir);
+  textdomain (PACKAGE);
+#endif /* ENABLE_NLS */
+}
 
 
 int 
 main(int argc, char *argv[]) 
 {
-  if ( ! parse_command_line(&argc, &argv) ) 
-    return 0;
+  PsppireVarStore *var_store ;
+  GtkWidget *data_editor ;
+  GtkSheet *var_sheet ; 
+  GtkSheet *data_sheet ;
+
+  gchar *filename=0;
+  GError *err = 0;
 
   gtk_init(&argc, &argv);
 
+  if ( ! parse_command_line(&argc, &argv, &filename, &err) ) 
+    {
+      g_clear_error(&err);
+      return 1;
+    }
+
+
   glade_init();
 
+  i18n_init();
+
+  message_dialog_init();
+
   the_dictionary = psppire_dict_new();
 
   /* Create the model for the var_sheet */
-  PsppireVarStore *var_store = psppire_var_store_new(the_dictionary);
+  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);
 
@@ -78,25 +111,30 @@ main(int argc, char *argv[])
 
   if ( !xml ) return 1;
 
-  GtkWidget *data_editor = get_widget_assert(xml, "data_editor");
+  data_editor = get_widget_assert(xml, "data_editor");
   gtk_window_set_icon_from_file(GTK_WINDOW(data_editor), 
                                PKGDATADIR "/psppicon.png",0);
 
   /* connect the signals in the interface */
   glade_xml_signal_autoconnect(xml);
 
-  GtkSheet *var_sheet  = GTK_SHEET(get_widget_assert(xml, "variable_sheet"));
-  GtkSheet *data_sheet = GTK_SHEET(get_widget_assert(xml, "data_sheet"));
+  var_sheet  = GTK_SHEET(get_widget_assert(xml, "variable_sheet"));
+  data_sheet = GTK_SHEET(get_widget_assert(xml, "data_sheet"));
 
   gtk_sheet_set_model(var_sheet, G_SHEET_MODEL(var_store));
   
   gtk_sheet_set_model(data_sheet, G_SHEET_MODEL(data_store));
 
-
   gtk_init_add(callbacks_on_init, 0);
 
+  if (filename)
+    gtk_init_add((GtkFunction)load_system_file, filename);
+
   /* start the event loop */
   gtk_main();
+
+  message_dialog_done();
+
   return 0;
 }
 
@@ -105,7 +143,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[] =
     {
@@ -125,7 +163,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);
@@ -133,9 +171,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;
 }