extern struct dataset *the_dataset;
extern PsppireDataStore *the_data_store ;
+extern GtkRecentManager *the_recent_mgr;
static void
set_paste_menuitem_sensitivity (PsppireDataWindow *de, gboolean x)
#endif
-void
-psppire_data_window_load_file (PsppireDataWindow *de,
- const gchar *file_name)
+static gboolean
+load_file (PsppireWindow *de, const gchar *file_name)
{
struct getl_interface *sss;
struct string filename;
sss = create_syntax_string_source ("GET FILE=%s.",
ds_cstr (&filename));
+
ds_destroy (&filename);
if (execute_syntax (sss) )
{
- psppire_window_set_filename (PSPPIRE_WINDOW (de), file_name);
- add_most_recent (file_name, the_recent_mgr);
+ psppire_window_set_filename (de, file_name);
+ return TRUE;
}
- psppire_window_set_unsaved (PSPPIRE_WINDOW (de), FALSE);
+ return FALSE;
}
/* Callback for the data_open action.
Prompts for a filename and opens it */
static void
-open_data_dialog (GtkAction *action, PsppireDataWindow *de)
+open_data_dialog (GtkAction *action, PsppireWindow *de)
{
GtkWidget *dialog =
gtk_file_chooser_dialog_new (_("Open"),
gchar *name =
gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
- psppire_data_window_load_file (de, name);
+ psppire_window_load (de, name);
g_free (name);
}
/* Save DE to file */
static void
-save_file (PsppireDataWindow *de)
+save_file (PsppireWindow *w)
{
gchar *fn = NULL;
GString *fnx;
struct getl_interface *sss;
struct string file_name ;
+ PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (w);
- g_object_get (de, "filename", &fn, NULL);
+ g_object_get (w, "filename", &fn, NULL);
fnx = g_string_new (fn);
ds_destroy (&file_name);
execute_syntax (sss);
-
- psppire_window_set_unsaved (PSPPIRE_WINDOW (de), FALSE);
}
psppire_window_set_filename (PSPPIRE_WINDOW (de), filename->str);
- save_file (de);
+ save_file (PSPPIRE_WINDOW (de));
g_string_free (filename, TRUE);
}
const gchar *fn = psppire_window_get_filename (de);
if ( NULL != fn)
- save_file (PSPPIRE_DATA_WINDOW (de));
+ psppire_window_save (de);
else
data_save_as_dialog (PSPPIRE_DATA_WINDOW (de));
}
gtk_menu_shell_append (GTK_MENU_SHELL (menu), sort_ascending);
- g_signal_connect_swapped (G_OBJECT (sort_ascending), "activate",
+ g_signal_connect_swapped (sort_ascending, "activate",
G_CALLBACK (psppire_data_editor_sort_ascending),
de->data_editor);
- g_signal_connect_swapped (G_OBJECT (sort_descending), "activate",
+ g_signal_connect_swapped (sort_descending, "activate",
G_CALLBACK (psppire_data_editor_sort_descending),
de->data_editor);
- g_signal_connect_swapped (G_OBJECT (insert_variable), "activate",
+ g_signal_connect_swapped (insert_variable, "activate",
G_CALLBACK (gtk_action_activate),
de->insert_variable);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), insert_case);
- g_signal_connect_swapped (G_OBJECT (insert_case), "activate",
+ g_signal_connect_swapped (insert_case, "activate",
G_CALLBACK (gtk_action_activate),
de->insert_case);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), insert_variable);
- g_signal_connect_swapped (G_OBJECT (insert_variable), "activate",
+ g_signal_connect_swapped (insert_variable, "activate",
G_CALLBACK (gtk_action_activate),
de->insert_variable);
static void
on_recent_data_select (GtkMenuShell *menushell,
- gpointer user_data)
+ PsppireWindow *window)
{
gchar *file;
- PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (user_data);
gchar *uri =
gtk_recent_chooser_get_current_uri (GTK_RECENT_CHOOSER (menushell));
g_free (uri);
- psppire_data_window_load_file (de, file);
+ psppire_window_load (window, file);
g_free (file);
}
se = psppire_syntax_window_new ();
- psppire_syntax_window_load_from_file (PSPPIRE_SYNTAX_WINDOW (se), file, NULL);
- gtk_widget_show (se);
+ if ( psppire_window_load (PSPPIRE_WINDOW (se), file) )
+ gtk_widget_show (se);
+ else
+ gtk_widget_destroy (se);
g_free (file);
}
static void
set_unsaved (gpointer w)
{
- psppire_window_set_unsaved (PSPPIRE_WINDOW (w), TRUE);
+ psppire_window_set_unsaved (PSPPIRE_WINDOW (w));
}
static void
G_CALLBACK (regression_dialog), de);
}
- {
+ {
GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER));
GtkWidget *recent_data =
gtk_recent_filter_add_pattern (filter, "*.por");
gtk_recent_filter_add_pattern (filter, "*.POR");
+ gtk_recent_chooser_set_sort_type (GTK_RECENT_CHOOSER (menu_data), GTK_RECENT_SORT_MRU);
+
gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (menu_data), filter);
}
gtk_recent_filter_add_pattern (filter, "*.sps");
gtk_recent_filter_add_pattern (filter, "*.SPS");
+ gtk_recent_chooser_set_sort_type (GTK_RECENT_CHOOSER (menu_files), GTK_RECENT_SORT_MRU);
+
gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (menu_files), filter);
}
de);
- g_signal_connect (GTK_NOTEBOOK (de->data_editor),
+ g_signal_connect (de->data_editor,
"switch-page",
G_CALLBACK (on_switch_sheet), de);
static void
psppire_data_window_iface_init (PsppireWindowIface *iface)
{
- iface->save = data_save;
+ iface->save = save_file;
+ iface->load = load_file;
}