]> www.fi.muni.cz Git - evince.git/blobdiff - shell/ev-window.c
https://www.fi.muni.cz/~kas/git / evince.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
A bit different fix for rounding problem but it has no
[evince.git] / shell / ev-window.c
diff --git a/shell/ev-window.c b/shell/ev-window.c
index 8a0ec4efc49b536c0630c4142aca51d13895b4f9..aeceba8cf087962977f033dcb1812f6267567b4d 100644 (file)
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -37,8 +37,10 @@
 #include "ev-password.h"
 #include "ev-password-view.h"
 #include "ev-print-job.h"
 #include "ev-password.h"
 #include "ev-password-view.h"
 #include "ev-print-job.h"
+#include "ev-properties.h"
 #include "ev-document-thumbnails.h"
 #include "ev-document-links.h"
 #include "ev-document-thumbnails.h"
 #include "ev-document-links.h"
+#include "ev-document-fonts.h"
 #include "ev-document-types.h"
 #include "ev-document-find.h"
 #include "ev-document-security.h"
 #include "ev-document-types.h"
 #include "ev-document-find.h"
 #include "ev-document-security.h"
@@ -52,6 +54,10 @@
 #include "egg-editable-toolbar.h"
 #include "ephy-zoom.h"
 #include "ephy-zoom-action.h"
 #include "egg-editable-toolbar.h"
 #include "ephy-zoom.h"
 #include "ephy-zoom-action.h"
+#include "ev-application.h"
+#include "ev-stock-icons.h"
+#include "ev-file-helpers.h"
+#include <poppler.h>
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
@@ -66,13 +72,9 @@
 
 #include <string.h>
 
 
 #include <string.h>
 
