X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-window.c;h=4c7fcf57dc2040c32357e9e371bbad8f6339d75d;hb=b0fd056eedc6872d45541c1ee0eb43e909bbc8b1;hp=54ece05de51b7386573d0179b8bca49f6f73ab25;hpb=5d83e7dd4fc3bac1b385a5916b6816efd191b4b2;p=pspp

diff --git a/src/ui/gui/psppire-window.c b/src/ui/gui/psppire-window.c
index 54ece05de5..4c7fcf57dc 100644
--- a/src/ui/gui/psppire-window.c
+++ b/src/ui/gui/psppire-window.c
@@ -17,6 +17,7 @@
 #include <config.h>
 
 #include "psppire-window.h"
+#include "psppire-window-base.h"
 
 #include <gtk/gtk.h>
 
@@ -28,10 +29,10 @@
 #define N_(msgid) msgid
 
 #include "data/any-reader.h"
+#include "data/file-name.h"
 #include "data/dataset.h"
 
 #include "helper.h"
-#include "psppire-conf.h"
 #include "psppire-data-window.h"
 #include "psppire-encoding-selector.h"
 #include "psppire-syntax-window.h"
@@ -66,7 +67,7 @@ psppire_window_get_type (void)
       };
 
       psppire_window_type =
-	g_type_register_static (GTK_TYPE_WINDOW, "PsppireWindow",
+	g_type_register_static (PSPPIRE_TYPE_WINDOW_BASE, "PsppireWindow",
 				&psppire_window_info, G_TYPE_FLAG_ABSTRACT);
     }
 
@@ -228,17 +229,6 @@ psppire_window_get_property (GObject         *object,
 }
 
 
-static void
-on_realize (GtkWindow *window, gpointer data)
-{
-  PsppireConf *conf = psppire_conf_new ();
-
-  const gchar *base = G_OBJECT_TYPE_NAME (window);
-
-  psppire_conf_set_window_geometry (conf, base, window);
-}
-
-
 static void
 psppire_window_finalize (GObject *object)
 {
@@ -422,13 +412,6 @@ on_delete (PsppireWindow *w, GdkEvent *event, gpointer user_data)
 {
   PsppireWindowRegister *reg = psppire_window_register_new ();
 
-  const gchar *base = G_OBJECT_TYPE_NAME (w);
-
-  PsppireConf *conf = psppire_conf_new ();
-
-  psppire_conf_save_window_geometry (conf, base, GTK_WINDOW (w));
-
-
   if ( w->dirty )
     {
       gint response = psppire_window_query_save (w);
@@ -488,10 +471,7 @@ psppire_window_init (PsppireWindow *window)
 
   g_signal_connect_swapped (window, "delete-event", G_CALLBACK (on_delete), window);
 
-  g_object_set (window, "icon-name", "psppicon", NULL);
-
-  g_signal_connect (window, "realize",
-		    G_CALLBACK (on_realize), window);
+  g_object_set (window, "icon-name", "pspp", NULL);
 }
 
 /*
@@ -526,7 +506,7 @@ psppire_window_query_save (PsppireWindow *se)
 			    description);
   g_free (description);
 
-  g_object_set (dialog, "icon-name", "psppicon", NULL);
+  g_object_set (dialog, "icon-name", "pspp", NULL);
 
   gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
 					    _("If you don't save, changes from the last %ld seconds will be permanently lost."),
@@ -706,9 +686,32 @@ psppire_window_load (PsppireWindow *w, const gchar *file)
   return ok;
 }
 
+
+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)
 {
+  GtkFileFilter *filter = gtk_file_filter_new ();
   GtkWidget *dialog =
     gtk_file_chooser_dialog_new (_("Open"),
 				 GTK_WINDOW (toplevel),
@@ -717,28 +720,23 @@ psppire_window_file_chooser_dialog (PsppireWindow *toplevel)
 				 GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
 				 NULL);
 
-  GtkFileFilter *filter;
+  g_object_set (dialog, "local-only", FALSE, NULL);
 
-  filter = gtk_file_filter_new ();
   gtk_file_filter_set_name (filter, _("Data and Syntax Files"));
-  gtk_file_filter_add_pattern (filter, "*.sav");
-  gtk_file_filter_add_pattern (filter, "*.SAV");
-  gtk_file_filter_add_pattern (filter, "*.por");
-  gtk_file_filter_add_pattern (filter, "*.POR");
+  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, "*.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_add_pattern (filter, "*.sav");
-  gtk_file_filter_add_pattern (filter, "*.SAV");
+  gtk_file_filter_add_mime_type (filter, "application/x-spss-sav");
   gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
 
   filter = gtk_file_filter_new ();
   gtk_file_filter_set_name (filter, _("Portable Files (*.por) "));
-  gtk_file_filter_add_pattern (filter, "*.por");
-  gtk_file_filter_add_pattern (filter, "*.POR");
+  gtk_file_filter_add_mime_type (filter, "application/x-spss-por");
   gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
 
   filter = gtk_file_filter_new ();
@@ -773,8 +771,17 @@ psppire_window_file_chooser_dialog (PsppireWindow *toplevel)
       free (dir_name);
     }
 
-  gtk_file_chooser_set_extra_widget (
-    GTK_FILE_CHOOSER (dialog), psppire_encoding_selector_new ("Auto", true));
+
+  {
+    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);
+  }
 
   return dialog;
 }