]> www.fi.muni.cz Git - evince.git/blobdiff - shell/ev-window.c
Replace GTK_WIDGET_IS_SENSITIVE() with gtk_widget_is_sensitive()
[evince.git] / shell / ev-window.c
index bee7d341b506e1543e6da22523c5c655f7343ac8..3d1ffaf0b8885937d0a76681e9dda531576f42eb 100644 (file)
@@ -62,6 +62,7 @@
 #include "ev-document-thumbnails.h"
 #include "ev-document-annotations.h"
 #include "ev-document-type-builtins.h"
+#include "ev-document-misc.h"
 #include "ev-file-exporter.h"
 #include "ev-file-helpers.h"
 #include "ev-file-monitor.h"
@@ -86,6 +87,7 @@
 #include "ev-utils.h"
 #include "ev-keyring.h"
 #include "ev-view.h"
+#include "ev-view-presentation.h"
 #include "ev-view-type-builtins.h"
 #include "ev-window.h"
 #include "ev-window-title.h"
 #include "ev-media-player-keys.h"
 #endif /* ENABLE_DBUS */
 
-#ifdef ENABLE_PDF
-#include <poppler.h>
-#endif
-
 typedef enum {
        PAGE_MODE_DOCUMENT,
        PAGE_MODE_PASSWORD
@@ -134,6 +132,7 @@ struct _EvWindowPrivate {
        GtkWidget *find_bar;
        GtkWidget *scrolled_window;
        GtkWidget *view;
+       GtkWidget *presentation_view;
        GtkWidget *message_area;
        GtkWidget *password_view;
        GtkWidget *sidebar_thumbs;
@@ -165,9 +164,6 @@ struct _EvWindowPrivate {
        /* Fullscreen mode */
        GtkWidget *fullscreen_toolbar;
 
-       /* Presentation mode */
-       guint      presentation_timeout_id;
-
        /* Popup view */
        GtkWidget *view_popup;
        EvLink    *link;
@@ -216,6 +212,8 @@ struct _EvWindowPrivate {
 #define EV_WINDOW_GET_PRIVATE(object) \
        (G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_WINDOW, EvWindowPrivate))
 
+#define EV_WINDOW_IS_PRESENTATION(w) (w->priv->presentation_view != NULL)
+
 #define PAGE_SELECTOR_ACTION   "PageSelector"
 #define ZOOM_CONTROL_ACTION    "ViewZoom"
 #define NAVIGATION_ACTION      "Navigation"
@@ -226,8 +224,6 @@ struct _EvWindowPrivate {
 #define GCONF_LOCKDOWN_PRINT        "/desktop/gnome/lockdown/disable_printing"
 #define GCONF_LOCKDOWN_PRINT_SETUP  "/desktop/gnome/lockdown/disable_print_setup"
 
-#define PRESENTATION_TIMEOUT 5
-
 #define SIDEBAR_DEFAULT_SIZE    132
 #define LINKS_SIDEBAR_ID "links"
 #define THUMBNAILS_SIDEBAR_ID "thumbnails"
@@ -326,6 +322,15 @@ static guint ev_window_n_copies = 0;
 
 G_DEFINE_TYPE (EvWindow, ev_window, GTK_TYPE_WINDOW)
 
+static gdouble
+get_screen_dpi (EvWindow *window)
+{
+       GdkScreen *screen;
+
+       screen = gtk_window_get_screen (GTK_WINDOW (window));
+       return ev_document_misc_get_screen_dpi (screen);
+}
+
 static void
 ev_window_set_action_sensitive (EvWindow   *ev_window,
                                const char *name,
@@ -404,9 +409,6 @@ ev_window_setup_action_sensitivity (EvWindow *ev_window)
        /* File menu */
        ev_window_set_action_sensitive (ev_window, "FileOpenCopy", has_document);
        ev_window_set_action_sensitive (ev_window, "FileSaveAs", has_document && ok_to_copy);
-#if !GTK_CHECK_VERSION (2, 17, 4)
-       ev_window_set_action_sensitive (ev_window, "FilePageSetup", has_pages && ok_to_print && ok_to_print_setup);
-#endif
        ev_window_set_action_sensitive (ev_window, "FilePrint", has_pages && ok_to_print);
        ev_window_set_action_sensitive (ev_window, "FileProperties", has_document && has_properties);
 
@@ -468,7 +470,7 @@ ev_window_update_actions (EvWindow *ev_window)
         ev_window_set_action_sensitive (ev_window, "F3",
                                         has_pages && can_find_in_page);
 
-       presentation_mode = ev_view_get_presentation (view);
+       presentation_mode = EV_WINDOW_IS_PRESENTATION (ev_window);
        
        ev_window_set_action_sensitive (ev_window, "ViewZoomIn",
                                        has_pages &&
@@ -502,7 +504,7 @@ ev_window_update_actions (EvWindow *ev_window)
                                                      ZOOM_CONTROL_ACTION);
 
                real_zoom = ev_document_model_get_scale (ev_window->priv->model);
-               real_zoom *= 72.0 / get_screen_dpi (GTK_WINDOW (ev_window));
+               real_zoom *= 72.0 / get_screen_dpi (ev_window);
                zoom = ephy_zoom_get_nearest_zoom_level (real_zoom);
 
                ephy_zoom_action_set_zoom_level (EPHY_ZOOM_ACTION (action), zoom);
@@ -556,7 +558,7 @@ update_chrome_visibility (EvWindow *window)
        gboolean menubar, toolbar, findbar, fullscreen_toolbar, sidebar;
        gboolean fullscreen_mode, presentation, fullscreen;
 
-       presentation = ev_view_get_presentation (EV_VIEW (priv->view));
+       presentation = EV_WINDOW_IS_PRESENTATION (window);
        fullscreen = ev_document_model_get_fullscreen (priv->model);
        fullscreen_mode = fullscreen || presentation;
 
@@ -803,8 +805,7 @@ ev_window_add_history (EvWindow *window, gint page, EvLink *link)
        if (link) {
                action = g_object_ref (ev_link_get_action (link));
                dest = ev_link_action_get_dest (action);
-               page = ev_link_dest_get_page (dest);
-               page_label = ev_view_page_label_from_dest (EV_VIEW (window->priv->view), dest);
+               page_label = ev_document_links_get_dest_page_label (EV_DOCUMENT_LINKS (window->priv->document), dest);
        } else {
                dest = ev_link_dest_new_page (page);
                action = ev_link_action_new_dest (dest);
@@ -832,7 +833,7 @@ ev_window_add_history (EvWindow *window, gint page, EvLink *link)
        }
 
        if (find_task.chapter)
-               link_title = g_strdup_printf (_("Page %s - %s"), page_label, find_task.chapter);
+               link_title = g_strdup_printf (_("Page %s  %s"), page_label, find_task.chapter);
        else
                link_title = g_strdup_printf (_("Page %s"), page_label);
        
@@ -855,6 +856,14 @@ view_handle_link_cb (EvView *view, EvLink *link, EvWindow *window)
        ev_window_add_history (window, current_page, NULL);
 }
 
+static void
+view_selection_changed_cb (EvView   *view,
+                          EvWindow *window)
+{
+       ev_window_set_action_sensitive (window, "EditCopy",
+                                       ev_view_get_has_selection (view));
+}
+
 static void
 ev_window_page_changed_cb (EvWindow        *ev_window,
                           gint             old_page,
@@ -980,7 +989,7 @@ setup_model_from_metadata (EvWindow *window)
        /* Zoom */
        if (ev_document_model_get_sizing_mode (window->priv->model) == EV_SIZING_FREE &&
            ev_metadata_get_double (window->priv->metadata, "zoom", &zoom)) {
-               zoom *= get_screen_dpi (GTK_WINDOW (window)) / 72.0;
+               zoom *= get_screen_dpi (window) / 72.0;
                ev_document_model_set_scale (window->priv->model, zoom);
        }
 
@@ -1248,7 +1257,10 @@ ev_window_setup_document (EvWindow *ev_window)
        info = ev_document_get_info (document);
        update_document_mode (ev_window, info->mode);
 
-       gtk_widget_grab_focus (ev_window->priv->view);
+       if (EV_WINDOW_IS_PRESENTATION (ev_window))
+               gtk_widget_grab_focus (ev_window->priv->presentation_view);
+       else
+               gtk_widget_grab_focus (ev_window->priv->view);
 
        return FALSE;
 }
@@ -2865,43 +2877,6 @@ get_print_page_setup (GKeyFile *key_file)
        return page_setup ? page_setup : gtk_page_setup_new ();
 }
 
-static void
-ev_window_print_page_setup_done_cb (GtkPageSetup *page_setup,
-                                   EvWindow     *window)
-{
-       /* Dialog was canceled */
-       if (!page_setup)
-               return;
-
-       ev_window_save_print_page_setup (window, page_setup);
-}
-
-static void
-ev_window_cmd_file_print_setup (GtkAction *action,
-                               EvWindow  *ev_window)
-{
-       GKeyFile         *print_settings_file;
-       GtkPrintSettings *print_settings;
-       GtkPageSetup     *print_page_setup;
-
-       print_settings_file = get_print_settings_file ();
-
-       print_settings = get_print_settings (print_settings_file);
-       ev_window_load_print_settings_from_metadata (ev_window, print_settings);
-
-       print_page_setup = get_print_page_setup (print_settings_file);
-       ev_window_load_print_page_setup_from_metadata (ev_window, print_page_setup);
-
-       gtk_print_run_page_setup_dialog_async (GTK_WINDOW (ev_window),
-                                              print_page_setup,
-                                              print_settings,
-                                              (GtkPageSetupDoneFunc)ev_window_print_page_setup_done_cb,
-                                              ev_window);
-       g_object_unref (print_settings);
-       g_object_unref (print_page_setup);
-       g_key_file_free (print_settings_file);
-}
-
 static void
 ev_window_print_cancel (EvWindow *ev_window)
 {
@@ -3227,6 +3202,15 @@ ev_window_cmd_file_close_window (GtkAction *action, EvWindow *ev_window)
        gchar     *text, *markup;
        gint       n_print_jobs;
 
+       if (EV_WINDOW_IS_PRESENTATION (ev_window)) {
+               gint current_page;
+
+               /* Save current page */
+               current_page = ev_view_presentation_get_current_page (
+                       EV_VIEW_PRESENTATION (ev_window->priv->presentation_view));
+               ev_document_model_set_page (ev_window->priv->model, current_page);
+       }
+
        n_print_jobs = ev_window->priv->print_queue ?
                g_queue_get_length (ev_window->priv->print_queue) : 0;
        
@@ -3478,7 +3462,6 @@ fullscreen_toolbar_remove_shadow (GtkWidget *toolbar)
 static void
 ev_window_run_fullscreen (EvWindow *window)
 {
-       EvView  *view = EV_VIEW (window->priv->view);
        gboolean fullscreen_window = TRUE;
 
        if (ev_document_model_get_fullscreen (window->priv->model))
@@ -3501,7 +3484,7 @@ ev_window_run_fullscreen (EvWindow *window)
                                       window->priv->fullscreen_toolbar, 1);
        }
 
-       if (ev_view_get_presentation (view)) {
+       if (EV_WINDOW_IS_PRESENTATION (window)) {
                ev_window_stop_presentation (window, FALSE);
                fullscreen_window = FALSE;
        }
@@ -3563,70 +3546,6 @@ ev_window_cmd_view_fullscreen (GtkAction *action, EvWindow *window)
        }
 }
 
-static gboolean
-presentation_timeout_cb (EvWindow *window)
-{
-       EvView *view = EV_VIEW (window->priv->view);
-
-       if (!view || !ev_view_get_presentation (EV_VIEW (view)))
-               return FALSE;
-
-       ev_view_hide_cursor (EV_VIEW (window->priv->view));
-       window->priv->presentation_timeout_id = 0;
-
-       return FALSE;
-}
-
-static void
-presentation_set_timeout (EvWindow *window)
-{
-       if (window->priv->presentation_timeout_id > 0) {
-               g_source_remove (window->priv->presentation_timeout_id);
-       }
-
-       window->priv->presentation_timeout_id =
-               g_timeout_add_seconds (PRESENTATION_TIMEOUT,
-                                      (GSourceFunc)presentation_timeout_cb, window);
-
-       ev_view_show_cursor (EV_VIEW (window->priv->view));
-}
-
-static void
-presentation_clear_timeout (EvWindow *window)
-{
-       if (window->priv->presentation_timeout_id > 0) {
-               g_source_remove (window->priv->presentation_timeout_id);
-       }
-       
-       window->priv->presentation_timeout_id = 0;
-
-       ev_view_show_cursor (EV_VIEW (window->priv->view));
-}
-
-static gboolean
-presentation_motion_notify_cb (GtkWidget *widget,
-                              GdkEventMotion *event,
-                              gpointer user_data)
-{
-       EvWindow *window = EV_WINDOW (user_data);
-
-       presentation_set_timeout (window);
-
-       return FALSE;
-}
-
-static gboolean
-presentation_leave_notify_cb (GtkWidget *widget,
-                             GdkEventCrossing *event,
-                             gpointer user_data)
-{
-       EvWindow *window = EV_WINDOW (user_data);
-
-       presentation_clear_timeout (window);
-
-       return FALSE;
-}
-
 static void
 ev_window_update_presentation_action (EvWindow *window)
 {
@@ -3636,50 +3555,56 @@ ev_window_update_presentation_action (EvWindow *window)
        g_signal_handlers_block_by_func
                (action, G_CALLBACK (ev_window_cmd_view_presentation), window);
        gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
-                                     ev_view_get_presentation (EV_VIEW (window->priv->view)));
+                                     EV_WINDOW_IS_PRESENTATION (window));
        g_signal_handlers_unblock_by_func
                (action, G_CALLBACK (ev_window_cmd_view_presentation), window);
 }
 