-#include "ev-application.h"
-#include "ev-stock-icons.h"
-
 typedef enum {
 typedef enum {
-       PAGE_MODE_SINGLE_PAGE,
-       PAGE_MODE_CONTINUOUS_PAGE,
-       PAGE_MODE_PASSWORD,
+       PAGE_MODE_DOCUMENT,
+       PAGE_MODE_PASSWORD
 } EvWindowPageMode;
 
 typedef enum {
 } EvWindowPageMode;
 
 typedef enum {
@@ -158,6 +160,9 @@ static gboolean start_loading_document                  (EvWindow         *ev_wi
 static void     ev_window_sizing_mode_changed_cb        (EvView           *view,
                                                         GParamSpec       *pspec,
                                                         EvWindow         *ev_window);
 static void     ev_window_sizing_mode_changed_cb        (EvView           *view,
                                                         GParamSpec       *pspec,
                                                         EvWindow         *ev_window);
+static void     ev_window_zoom_changed_cb              (EvView           *view,
+                                                        GParamSpec       *pspec,
+                                                        EvWindow         *ev_window);
 static void     ev_window_add_recent                    (EvWindow         *window,
                                                         const char       *filename);
 static void     ev_window_fullscreen                    (EvWindow         *window);
 static void     ev_window_add_recent                    (EvWindow         *window,
                                                         const char       *filename);
 static void     ev_window_fullscreen                    (EvWindow         *window);
@@ -168,7 +173,8 @@ static void     ev_window_run_presentation              (EvWindow         *windo
 static void     ev_window_stop_presentation             (EvWindow         *window);
 static void     ev_window_cmd_view_presentation         (GtkAction        *action,
                                                         EvWindow         *window);
 static void     ev_window_stop_presentation             (EvWindow         *window);
 static void     ev_window_cmd_view_presentation         (GtkAction        *action,
                                                         EvWindow         *window);
-
+static void     show_fullscreen_popup                   (EvWindow         *window);
+                                                       
 
 G_DEFINE_TYPE (EvWindow, ev_window, GTK_TYPE_WINDOW)
 
 
 G_DEFINE_TYPE (EvWindow, ev_window, GTK_TYPE_WINDOW)
 
@@ -187,12 +193,17 @@ update_action_sensitivity (EvWindow *ev_window)
 {
        EvView *view;
        EvDocument *document;
 {
        EvView *view;
        EvDocument *document;
+       const EvDocumentInfo *info = NULL;
        EvWindowPageMode page_mode;
        gboolean sensitive, has_pages = FALSE, has_document;
        int n_pages = 0, page = -1;
        EvWindowPageMode page_mode;
        gboolean sensitive, has_pages = FALSE, has_document;
        int n_pages = 0, page = -1;
+       gboolean ok_to_print = TRUE;
+       gboolean ok_to_copy = TRUE;
 
        view = EV_VIEW (ev_window->priv->view);
        document = ev_window->priv->document;
 
        view = EV_VIEW (ev_window->priv->view);
        document = ev_window->priv->document;
+       if (document)
+               info = ev_page_cache_get_info (ev_window->priv->page_cache);
        page_mode = ev_window->priv->page_mode;
        has_document = document != NULL;
        if (has_document && ev_window->priv->page_cache) {
        page_mode = ev_window->priv->page_mode;
        has_document = document != NULL;
        if (has_document && ev_window->priv->page_cache) {
@@ -201,17 +212,22 @@ update_action_sensitivity (EvWindow *ev_window)
                has_pages = has_document && n_pages > 0;
        }
 
                has_pages = has_document && n_pages > 0;
        }
 
+       if (info && info->fields_mask & EV_DOCUMENT_INFO_PERMISSIONS) {
+               ok_to_print = (info->permissions & EV_DOCUMENT_PERMISSIONS_OK_TO_PRINT);
+               ok_to_copy = (info->permissions & EV_DOCUMENT_PERMISSIONS_OK_TO_COPY);
+       }
+
        /* File menu */
        /* "FileOpen": always sensitive */
        /* File menu */
        /* "FileOpen": always sensitive */
-       set_action_sensitive (ev_window, "FileSaveAs", has_document);
-       set_action_sensitive (ev_window, "FilePrint", has_pages);
+       set_action_sensitive (ev_window, "FileSaveAs", has_document && ok_to_copy);
+       set_action_sensitive (ev_window, "FilePrint", has_pages && ok_to_print);
+       set_action_sensitive (ev_window, "FileProperties", has_document);
        /* "FileCloseWindow": always sensitive */
 
         /* Edit menu */
        /* "FileCloseWindow": always sensitive */
 
         /* Edit menu */
-
        sensitive = has_pages && ev_document_can_get_text (document);
        sensitive = has_pages && ev_document_can_get_text (document);
-       set_action_sensitive (ev_window, "EditCopy", sensitive);
-       set_action_sensitive (ev_window, "EditSelectAll", sensitive);
+       set_action_sensitive (ev_window, "EditCopy", sensitive && ok_to_copy);
+       set_action_sensitive (ev_window, "EditSelectAll", sensitive && ok_to_copy);
        set_action_sensitive (ev_window, "EditFind",
                              has_pages && EV_IS_DOCUMENT_FIND (document));
        set_action_sensitive (ev_window, "Slash",
        set_action_sensitive (ev_window, "EditFind",
                              has_pages && EV_IS_DOCUMENT_FIND (document));
        set_action_sensitive (ev_window, "Slash",
@@ -226,7 +242,6 @@ update_action_sensitivity (EvWindow *ev_window)
                              has_pages && ev_view_can_zoom_in (view));
        set_action_sensitive (ev_window, "ViewZoomOut",
                              has_pages && ev_view_can_zoom_out (view));
                              has_pages && ev_view_can_zoom_in (view));
        set_action_sensitive (ev_window, "ViewZoomOut",
                              has_pages && ev_view_can_zoom_out (view));
-       set_action_sensitive (ev_window, "ViewNormalSize", has_pages);
        set_action_sensitive (ev_window, "ViewBestFit", has_pages);
        set_action_sensitive (ev_window, "ViewPageWidth", has_pages);
        set_action_sensitive (ev_window, "ViewReload", has_pages);
        set_action_sensitive (ev_window, "ViewBestFit", has_pages);
        set_action_sensitive (ev_window, "ViewPageWidth", has_pages);
        set_action_sensitive (ev_window, "ViewReload", has_pages);
@@ -244,18 +259,6 @@ update_action_sensitivity (EvWindow *ev_window)
                set_action_sensitive (ev_window, "GoLastPage", FALSE);
        }
 
                set_action_sensitive (ev_window, "GoLastPage", FALSE);
        }
 
-       /* Page View radio group */
-       if (document) {
-               set_action_sensitive (ev_window, "SinglePage", page_mode != PAGE_MODE_PASSWORD);
-               set_action_sensitive (ev_window, "ContinuousPage", page_mode != PAGE_MODE_PASSWORD);
-       } else {
-               set_action_sensitive (ev_window, "SinglePage", FALSE);
-               set_action_sensitive (ev_window, "ContinuousPage", FALSE);
-       }
-       /* Help menu */
-       /* "HelpContents": always sensitive */
-       /* "HelpAbout": always sensitive */
-
        /* Toolbar-specific actions: */
        set_action_sensitive (ev_window, PAGE_SELECTOR_ACTION, has_pages);
        set_action_sensitive (ev_window, ZOOM_CONTROL_ACTION,  has_pages);
        /* Toolbar-specific actions: */
        set_action_sensitive (ev_window, PAGE_SELECTOR_ACTION, has_pages);
        set_action_sensitive (ev_window, ZOOM_CONTROL_ACTION,  has_pages);
@@ -315,7 +318,10 @@ update_chrome_visibility (EvWindow *window)
        set_widget_visibility (priv->fullscreen_toolbar, fullscreen_toolbar);
 
        if (priv->fullscreen_popup != NULL) {
        set_widget_visibility (priv->fullscreen_toolbar, fullscreen_toolbar);
 
        if (priv->fullscreen_popup != NULL) {
-               set_widget_visibility (priv->fullscreen_popup, fullscreen);
+               if (fullscreen)
+                       show_fullscreen_popup (window);
+               else
+                       set_widget_visibility (priv->fullscreen_popup, FALSE);
        }
 }
 
        }
 }
 
@@ -341,6 +347,28 @@ update_chrome_flag (EvWindow *window, EvChrome flag, const char *pref, gboolean
        update_chrome_visibility (window);
 }
 
        update_chrome_visibility (window);
 }
 
+static void
+ev_window_cmd_focus_page_selector (GtkAction *act, EvWindow *window)
+{
+       GtkAction *action;
+       
+       action = gtk_action_group_get_action (window->priv->action_group,
+                                             PAGE_SELECTOR_ACTION);
+       ev_page_action_grab_focus (EV_PAGE_ACTION (action));
+}
+
+static void
+ev_window_cmd_scroll_forward (GtkAction *action, EvWindow *window)
+{
+       ev_view_scroll (EV_VIEW (window->priv->view), EV_SCROLL_PAGE_FORWARD);
+}
+
+static void
+ev_window_cmd_scroll_backward (GtkAction *action, EvWindow *window)
+{
+       ev_view_scroll (EV_VIEW (window->priv->view), EV_SCROLL_PAGE_BACKWARD);
+}
+
 static void
 ev_window_cmd_continuous (GtkAction *action, EvWindow *ev_window)
 {
 static void
 ev_window_cmd_continuous (GtkAction *action, EvWindow *ev_window)
 {
@@ -449,11 +477,12 @@ update_sizing_buttons (EvWindow *window)
 }
 
 void
 }
 
 void
-ev_window_open_page (EvWindow *ev_window, int page)
+ev_window_open_page_label (EvWindow   *ev_window, 
+                          const char *label)
 {
        if (ev_window->priv->page_cache) {
 {
        if (ev_window->priv->page_cache) {
-           page = CLAMP (page, 0, ev_page_cache_get_n_pages (ev_window->priv->page_cache));
-           ev_page_cache_set_current_page (ev_window->priv->page_cache, page);
+               ev_page_cache_set_page_label (ev_window->priv->page_cache, 
+                                             label);
        }
 }
 
        }
 }
 
@@ -568,7 +597,7 @@ update_document_mode (EvWindow *window, EvDocumentMode mode)
 static void
 ev_window_setup_document (EvWindow *ev_window)
 {
 static void
 ev_window_setup_document (EvWindow *ev_window)
 {
-       EvDocumentInfo *info;
+       const EvDocumentInfo *info;
        EvDocument *document;
        EvView *view = EV_VIEW (ev_window->priv->view);
        EvSidebar *sidebar = EV_SIDEBAR (ev_window->priv->sidebar);
        EvDocument *document;
        EvView *view = EV_VIEW (ev_window->priv->view);
        EvSidebar *sidebar = EV_SIDEBAR (ev_window->priv->sidebar);
@@ -589,7 +618,7 @@ ev_window_setup_document (EvWindow *ev_window)
                                         ev_window, 0);
        }
 
                                         ev_window, 0);
        }
 
-       ev_window_set_page_mode (ev_window, PAGE_MODE_SINGLE_PAGE);
+       ev_window_set_page_mode (ev_window, PAGE_MODE_DOCUMENT);
 
        ev_sidebar_set_document (sidebar, document);
 
 
        ev_sidebar_set_document (sidebar, document);
 
