projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert filename encodings when opening files.
[pspp-builds.git]
/
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 ccfa9ad1c3073bae0c6d0c6878c4e37cb7f6eb20..8eb0a143b5af0060d8682d754e534cd2e3f30c57 100644
(file)
--- a/
src/ui/gui/psppire-data-window.c
+++ b/
src/ui/gui/psppire-data-window.c
@@
-53,7
+53,6
@@
#include "crosstabs-dialog.h"
#include "frequencies-dialog.h"
#include "examine-dialog.h"
#include "crosstabs-dialog.h"
#include "frequencies-dialog.h"
#include "examine-dialog.h"
-#include "dict-display.h"
#include "regression-dialog.h"
#include "oneway-anova-dialog.h"
#include "t-test-independent-samples-dialog.h"
#include "regression-dialog.h"
#include "oneway-anova-dialog.h"
#include "t-test-independent-samples-dialog.h"
@@
-347,11
+346,18
@@
dump_rm (GtkRecentManager *rm)
static gboolean
load_file (PsppireWindow *de, const gchar *file_name)
{
static gboolean
load_file (PsppireWindow *de, const gchar *file_name)
{
+ gchar *native_file_name;
struct getl_interface *sss;
struct string filename;
ds_init_empty (&filename);
struct getl_interface *sss;
struct string filename;
ds_init_empty (&filename);
- syntax_gen_string (&filename, ss_cstr (file_name));
+
+ native_file_name =
+ convert_glib_filename_to_system_filename (file_name, NULL);
+
+ syntax_gen_string (&filename, ss_cstr (native_file_name));
+
+ g_free (native_file_name);
sss = create_syntax_string_source ("GET FILE=%s.",
ds_cstr (&filename));
sss = create_syntax_string_source ("GET FILE=%s.",
ds_cstr (&filename));
@@
-359,10
+365,7
@@
load_file (PsppireWindow *de, const gchar *file_name)
ds_destroy (&filename);
if (execute_syntax (sss) )
ds_destroy (&filename);
if (execute_syntax (sss) )
- {
- psppire_window_set_filename (de, file_name);
- return TRUE;
- }
+ return TRUE;
return FALSE;
}
return FALSE;
}
@@
-690,6
+693,7
@@
static void
fonts_activate (GtkMenuItem *menuitem, gpointer data)
{
PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
fonts_activate (GtkMenuItem *menuitem, gpointer data)
{
PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
+ GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (de));
PangoFontDescription *current_font;
gchar *font_name;
GtkWidget *dialog =
PangoFontDescription *current_font;
gchar *font_name;
GtkWidget *dialog =
@@
-704,8
+708,8
@@
fonts_activate (GtkMenuItem *menuitem, gpointer data)
g_free (font_name);
gtk_window_set_transient_for (GTK_WINDOW (dialog),
g_free (font_name);
gtk_window_set_transient_for (GTK_WINDOW (dialog),
- GTK_WINDOW (
get_widget_assert (de->builder,
- "data_editor")));
+ GTK_WINDOW (
toplevel));
+
if ( GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (dialog)) )
{
const gchar *font = gtk_font_selection_dialog_get_font_name
if ( GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (dialog)) )
{
const gchar *font = gtk_font_selection_dialog_get_font_name
@@
-1101,8
+1105,10
@@
psppire_data_window_init (PsppireDataWindow *de)
{
{
+ GtkWidget *toolbarbutton = get_widget_assert (de->builder, "button-open");
+
GtkAction *action_data_open =
GtkAction *action_data_open =
- resolve_action (de->builder, "file_open_data",
"button-open"
);
+ resolve_action (de->builder, "file_open_data",
NULL
);
g_object_set (action_data_open,
"tooltip", _("Open a data file"),
g_object_set (action_data_open,
"tooltip", _("Open a data file"),
@@
-1111,6
+1117,9
@@
psppire_data_window_init (PsppireDataWindow *de)
g_signal_connect (action_data_open, "activate",
G_CALLBACK (open_data_dialog), de);
g_signal_connect (action_data_open, "activate",
G_CALLBACK (open_data_dialog), de);
+
+ g_signal_connect_swapped (toolbarbutton, "clicked",
+ G_CALLBACK (gtk_action_activate), action_data_open);
}
}