#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"
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);
- 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));
ds_destroy (&filename);
if (execute_syntax (sss) )
- {
- psppire_window_set_filename (de, file_name);
- return TRUE;
- }
+ return TRUE;
return FALSE;
}
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 =
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
connect_help (de->builder);
- g_object_ref (menubar);
- gtk_widget_unparent (menubar);
-
- g_object_ref (hb);
- gtk_widget_unparent (hb);
-
- g_object_ref (sb);
- gtk_widget_unparent (sb);
-
gtk_box_pack_start (GTK_BOX (box), menubar, FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (box), hb, FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (box), GTK_WIDGET (de->data_editor), TRUE, TRUE, 0);
{
+ GtkWidget *toolbarbutton = get_widget_assert (de->builder, "button-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_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);
}