@@ -602,9 +631,8 @@ ev_window_setup_document (EvWindow *ev_window)
        ev_page_action_set_document (EV_PAGE_ACTION (action), document);
        update_action_sensitivity (ev_window);
 
        ev_page_action_set_document (EV_PAGE_ACTION (action), document);
        update_action_sensitivity (ev_window);
 
-       info = ev_document_get_info (document);
+       info = ev_page_cache_get_info (ev_window->priv->page_cache);
        update_document_mode (ev_window, info->mode);
        update_document_mode (ev_window, info->mode);
-       g_free (info);
 }
 
 static void
 }
 
 static void
@@ -1060,22 +1088,50 @@ using_postscript_printer (GnomePrintConfig *config)
 }
 
 static void
 }
 
 static void
-ev_window_print (EvWindow *ev_window)
+ev_window_print (EvWindow *window)
+{
+       EvPageCache *page_cache;
+       int last_page;
+
+       page_cache = ev_document_get_page_cache (window->priv->document);
+       last_page = ev_page_cache_get_n_pages (page_cache);
+
+       ev_window_print_range (window, 1, -1);
+}
+
+void
+ev_window_print_range (EvWindow *ev_window, int first_page, int last_page)
 {
        GnomePrintConfig *config;
        GnomePrintJob *job;
        GtkWidget *print_dialog;
 {
        GnomePrintConfig *config;
        GnomePrintJob *job;
        GtkWidget *print_dialog;
+       gchar *pages_label;
        EvPrintJob *print_job = NULL;
        EvPrintJob *print_job = NULL;
+       EvPageCache *page_cache;
 
         g_return_if_fail (EV_IS_WINDOW (ev_window));
        g_return_if_fail (ev_window->priv->document != NULL);
 
 
         g_return_if_fail (EV_IS_WINDOW (ev_window));
        g_return_if_fail (ev_window->priv->document != NULL);
 
+       page_cache = ev_document_get_page_cache (ev_window->priv->document);
+       if (last_page == -1) {
+               last_page = ev_page_cache_get_n_pages (page_cache);
+       }
+
        config = gnome_print_config_default ();
        job = gnome_print_job_new (config);
 
        print_dialog = gnome_print_dialog_new (job, (guchar *) _("Print"),
                                               (GNOME_PRINT_DIALOG_RANGE |
                                                GNOME_PRINT_DIALOG_COPIES));
        config = gnome_print_config_default ();
        job = gnome_print_job_new (config);
 
        print_dialog = gnome_print_dialog_new (job, (guchar *) _("Print"),
                                               (GNOME_PRINT_DIALOG_RANGE |
                                                GNOME_PRINT_DIALOG_COPIES));
+
+       pages_label = g_strconcat (_("Pages"), " ", NULL);
+       gnome_print_dialog_construct_range_page (GNOME_PRINT_DIALOG (print_dialog),
+                                                GNOME_PRINT_RANGE_ALL |
+                                                GNOME_PRINT_RANGE_RANGE,
+                                                first_page, last_page,
+                                                NULL, (const guchar *)pages_label);
+       g_free (pages_label);
+                                                
        gtk_dialog_set_response_sensitive (GTK_DIALOG (print_dialog),
                                           GNOME_PRINT_DIALOG_RESPONSE_PREVIEW,
                                           FALSE);
        gtk_dialog_set_response_sensitive (GTK_DIALOG (print_dialog),
                                           GNOME_PRINT_DIALOG_RESPONSE_PREVIEW,
                                           FALSE);
@@ -1130,6 +1186,28 @@ ev_window_cmd_file_print (GtkAction *action, EvWindow *ev_window)
        ev_window_print (ev_window);
 }
 
        ev_window_print (ev_window);
 }
 
+static void
+ev_window_cmd_file_properties (GtkAction *action, EvWindow *ev_window)
+{
+       EvDocument *document = ev_window->priv->document;
+       EvDocumentInfo *info;
+       GtkDialog *dialog;
+       GtkTreeModel *fonts;
+
+       if (EV_IS_DOCUMENT_FONTS (document)) {
+               fonts = ev_document_fonts_get_fonts_model (EV_DOCUMENT_FONTS (document));
+       } else {
+               fonts = NULL;
+       }
+
+       info = ev_document_get_info (document);
+       dialog = ev_properties_new (info, fonts);
+       gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW(window));
+       gtk_dialog_run (dialog);
+       gtk_widget_destroy (GTK_WIDGET (dialog));
+       ev_document_info_free (info);
+}
+                                       
 static void
 ev_window_cmd_file_close_window (GtkAction *action, EvWindow *ev_window)
 {
 static void
 ev_window_cmd_file_close_window (GtkAction *action, EvWindow *ev_window)
 {
@@ -1324,6 +1402,18 @@ fullscreen_clear_timeout (EvWindow *window)
        ev_view_show_cursor (EV_VIEW (window->priv->view));
 }
 
        ev_view_show_cursor (EV_VIEW (window->priv->view));
 }
 
+
+static void
+show_fullscreen_popup (EvWindow *window)
+{
+       if (!GTK_WIDGET_VISIBLE (window->priv->fullscreen_popup)) {
+               g_object_set (window->priv->fullscreen_popup, "visible", TRUE, NULL);
+               ev_view_show_cursor (EV_VIEW (window->priv->view));
+       }
+
+       fullscreen_set_timeout (window);        
+}
+
 static gboolean
 fullscreen_motion_notify_cb (GtkWidget *widget,
                             GdkEventMotion *event,
 static gboolean
 fullscreen_motion_notify_cb (GtkWidget *widget,
                             GdkEventMotion *event,
@@ -1331,12 +1421,7 @@ fullscreen_motion_notify_cb (GtkWidget *widget,
 {
        EvWindow *window = EV_WINDOW (user_data);
 
 {
        EvWindow *window = EV_WINDOW (user_data);
 
-       if (!GTK_WIDGET_VISIBLE (window->priv->fullscreen_popup)) {
-               g_object_set (window->priv->fullscreen_popup, "visible", TRUE, NULL);
-               ev_view_show_cursor (EV_VIEW (window->priv->view));
-       }
-
-       fullscreen_set_timeout (window);
+       show_fullscreen_popup (window);
 
        return FALSE;
 }
 
        return FALSE;
 }
@@ -1581,7 +1666,7 @@ ev_window_focus_in_event (GtkWidget *widget, GdkEventFocus *event)
                      NULL);
 
        if (fullscreen)
                      NULL);
 
        if (fullscreen)
-               gtk_widget_show (priv->fullscreen_popup);
+               show_fullscreen_popup (window);
 
        return GTK_WIDGET_CLASS (ev_window_parent_class)->focus_in_event (widget, event);
 }
 
        return GTK_WIDGET_CLASS (ev_window_parent_class)->focus_in_event (widget, event);
 }
