X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-window.c;h=4d2f085cada746aa88d9283556b2f6bb8732287a;hb=9fd97e410494b051da21490040e4a5b5de2d5a2a;hp=0a4021f71841585bd02544a07d5103ad32c0a9ee;hpb=9828d3a39e35f69e6e37159380a6fcbe6bba2f02;p=pspp

diff --git a/src/ui/gui/psppire-window.c b/src/ui/gui/psppire-window.c
index 0a4021f718..4d2f085cad 100644
--- a/src/ui/gui/psppire-window.c
+++ b/src/ui/gui/psppire-window.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2009, 2010, 2011, 2013  Free Software Foundation
+   Copyright (C) 2009, 2010, 2011, 2013, 2014  Free Software Foundation
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -660,7 +660,8 @@ psppire_window_save_as (PsppireWindow *w)
 static void delete_recent (const char *file_name);
 
 gboolean
-psppire_window_load (PsppireWindow *w, const gchar *file, gpointer hint)
+psppire_window_load (PsppireWindow *w, const gchar *file,
+                     const gchar *encoding, gpointer hint)
 {
   gboolean ok;
   PsppireWindowIface *i = PSPPIRE_WINDOW_MODEL_GET_IFACE (w);
@@ -671,7 +672,7 @@ psppire_window_load (PsppireWindow *w, const gchar *file, gpointer hint)
 
   g_return_val_if_fail (i->load, FALSE);
 
-  ok = i->load (w, file, hint);
+  ok = i->load (w, file, encoding, hint);
 
   if ( ok )
     {
@@ -685,27 +686,6 @@ psppire_window_load (PsppireWindow *w, const gchar *file, gpointer hint)
 }
 
 
-static void
-on_selection_changed (GtkFileChooser *chooser, GtkWidget *encoding_selector)
-{
-  const gchar *sysname;
-
-  const gchar *name = gtk_file_chooser_get_filename (chooser);
-
-  if ( NULL == name )
-    return;
-
-  sysname = convert_glib_filename_to_system_filename (name, NULL);
-
-  if ( ! fn_exists (sysname))
-    {
-      gtk_widget_set_sensitive (encoding_selector, FALSE);
-      return;
-    }
-
-  gtk_widget_set_sensitive (encoding_selector, ! any_reader_may_open (sysname));
-}
-
 GtkWidget *
 psppire_window_file_chooser_dialog (PsppireWindow *toplevel)
 {
@@ -723,13 +703,15 @@ psppire_window_file_chooser_dialog (PsppireWindow *toplevel)
   gtk_file_filter_set_name (filter, _("Data and Syntax Files"));
   gtk_file_filter_add_mime_type (filter, "application/x-spss-sav");
   gtk_file_filter_add_mime_type (filter, "application/x-spss-por");
+  gtk_file_filter_add_pattern (filter, "*.zsav");
   gtk_file_filter_add_pattern (filter, "*.sps");
   gtk_file_filter_add_pattern (filter, "*.SPS");
   gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
 
   filter = gtk_file_filter_new ();
-  gtk_file_filter_set_name (filter, _("System Files (*.sav)"));
+  gtk_file_filter_set_name (filter, _("System Files (*.sav, *.zsav)"));
   gtk_file_filter_add_mime_type (filter, "application/x-spss-sav");
+  gtk_file_filter_add_pattern (filter, "*.zsav");
   gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
 
   filter = gtk_file_filter_new ();
@@ -769,17 +751,9 @@ psppire_window_file_chooser_dialog (PsppireWindow *toplevel)
       free (dir_name);
     }
 
-
-  {
-    GtkWidget *encoding_selector =  psppire_encoding_selector_new ("Auto", true);
-
-    gtk_widget_set_sensitive (encoding_selector, FALSE);
-
-    g_signal_connect (dialog, "selection-changed", G_CALLBACK (on_selection_changed),
-		      encoding_selector);
-
-    gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (dialog), encoding_selector);
-  }
+    gtk_file_chooser_set_extra_widget (
+      GTK_FILE_CHOOSER (dialog),
+      psppire_encoding_selector_new ("Auto", true));
 
   return dialog;
 }
@@ -803,9 +777,12 @@ psppire_window_open (PsppireWindow *de)
         gchar *encoding = psppire_encoding_selector_get_encoding (
           gtk_file_chooser_get_extra_widget (GTK_FILE_CHOOSER (dialog)));
 
-	if (any_reader_may_open (sysname))
-          open_data_window (de, name, NULL);
-	else
+        int retval;
+
+        retval = any_reader_detect (sysname, NULL);
+	if (retval == 1)
+          open_data_window (de, name, encoding, NULL);
+	else if (retval == 0)
 	  open_syntax_window (name, encoding);
 
         g_free (encoding);
@@ -825,17 +802,24 @@ psppire_window_open (PsppireWindow *de)
    with associated MIME_TYPE.  If it's already in the list, it moves it to the
    top. */
 void
-add_most_recent (const char *file_name, const char *mime_type)
+add_most_recent (const char *file_name,
+                 const char *mime_type, const char *encoding)
 {
   gchar *uri = g_filename_to_uri  (file_name, NULL, NULL);
-
   if ( uri )
     {
       GtkRecentData recent_data;
+      gchar *full_mime_type;
+
+      if (encoding && encoding[0])
+        full_mime_type = g_strdup_printf ("%s; charset=%s",
+                                          mime_type, encoding);
+      else
+        full_mime_type = g_strdup (mime_type);
 
       recent_data.display_name = NULL;
       recent_data.description = NULL;
-      recent_data.mime_type = CONST_CAST (gchar *, mime_type);
+      recent_data.mime_type = full_mime_type;
       recent_data.app_name = CONST_CAST (gchar *, g_get_application_name ());
       recent_data.app_exec = g_strjoin (" ", g_get_prgname (), "%u", NULL);
       recent_data.groups = NULL;
@@ -845,6 +829,7 @@ add_most_recent (const char *file_name, const char *mime_type)
                                    uri, &recent_data);
 
       g_free (recent_data.app_exec);
+      g_free (full_mime_type);
     }
 
   g_free (uri);