merge master->gtk3, fixed psppire-output-view.c refactoring; this compiles and runs...

[pspp] / src / ui / gui / psppire-data-window.c

diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c
index 35ffdb840f403836b2376a168100939331ef5541..126980c8bb6f6e4fa1ac2a95dbd1022aa6836f07 100644 (file)
--- a/src/ui/gui/psppire-data-window.c
+++ b/src/ui/gui/psppire-data-window.c
@@ -332,7 +332,8 @@ name_has_suffix (const gchar *name)
 }
 
 static gboolean
-load_file (PsppireWindow *de, const gchar *file_name, gpointer syn)
+load_file (PsppireWindow *de, const gchar *file_name, const char *encoding,
+           gpointer syn)
 {
   const char *mime_type = NULL;
   gchar *syntax = NULL;
@@ -352,8 +353,12 @@ load_file (PsppireWindow *de, const gchar *file_name, gpointer syn)
       syntax_gen_string (&filename, ss_cstr (utf8_file_name));
       
       g_free (utf8_file_name);
-      
-      syntax = g_strdup_printf ("GET FILE=%s.", ds_cstr (&filename));
+
+      if (encoding && encoding[0])
+        syntax = g_strdup_printf ("GET FILE=%s ENCODING='%s'.",
+                                  ds_cstr (&filename), encoding);
+      else
+        syntax = g_strdup_printf ("GET FILE=%s.", ds_cstr (&filename));
       ds_destroy (&filename);
     }
   else
@@ -372,7 +377,7 @@ load_file (PsppireWindow *de, const gchar *file_name, gpointer syn)
       else if (name_has_sav_suffix (file_name))
        mime_type = "application/x-spss-sav";
       
-      add_most_recent (file_name, mime_type);
+      add_most_recent (file_name, mime_type, encoding);
     }
 
   return ok;
@@ -693,14 +698,10 @@ static void
 fonts_activate (PsppireDataWindow  *de)
 {
   GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (de));
-  PangoFontDescription *current_font;
-  gchar *font_name;
-  GtkWidget *dialog =
-    gtk_font_selection_dialog_new (_("Font Selection"));
-
-
-  current_font = GTK_WIDGET(de->data_editor)->style->font_desc;
-  font_name = pango_font_description_to_string (current_font);
+  GtkWidget *dialog =  gtk_font_selection_dialog_new (_("Font Selection"));
+  GtkStyle *style = gtk_widget_get_style (GTK_WIDGET(de->data_editor));
+  PangoFontDescription *current_font = style->font_desc;
+  gchar *font_name = pango_font_description_to_string (current_font);
 
   gtk_font_selection_dialog_set_font_name (GTK_FONT_SELECTION_DIALOG (dialog), font_name);
 
@@ -762,7 +763,7 @@ on_recent_data_select (GtkMenuShell *menushell,
 
   g_free (uri);
 
-  open_data_window (window, file, NULL);
+  open_data_window (window, file, NULL, NULL);
 
   g_free (file);
 }
@@ -825,7 +826,7 @@ on_recent_files_select (GtkMenuShell *menushell,   gpointer user_data)
 
   free (encoding);
 
-  if ( psppire_window_load (PSPPIRE_WINDOW (se), file, NULL) ) 
+  if ( psppire_window_load (PSPPIRE_WINDOW (se), file, encoding, NULL) ) 
     gtk_widget_show (se);
   else
     gtk_widget_destroy (se);
@@ -915,12 +916,14 @@ enable_save (PsppireDataWindow *dw)
 static void
 psppire_data_window_init (PsppireDataWindow *de)
 {
+  GtkWidget *w ;
   de->builder = builder_new ("data-editor.ui");
 
   de->ui_manager = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER));
 
-  PSPPIRE_WINDOW (de)->menu =
-    GTK_MENU_SHELL (gtk_ui_manager_get_widget (de->ui_manager, "/ui/menubar/windows/windows_minimise_all")->parent);
+  w = gtk_ui_manager_get_widget (de->ui_manager, "/ui/menubar/windows/windows_minimise_all");
+
+  PSPPIRE_WINDOW (de)->menu = GTK_MENU_SHELL (gtk_widget_get_parent (w));
 
   de->uim = NULL;
   de->merge_id = 0;
@@ -1368,7 +1371,8 @@ create_data_window (void)
 }
 
 void
-open_data_window (PsppireWindow *victim, const char *file_name, gpointer hint)
+open_data_window (PsppireWindow *victim, const char *file_name,
+                  const char *encoding, gpointer hint)
 {
   GtkWidget *window;
 
@@ -1381,7 +1385,7 @@ open_data_window (PsppireWindow *victim, const char *file_name, gpointer hint)
   else
     window = psppire_data_window_new (NULL);
 
-  psppire_window_load (PSPPIRE_WINDOW (window), file_name, hint);
+  psppire_window_load (PSPPIRE_WINDOW (window), file_name, encoding, hint);
   gtk_widget_show_all (window);
 }