@@ -1616,15 +1701,12 @@ ev_window_set_page_mode (EvWindow         *window,
        window->priv->page_mode = page_mode;
 
        switch (page_mode) {
        window->priv->page_mode = page_mode;
 
        switch (page_mode) {
-       case PAGE_MODE_SINGLE_PAGE:
+       case PAGE_MODE_DOCUMENT:
                child = window->priv->view;
                break;
        case PAGE_MODE_PASSWORD:
                child = window->priv->password_view;
                break;
                child = window->priv->view;
                break;
        case PAGE_MODE_PASSWORD:
                child = window->priv->password_view;
                break;
-       case PAGE_MODE_CONTINUOUS_PAGE:
-               child = window->priv->page_view;
-               break;
        default:
                g_assert_not_reached ();
        }
        default:
                g_assert_not_reached ();
        }
@@ -1643,8 +1725,10 @@ static void
 ev_window_cmd_edit_toolbar_cb (GtkDialog *dialog, gint response, gpointer data)
 {
        EvWindow *ev_window = EV_WINDOW (data);
 ev_window_cmd_edit_toolbar_cb (GtkDialog *dialog, gint response, gpointer data)
 {
        EvWindow *ev_window = EV_WINDOW (data);
-        egg_editable_toolbar_set_edit_mode (EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar), FALSE);
-        egg_toolbars_model_save (ev_window->priv->toolbar_model, ev_window->priv->toolbar_file, "1.0");
+        egg_editable_toolbar_set_edit_mode
+                       (EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar), FALSE);
+        egg_toolbars_model_save (ev_window->priv->toolbar_model,
+                                ev_window->priv->toolbar_file, "1.0");
         gtk_widget_destroy (GTK_WIDGET (dialog));
 }
 
         gtk_widget_destroy (GTK_WIDGET (dialog));
 }
 
@@ -1689,7 +1773,6 @@ ev_window_cmd_view_zoom_in (GtkAction *action, EvWindow *ev_window)
 
        ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_FREE);
        ev_view_zoom_in (EV_VIEW (ev_window->priv->view));
 
        ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_FREE);
        ev_view_zoom_in (EV_VIEW (ev_window->priv->view));
-       update_action_sensitivity (ev_window);
 }
 
 static void
 }
 
 static void
@@ -1699,16 +1782,6 @@ ev_window_cmd_view_zoom_out (GtkAction *action, EvWindow *ev_window)
 
        ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_FREE);
        ev_view_zoom_out (EV_VIEW (ev_window->priv->view));
 
        ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_FREE);
        ev_view_zoom_out (EV_VIEW (ev_window->priv->view));
-       update_action_sensitivity (ev_window);
-}
-
-static void
-ev_window_cmd_view_normal_size (GtkAction *action, EvWindow *ev_window)
-{
-        g_return_if_fail (EV_IS_WINDOW (ev_window));
-
-       ev_view_zoom_normal (EV_VIEW (ev_window->priv->view));
-       update_action_sensitivity (ev_window);
 }
 
 static void
 }
 
 static void
@@ -1758,7 +1831,11 @@ ev_window_cmd_view_reload (GtkAction *action, EvWindow *ev_window)
        uri = g_strdup (ev_window->priv->uri);
 
        ev_window_open (ev_window, uri);
        uri = g_strdup (ev_window->priv->uri);
 
        ev_window_open (ev_window, uri);
-       ev_window_open_page (ev_window, page);
+
+       /* In case the number of pages in the document has changed. */
+       page = CLAMP (page, 0, ev_page_cache_get_n_pages (ev_window->priv->page_cache));
+
+       ev_page_cache_set_current_page (ev_window->priv->page_cache, page);
 
        g_free (uri);
 }
 
        g_free (uri);
 }
@@ -1812,7 +1889,7 @@ ev_window_cmd_escape (GtkAction *action, EvWindow *window)
 }
 
 static void
 }
 
 static void
-update_view_size (EvWindow *window)
+update_view_size (EvView *view, EvWindow *window)
 {
        int width, height;
        GtkRequisition vsb_requisition;
 {
        int width, height;
        GtkRequisition vsb_requisition;
@@ -1843,14 +1920,6 @@ update_view_size (EvWindow *window)
                                   hsb_requisition.height + scrollbar_spacing);
 }
 
                                   hsb_requisition.height + scrollbar_spacing);
 }
 
-static void
-size_allocate_cb (GtkWidget     *scrolled_window,
-                 GtkAllocation *allocation,
-                 EvWindow      *window)
-{
-       update_view_size (window);
-}
-
 static void     
 ev_window_sizing_mode_changed_cb (EvView *view, GParamSpec *pspec,
                                  EvWindow   *ev_window)
 static void     
 ev_window_sizing_mode_changed_cb (EvView *view, GParamSpec *pspec,
                                  EvWindow   *ev_window)
@@ -1864,10 +1933,10 @@ ev_window_sizing_mode_changed_cb (EvView *view, GParamSpec *pspec,
 
        scrolled_window = ev_window->priv->scrolled_window;
 
 
        scrolled_window = ev_window->priv->scrolled_window;
 
-       g_signal_handlers_disconnect_by_func (scrolled_window, size_allocate_cb, ev_window);
+       g_signal_handlers_disconnect_by_func (ev_window->priv->view, update_view_size, ev_window);
 
        if (sizing_mode != EV_SIZING_FREE)
 
        if (sizing_mode != EV_SIZING_FREE)
-               update_view_size (ev_window);
+               update_view_size (NULL, ev_window);
 
        switch (sizing_mode) {
        case EV_SIZING_BEST_FIT:
 
        switch (sizing_mode) {
        case EV_SIZING_BEST_FIT:
@@ -1875,8 +1944,8 @@ ev_window_sizing_mode_changed_cb (EvView *view, GParamSpec *pspec,
                              "hscrollbar-policy", GTK_POLICY_NEVER,
                              "vscrollbar-policy", GTK_POLICY_AUTOMATIC,
                              NULL);
                              "hscrollbar-policy", GTK_POLICY_NEVER,
                              "vscrollbar-policy", GTK_POLICY_AUTOMATIC,
                              NULL);
-               g_signal_connect (scrolled_window, "size-allocate",
-                                 G_CALLBACK (size_allocate_cb),
+               g_signal_connect (ev_window->priv->view, "zoom_invalid",
+                                 G_CALLBACK (update_view_size),
                                  ev_window);
                break;
        case EV_SIZING_FIT_WIDTH:
                                  ev_window);
                break;
        case EV_SIZING_FIT_WIDTH:
@@ -1884,8 +1953,8 @@ ev_window_sizing_mode_changed_cb (EvView *view, GParamSpec *pspec,
                              "hscrollbar-policy", GTK_POLICY_NEVER,
                              "vscrollbar-policy", GTK_POLICY_AUTOMATIC,
                              NULL);
                              "hscrollbar-policy", GTK_POLICY_NEVER,
                              "vscrollbar-policy", GTK_POLICY_AUTOMATIC,
                              NULL);
-               g_signal_connect (scrolled_window, "size-allocate",
-                                 G_CALLBACK (size_allocate_cb),
+               g_signal_connect (ev_window->priv->view, "zoom_invalid",
+                                 G_CALLBACK (update_view_size),
                                  ev_window);
                break;
        case EV_SIZING_FREE:
                                  ev_window);
                break;
        case EV_SIZING_FREE:
@@ -1899,16 +1968,53 @@ ev_window_sizing_mode_changed_cb (EvView *view, GParamSpec *pspec,
        update_sizing_buttons (ev_window);
 }
 
        update_sizing_buttons (ev_window);
 }
 
