X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=21ba79b11400e2efd231437efc9a461ec78b2e43;hb=e294a372f351d7105c21a2db58022af8b119aa64;hp=4d77cb3d1bfe13cbfdab1b6ea17b505522cdbdb1;hpb=75aeeafa67aa460512683311566a83917d399c70;p=pspp

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index 4d77cb3d1b..21ba79b114 100644
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -18,16 +18,13 @@
    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>
@@ -36,19 +33,15 @@
 #include "psppire-dict.h"
 #include "psppire-var-store.h"
 #include "psppire-data-store.h"
-
 #include "helper.h"
 #include "data-sheet.h"
 #include "var-sheet.h"
-#include "psppire-case-array.h"
 #include "message-dialog.h"
 
 GladeXML *xml;
 
 
 PsppireDict *the_dictionary = 0;
-PsppireCaseArray *the_cases = 0;
-
 
 PsppireDataStore *data_store = 0;
 
@@ -56,24 +49,32 @@ PsppireDataStore *data_store = 0;
 static bool parse_command_line (int *argc, char ***argv, 
 				gchar **filename, GError **err);
 
+
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
+
 static void
-i18n_init (void) 
+give_help(void)
 {
-#if ENABLE_NLS
-#if HAVE_LC_MESSAGES
-  setlocale (LC_MESSAGES, "");
-#endif
-  setlocale (LC_MONETARY, "");
-  bindtextdomain (PACKAGE, locale_dir);
-  textdomain (PACKAGE);
-#endif /* ENABLE_NLS */
+  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);
 }
 
+PsppireVarStore *var_store = 0;
 
 int 
 main(int argc, char *argv[]) 
 {
-  PsppireVarStore *var_store ;
+
   GtkWidget *data_editor ;
   GtkSheet *var_sheet ; 
   GtkSheet *data_sheet ;
@@ -83,6 +84,14 @@ 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);
@@ -92,19 +101,23 @@ main(int argc, char *argv[])
 
   glade_init();
 
-  i18n_init();
+
+  settings_init();
+
+  /* 
+  set_pspp_locale("da_DK");
+  */
 
   message_dialog_init();
 
   the_dictionary = psppire_dict_new();
 
+  bind_textdomain_codeset(PACKAGE, "UTF-8");
+
   /* 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(100000, 20);
-
-  data_store = psppire_data_store_new(the_dictionary, the_cases);
+  data_store = psppire_data_store_new(the_dictionary);
 
   /* load the interface */
   xml = glade_xml_new(PKGDATADIR "/psppire.glade", NULL, NULL);
@@ -125,16 +138,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;
 }
 
@@ -182,3 +208,5 @@ parse_command_line (int *argc, char ***argv, gchar **filename, GError **err)
 
   return true;
 }
+
+