X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-window.c;h=cbd504ca5eacb50c48741a266d7af7f47247695d;hb=630b54e8cd688dc0af01f73ca90169f270823d1d;hp=ad80f752a9a20072d58ba8c47ec7a1ee5fb50751;hpb=4dbb42e6c42e5e1982fee1c72300276a867a408e;p=evince.git diff --git a/shell/ev-window.c b/shell/ev-window.c index ad80f752..cbd504ca 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -50,11 +50,15 @@ #include "ev-jobs.h" #include "ev-sidebar-page.h" #include "eggfindbar.h" + +#ifndef HAVE_GTK_RECENT #include "egg-recent-view-uimanager.h" #include "egg-recent-view.h" +#include "egg-recent-model.h" +#endif + #include "egg-toolbar-editor.h" #include "egg-editable-toolbar.h" -#include "egg-recent-model.h" #include "egg-toolbars-model.h" #include "ephy-zoom.h" #include "ephy-zoom-action.h" @@ -125,10 +129,15 @@ struct _EvWindowPrivate { GtkWidget *password_dialog; /* UI Builders */ - GtkActionGroup *action_group; - GtkActionGroup *view_popup_action_group; - GtkActionGroup *attachment_popup_action_group; - GtkUIManager *ui_manager; + GtkActionGroup *action_group; + GtkActionGroup *view_popup_action_group; + GtkActionGroup *attachment_popup_action_group; +#ifdef HAVE_GTK_RECENT + GtkRecentManager *recent_manager; + GtkActionGroup *recent_action_group; + guint recent_ui_id; +#endif + GtkUIManager *ui_manager; /* Fullscreen mode */ GtkWidget *fullscreen_toolbar; @@ -153,7 +162,9 @@ struct _EvWindowPrivate { EvPageCache *page_cache; EvWindowPageMode page_mode; EvWindowTitle *title; +#ifndef HAVE_GTK_RECENT EggRecentViewUIManager *recent_view; +#endif EvJob *xfer_job; #ifdef WITH_GNOME_PRINT @@ -200,8 +211,10 @@ static void ev_window_set_page_mode (EvWindow *windo EvWindowPageMode page_mode); static void ev_window_xfer_job_cb (EvJobXfer *job, gpointer data); +#ifdef WITH_GTK_PRINT static void ev_window_print_job_cb (EvJobPrint *job, EvWindow *window); +#endif static void ev_window_sizing_mode_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_window); @@ -950,7 +963,7 @@ ev_window_xfer_job_cb (EvJobXfer *job, if (ev_window->priv->document) g_object_unref (ev_window->priv->document); ev_window->priv->document = g_object_ref (document); - + ev_window_setup_document (ev_window); ev_window_add_recent (ev_window, ev_window->priv->uri); @@ -1043,7 +1056,7 @@ ev_window_open_uri (EvWindow *ev_window, ev_window_clear_xfer_job (ev_window); ev_window_clear_local_uri (ev_window); ev_view_set_loading (EV_VIEW (ev_window->priv->view), TRUE); - + ev_window->priv->xfer_job = ev_job_xfer_new (uri, dest, mode); g_signal_connect (ev_window->priv->xfer_job, "finished", @@ -1106,6 +1119,19 @@ ev_window_cmd_file_open (GtkAction *action, EvWindow *window) gtk_widget_show (chooser); } +#ifdef HAVE_GTK_RECENT +static void +ev_window_cmd_recent_file_activate (GtkAction *action, + GtkRecentInfo *info) +{ + const gchar *uri; + + uri = gtk_recent_info_get_uri (info); + + ev_application_open_uri (EV_APP, uri, NULL, + GDK_CURRENT_TIME, NULL); +} +#else static void ev_window_cmd_recent_file_activate (GtkAction *action, EvWindow *ev_window) @@ -1118,25 +1144,131 @@ ev_window_cmd_recent_file_activate (GtkAction *action, uri = egg_recent_item_get_uri (item); - ev_application_open_uri (EV_APP, uri, NULL, GDK_CURRENT_TIME, NULL); + ev_application_open_uri (EV_APP, uri, NULL, + GDK_CURRENT_TIME, NULL); g_free (uri); } +#endif /* HAVE_GTK_RECENT */ static void ev_window_add_recent (EvWindow *window, const char *filename) { +#ifdef HAVE_GTK_RECENT + gtk_recent_manager_add_item (window->priv->recent_manager, filename); +#else EggRecentItem *item; item = egg_recent_item_new_from_uri (filename); egg_recent_item_add_group (item, "Evince"); egg_recent_model_add_full (ev_application_get_recent_model (EV_APP), item); +#endif /* HAVE_GTK_RECENT */ +} + +#ifdef HAVE_GTK_RECENT +static gint +compare_recent_items (GtkRecentInfo *a, GtkRecentInfo *b) +{ + gboolean has_ev_a, has_ev_b; + const gchar *evince = g_get_application_name (); + + has_ev_a = gtk_recent_info_has_application (a, evince); + has_ev_b = gtk_recent_info_has_application (b, evince); + + if (has_ev_a && has_ev_b) { + time_t time_a, time_b; + + time_a = gtk_recent_info_get_modified (a); + time_b = gtk_recent_info_get_modified (b); + + return (time_b - time_a); + } else if (has_ev_a) { + return -1; + } else if (has_ev_b) { + return 1; + } + + return 0; } +#endif /* HAVE_GTK_RECENT */ static void ev_window_setup_recent (EvWindow *ev_window) { +#ifdef HAVE_GTK_RECENT + GList *items, *l; + guint n_items = 0; + const gchar *evince = g_get_application_name (); + static guint i = 0; + + if (ev_window->priv->recent_ui_id > 0) { + gtk_ui_manager_remove_ui (ev_window->priv->ui_manager, + ev_window->priv->recent_ui_id); + gtk_ui_manager_ensure_update (ev_window->priv->ui_manager); + } + ev_window->priv->recent_ui_id = gtk_ui_manager_new_merge_id (ev_window->priv->ui_manager); + + if (ev_window->priv->recent_action_group) { + gtk_ui_manager_remove_action_group (ev_window->priv->ui_manager, + ev_window->priv->recent_action_group); + g_object_unref (ev_window->priv->recent_action_group); + } + ev_window->priv->recent_action_group = gtk_action_group_new ("RecentFilesActions"); + gtk_ui_manager_insert_action_group (ev_window->priv->ui_manager, + ev_window->priv->recent_action_group, 0); + + items = gtk_recent_manager_get_items (ev_window->priv->recent_manager); + items = g_list_sort (items, (GCompareFunc) compare_recent_items); + + for (l = items; l && l->data; l = g_list_next (l)) { + GtkRecentInfo *info; + GtkAction *action; + gchar *action_name; + gchar *label; + + info = (GtkRecentInfo *) l->data; + if (!gtk_recent_info_has_application (info, evince)) + continue; + + action_name = g_strdup_printf ("RecentFile%u", i++); + label = g_strdup_printf ("_%d. %s", + n_items + 1, + gtk_recent_info_get_display_name (info)); + + action = g_object_new (GTK_TYPE_ACTION, + "name", action_name, + "label", label, + NULL); + + g_object_weak_ref (G_OBJECT (action), + (GWeakNotify) gtk_recent_info_unref, + gtk_recent_info_ref (info)); + g_signal_connect (G_OBJECT (action), "activate", + G_CALLBACK (ev_window_cmd_recent_file_activate), + (gpointer) info); + + gtk_action_group_add_action (ev_window->priv->recent_action_group, + action); + g_object_unref (action); + + gtk_ui_manager_add_ui (ev_window->priv->ui_manager, + ev_window->priv->recent_ui_id, + "/MainMenu/FileMenu/RecentFilesMenu", + label, + action_name, + GTK_UI_MANAGER_MENUITEM, + FALSE); + g_free (action_name); + g_free (label); + + if (++n_items == 5) + break; + } + + g_list_foreach (items, (GFunc) gtk_recent_info_unref, NULL); + g_list_free (items); +#else /* HAVE_GTK_RECENT */ ev_window->priv->recent_view = egg_recent_view_uimanager_new (ev_window->priv->ui_manager, "/MainMenu/FileMenu/RecentFilesMenu", G_CALLBACK (ev_window_cmd_recent_file_activate), @@ -1151,6 +1283,7 @@ ev_window_setup_recent (EvWindow *ev_window) g_signal_connect (ev_window->priv->recent_view, "activate", G_CALLBACK (ev_window_cmd_recent_file_activate), ev_window); +#endif /* HAVE_GTK_RECENT */ } static void @@ -2236,6 +2369,24 @@ ev_window_screen_changed (GtkWidget *widget, EvWindowPrivate *priv = window->priv; GdkScreen *screen; + screen = gtk_widget_get_screen (widget); + if (screen == old_screen) + return; + +#ifdef HAVE_GTK_RECENT + if (old_screen) { + g_signal_handlers_disconnect_by_func ( + gtk_recent_manager_get_for_screen (old_screen), + G_CALLBACK (ev_window_setup_recent), window); + } + + priv->recent_manager = gtk_recent_manager_get_for_screen (screen); + g_signal_connect_swapped (priv->recent_manager, + "changed", + G_CALLBACK (ev_window_setup_recent), + window); +#endif + if (GTK_WIDGET_CLASS (ev_window_parent_class)->screen_changed) { GTK_WIDGET_CLASS (ev_window_parent_class)->screen_changed (widget, old_screen); } @@ -2244,7 +2395,6 @@ ev_window_screen_changed (GtkWidget *widget, g_signal_handlers_disconnect_by_func (old_screen, G_CALLBACK (screen_size_changed_cb), window); - screen = gtk_widget_get_screen (widget); g_signal_connect_object (screen, "size-changed", G_CALLBACK (screen_size_changed_cb), window, 0); @@ -2477,10 +2627,14 @@ ev_window_cmd_escape (GtkAction *action, EvWindow *window) "presentation", &presentation, NULL); - if (fullscreen) + if (fullscreen) { ev_window_stop_fullscreen (window); - if (presentation) + } else if (presentation) { ev_window_stop_presentation (window); + gtk_widget_grab_focus (window->priv->view); + } else { + gtk_widget_grab_focus (window->priv->view); + } if (fullscreen && presentation) g_warning ("Both fullscreen and presentation set somehow"); @@ -3040,11 +3194,6 @@ ev_window_dispose (GObject *object) priv->title = NULL; } - if (priv->recent_view) { - g_object_unref (priv->recent_view); - priv->recent_view = NULL; - } - if (priv->ui_manager) { g_object_unref (priv->ui_manager); priv->ui_manager = NULL; @@ -3065,6 +3214,27 @@ ev_window_dispose (GObject *object) priv->attachment_popup_action_group = NULL; } +#ifdef HAVE_GTK_RECENT + if (priv->recent_action_group) { + g_object_unref (priv->recent_action_group); + priv->recent_action_group = NULL; + } + + if (priv->recent_manager) { + g_signal_handlers_disconnect_by_func (priv->recent_manager, + ev_window_setup_recent, + window); + priv->recent_manager = NULL; + } + + priv->recent_ui_id = 0; +#else + if (priv->recent_view) { + g_object_unref (priv->recent_view); + priv->recent_view = NULL; + } +#endif /* HAVE_GTK_RECENT */ + if (priv->page_cache) { g_signal_handlers_disconnect_by_func (priv->page_cache, page_changed_cb, window); priv->page_cache = NULL; @@ -3080,6 +3250,11 @@ ev_window_dispose (GObject *object) priv->view = NULL; } + if (priv->password_view) { + g_object_unref (priv->password_view); + priv->password_view = NULL; + } + if (priv->xfer_job) { ev_window_clear_xfer_job (window); } @@ -3297,7 +3472,7 @@ static const GtkActionEntry entries[] = { /* Toggle items */ static const GtkToggleActionEntry toggle_entries[] = { /* View Menu */ - { "ViewToolbar", NULL, N_("_Toolbar"), "T", + { "ViewToolbar", NULL, N_("_Toolbar"), NULL, N_("Show or hide the toolbar"), G_CALLBACK (ev_window_view_toolbar_cb), TRUE }, { "ViewSidebar", GTK_STOCK_INDEX, N_("Side _Pane"), "F9", @@ -3630,7 +3805,7 @@ open_remote_link (EvWindow *window, EvLinkAction *action) uri = g_build_filename (dir, ev_link_action_get_filename (action), NULL); g_free (dir); - + ev_application_open_uri_at_dest (EV_APP, uri, ev_link_action_get_dest (action), 0, @@ -3656,6 +3831,8 @@ do_action_named (EvWindow *window, EvLinkAction *action) ev_window_cmd_focus_page_selector (NULL, window); } else if (g_ascii_strcasecmp (name, "Find") == 0) { ev_window_cmd_edit_find (NULL, window); + } else if (g_ascii_strcasecmp (name, "Close") == 0) { + ev_window_cmd_file_close_window (NULL, window); } else { g_warning ("Unimplemented named action: %s, please post a " "bug report in Evince bugzilla " @@ -3887,7 +4064,18 @@ ev_window_init (EvWindow *ev_window) g_warning ("building menus failed: %s", error->message); g_error_free (error); } - + +#ifdef HAVE_GTK_RECENT + ev_window->priv->recent_manager = gtk_recent_manager_get_for_screen ( + gtk_widget_get_screen (GTK_WIDGET (ev_window))); + ev_window->priv->recent_action_group = NULL; + ev_window->priv->recent_ui_id = 0; + g_signal_connect_swapped (ev_window->priv->recent_manager, + "changed", + G_CALLBACK (ev_window_setup_recent), + ev_window); +#endif /* HAVE_GTK_RECENT */ + ev_window->priv->menubar = gtk_ui_manager_get_widget (ev_window->priv->ui_manager, "/MainMenu");