#include <config.h>
-#include <locale.h>
+#include <libpspp/i18n.h>
#include <assert.h>
#include <libintl.h>
#include <gsl/gsl_errno.h>
+#include <xalloc.h>
#include <argp.h>
#include <ui/command-line.h>
#include "relocatable.h"
#include "psppire-data-window.h"
#include "psppire.h"
+#include "widgets.h"
#include <libpspp/getl.h>
#include <unistd.h>
#include "psppire-dict.h"
#include "psppire-var-store.h"
#include "psppire-data-store.h"
-#include "helper.h"
+#include "executor.h"
#include "message-dialog.h"
#include <ui/syntax-gen.h>
-
+#include "psppire-window-register.h"
#include "psppire-output-window.h"
#include <data/sys-file-reader.h>
#include <ui/source-init-opts.h>
+GtkRecentManager *the_recent_mgr = 0;
PsppireDataStore *the_data_store = 0;
PsppireVarStore *the_var_store = 0;
{
PsppireDict *dictionary = 0;
- /* gtk_init messes with the locale.
- So unset the bits we want to control ourselves */
- setlocale (LC_NUMERIC, "C");
- bindtextdomain (PACKAGE, locale_dir);
+ i18n_init ();
+ preregister_widgets ();
gsl_set_error_handler_off ();
fn_init ();
journal_enable ();
textdomain (PACKAGE);
+
+ the_recent_mgr = gtk_recent_manager_get_default ();
+
the_data_window = psppire_data_window_new ();
command_line_processor_replace_aux (clp, &post_init_argp, the_source_stream);
message_dialog_done ();
settings_done ();
outp_done ();
+ i18n_done ();
+}
+
+
+static void
+func (gpointer key, gpointer value, gpointer data)
+{
+ gboolean rv;
+ PsppireWindow *window = PSPPIRE_WINDOW (value);
+
+ g_signal_emit_by_name (window, "delete-event", 0, &rv);
}
+void
+psppire_quit (void)
+{
+ PsppireWindowRegister *reg = psppire_window_register_new ();
+ psppire_window_register_foreach (reg, func, NULL);
+
+ gtk_main_quit ();
+}
struct icon_info
{
case ARGP_KEY_ARG:
{
- psppire_data_window_load_file (PSPPIRE_DATA_WINDOW (the_data_window),
- arg);
+ gchar *filename = NULL;
+ gchar *utf8 = NULL;
+ const gchar *local_encoding = NULL;
+ gsize written = -1;
+ const gboolean local_is_utf8 = g_get_charset (&local_encoding);
+
+ /* There seems to be no Glib function to convert from local encoding
+ to filename encoding. Therefore it has to be done in two steps:
+ the intermediate encoding is UTF8.
+
+ Either step could fail. However, in many cases the file can still
+ be loaded even if the conversion fails. So in those cases, after showing
+ a warning, we simply copy the locally encoded filename to the destination
+ and hope for the best.
+ */
+
+ if ( local_is_utf8)
+ {
+ utf8 = xstrdup (arg);
+ }
+ else
+ {
+ GError *err = NULL;
+ utf8 = g_locale_to_utf8 (arg, -1, NULL, &written, &err);
+ if ( NULL == utf8)
+ {
+ g_warning ("Cannot convert filename from local encoding \"%s\" to UTF-8: %s",
+ local_encoding,
+ err->message);
+ g_clear_error (&err);
+ }
+ }
+
+ if ( NULL != utf8)
+ {
+ GError *err = NULL;
+ filename = g_filename_from_utf8 (utf8, written, NULL, NULL, &err);
+ if ( NULL == filename)
+ {
+ g_warning ("Cannot convert filename from UTF8 to filename encoding: %s",
+ err->message);
+ g_clear_error (&err);
+ }
+ }
+
+ g_free (utf8);
+
+ if ( filename == NULL)
+ filename = xstrdup (arg);
+
+ psppire_window_load (PSPPIRE_WINDOW (the_data_window), filename);
+
+ g_free (filename);
break;
}
default:
if ( NULL == filename )
filename = xasprintf ("%s%s", dir, OUTPUT_FILE_NAME);
-
return filename;
}