X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=8491851383f4405805bbf71d0a35d5e172500b29;hb=82cdb6b894ba84fad617196cdba815c9aa15605f;hp=bdd5ad5332f4062d4b0bf6927a42ea2b57223d30;hpb=8953baa61127d6d3b91f763663ea647bf3e4e793;p=pspp-builds.git

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index bdd5ad53..84918513 100644
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -16,17 +16,19 @@
 
 #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>
@@ -44,15 +46,17 @@
 #include <language/syntax-string-source.h>
 
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 #include "psppire-dict.h"
+#include "dict-display.h"
+#include "psppire-selector.h"
+#include "psppire-var-view.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>
@@ -60,6 +64,7 @@
 
 #include <ui/source-init-opts.h>
 
+GtkRecentManager *the_recent_mgr = 0;
 PsppireDataStore *the_data_store = 0;
 PsppireVarStore *the_var_store = 0;
 
@@ -80,7 +85,6 @@ replace_casereader (struct casereader *s)
 #define N_(msgid) msgid
 
 
-const char * output_file_name (void);
 
 
 void
@@ -88,14 +92,9 @@ initialize (struct command_line_processor *clp, int argc, char **argv)
 {
   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 ();
 
-  glade_init ();
+  preregister_widgets ();
 
   gsl_set_error_handler_off ();
   fn_init ();
@@ -147,6 +146,13 @@ initialize (struct command_line_processor *clp, int argc, char **argv)
   journal_enable ();
   textdomain (PACKAGE);
 
+
+  the_recent_mgr = gtk_recent_manager_get_default ();
+
+  psppire_selector_set_default_selection_func (GTK_TYPE_ENTRY, insert_source_row_into_entry);
+  psppire_selector_set_default_selection_func (PSPPIRE_VAR_VIEW_TYPE, insert_source_row_into_tree_view);
+  psppire_selector_set_default_selection_func (GTK_TYPE_TREE_VIEW, insert_source_row_into_tree_view);
+
   the_data_window = psppire_data_window_new ();
 
   command_line_processor_replace_aux (clp, &post_init_argp, the_source_stream);
@@ -167,8 +173,27 @@ de_initialize (void)
   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
@@ -257,46 +282,59 @@ parse_non_options (int key, char *arg, struct argp_state *state)
     {
     case ARGP_KEY_ARG:
       {
-	struct string syntax;
-	FILE *fp = fopen (arg, "r");
-	if (NULL == fp)
+	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)
 	  {
-	    const int errnum = errno;
-	    fprintf (state->err_stream, _("Cannot open %s: %s.\n"),
-		     arg, strerror (errnum));
-	    return 0;
+	    utf8 = xstrdup (arg);
 	  }
-	if ( sfm_detect (fp))
+	else
 	  {
-	    ds_init_cstr (&syntax, "GET FILE=");
-	    goto close;
+	    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);
+	      }
 	  }
-	rewind (fp);
-	if (pfm_detect (fp))
+
+	if ( NULL != utf8)
 	  {
-	    ds_init_cstr (&syntax, "IMPORT FILE=");
-	    goto close;
+	    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);
+	      }
 	  }
 
-	fclose (fp);
-	msg (ME, _("%s is neither a system nor portable file"), arg);
-	break;
-
-      close:
-	fclose (fp);
-
-	syntax_gen_string (&syntax, ss_cstr (arg));
-	ds_put_cstr (&syntax, ".");
+	g_free (utf8);
 
-	getl_append_source (ss,
-			    create_syntax_string_source (ds_cstr (&syntax)),
-			    GETL_BATCH,
-			    ERRMODE_CONTINUE);
+	if ( filename == NULL)
+	  filename = xstrdup (arg);
 
-	ds_destroy (&syntax);
-
-	psppire_window_set_filename (the_data_window, arg);
+	psppire_window_load (PSPPIRE_WINDOW (the_data_window), filename);
 
+	g_free (filename);
 	break;
       }
     default:
@@ -318,6 +356,5 @@ output_file_name (void)
   if ( NULL == filename )
     filename = xasprintf ("%s%s", dir, OUTPUT_FILE_NAME);
 
-
   return filename;
 }