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)
}
}
-/* Puts FILE_NAME into the recent list.
- If it's already in the list, it moves it to the top
-*/
+#if 0
static void
-add_most_recent (const char *file_name)
+dump_rm (GtkRecentManager *rm)
{
+ GList *items = gtk_recent_manager_get_items (rm);
+
+ GList *i;
+
+ g_print ("Recent Items:\n");
+ for (i = items; i; i = i->next)
+ {
+ GtkRecentInfo *ri = i->data;
+
+ g_print ("Item: %s (Mime: %s) (Desc: %s) (URI: %s)\n",
+ gtk_recent_info_get_short_name (ri),
+ gtk_recent_info_get_mime_type (ri),
+ gtk_recent_info_get_description (ri),
+ gtk_recent_info_get_uri (ri)
+ );
+
+
+ gtk_recent_info_unref (ri);
+ }
+
+ g_list_free (items);
}
+#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);
+ 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));
}
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
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)
+on_recent_data_select (GtkMenuShell *menushell,
+ 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
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);
}
G_CALLBACK (regression_dialog), de);
}
+ {
+ GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER));
-#if 0
- {
- GtkRecentManager *rm = gtk_recent_manager_get_default ();
- GtkAction *recent_data = get_action_assert (de->builder, "file_recent-data");
- GtkAction *recent_files = get_action_assert (de->builder, "file_recent-files");
-#if 0
- GtkWidget *recent_separator = get_widget_assert (de->builder, "file_separator1");
-#endif
+ GtkWidget *recent_data =
+ gtk_ui_manager_get_widget (uim,"/ui/menubar/file/file_recent-data");
- GtkWidget *menu = gtk_recent_chooser_menu_new_for_manager (rm);
+ GtkWidget *recent_files =
+ gtk_ui_manager_get_widget (uim,"/ui/menubar/file/file_recent-files");
- GtkRecentFilter *filter = gtk_recent_filter_new ();
-#if 0
- gtk_widget_show (recent_data);
- gtk_widget_show (recent_files);
- gtk_widget_show (recent_separator);
-#endif
+ GtkWidget *menu_data =
+ gtk_recent_chooser_menu_new_for_manager (the_recent_mgr);
+
+ GtkWidget *menu_files =
+ gtk_recent_chooser_menu_new_for_manager (the_recent_mgr);
+
+ {
+ GtkRecentFilter *filter = gtk_recent_filter_new ();
- gtk_recent_filter_add_pattern (filter, "*.sav");
- gtk_recent_filter_add_pattern (filter, "*.SAV");
+ gtk_recent_filter_add_pattern (filter, "*.sav");
+ gtk_recent_filter_add_pattern (filter, "*.SAV");
+ gtk_recent_filter_add_pattern (filter, "*.por");
+ gtk_recent_filter_add_pattern (filter, "*.POR");
- gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (menu), filter);
+ gtk_recent_chooser_set_sort_type (GTK_RECENT_CHOOSER (menu_data), GTK_RECENT_SORT_MRU);
- gtk_action_set_sensitive (recent_data, TRUE);
- g_signal_connect (menu, "selection-done",
- G_CALLBACK (on_recent_data_select), de);
+ gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (menu_data), filter);
+ }
+
+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (recent_data), menu_data);
+
+
+ g_signal_connect (menu_data, "selection-done",
+ G_CALLBACK (on_recent_data_select),
+ de);
- gtk_menu_item_set_submenu (GTK_MENU_ITEM (recent_data), menu);
+ {
+ GtkRecentFilter *filter = gtk_recent_filter_new ();
+ gtk_recent_filter_add_pattern (filter, "*.sps");
+ gtk_recent_filter_add_pattern (filter, "*.SPS");
- filter = gtk_recent_filter_new ();
- menu = gtk_recent_chooser_menu_new_for_manager (rm);
+ gtk_recent_chooser_set_sort_type (GTK_RECENT_CHOOSER (menu_files), GTK_RECENT_SORT_MRU);
- gtk_recent_filter_add_pattern (filter, "*.sps");
- gtk_recent_filter_add_pattern (filter, "*.SPS");
+ gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (menu_files), filter);
+ }
- gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (menu), filter);
+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (recent_files), menu_files);
- gtk_widget_set_sensitive (recent_files, TRUE);
- g_signal_connect (menu, "selection-done",
- G_CALLBACK (on_recent_files_select), de);
+ g_signal_connect (menu_files, "selection-done",
+ G_CALLBACK (on_recent_files_select),
+ de);
- gtk_menu_item_set_submenu (GTK_MENU_ITEM (recent_files), menu);
}
-#endif
g_signal_connect (get_action_assert (de->builder,"file_new_syntax"),
"activate",
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;
}