+static void     
+ev_window_zoom_changed_cb (EvView *view, GParamSpec *pspec,
+                          EvWindow   *ev_window)
+{
+        update_action_sensitivity (ev_window);
+}
+
+static char *
+build_comments_string (void)
+{
+       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;
+       }
+
+       return g_strdup_printf (_("PostScript and PDF File Viewer.\n"
+                                 "Using poppler %s (%s)"),
+                               version, backend_name);
+}
+
 static void
 ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window)
 {
        const char *authors[] = {
 static void
 ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window)
 {
        const char *authors[] = {
-               N_("Many..."),
+               "Martin Kretzschmar <m_kretzschmar@gmx.net>",
+               "Jonathan Blandford <jrb@gnome.org>",
+               "Marco Pesenti Gritti <marco@gnome.org>",
+               "Nickolay V. Shmyrev <nshmyrev@yandex.ru>",
+               "Bryan Clark <clarkbw@gnome.org>",
                NULL
        };
 
        const char *documenters[] = {
                NULL
        };
 
        const char *documenters[] = {
-               N_("Not so many..."),
+               "Nickolay V. Shmyrev <nshmyrev@yandex.ru>",
                NULL
        };
 
                NULL
        };
 
@@ -1927,6 +2033,7 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window)
        };
 
        char *license_trans;
        };
 
        char *license_trans;
+       char *comments;
 
 #ifdef ENABLE_NLS
        const char **p;
 
 #ifdef ENABLE_NLS
        const char **p;
@@ -1940,6 +2047,7 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window)
 
        license_trans = g_strconcat (_(license[0]), "\n", _(license[1]), "\n",
                                     _(license[2]), "\n", NULL);
 
        license_trans = g_strconcat (_(license[0]), "\n", _(license[1]), "\n",
                                     _(license[2]), "\n", NULL);
+       comments = build_comments_string ();
 
        gtk_show_about_dialog (
                GTK_WINDOW (ev_window),
 
        gtk_show_about_dialog (
                GTK_WINDOW (ev_window),
@@ -1949,12 +2057,13 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window)
                _("\xc2\xa9 1996-2004 The Evince authors"),
                "license", license_trans,
                "website", "http://www.gnome.org/projects/evince",
                _("\xc2\xa9 1996-2004 The Evince authors"),
                "license", license_trans,
                "website", "http://www.gnome.org/projects/evince",
-               "comments", _("PostScript and PDF File Viewer."),
+               "comments", comments,
                "authors", authors,
                "documenters", documenters,
                "translator-credits", _("translator-credits"),
                NULL);
 
                "authors", authors,
                "documenters", documenters,
                "translator-credits", _("translator-credits"),
                NULL);
 
+       g_free (comments);
        g_free (license_trans);
 }
 
        g_free (license_trans);
 }
 
@@ -2111,21 +2220,6 @@ find_bar_close_cb (EggFindBar *find_bar,
        update_chrome_flag (ev_window, EV_CHROME_FINDBAR, NULL, FALSE);
 }
 
        update_chrome_flag (ev_window, EV_CHROME_FINDBAR, NULL, FALSE);
 }
 
-static void
-ev_window_page_mode_cb (GtkRadioAction *action,
-                       GtkRadioAction *activated_action,
-                       EvWindow       *window)
-{
-       int mode;
-
-       mode = gtk_radio_action_get_current_value (action);
-
-       g_assert (mode == PAGE_MODE_CONTINUOUS_PAGE ||
-                 mode == PAGE_MODE_SINGLE_PAGE);
-
-       ev_window_set_page_mode (window, (EvWindowPageMode) mode);
-}
-
 static void
 find_bar_search_changed_cb (EggFindBar *find_bar,
                            GParamSpec *param,
 static void
 find_bar_search_changed_cb (EggFindBar *find_bar,
                            GParamSpec *param,
@@ -2191,7 +2285,6 @@ zoom_control_changed_cb (EphyZoomAction *action,
        }
        
        ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), mode);
        }
        
        ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), mode);
-       update_action_sensitivity (ev_window);
 }
 
 static void
 }
 
 static void
@@ -2255,6 +2348,10 @@ ev_window_dispose (GObject *object)
                priv->find_bar = NULL;
        }
 
                priv->find_bar = NULL;
        }
 
+       if (window->priv->fullscreen_timeout_source) {
+               g_source_destroy (window->priv->fullscreen_timeout_source);
+               window->priv->fullscreen_timeout_source = NULL;
+       }
        destroy_fullscreen_popup (window);
 
        G_OBJECT_CLASS (ev_window_parent_class)->dispose (object);
        destroy_fullscreen_popup (window);
 
        G_OBJECT_CLASS (ev_window_parent_class)->dispose (object);