+static void
+ev_window_view_presentation_finished (EvWindow *window)
+{
+       ev_window_stop_presentation (window, TRUE);
+}
+
 static void
 ev_window_run_presentation (EvWindow *window)
 {
-       EvView  *view = EV_VIEW (window->priv->view);
        gboolean fullscreen_window = TRUE;
+       guint    current_page;
+       guint    rotation;
 
-       if (ev_view_get_presentation (view))
+       if (EV_WINDOW_IS_PRESENTATION (window))
                return;
 
        if (ev_document_model_get_fullscreen (window->priv->model)) {
                ev_window_stop_fullscreen (window, FALSE);
                fullscreen_window = FALSE;
        }
-       
-       g_object_set (G_OBJECT (window->priv->scrolled_window),
-                     "shadow-type", GTK_SHADOW_NONE,
-                     NULL);
 
-       ev_view_set_presentation (view, TRUE);
-       ev_window_update_presentation_action (window);
+       current_page = ev_document_model_get_page (window->priv->model);
+       rotation = ev_document_model_get_rotation (window->priv->model);
+       window->priv->presentation_view =
+               ev_view_presentation_new (window->priv->document, current_page, rotation);
+       g_signal_connect_swapped (window->priv->presentation_view, "finished",
+                                 G_CALLBACK (ev_window_view_presentation_finished),
+                                 window);
 
+       gtk_box_pack_start (GTK_BOX (window->priv->main_box),
+                           window->priv->presentation_view,
+                           TRUE, TRUE, 0);
+
+       gtk_widget_hide (window->priv->hpaned);
+       ev_window_update_presentation_action (window);
        update_chrome_visibility (window);
-       
-       gtk_widget_grab_focus (window->priv->view);
+
+       gtk_widget_grab_focus (window->priv->presentation_view);
        if (fullscreen_window)
                gtk_window_fullscreen (GTK_WINDOW (window));
 
-       g_signal_connect (window->priv->view,
-                         "motion-notify-event",
-                         G_CALLBACK (presentation_motion_notify_cb),
-                         window);
-       g_signal_connect (window->priv->view,
-                         "leave-notify-event",
-                         G_CALLBACK (presentation_leave_notify_cb),
-                         window);
-       presentation_set_timeout (window);
+       gtk_widget_show (window->priv->presentation_view);
 
        ev_application_screensaver_disable (EV_APP);
-       
+
        if (window->priv->metadata && !ev_window_is_empty (window))
                ev_metadata_set_boolean (window->priv->metadata, "presentation", TRUE);
 }
