projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gui: Allow File|Open to select an encoding for system files.
[pspp]
/
src
/
ui
/
gui
/
psppire-window.c
diff --git
a/src/ui/gui/psppire-window.c
b/src/ui/gui/psppire-window.c
index f6cdb7b24368f5686832569799a3beb522ec05a7..9826b702d9f4e005da364c0244a880f58655e36b 100644
(file)
--- 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.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2009, 2010, 2011 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
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
@@
-17,6
+17,7
@@
#include <config.h>
#include "psppire-window.h"
#include <config.h>
#include "psppire-window.h"
+#include "psppire-window-base.h"
#include <gtk/gtk.h>
#include <gtk/gtk.h>
@@
-28,10
+29,10
@@
#define N_(msgid) msgid
#include "data/any-reader.h"
#define N_(msgid) msgid
#include "data/any-reader.h"
+#include "data/file-name.h"
#include "data/dataset.h"
#include "helper.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"
#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 =
};
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);
}
&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)
{
static void
psppire_window_finalize (GObject *object)
{
@@
-246,6
+236,8
@@
psppire_window_finalize (GObject *object)
PsppireWindowRegister *reg = psppire_window_register_new ();
PsppireWindowRegister *reg = psppire_window_register_new ();
+ g_signal_handler_disconnect (reg, window->remove_handler);
+ g_signal_handler_disconnect (reg, window->insert_handler);
psppire_window_register_remove (reg, window->list_name);
g_free (window->filename);
g_free (window->basename);
psppire_window_register_remove (reg, window->list_name);
g_free (window->filename);
g_free (window->basename);
@@
-253,12
+245,6
@@
psppire_window_finalize (GObject *object)
g_free (window->description);
g_free (window->list_name);
g_free (window->description);
g_free (window->list_name);
- g_signal_handler_disconnect (psppire_window_register_new (),
- window->remove_handler);
-
- g_signal_handler_disconnect (psppire_window_register_new (),
- window->insert_handler);
-
g_hash_table_destroy (window->menuitem_table);
if (G_OBJECT_CLASS (parent_class)->finalize)
g_hash_table_destroy (window->menuitem_table);
if (G_OBJECT_CLASS (parent_class)->finalize)
@@
-350,11
+336,12
@@
insert_menuitem_into_menu (PsppireWindow *window, gpointer key)
/* Add a separator before adding the first real item. If we add a separator
at any other time, sometimes GtkUIManager removes it. */
/* Add a separator before adding the first real item. If we add a separator
at any other time, sometimes GtkUIManager removes it. */
- if (
g_hash_table_size (window->menuitem_table) == 0
)
+ if (
!window->added_separator
)
{
GtkWidget *separator = gtk_separator_menu_item_new ();
gtk_widget_show (separator);
gtk_menu_shell_append (window->menu, separator);
{
GtkWidget *separator = gtk_separator_menu_item_new ();
gtk_widget_show (separator);
gtk_menu_shell_append (window->menu, separator);
+ window->added_separator = TRUE;
}
filename = g_filename_display_name (key);
}
filename = g_filename_display_name (key);
@@
-422,13
+409,6
@@
on_delete (PsppireWindow *w, GdkEvent *event, gpointer user_data)
{
PsppireWindowRegister *reg = psppire_window_register_new ();
{
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);
if ( w->dirty )
{
gint response = psppire_window_query_save (w);
@@
-484,14
+464,12
@@
psppire_window_init (PsppireWindow *window)
G_CALLBACK (remove_menuitem),
window);
G_CALLBACK (remove_menuitem),
window);
+ window->added_separator = FALSE;
window->dirty = FALSE;
g_signal_connect_swapped (window, "delete-event", G_CALLBACK (on_delete), window);
g_object_set (window, "icon-name", "pspp", NULL);
window->dirty = FALSE;
g_signal_connect_swapped (window, "delete-event", G_CALLBACK (on_delete), window);
g_object_set (window, "icon-name", "pspp", NULL);
-
- g_signal_connect (window, "realize",
- G_CALLBACK (on_realize), window);
}
/*
}
/*
@@
-682,7
+660,8
@@
psppire_window_save_as (PsppireWindow *w)
static void delete_recent (const char *file_name);
gboolean
static void delete_recent (const char *file_name);
gboolean
-psppire_window_load (PsppireWindow *w, const gchar *file)
+psppire_window_load (PsppireWindow *w, const gchar *file,
+ const gchar *encoding, gpointer hint)
{
gboolean ok;
PsppireWindowIface *i = PSPPIRE_WINDOW_MODEL_GET_IFACE (w);
{
gboolean ok;
PsppireWindowIface *i = PSPPIRE_WINDOW_MODEL_GET_IFACE (w);
@@
-693,7
+672,7
@@
psppire_window_load (PsppireWindow *w, const gchar *file)
g_return_val_if_fail (i->load, FALSE);
g_return_val_if_fail (i->load, FALSE);
- ok = i->load (w, file);
+ ok = i->load (w, file
, encoding, hint
);
if ( ok )
{
if ( ok )
{
@@
-706,6
+685,7
@@
psppire_window_load (PsppireWindow *w, const gchar *file)
return ok;
}
return ok;
}
+
GtkWidget *
psppire_window_file_chooser_dialog (PsppireWindow *toplevel)
{
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_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_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_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 ();
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
filter = gtk_file_filter_new ();
@@
-769,8
+751,9
@@
psppire_window_file_chooser_dialog (PsppireWindow *toplevel)
free (dir_name);
}
free (dir_name);
}
- gtk_file_chooser_set_extra_widget (
- GTK_FILE_CHOOSER (dialog), psppire_encoding_selector_new ("Auto", true));
+ gtk_file_chooser_set_extra_widget (
+ GTK_FILE_CHOOSER (dialog),
+ psppire_encoding_selector_new ("Auto", true));
return dialog;
}
return dialog;
}
@@
-794,9
+777,10
@@
psppire_window_open (PsppireWindow *de)
gchar *encoding = psppire_encoding_selector_get_encoding (
gtk_file_chooser_get_extra_widget (GTK_FILE_CHOOSER (dialog)));
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);
- else
+ enum detect_result res = any_reader_may_open (sysname);
+ if (ANY_YES == res)
+ open_data_window (de, name, encoding, NULL);
+ else if (ANY_NO == res)
open_syntax_window (name, encoding);
g_free (encoding);
open_syntax_window (name, encoding);
g_free (encoding);
@@
-816,17
+800,24
@@
psppire_window_open (PsppireWindow *de)
with associated MIME_TYPE. If it's already in the list, it moves it to the
top. */
void
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);
{
gchar *uri = g_filename_to_uri (file_name, NULL, NULL);
-
if ( uri )
{
GtkRecentData recent_data;
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.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;
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;
@@
-836,6
+827,7
@@
add_most_recent (const char *file_name, const char *mime_type)
uri, &recent_data);
g_free (recent_data.app_exec);
uri, &recent_data);
g_free (recent_data.app_exec);
+ g_free (full_mime_type);
}
g_free (uri);
}
g_free (uri);