@@ -2293,6 +2390,9 @@ static const GtkActionEntry entries[] = {
        { "FilePrint", GTK_STOCK_PRINT, N_("Print..."), "<control>P",
          N_("Print this document"),
          G_CALLBACK (ev_window_cmd_file_print) },
        { "FilePrint", GTK_STOCK_PRINT, N_("Print..."), "<control>P",
          N_("Print this document"),
          G_CALLBACK (ev_window_cmd_file_print) },
+       { "FileProperties", GTK_STOCK_PROPERTIES, N_("Properties"), "<alt>Return",
+         N_("View the properties of this document"),
+         G_CALLBACK (ev_window_cmd_file_properties) },                       
        { "FileCloseWindow", GTK_STOCK_CLOSE, NULL, "<control>W",
          N_("Close this window"),
          G_CALLBACK (ev_window_cmd_file_close_window) },
        { "FileCloseWindow", GTK_STOCK_CLOSE, NULL, "<control>W",
          N_("Close this window"),
          G_CALLBACK (ev_window_cmd_file_close_window) },
@@ -2310,8 +2410,8 @@ static const GtkActionEntry entries[] = {
        { "EditFindNext", NULL, N_("Find Ne_xt"), "<control>G",
          N_("Find next occurrence of the word or phrase"),
          G_CALLBACK (ev_window_cmd_edit_find_next) },
        { "EditFindNext", NULL, N_("Find Ne_xt"), "<control>G",
          N_("Find next occurrence of the word or phrase"),
          G_CALLBACK (ev_window_cmd_edit_find_next) },
-        { "EditToolbar", NULL, N_("Toolbar..."), NULL,
-          N_("Open Toolbar Editor Dialog"),
+        { "EditToolbar", NULL, N_("T_oolbar"), NULL,
+          N_("Customize the toolbar"),
           G_CALLBACK (ev_window_cmd_edit_toolbar) },
 
         /* View menu */
           G_CALLBACK (ev_window_cmd_edit_toolbar) },
 
         /* View menu */
@@ -2321,18 +2421,15 @@ static const GtkActionEntry entries[] = {
         { "ViewZoomOut", GTK_STOCK_ZOOM_OUT, NULL, "<control>minus",
           N_("Shrink the document"),
           G_CALLBACK (ev_window_cmd_view_zoom_out) },
         { "ViewZoomOut", GTK_STOCK_ZOOM_OUT, NULL, "<control>minus",
           N_("Shrink the document"),
           G_CALLBACK (ev_window_cmd_view_zoom_out) },
-        { "ViewNormalSize", GTK_STOCK_ZOOM_100, NULL, "<control>0",
-          N_("Reset the zoom level to the default value"),
-          G_CALLBACK (ev_window_cmd_view_normal_size) },
         { "ViewReload", GTK_STOCK_REFRESH, N_("_Reload"), "<control>R",
           N_("Reload the document"),
           G_CALLBACK (ev_window_cmd_view_reload) },
 
         /* Go menu */
         { "ViewReload", GTK_STOCK_REFRESH, N_("_Reload"), "<control>R",
           N_("Reload the document"),
           G_CALLBACK (ev_window_cmd_view_reload) },
 
         /* Go menu */
-        { "GoPreviousPage", GTK_STOCK_GO_BACK, N_("_Previous Page"), "Page_Up",
+        { "GoPreviousPage", GTK_STOCK_GO_BACK, N_("_Previous Page"), "<control>Page_Up",
           N_("Go to the previous page"),
           G_CALLBACK (ev_window_cmd_go_previous_page) },
           N_("Go to the previous page"),
           G_CALLBACK (ev_window_cmd_go_previous_page) },
-        { "GoNextPage", GTK_STOCK_GO_FORWARD, N_("_Next Page"), "Page_Down",
+        { "GoNextPage", GTK_STOCK_GO_FORWARD, N_("_Next Page"), "<control>Page_Down",
           N_("Go to the next page"),
           G_CALLBACK (ev_window_cmd_go_next_page) },
         { "GoFirstPage", GTK_STOCK_GOTO_FIRST, N_("_First Page"), "<control>Home",
           N_("Go to the next page"),
           G_CALLBACK (ev_window_cmd_go_next_page) },
         { "GoFirstPage", GTK_STOCK_GOTO_FIRST, N_("_First Page"), "<control>Home",
@@ -2357,11 +2454,38 @@ static const GtkActionEntry entries[] = {
          G_CALLBACK (ev_window_cmd_leave_fullscreen) },
 
        /* Accellerators */
          G_CALLBACK (ev_window_cmd_leave_fullscreen) },
 
        /* Accellerators */
-       { "Escape", NULL, N_("Selection Caret"), "Escape", "",
+       { "Escape", NULL, "", "Escape", "",
          G_CALLBACK (ev_window_cmd_escape) },
         { "Slash", GTK_STOCK_FIND, NULL, "slash",
           N_("Find a word or phrase in the document"),
          G_CALLBACK (ev_window_cmd_escape) },
         { "Slash", GTK_STOCK_FIND, NULL, "slash",
           N_("Find a word or phrase in the document"),
-          G_CALLBACK (ev_window_cmd_edit_find) }
+          G_CALLBACK (ev_window_cmd_edit_find) },
+        { "PageDown", NULL, "", "Page_Down",
+          N_("Scroll one page forward"),
+          G_CALLBACK (ev_window_cmd_scroll_forward) },
+        { "PageUp", NULL, "", "Page_Up",
+          N_("Scroll one page backward"),
+          G_CALLBACK (ev_window_cmd_scroll_backward) },
+        { "Space", NULL, "", "space",
+          N_("Scroll one page forward"),
+          G_CALLBACK (ev_window_cmd_scroll_forward) },
+        { "ShiftSpace", NULL, "", "<shift>space",
+          N_("Scroll one page backward"),
+          G_CALLBACK (ev_window_cmd_scroll_backward) },
+        { "BackSpace", NULL, "", "BackSpace",
+          N_("Scroll one page backward"),
+          G_CALLBACK (ev_window_cmd_scroll_backward) },
+        { "ShiftBackSpace", NULL, "", "<shift>BackSpace",
+          N_("Scroll one page forward"),
+          G_CALLBACK (ev_window_cmd_scroll_forward) },
+        { "Plus", GTK_STOCK_ZOOM_IN, NULL, "plus",
+          N_("Enlarge the document"),
+          G_CALLBACK (ev_window_cmd_view_zoom_in) },
+        { "Minus", GTK_STOCK_ZOOM_OUT, NULL, "minus",
+          N_("Shrink the document"),
+          G_CALLBACK (ev_window_cmd_view_zoom_out) },
+        { "FocusPageSelector", NULL, "", "<control>l",
+          N_("Focus the page selector"),
+          G_CALLBACK (ev_window_cmd_focus_page_selector) }
 };
 
 /* Toggle items */
 };
 
 /* Toggle items */
@@ -2396,15 +2520,6 @@ static const GtkToggleActionEntry toggle_entries[] = {
           G_CALLBACK (ev_window_cmd_view_page_width) },
 };
 
           G_CALLBACK (ev_window_cmd_view_page_width) },
 };
 