@@ -3688,28 +3613,25 @@ static void
 ev_window_stop_presentation (EvWindow *window,
                             gboolean  unfullscreen_window)
 {
-       EvView *view = EV_VIEW (window->priv->view);
-       
-       if (!ev_view_get_presentation (view))
+       guint current_page;
+
+       if (!EV_WINDOW_IS_PRESENTATION (window))
                return;
 
-       g_object_set (G_OBJECT (window->priv->scrolled_window),
-                     "shadow-type", GTK_SHADOW_IN,
-                     NULL);
+       current_page = ev_view_presentation_get_current_page (EV_VIEW_PRESENTATION (window->priv->presentation_view));
+       ev_document_model_set_page (window->priv->model, current_page);
+
+       gtk_container_remove (GTK_CONTAINER (window->priv->main_box),
+                             window->priv->presentation_view);
+       window->priv->presentation_view = NULL;
 
-       ev_view_set_presentation (EV_VIEW (window->priv->view), FALSE);
+       gtk_widget_show (window->priv->hpaned);
        ev_window_update_presentation_action (window);
        update_chrome_visibility (window);
        if (unfullscreen_window)
                gtk_window_unfullscreen (GTK_WINDOW (window));
 
-       g_signal_handlers_disconnect_by_func (window->priv->view,
-                                             (gpointer) presentation_motion_notify_cb,
-                                             window);
-       g_signal_handlers_disconnect_by_func (window->priv->view,
-                                             (gpointer) presentation_leave_notify_cb,
-                                             window);
-       presentation_clear_timeout (window);
+       gtk_widget_grab_focus (window->priv->view);
 
        ev_application_screensaver_enable (EV_APP);
 
@@ -3771,7 +3693,7 @@ ev_window_screen_changed (GtkWidget *widget,
                return;
 
        ev_window_setup_gtk_settings (window);
-       dpi = get_screen_dpi (GTK_WINDOW (window));
+       dpi = get_screen_dpi (window);
        ev_document_model_set_min_scale (priv->model, MIN_SCALE * dpi / 72.0);
        ev_document_model_set_max_scale (priv->model, MAX_SCALE * dpi / 72.0);
 
@@ -3785,7 +3707,6 @@ ev_window_state_event (GtkWidget           *widget,
                       GdkEventWindowState *event)
 {
        EvWindow *window = EV_WINDOW (widget);
-       EvView   *view = EV_VIEW (window->priv->view);
 
        if (GTK_WIDGET_CLASS (ev_window_parent_class)->window_state_event) {
                GTK_WIDGET_CLASS (ev_window_parent_class)->window_state_event (widget, event);
@@ -3795,14 +3716,14 @@ ev_window_state_event (GtkWidget           *widget,
                return FALSE;
 
        if (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) {
-               if (ev_document_model_get_fullscreen (window->priv->model) || ev_view_get_presentation (view))
+               if (ev_document_model_get_fullscreen (window->priv->model) || EV_WINDOW_IS_PRESENTATION (window))
                        return FALSE;
                
                ev_window_run_fullscreen (window);
        } else {
                if (ev_document_model_get_fullscreen (window->priv->model))
                        ev_window_stop_fullscreen (window, FALSE);
-               else if (ev_view_get_presentation (view))
+               else if (EV_WINDOW_IS_PRESENTATION (window))
                        ev_window_stop_presentation (window, FALSE);
        }
 
@@ -4057,23 +3978,19 @@ ev_window_cmd_escape (GtkAction *action, EvWindow *window)
                gtk_widget_grab_focus (window->priv->view);
        } else {
                gboolean fullscreen;
-               gboolean presentation;
 
                fullscreen = ev_document_model_get_fullscreen (window->priv->model);
-               g_object_get (window->priv->view,
-                             "presentation", &presentation,
-                             NULL);
 
                if (fullscreen) {
                        ev_window_stop_fullscreen (window, TRUE);
-               } else if (presentation) {
+               } else if (EV_WINDOW_IS_PRESENTATION (window)) {
                        ev_window_stop_presentation (window, TRUE);
                        gtk_widget_grab_focus (window->priv->view);
                } else {
                        gtk_widget_grab_focus (window->priv->view);
                }
 
-               if (fullscreen && presentation)
+               if (fullscreen && EV_WINDOW_IS_PRESENTATION (window))
                        g_warning ("Both fullscreen and presentation set somehow");
        }
 }
@@ -4132,7 +4049,7 @@ ev_window_zoom_changed_cb (EvDocumentModel *model, GParamSpec *pspec, EvWindow *
                gdouble zoom;
 
                zoom = ev_document_model_get_scale (model);
-               zoom *= 72.0 / get_screen_dpi (GTK_WINDOW (ev_window));
+               zoom *= 72.0 / get_screen_dpi (ev_window);
                ev_metadata_set_double (ev_window->priv->metadata, "zoom", zoom);
        }
 }
@@ -4221,12 +4138,6 @@ ev_window_inverted_colors_changed_cb (EvDocumentModel *model,
        ev_window_refresh_window_thumbnail (window);
 }
 
-static void
-ev_window_has_selection_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *window)
-{
-        ev_window_update_actions (window);
-}
-
 static void
 ev_window_dual_mode_changed_cb (EvDocumentModel *model,
                                GParamSpec      *pspec,
@@ -4240,33 +4151,21 @@ ev_window_dual_mode_changed_cb (EvDocumentModel *model,
 }
 
 static char *
-build_comments_string (void)
-{
-#ifdef ENABLE_PDF
-       PopplerBackend backend;
-       const char *backend_name;
-       const char *version;
-
-       backend = poppler_get_backend ();
-       version = poppler_get_version ();
-       switch (backend) {
-               case POPPLER_BACKEND_CAIRO:
-                       backend_name = "cairo";
-                       break;
-               case POPPLER_BACKEND_SPLASH:
-                       backend_name = "splash";
-                       break;
-               default:
-                       backend_name = "unknown";
-                       break;
+build_comments_string (EvDocument *document)
+{
+       gchar *comments = NULL;
+       EvDocumentBackendInfo info;
+
+       if (document && ev_document_get_backend_info (document, &info)) {
+               comments = g_strdup_printf (
+                       _("Document Viewer\nUsing %s (%s)"),
+                       info.name, info.version);
+       } else {
+               comments = g_strdup_printf (
+                       _("Document Viewer"));
        }
 
-       return g_strdup_printf (_("Document Viewer.\n"
-                                 "Using poppler %s (%s)"),
-                               version, backend_name);
-#else
-       return g_strdup_printf (_("Document Viewer"));
-#endif
+       return comments;
 }
 
 static void
@@ -4318,7 +4217,8 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window)
 
        license_trans = g_strconcat (_(license[0]), "\n", _(license[1]), "\n",
                                     _(license[2]), "\n", NULL);
-       comments = build_comments_string ();
+
+       comments = build_comments_string (ev_window->priv->document);
 
        gtk_show_about_dialog (
                GTK_WINDOW (ev_window),
@@ -4355,7 +4255,7 @@ ev_window_view_toolbar_cb (GtkAction *action, EvWindow *ev_window)
 static void
 ev_window_view_sidebar_cb (GtkAction *action, EvWindow *ev_window)
 {
-       if (ev_view_get_presentation (EV_VIEW (ev_window->priv->view)))
+       if (EV_WINDOW_IS_PRESENTATION (ev_window))
                return;
            
        update_chrome_flag (ev_window, EV_CHROME_SIDEBAR,
@@ -4396,12 +4296,11 @@ ev_window_sidebar_visibility_changed_cb (EvSidebar  *ev_sidebar,
                                         GParamSpec *pspec,
                                         EvWindow   *ev_window)
 {
-       EvView *view = EV_VIEW (ev_window->priv->view);
        GtkAction *action;
 
        action = gtk_action_group_get_action (ev_window->priv->action_group, "ViewSidebar");
 
-       if (!ev_view_get_presentation (view)) {
+       if (!EV_WINDOW_IS_PRESENTATION (ev_window)) {
                gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
                                              GTK_WIDGET_VISIBLE (ev_sidebar));
 
@@ -4525,19 +4424,34 @@ view_menu_annot_popup (EvWindow     *ev_window,
 
 static gboolean
 view_menu_popup_cb (EvView   *view,
-                   GObject  *object,
+                   GList    *items,
                    EvWindow *ev_window)
 {
-       if (ev_view_get_presentation (EV_VIEW (ev_window->priv->view)))
-               return FALSE;
+       GList   *l;
+       gboolean has_link = FALSE;
+       gboolean has_image = FALSE;
+       gboolean has_annot = FALSE;
+
+       for (l = items; l; l = g_list_next (l)) {
+               if (EV_IS_LINK (l->data)) {
+                       view_menu_link_popup (ev_window, EV_LINK (l->data));
+                       has_link = TRUE;
+               } else if (EV_IS_IMAGE (l->data)) {
+                       view_menu_image_popup (ev_window, EV_IMAGE (l->data));
+                       has_image = TRUE;
+               } else if (EV_IS_ANNOTATION (l->data)) {
+                       view_menu_annot_popup (ev_window, EV_ANNOTATION (l->data));
+                       has_annot = TRUE;
+               }
+       }
+
+       if (!has_link)
+               view_menu_link_popup (ev_window, NULL);
+       if (!has_image)
+               view_menu_image_popup (ev_window, NULL);
+       if (!has_annot)
+               view_menu_annot_popup (ev_window, NULL);
 
-       view_menu_link_popup (ev_window,
-                             EV_IS_LINK (object) ? EV_LINK (object) : NULL);
-       view_menu_image_popup (ev_window,
-                              EV_IS_IMAGE (object) ? EV_IMAGE (object) : NULL);
-       view_menu_annot_popup (ev_window,
-                              EV_IS_ANNOTATION (object) ? EV_ANNOTATION (object) : NULL);
-       
        gtk_menu_popup (GTK_MENU (ev_window->priv->view_popup),
                        NULL, NULL, NULL, NULL,
                        3, gtk_get_current_event_time ());
@@ -4753,7 +4667,7 @@ zoom_control_changed_cb (EphyZoomAction *action,
 
        if (mode == EV_SIZING_FREE) {
                ev_document_model_set_scale (ev_window->priv->model,
-                                            zoom * get_screen_dpi (GTK_WINDOW (ev_window)) / 72.0);
+                                            zoom * get_screen_dpi (ev_window) / 72.0);
        }
 }
 
@@ -4986,11 +4900,6 @@ ev_window_dispose (GObject *object)
                priv->history = NULL;
        }
 
-       if (priv->presentation_timeout_id > 0) {
-               g_source_remove (priv->presentation_timeout_id);
-               priv->presentation_timeout_id = 0;
-       }
-
        if (priv->print_queue) {
                g_queue_free (priv->print_queue);
                priv->print_queue = NULL;
@@ -5026,12 +4935,12 @@ ev_window_key_press_event (GtkWidget   *widget,
         */
        if (priv->view) {
                g_object_ref (priv->view);
-               if (GTK_WIDGET_IS_SENSITIVE (priv->view))
+               if (gtk_widget_is_sensitive (priv->view))
                        handled = gtk_widget_event (priv->view, (GdkEvent*) event);
                g_object_unref (priv->view);
        }
 
-       if (!handled && !ev_view_get_presentation (EV_VIEW (priv->view))) {
+       if (!handled && !EV_WINDOW_IS_PRESENTATION (ev_window)) {
                guint modifier = event->state & gtk_accelerator_get_default_mod_mask ();
 
                if (priv->menubar_accel_keyval != 0 &&
@@ -5083,19 +4992,16 @@ static const GtkActionEntry entries[] = {
        { "Help", NULL, N_("_Help") },
 
        /* File menu */
-       { "FileOpen", GTK_STOCK_OPEN, N_("_Open..."), "<control>O",
+       { "FileOpen", GTK_STOCK_OPEN, N_("_Open"), "<control>O",
          N_("Open an existing document"),
          G_CALLBACK (ev_window_cmd_file_open) },
        { "FileOpenCopy", NULL, N_("Op_en a Copy"), "<control>N",
          N_("Open a copy of the current document in a new window"),
          G_CALLBACK (ev_window_cmd_file_open_copy) },
-               { "FileSaveAs", GTK_STOCK_SAVE_AS, N_("_Save a Copy..."), "<control>S",
+               { "FileSaveAs", GTK_STOCK_SAVE_AS, N_("_Save a Copy"), "<control>S",
          N_("Save a copy of the current document"),
          G_CALLBACK (ev_window_cmd_save_as) },
-       { "FilePageSetup", GTK_STOCK_PAGE_SETUP, N_("Page Set_up..."), NULL,
-         N_("Setup the page settings for printing"),
-         G_CALLBACK (ev_window_cmd_file_print_setup) },
-       { "FilePrint", GTK_STOCK_PRINT, N_("_Print..."), "<control>P",
+       { "FilePrint", GTK_STOCK_PRINT, N_("_Print…"), "<control>P",
          N_("Print this document"),
          G_CALLBACK (ev_window_cmd_file_print) },
        { "FileProperties", GTK_STOCK_PROPERTIES, N_("P_roperties"), "<alt>Return", NULL,
@@ -5108,7 +5014,7 @@ static const GtkActionEntry entries[] = {
           G_CALLBACK (ev_window_cmd_edit_copy) },
        { "EditSelectAll", GTK_STOCK_SELECT_ALL, N_("Select _All"), "<control>A", NULL,
          G_CALLBACK (ev_window_cmd_edit_select_all) },
-        { "EditFind", GTK_STOCK_FIND, N_("_Find..."), "<control>F",
+        { "EditFind", GTK_STOCK_FIND, N_("_Find"), "<control>F",
           N_("Find a word or phrase in the document"),
           G_CALLBACK (ev_window_cmd_edit_find) },
        { "EditFindNext", NULL, N_("Find Ne_xt"), "<control>G", NULL,
@@ -5263,7 +5169,7 @@ static const GtkActionEntry view_popup_entries [] = {
          NULL, G_CALLBACK (ev_view_popup_cmd_open_link_new_window) },
        { "CopyLinkAddress", NULL, N_("_Copy Link Address"), NULL,
          NULL, G_CALLBACK (ev_view_popup_cmd_copy_link_address) },
-       { "SaveImageAs", NULL, N_("_Save Image As..."), NULL,
+       { "SaveImageAs", NULL, N_("_Save Image As"), NULL,
          NULL, G_CALLBACK (ev_view_popup_cmd_save_image_as) },
        { "CopyImage", NULL, N_("Copy _Image"), NULL,
          NULL, G_CALLBACK (ev_view_popup_cmd_copy_image) },
@@ -5272,7 +5178,7 @@ static const GtkActionEntry view_popup_entries [] = {
 static const GtkActionEntry attachment_popup_entries [] = {
        { "OpenAttachment", GTK_STOCK_OPEN, N_("_Open Attachment"), NULL,
          NULL, G_CALLBACK (ev_attachment_popup_cmd_open_attachment) },
-       { "SaveAttachmentAs", GTK_STOCK_SAVE_AS, N_("_Save Attachment As..."), NULL,
+       { "SaveAttachmentAs", GTK_STOCK_SAVE_AS, N_("_Save Attachment As"), NULL,
          NULL, G_CALLBACK (ev_attachment_popup_cmd_save_attachment_as) },
 };
 
@@ -5351,7 +5257,7 @@ register_custom_actions (EvWindow *window, GtkActionGroup *group)
 
        action = g_object_new (EV_TYPE_OPEN_RECENT_ACTION,
                               "name", "FileOpenRecent",
-                              "label", _("_Open..."),
+                              "label", _("_Open"),
                               "tooltip", _("Open an existing document"),
                               "stock_id", GTK_STOCK_OPEN,
                               NULL);
@@ -6215,16 +6121,6 @@ ev_window_init (EvWindow *ev_window)
        }
        g_free (ui_path);
 
-#if GTK_CHECK_VERSION (2, 17, 4)
-       {
-               GtkAction *action;
-
-               action = gtk_action_group_get_action (ev_window->priv->action_group,
-                                                     "FilePageSetup");
-               g_object_set (action, "visible", FALSE, "sensitive", FALSE, NULL);
-       }
-#endif
-
        ev_window->priv->recent_manager = gtk_recent_manager_get_default ();
        ev_window->priv->recent_action_group = NULL;
        ev_window->priv->recent_ui_id = 0;
@@ -6345,7 +6241,7 @@ ev_window_init (EvWindow *ev_window)
 
        ev_window->priv->view = ev_view_new ();
        ev_view_set_model (EV_VIEW (ev_window->priv->view), ev_window->priv->model);
-       dpi = get_screen_dpi (GTK_WINDOW (ev_window));
+       dpi = get_screen_dpi (ev_window);
        ev_document_model_set_min_scale (ev_window->priv->model, MIN_SCALE * dpi / 72.0);
        ev_document_model_set_max_scale (ev_window->priv->model, MAX_SCALE * dpi / 72.0);
        ev_window->priv->password_view = ev_password_view_new (GTK_WINDOW (ev_window));
@@ -6365,10 +6261,12 @@ ev_window_init (EvWindow *ev_window)
        g_signal_connect_object (ev_window->priv->view, "handle-link",
                                 G_CALLBACK (view_handle_link_cb),
                                 ev_window, 0);
-       g_signal_connect_object (ev_window->priv->view,
-                                "popup",
+       g_signal_connect_object (ev_window->priv->view, "popup",
                                 G_CALLBACK (view_menu_popup_cb),
                                 ev_window, 0);
+       g_signal_connect_object (ev_window->priv->view, "selection-changed",
+                                G_CALLBACK (view_selection_changed_cb),
+                                ev_window, 0);
        gtk_widget_show (ev_window->priv->view);
        gtk_widget_show (ev_window->priv->password_view);
 
@@ -6414,16 +6312,10 @@ ev_window_init (EvWindow *ev_window)
                          "notify::dual-page",
                          G_CALLBACK (ev_window_dual_mode_changed_cb),
                          ev_window);
-
-       /* Connect to view signals */
        g_signal_connect (ev_window->priv->model,
                          "notify::inverted-colors",
                          G_CALLBACK (ev_window_inverted_colors_changed_cb),
                          ev_window);
-       g_signal_connect (ev_window->priv->view,
-                         "notify::has-selection",
-                         G_CALLBACK (ev_window_has_selection_changed_cb),
-                         ev_window);
 
        /* Connect sidebar signals */
        g_signal_connect (ev_window->priv->sidebar,