Minor i18n issues.

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

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index e252acdefb84f69cb6b9ba96db26574a36c7c8ed..ae962e66fcc408c8e56ded614754f219dbf319db 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>
@@ -55,6 +55,25 @@ static bool parse_command_line (int *argc, char ***argv,
                                gchar **filename, GError **err);
 
 
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
+
+static void
+give_help(void)
+{
+  static struct msg m = {
+    MSG_GENERAL, 
+    MSG_NOTE,
+    {0, -1},
+    0, 
+  };
+
+  if (! m.text) 
+    m.text=g_strdup(_("Sorry. The help system hasn't yet been implemented."));
+
+  popup_message(&m);
+}
+
 int 
 main(int argc, char *argv[]) 
 {
@@ -68,15 +87,30 @@ main(int argc, char *argv[])
 
   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();
@@ -108,16 +142,29 @@ main(int argc, char *argv[])
   
   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);
+  else
+    gtk_init_add((GtkFunction)clear_file, 0);
+
+  var_data_selection_init();
+
+  {
+  GList *helps = glade_xml_get_widget_prefix(xml, "help_button_");
+
+  GList *i;
+  for ( i = g_list_first(helps); i ; i = g_list_next(i))
+      g_signal_connect(GTK_WIDGET(i->data), "clicked", give_help, 0);
+  }
+
 
   /* start the event loop */
   gtk_main();
 
   message_dialog_done();
 
+  settings_done();
+
   return 0;
 }
 
@@ -165,3 +212,5 @@ parse_command_line (int *argc, char ***argv, gchar **filename, GError **err)
 
   return true;
 }
+
+