-static const GtkRadioActionEntry page_view_entries[] = {
-       { "SinglePage", GTK_STOCK_DND, N_("Single"), NULL,
-         N_("Show the document one page at a time"),
-         PAGE_MODE_SINGLE_PAGE },
-       { "ContinuousPage", GTK_STOCK_DND_MULTIPLE, N_("Multi"), NULL,
-         N_("Show the full document at once"),
-         PAGE_MODE_CONTINUOUS_PAGE }
-};
-
 static void
 drag_data_received_cb (GtkWidget *widget, GdkDragContext *context,
                       gint x, gint y, GtkSelectionData *selection_data,
 static void
 drag_data_received_cb (GtkWidget *widget, GdkDragContext *context,
                       gint x, gint y, GtkSelectionData *selection_data,
@@ -2423,6 +2538,25 @@ drag_data_received_cb (GtkWidget *widget, GdkDragContext *context,
        }
 }
 
        }
 }
 
+static void
+activate_link_cb (EvPageAction *page_action, EvLink *link, EvWindow *window)
+{
+       g_return_if_fail (EV_IS_WINDOW (window));
+
+       ev_page_cache_set_link (window->priv->page_cache, link);
+       gtk_widget_grab_focus (window->priv->view);
+}
+
+static gboolean
+activate_label_cb (EvPageAction *page_action, char *label, EvWindow *window)
+{
+       g_return_val_if_fail (EV_IS_WINDOW (window), FALSE);
+
+       gtk_widget_grab_focus (window->priv->view);
+
+       return ev_page_cache_set_page_label (window->priv->page_cache, label);
+}
+
 static void
 register_custom_actions (EvWindow *window, GtkActionGroup *group)
 {
 static void
 register_custom_actions (EvWindow *window, GtkActionGroup *group)
 {
@@ -2434,6 +2568,10 @@ register_custom_actions (EvWindow *window, GtkActionGroup *group)
                               "tooltip", _("Select Page"),
                               "visible_overflown", FALSE,
                               NULL);
                               "tooltip", _("Select Page"),
                               "visible_overflown", FALSE,
                               NULL);
+       g_signal_connect (action, "activate_link",
+                         G_CALLBACK (activate_link_cb), window);
+       g_signal_connect (action, "activate_label",
+                         G_CALLBACK (activate_label_cb), window);
        gtk_action_group_add_action (group, action);
        g_object_unref (action);
 
        gtk_action_group_add_action (group, action);
        g_object_unref (action);
 
@@ -2575,20 +2713,60 @@ sidebar_widget_model_set (EvSidebarLinks *ev_sidebar_links,
        ev_page_action_set_model (EV_PAGE_ACTION (action), model);
 }
 
        ev_page_action_set_model (EV_PAGE_ACTION (action), model);
 }
 
