projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Internationalisation.
[pspp-builds.git]
/
src
/
ui
/
gui
/
psppire.c
diff --git
a/src/ui/gui/psppire.c
b/src/ui/gui/psppire.c
index 4d77cb3d1bfe13cbfdab1b6ea17b505522cdbdb1..3560dbf634e8f107a971fddf88e8740d11b9cd45 100644
(file)
--- a/
src/ui/gui/psppire.c
+++ b/
src/ui/gui/psppire.c
@@
-18,16
+18,14
@@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA. */
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 <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>
#include <getopt.h>
#include <gtk/gtk.h>
#include <gtk/gtk.h>
@@
-56,20
+54,6
@@
PsppireDataStore *data_store = 0;
static bool parse_command_line (int *argc, char ***argv,
gchar **filename, GError **err);
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[])
{
int
main(int argc, char *argv[])
{
@@
-83,16
+67,29
@@
main(int argc, char *argv[])
gtk_init(&argc, &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;
}
if ( ! parse_command_line(&argc, &argv, &filename, &err) )
{
g_clear_error(&err);
return 1;
}
-
glade_init();
glade_init();
- i18n_init();
+
+ settings_init();
+
+
+
+ /*
+ set_pspp_locale("da_DK");
+ */
message_dialog_init();
message_dialog_init();
@@
-125,16
+122,20
@@
main(int argc, char *argv[])
gtk_sheet_set_model(data_sheet, G_SHEET_MODEL(data_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);
if (filename)
gtk_init_add((GtkFunction)load_system_file, filename);
+ else
+ gtk_init_add((GtkFunction)clear_file, 0);
+
+ var_data_selection_init();
/* start the event loop */
gtk_main();
message_dialog_done();
/* start the event loop */
gtk_main();
message_dialog_done();
+ settings_done();
+
return 0;
}
return 0;
}