+
+static void
+set_view_actions_sensitivity (EvWindow *window, gboolean sensitive)
+{
+       if (window->priv->action_group) {
+               set_action_sensitive (window, "PageDown", sensitive);
+               set_action_sensitive (window, "PageUp", sensitive);
+               set_action_sensitive (window, "Space", sensitive);
+               set_action_sensitive (window, "ShiftSpace", sensitive);
+               set_action_sensitive (window, "BackSpace", sensitive);
+               set_action_sensitive (window, "ShiftBackSpace", sensitive);
+               set_action_sensitive (window, "Slash", sensitive);
+               set_action_sensitive (window, "Plus", sensitive);
+               set_action_sensitive (window, "Minus", sensitive);
+       }
+}
+
+static void
+view_actions_focus_in_cb (GtkWidget *widget, GdkEventFocus *event, EvWindow *window)
+{
+       set_view_actions_sensitivity (window, TRUE);
+}
+
+static void
+view_actions_focus_out_cb (GtkWidget *widget, GdkEventFocus *event, EvWindow *window)
+{
+       set_view_actions_sensitivity (window, FALSE);
+}
+
+static void
+enable_view_actions_for_widget (EvWindow *window, GtkWidget *widget)
+{
+       g_signal_connect_object (widget, "focus_in_event",
+                                G_CALLBACK (view_actions_focus_in_cb),
+                                window, 0);
+       g_signal_connect_object (widget, "focus_out_event",
+                                G_CALLBACK (view_actions_focus_out_cb),
+                                window, 0);
+}
+
 static void
 ev_window_init (EvWindow *ev_window)
 {
        GtkActionGroup *action_group;
        GtkAccelGroup *accel_group;
        GError *error = NULL;
 static void
 ev_window_init (EvWindow *ev_window)
 {
        GtkActionGroup *action_group;
        GtkAccelGroup *accel_group;
        GError *error = NULL;
-       GtkWidget *sidebar_widget, *toolbar_dock;
+       GtkWidget *sidebar_widget, *toolbar_dock, *tree_view;
        GConfValue *value;
        GConfClient *client;
        int sidebar_size;
 
        ev_window->priv = EV_WINDOW_GET_PRIVATE (ev_window);
 
        GConfValue *value;
        GConfClient *client;
        int sidebar_size;
 
        ev_window->priv = EV_WINDOW_GET_PRIVATE (ev_window);
 
-       ev_window->priv->page_mode = PAGE_MODE_SINGLE_PAGE;
+       ev_window->priv->page_mode = PAGE_MODE_DOCUMENT;
        update_window_title (NULL, NULL, ev_window);
 
        ev_window->priv->main_box = gtk_vbox_new (FALSE, 0);
        update_window_title (NULL, NULL, ev_window);
 
        ev_window->priv->main_box = gtk_vbox_new (FALSE, 0);
@@ -2603,11 +2781,6 @@ ev_window_init (EvWindow *ev_window)
        gtk_action_group_add_toggle_actions (action_group, toggle_entries,
                                             G_N_ELEMENTS (toggle_entries),
                                             ev_window);
        gtk_action_group_add_toggle_actions (action_group, toggle_entries,
                                             G_N_ELEMENTS (toggle_entries),
                                             ev_window);
-       gtk_action_group_add_radio_actions (action_group, page_view_entries,
-                                           G_N_ELEMENTS (page_view_entries),
-                                           ev_window->priv->page_mode,
-                                           G_CALLBACK (ev_window_page_mode_cb),
-                                           ev_window);
        set_action_properties (action_group);
        register_custom_actions (ev_window, action_group);
 
        set_action_properties (action_group);
        register_custom_actions (ev_window, action_group);
 
@@ -2619,6 +2792,8 @@ ev_window_init (EvWindow *ev_window)
                gtk_ui_manager_get_accel_group (ev_window->priv->ui_manager);
        gtk_window_add_accel_group (GTK_WINDOW (ev_window), accel_group);
 
                gtk_ui_manager_get_accel_group (ev_window->priv->ui_manager);
        gtk_window_add_accel_group (GTK_WINDOW (ev_window), accel_group);
 
+       set_view_actions_sensitivity (ev_window, FALSE);
+
        g_signal_connect (ev_window->priv->ui_manager, "connect_proxy",
                          G_CALLBACK (connect_proxy_cb), ev_window);
        g_signal_connect (ev_window->priv->ui_manager, "disconnect_proxy",
        g_signal_connect (ev_window->priv->ui_manager, "connect_proxy",
                          G_CALLBACK (connect_proxy_cb), ev_window);
        g_signal_connect (ev_window->priv->ui_manager, "disconnect_proxy",
@@ -2627,7 +2802,7 @@ ev_window_init (EvWindow *ev_window)
        if (!gtk_ui_manager_add_ui_from_file (ev_window->priv->ui_manager,
                                              DATADIR"/evince-ui.xml",
                                              &error)) {
        if (!gtk_ui_manager_add_ui_from_file (ev_window->priv->ui_manager,
                                              DATADIR"/evince-ui.xml",
                                              &error)) {
-               g_message ("building menus failed: %s", error->message);
+               g_warning ("building menus failed: %s", error->message);
                g_error_free (error);
        }
 
                g_error_free (error);
        }
 
@@ -2642,7 +2817,7 @@ ev_window_init (EvWindow *ev_window)
        ev_window->priv->toolbar_model = egg_toolbars_model_new ();
        
        ev_window->priv->toolbar_file = g_build_filename
        ev_window->priv->toolbar_model = egg_toolbars_model_new ();
        
        ev_window->priv->toolbar_file = g_build_filename
-                       (g_get_home_dir (), ".gnome2/evince_toolbar.xml", NULL);
+                       (ev_dot_dir (), "evince_toolbar.xml", NULL);
 
        if (!g_file_test (ev_window->priv->toolbar_file, G_FILE_TEST_EXISTS)) {
                egg_toolbars_model_load (ev_window->priv->toolbar_model,
 
        if (!g_file_test (ev_window->priv->toolbar_file, G_FILE_TEST_EXISTS)) {
                egg_toolbars_model_load (ev_window->priv->toolbar_model,
@@ -2651,6 +2826,9 @@ ev_window_init (EvWindow *ev_window)
                egg_toolbars_model_load (ev_window->priv->toolbar_model,
                                         ev_window->priv->toolbar_file);
        }
                egg_toolbars_model_load (ev_window->priv->toolbar_model,
                                         ev_window->priv->toolbar_file);
        }
+
+       egg_toolbars_model_set_flags (ev_window->priv->toolbar_model, 0,
+                                     EGG_TB_MODEL_NOT_REMOVABLE); 
        
        /* This sucks, but there is no way to have a draw=no, expand=true separator
         * in a GtkUIManager-built toolbar. So, just add another toolbar.
        
        /* This sucks, but there is no way to have a draw=no, expand=true separator
         * in a GtkUIManager-built toolbar. So, just add another toolbar.
@@ -2707,11 +2885,17 @@ ev_window_init (EvWindow *ev_window)
                          "notify::model",
                          G_CALLBACK (sidebar_widget_model_set),
                          ev_window);
                          "notify::model",
                          G_CALLBACK (sidebar_widget_model_set),
                          ev_window);
+       tree_view = ev_sidebar_links_get_treeview
+                       (EV_SIDEBAR_LINKS (sidebar_widget));
+       enable_view_actions_for_widget (ev_window, tree_view);
        gtk_widget_show (sidebar_widget);
        ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar),
                             sidebar_widget);
 
        sidebar_widget = ev_sidebar_thumbnails_new ();
        gtk_widget_show (sidebar_widget);
        ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar),
                             sidebar_widget);
 
        sidebar_widget = ev_sidebar_thumbnails_new ();
+       tree_view = ev_sidebar_thumbnails_get_treeview
+                       (EV_SIDEBAR_THUMBNAILS (sidebar_widget));
+       enable_view_actions_for_widget (ev_window, tree_view);
        gtk_widget_show (sidebar_widget);
        ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar),
                             sidebar_widget);
        gtk_widget_show (sidebar_widget);
        ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar),
                             sidebar_widget);
@@ -2731,8 +2915,8 @@ ev_window_init (EvWindow *ev_window)
                                  "unlock",
                                  G_CALLBACK (ev_window_popup_password_dialog),
                                  ev_window);
                                  "unlock",
                                  G_CALLBACK (ev_window_popup_password_dialog),
                                  ev_window);
+       enable_view_actions_for_widget (ev_window, ev_window->priv->view);
        gtk_widget_show (ev_window->priv->view);
        gtk_widget_show (ev_window->priv->view);
-       //gtk_widget_show (ev_window->priv->page_view);
        gtk_widget_show (ev_window->priv->password_view);
 
        /* We own a ref on these widgets, as we can swap them in and out */
        gtk_widget_show (ev_window->priv->password_view);
 
        /* We own a ref on these widgets, as we can swap them in and out */
@@ -2755,6 +2939,10 @@ ev_window_init (EvWindow *ev_window)
                          "notify::sizing-mode",
                          G_CALLBACK (ev_window_sizing_mode_changed_cb),
                          ev_window);
                          "notify::sizing-mode",
                          G_CALLBACK (ev_window_sizing_mode_changed_cb),
                          ev_window);
+       g_signal_connect (ev_window->priv->view,
+                         "notify::zoom",
+                         G_CALLBACK (ev_window_zoom_changed_cb),
+                         ev_window);
 
        ev_window->priv->statusbar = gtk_statusbar_new ();
        gtk_box_pack_end (GTK_BOX (ev_window->priv->main_box),
 
        ev_window->priv->statusbar = gtk_statusbar_new ();
        gtk_box_pack_end (GTK_BOX (ev_window->priv->main_box),
@@ -2807,8 +2995,8 @@ ev_window_init (EvWindow *ev_window)
                          G_CALLBACK (find_bar_search_changed_cb),
                          ev_window);
 
                          G_CALLBACK (find_bar_search_changed_cb),
                          ev_window);
 
-       /* Give focus to the scrolled window */
-       gtk_widget_grab_focus (ev_window->priv->scrolled_window);
+       /* Give focus to the document view */
+       gtk_widget_grab_focus (ev_window->priv->view);
 
        /* Drag and Drop */
        gtk_drag_dest_unset (GTK_WIDGET (ev_window));
 
        /* Drag and Drop */
        gtk_drag_dest_unset (GTK_WIDGET (ev_window));
Dual-screen mode for evince