]> www.fi.muni.cz Git - evince.git/blobdiff - shell/ev-window.c
Move view drag and drop stuff to ev-view.
[evince.git] / shell / ev-window.c
index 25b8a20d4842f180b4c27d975ea41d9b1dc53a08..ec979874bdba626c640959973a1e75d2e7f18358 100644 (file)
 
 #include "ev-window.h"
 #include "ev-window-title.h"
+#include "ev-navigation-action.h"
 #include "ev-page-action.h"
 #include "ev-sidebar.h"
 #include "ev-sidebar-links.h"
+#include "ev-sidebar-attachments.h"
 #include "ev-sidebar-thumbnails.h"
 #include "ev-view.h"
 #include "ev-password.h"
 #include "ev-password-view.h"
-#include "ev-print-job.h"
 #include "ev-properties-dialog.h"
-#include "ev-ps-exporter.h"
+#include "ev-file-exporter.h"
 #include "ev-document-thumbnails.h"
 #include "ev-document-links.h"
 #include "ev-document-fonts.h"
 #include "ev-document-find.h"
 #include "ev-document-security.h"
-#include "ev-document-types.h"
+#include "ev-document-factory.h"
 #include "ev-job-queue.h"
 #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"
 #include "ev-file-helpers.h"
 #include "ev-utils.h"
 #include "ev-debug.h"
+#include "ev-history.h"
+
+#ifdef WITH_GNOME_PRINT
+#include "ev-print-job.h"
+#include <libgnomeprintui/gnome-print-dialog.h>
+#endif
+
+#ifdef WITH_GTK_PRINT
+#include <gtk/gtkprintunixdialog.h>
+#endif
 
+#ifdef ENABLE_PDF
 #include <poppler.h>
+#endif
 
+#include <glib/gstdio.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gnome.h>
-#include <libgnomeprintui/gnome-print-dialog.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <gconf/gconf-client.h>
 
@@ -86,7 +103,10 @@ typedef enum {
        EV_CHROME_TOOLBAR       = 1 << 1,
        EV_CHROME_FINDBAR       = 1 << 2,
        EV_CHROME_RAISE_TOOLBAR = 1 << 3,
-       EV_CHROME_NORMAL        = EV_CHROME_MENUBAR | EV_CHROME_TOOLBAR
+       EV_CHROME_FULLSCREEN_TOOLBAR    = 1 << 4,
+       EV_CHROME_SIDEBAR       = 1 << 5,
+       EV_CHROME_PREVIEW_TOOLBAR       = 1 << 6,
+       EV_CHROME_NORMAL        = EV_CHROME_MENUBAR | EV_CHROME_TOOLBAR | EV_CHROME_SIDEBAR
 } EvChrome;
 
 struct _EvWindowPrivate {
@@ -102,59 +122,78 @@ struct _EvWindowPrivate {
        GtkWidget *find_bar;
        GtkWidget *scrolled_window;
        GtkWidget *view;
-       GtkWidget *page_view;
        GtkWidget *password_view;
        GtkWidget *sidebar_thumbs;
        GtkWidget *sidebar_links;
+       GtkWidget *sidebar_attachments;
+       GtkWidget *preview_toolbar;
 
        /* Dialogs */
        GtkWidget *properties;
+#ifdef WITH_PRINT
        GtkWidget *print_dialog;
+#endif
        GtkWidget *password_dialog;
 
        /* UI Builders */
-       GtkActionGroup *action_group;
-       GtkActionGroup *popups_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;
        GtkWidget *fullscreen_popup;
-       GSource   *fullscreen_timeout_source;
-       
+       guint      fullscreen_timeout_id;
+
        /* Popup link */
-       GtkWidget *popup;
+       GtkWidget *view_popup;
        EvLink    *link;
 
+       /* Popup attachment */
+       GtkWidget    *attachment_popup;
+       GList        *attach_list;
+
        /* Document */
        char *uri;
        char *local_uri;
-       char *loaded_uri;
-       char *password_uri;
+       EvLinkDest *dest;
+       gboolean unlink_temp_file;
        
        EvDocument *document;
-       EvDocument *password_document;
+       EvHistory *history;
        EvPageCache *page_cache;
        EvWindowPageMode page_mode;
        EvWindowTitle *title;
+#ifndef HAVE_GTK_RECENT
        EggRecentViewUIManager *recent_view;
+#endif
 
-       /* Job used to load document */
        EvJob *xfer_job;
-       EvJob *load_job;
+#ifdef WITH_GNOME_PRINT
        GnomePrintJob *print_job;
-};
+#endif
 
-static const GtkTargetEntry ev_drop_types[] = {
-       { "text/uri-list", 0, 0 }
+#ifdef WITH_GTK_PRINT
+       EvJob            *print_job;
+       GtkPrintJob      *gtk_print_job;
+       GtkPrinter       *printer;
+       GtkPrintSettings *print_settings;
+       GtkPageSetup     *print_page_setup;
+#endif
 };
 
-
 #define EV_WINDOW_GET_PRIVATE(object) \
        (G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_WINDOW, EvWindowPrivate))
 
 #define PAGE_SELECTOR_ACTION   "PageSelector"
 #define ZOOM_CONTROL_ACTION    "ViewZoom"
+#define NAVIGATION_ACTION      "Navigation"
 
 #define GCONF_OVERRIDE_RESTRICTIONS "/apps/evince/override_restrictions"
 #define GCONF_LOCKDOWN_SAVE         "/desktop/gnome/lockdown/disable_save_to_disk"
@@ -165,17 +204,21 @@ static const GtkTargetEntry ev_drop_types[] = {
 #define SIDEBAR_DEFAULT_SIZE    132
 #define LINKS_SIDEBAR_ID "links"
 #define THUMBNAILS_SIDEBAR_ID "thumbnails"
+#define ATTACHMENTS_SIDEBAR_ID "attachments"
 
+static void    ev_window_update_actions                (EvWindow *ev_window);
 static void     ev_window_update_fullscreen_popup       (EvWindow         *window);
 static void     ev_window_sidebar_visibility_changed_cb (EvSidebar        *ev_sidebar,
                                                         GParamSpec       *pspec,
                                                         EvWindow         *ev_window);
 static void     ev_window_set_page_mode                 (EvWindow         *window,
                                                         EvWindowPageMode  page_mode);
-static void    ev_window_load_job_cb                   (EvJobLoad *job,
-                                                        gpointer data);
-static void    ev_window_xfer_job_cb                   (EvJobXfer *job,
-                                                        gpointer data);
+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);
@@ -192,59 +235,92 @@ 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     show_fullscreen_popup                   (EvWindow         *window);
-static void     ev_popup_cmd_open_link                  (GtkAction        *action,
+static void     ev_window_run_preview                   (EvWindow         *window);
+static void     ev_view_popup_cmd_open_link             (GtkAction        *action,
                                                         EvWindow         *window);
-static void     ev_popup_cmd_copy_link_address          (GtkAction        *action,
+static void     ev_view_popup_cmd_open_link_new_window  (GtkAction        *action,
                                                         EvWindow         *window);
+static void     ev_view_popup_cmd_copy_link_address     (GtkAction        *action,
+                                                        EvWindow         *window);
+static void    ev_attachment_popup_cmd_open_attachment (GtkAction        *action,
+                                                        EvWindow *window);
+static void    ev_attachment_popup_cmd_save_attachment_as (GtkAction *action, 
+                                                        EvWindow *window);
 static void    ev_window_cmd_view_best_fit             (GtkAction        *action, 
                                                         EvWindow         *ev_window);
 static void    ev_window_cmd_view_page_width           (GtkAction        *action, 
                                                         EvWindow         *ev_window);
+static void    fullscreen_set_timeout                  (EvWindow *window);
+static gboolean fullscreen_motion_notify_cb            (GtkWidget *widget,
+                                                        GdkEventMotion *event,
+                                                        gpointer user_data);
+static gboolean fullscreen_leave_notify_cb             (GtkWidget *widget,
+                                                        GdkEventCrossing *event,
+                                                        gpointer user_data);
 
 G_DEFINE_TYPE (EvWindow, ev_window, GTK_TYPE_WINDOW)
 
+static gdouble
+ev_window_get_screen_dpi (EvWindow *ev_window)
+{
+       GdkScreen *screen;
+       gdouble    xdpi, ydpi;
+
+       screen = gtk_window_get_screen (GTK_WINDOW (ev_window));
+
+       xdpi = 25.4 * gdk_screen_get_width (screen) / gdk_screen_get_width_mm (screen);
+       ydpi = 25.4 * gdk_screen_get_height (screen) / gdk_screen_get_height_mm (screen);
+       
+       return (xdpi + ydpi) / 2.0;
+}
+
 static void
-set_action_sensitive (EvWindow   *ev_window,
-                     const char *name,
-                     gboolean    sensitive)
+ev_window_set_action_sensitive (EvWindow   *ev_window,
+                               const char *name,
+                               gboolean    sensitive)
 {
        GtkAction *action = gtk_action_group_get_action (ev_window->priv->action_group,
                                                         name);
        gtk_action_set_sensitive (action, sensitive);
 }
 
+
 static void
-update_action_sensitivity (EvWindow *ev_window)
+ev_window_setup_action_sensitivity (EvWindow *ev_window)
 {
-       EvView *view;
-       EvDocument *document;
+       EvDocument *document = ev_window->priv->document;
        const EvDocumentInfo *info = NULL;
-       EvWindowPageMode page_mode;
-       gboolean sensitive, has_pages = FALSE, has_document;
-       int n_pages = 0, page = -1;
+
+       gboolean has_document = FALSE;
        gboolean ok_to_print = TRUE;
        gboolean ok_to_copy = TRUE;
        gboolean has_properties = TRUE;
        gboolean override_restrictions = FALSE;
        gboolean can_get_text = FALSE;
-       gboolean ok_to_copy_text = FALSE;
-       GConfClient *client;
+       gboolean has_pages = FALSE;
+       gboolean can_find = FALSE;
 
-       view = EV_VIEW (ev_window->priv->view);
-
-       document = ev_window->priv->document;
+       GConfClient *client;
 
-       if (document)
+       if (document) {
+               has_document = TRUE;
                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 = ev_page_cache_get_current_page (ev_window->priv->page_cache);
-               n_pages = ev_page_cache_get_n_pages (ev_window->priv->page_cache);
-               has_pages = has_document && n_pages > 0;
+               has_pages = ev_page_cache_get_n_pages (ev_window->priv->page_cache) > 0;
+       }
+
+       if (!info || info->fields_mask == 0) {
+               has_properties = FALSE;
+       }
+
+       if (has_document && ev_document_can_get_text (document)) {
+               can_get_text = TRUE;
+       }
+       
+       if (has_pages && EV_IS_DOCUMENT_FIND (document)) {
+               can_find = TRUE;
        }
 
        client = gconf_client_get_default ();
@@ -256,12 +332,9 @@ update_action_sensitivity (EvWindow *ev_window)
                ok_to_copy = (info->permissions & EV_DOCUMENT_PERMISSIONS_OK_TO_COPY);
        }
 
-       if (has_document && !EV_IS_PS_EXPORTER(document))
+       if (has_document && !EV_IS_FILE_EXPORTER(document))
                ok_to_print = FALSE;
 
-       if (!info || info->fields_mask == 0) {
-               has_properties = FALSE;
-       }
        
        if (gconf_client_get_bool (client, GCONF_LOCKDOWN_SAVE, NULL)) {
                ok_to_copy = FALSE;
@@ -270,62 +343,86 @@ update_action_sensitivity (EvWindow *ev_window)
        if (gconf_client_get_bool (client, GCONF_LOCKDOWN_PRINT, NULL)) {
                ok_to_print = FALSE;
        }
-       
+#ifndef WITH_PRINT
+       ok_to_print = FALSE;
+#endif
        g_object_unref (client);
 
-       if (has_document && ev_document_can_get_text (document)) {
-               can_get_text = TRUE;
-               ok_to_copy_text = ev_view_get_has_selection (view);
-       }
-       
+
        /* File menu */
-       /* "FileOpen": always sensitive */
-       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 && has_properties);
-       /* "FileCloseWindow": always sensitive */
+       ev_window_set_action_sensitive (ev_window, "FileOpenCopy", has_document);
+       ev_window_set_action_sensitive (ev_window, "FileSaveAs", has_document && ok_to_copy);
+
+#ifdef WITH_GTK_PRINT
+       ev_window_set_action_sensitive (ev_window, "FilePrintSetup", has_pages && ok_to_print);
+#endif
+
+#ifdef WITH_GNOME_PRINT
+       ev_window_set_action_sensitive (ev_window, "FilePrintSetup", FALSE);
+#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);
 
         /* Edit menu */
-       sensitive = has_pages && ev_document_can_get_text (document);
-       set_action_sensitive (ev_window, "EditCopy", sensitive && ok_to_copy_text);
-       set_action_sensitive (ev_window, "EditSelectAll", sensitive && can_get_text);
-       set_action_sensitive (ev_window, "EditFind",
-                             has_pages && EV_IS_DOCUMENT_FIND (document));
-       set_action_sensitive (ev_window, "Slash",
-                             has_pages && EV_IS_DOCUMENT_FIND (document));
-       set_action_sensitive (ev_window, "EditFindNext",
-                             ev_view_can_find_next (view));
-       set_action_sensitive (ev_window, "EditRotateLeft", has_pages);
-       set_action_sensitive (ev_window, "EditRotateRight", has_pages);
+       ev_window_set_action_sensitive (ev_window, "EditSelectAll", has_pages && can_get_text);
+       ev_window_set_action_sensitive (ev_window, "EditFind", can_find);
+       ev_window_set_action_sensitive (ev_window, "Slash", can_find);
+       ev_window_set_action_sensitive (ev_window, "EditRotateLeft", has_pages);
+       ev_window_set_action_sensitive (ev_window, "EditRotateRight", has_pages);
 
         /* View menu */
-       set_action_sensitive (ev_window, "ViewContinuous", has_pages);
-       set_action_sensitive (ev_window, "ViewDual", has_pages);
-       set_action_sensitive (ev_window, "ViewZoomIn",
+       ev_window_set_action_sensitive (ev_window, "ViewContinuous", has_pages);
+       ev_window_set_action_sensitive (ev_window, "ViewDual", has_pages);
+       ev_window_set_action_sensitive (ev_window, "ViewBestFit", has_pages);
+       ev_window_set_action_sensitive (ev_window, "ViewPageWidth", has_pages);
+       ev_window_set_action_sensitive (ev_window, "ViewReload", has_pages);
+
+       /* Toolbar-specific actions: */
+       ev_window_set_action_sensitive (ev_window, PAGE_SELECTOR_ACTION, has_pages);
+       ev_window_set_action_sensitive (ev_window, ZOOM_CONTROL_ACTION,  has_pages);
+       ev_window_set_action_sensitive (ev_window, NAVIGATION_ACTION,  has_pages);
+
+        ev_window_update_actions (ev_window);
+}
+
+static void
+ev_window_update_actions (EvWindow *ev_window)
+{
+       EvView *view = EV_VIEW (ev_window->priv->view);
+       int n_pages = 0, page = -1;
+       gboolean has_pages = FALSE;
+
+       if (ev_window->priv->document && ev_window->priv->page_cache) {
+               page = ev_page_cache_get_current_page (ev_window->priv->page_cache);
+               n_pages = ev_page_cache_get_n_pages (ev_window->priv->page_cache);
+               has_pages = n_pages > 0;
+       }
+
+       ev_window_set_action_sensitive (ev_window, "EditCopy", has_pages && ev_view_get_has_selection (view));
+       ev_window_set_action_sensitive (ev_window, "EditFindNext",
+                             ev_view_can_find_next (view));
+       ev_window_set_action_sensitive (ev_window, "EditFindPrevious",
+                             ev_view_can_find_previous (view));
+
+       ev_window_set_action_sensitive (ev_window, "ViewZoomIn",
                              has_pages && ev_view_can_zoom_in (view));
-       set_action_sensitive (ev_window, "ViewZoomOut",
+       ev_window_set_action_sensitive (ev_window, "ViewZoomOut",
                              has_pages && ev_view_can_zoom_out (view));
-       set_action_sensitive (ev_window, "ViewBestFit", has_pages);
-       set_action_sensitive (ev_window, "ViewPageWidth", has_pages);
-       set_action_sensitive (ev_window, "ViewReload", has_pages);
 
         /* Go menu */
-       if (document) {
-               set_action_sensitive (ev_window, "GoPreviousPage", page > 0);
-               set_action_sensitive (ev_window, "GoNextPage", page < n_pages - 1);
-               set_action_sensitive (ev_window, "GoFirstPage", page > 0);
-               set_action_sensitive (ev_window, "GoLastPage", page < n_pages - 1);
+       if (has_pages) {
+               ev_window_set_action_sensitive (ev_window, "GoPreviousPage", page > 0);
+               ev_window_set_action_sensitive (ev_window, "GoNextPage", page < n_pages - 1);
+               ev_window_set_action_sensitive (ev_window, "GoFirstPage", page > 0);
+               ev_window_set_action_sensitive (ev_window, "GoLastPage", page < n_pages - 1);
        } else {
-               set_action_sensitive (ev_window, "GoFirstPage", FALSE);
-               set_action_sensitive (ev_window, "GoPreviousPage", FALSE);
-               set_action_sensitive (ev_window, "GoNextPage", FALSE);
-               set_action_sensitive (ev_window, "GoLastPage", FALSE);
+               ev_window_set_action_sensitive (ev_window, "GoFirstPage", FALSE);
+               ev_window_set_action_sensitive (ev_window, "GoPreviousPage", FALSE);
+               ev_window_set_action_sensitive (ev_window, "GoNextPage", FALSE);
+               ev_window_set_action_sensitive (ev_window, "GoLastPage", FALSE);
        }
 
-       /* Toolbar-specific actions: */
-       set_action_sensitive (ev_window, PAGE_SELECTOR_ACTION, has_pages);
-       set_action_sensitive (ev_window, ZOOM_CONTROL_ACTION,  has_pages);
-
        if (has_pages &&
            ev_view_get_sizing_mode (view) != EV_SIZING_FIT_WIDTH &&
            ev_view_get_sizing_mode (view) != EV_SIZING_BEST_FIT) {
@@ -337,16 +434,44 @@ update_action_sensitivity (EvWindow *ev_window)
                                                      ZOOM_CONTROL_ACTION);
 
                real_zoom = ev_view_get_zoom (EV_VIEW (ev_window->priv->view));
+               real_zoom *= 72.0 / ev_window_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);
        }
 }
 
+static void
+ev_window_set_view_accels_sensitivity (EvWindow *window, gboolean sensitive)
+{
+       gboolean can_find;
+       
+       can_find = window->priv->document && 
+           EV_IS_DOCUMENT_FIND (window->priv->document);
+
+       if (window->priv->action_group) {
+               ev_window_set_action_sensitive (window, "PageDown", sensitive);
+               ev_window_set_action_sensitive (window, "PageUp", sensitive);
+               ev_window_set_action_sensitive (window, "Space", sensitive);
+               ev_window_set_action_sensitive (window, "ShiftSpace", sensitive);
+               ev_window_set_action_sensitive (window, "BackSpace", sensitive);
+               ev_window_set_action_sensitive (window, "ShiftBackSpace", sensitive);
+               ev_window_set_action_sensitive (window, "Return", sensitive);
+               ev_window_set_action_sensitive (window, "ShiftReturn", sensitive);
+               ev_window_set_action_sensitive (window, "Plus", sensitive);
+               ev_window_set_action_sensitive (window, "Minus", sensitive);
+               ev_window_set_action_sensitive (window, "KpPlus", sensitive);
+               ev_window_set_action_sensitive (window, "KpMinus", sensitive);
+               ev_window_set_action_sensitive (window, "Equal", sensitive);
+
+               ev_window_set_action_sensitive (window, "Slash", sensitive && can_find);
+       }
+}
+
 static void
 set_widget_visibility (GtkWidget *widget, gboolean visible)
 {
-       g_return_if_fail (GTK_IS_WIDGET (widget));
+       g_assert (GTK_IS_WIDGET (widget));
        
        if (visible)
                gtk_widget_show (widget);
@@ -358,8 +483,9 @@ static void
 update_chrome_visibility (EvWindow *window)
 {
        EvWindowPrivate *priv = window->priv;
-       gboolean menubar, toolbar, findbar, fullscreen_toolbar;
+       gboolean menubar, toolbar, findbar, fullscreen_toolbar, sidebar;
        gboolean fullscreen_mode, presentation, fullscreen;
+       gboolean preview_toolbar;
 
        presentation = ev_view_get_presentation (EV_VIEW (priv->view));
        fullscreen = ev_view_get_fullscreen (EV_VIEW (priv->view));
@@ -368,24 +494,24 @@ update_chrome_visibility (EvWindow *window)
        menubar = (priv->chrome & EV_CHROME_MENUBAR) != 0 && !fullscreen_mode;
        toolbar = ((priv->chrome & EV_CHROME_TOOLBAR) != 0  || 
                   (priv->chrome & EV_CHROME_RAISE_TOOLBAR) != 0) && !fullscreen_mode;
-       fullscreen_toolbar = ((priv->chrome & EV_CHROME_TOOLBAR) != 0 ||
-                             (priv->chrome & EV_CHROME_RAISE_TOOLBAR) != 0);
+       fullscreen_toolbar = ((priv->chrome & EV_CHROME_FULLSCREEN_TOOLBAR) != 0 || 
+                             (priv->chrome & EV_CHROME_RAISE_TOOLBAR) != 0) && fullscreen;
        findbar = (priv->chrome & EV_CHROME_FINDBAR) != 0;
+       sidebar = (priv->chrome & EV_CHROME_SIDEBAR) != 0 && !fullscreen_mode;
+       preview_toolbar = (priv->chrome& EV_CHROME_PREVIEW_TOOLBAR);
 
-       set_widget_visibility (priv->menubar, menubar);
-       
+       set_widget_visibility (priv->menubar, menubar); 
        set_widget_visibility (priv->toolbar_dock, toolbar);
-       set_action_sensitive (window, "EditToolbar", toolbar);
-
        set_widget_visibility (priv->find_bar, findbar);
+       set_widget_visibility (priv->sidebar, sidebar);
+       set_widget_visibility (priv->preview_toolbar, preview_toolbar);
 
-       if (priv->fullscreen_popup != NULL) {
-               if (fullscreen)
-                       show_fullscreen_popup (window);
-               else
-                       set_widget_visibility (priv->fullscreen_popup, FALSE);
+       ev_window_set_action_sensitive (window, "EditToolbar", toolbar);
+       gtk_widget_set_sensitive (priv->menubar, menubar);
 
+       if (priv->fullscreen_popup != NULL) {
                set_widget_visibility (priv->fullscreen_toolbar, fullscreen_toolbar);
+               set_widget_visibility (priv->fullscreen_popup, fullscreen_toolbar);
        }
 }
 
@@ -419,18 +545,17 @@ update_sizing_buttons (EvWindow *window)
                      NULL);
 
        switch (sizing_mode) {
-       case EV_SIZING_BEST_FIT:
-               best_fit = TRUE;
-               page_width = FALSE;
-               break;
-       case EV_SIZING_FIT_WIDTH:
-               best_fit = FALSE;
-               page_width = TRUE;
-               break;
-
-       default:
-               best_fit = page_width = FALSE;
-               break;
+               case EV_SIZING_BEST_FIT:
+                       best_fit = TRUE;
+                       page_width = FALSE;
+                       break;
+               case EV_SIZING_FIT_WIDTH:
+                       best_fit = FALSE;
+                       page_width = TRUE;
+                       break;
+               default:
+                       best_fit = page_width = FALSE;
+                       break;
        }
 
        action = gtk_action_group_get_action (action_group, "ViewBestFit");
@@ -458,106 +583,17 @@ update_sizing_buttons (EvWindow *window)
        }
 }
 
-static void
-ev_window_cmd_focus_page_selector (GtkAction *act, EvWindow *window)
-{
-       GtkAction *action;
-       
-       update_chrome_flag (window, EV_CHROME_RAISE_TOOLBAR, TRUE);
-       set_action_sensitive (window, "ViewToolbar", FALSE);
-       
-       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)
-{
-       gboolean continuous;
-
-       ev_window_stop_presentation (ev_window);
-       continuous = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
-       g_object_set (G_OBJECT (ev_window->priv->view),
-                     "continuous", continuous,
-                     NULL);
-       update_action_sensitivity (ev_window);
-}
-
-static void
-ev_window_cmd_dual (GtkAction *action, EvWindow *ev_window)
-{
-       gboolean dual_page;
-
-       ev_window_stop_presentation (ev_window);
-       dual_page = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
-       g_object_set (G_OBJECT (ev_window->priv->view),
-                     "dual-page", dual_page,
-                     NULL);
-       update_action_sensitivity (ev_window);
-}
-
-static void
-ev_window_cmd_view_best_fit (GtkAction *action, EvWindow *ev_window)
-{
-       ev_window_stop_presentation (ev_window);
-
-       if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) {
-               ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_BEST_FIT);
-       } else {
-               ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_FREE);
-       }
-       update_action_sensitivity (ev_window);
-}
-
-static void
-ev_window_cmd_view_page_width (GtkAction *action, EvWindow *ev_window)
-{
-       ev_window_stop_presentation (ev_window);
-
-       if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) {
-               ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_FIT_WIDTH);
-       } else {
-               ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_FREE);
-       }
-       update_action_sensitivity (ev_window);
-}
-
-
-void
-ev_window_open_page_label (EvWindow   *ev_window, 
-                          const char *label)
-{
-       if (ev_window->priv->page_cache) {
-               ev_page_cache_set_page_label (ev_window->priv->page_cache, 
-                                             label);
-       }
-}
-
 gboolean
 ev_window_is_empty (const EvWindow *ev_window)
 {
        g_return_val_if_fail (EV_IS_WINDOW (ev_window), FALSE);
 
        return (ev_window->priv->document == NULL) && 
-               (ev_window->priv->load_job == NULL) &&
                (ev_window->priv->xfer_job == NULL);
 }
 
 static void
-unable_to_load_dialog_response_cb (GtkWidget *dialog,
+ev_window_error_dialog_response_cb (GtkWidget *dialog,
                                   gint       response_id,
                                   EvWindow  *ev_window)
 {
@@ -565,28 +601,27 @@ unable_to_load_dialog_response_cb (GtkWidget *dialog,
 }
 
 static void
-unable_to_load (EvWindow   *ev_window,
-               const char *error_message)
+ev_window_error_dialog (GtkWindow *window, const gchar *msg, GError *error)
 {
        GtkWidget *dialog;
 
-       dialog = gtk_message_dialog_new (GTK_WINDOW (ev_window),
+       dialog = gtk_message_dialog_new (GTK_WINDOW (window),
                                         GTK_DIALOG_DESTROY_WITH_PARENT,
                                         GTK_MESSAGE_ERROR,
                                         GTK_BUTTONS_CLOSE,
-                                        _("Unable to open document"));
+                                        msg);
        gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-                                                 "%s", error_message);
+                                                 "%s", error->message);
        g_signal_connect (dialog, "response",
-                         G_CALLBACK (unable_to_load_dialog_response_cb),
-                         ev_window);
+                         G_CALLBACK (ev_window_error_dialog_response_cb),
+                          window);
        gtk_widget_show (dialog);
 }
 
 static void
 find_changed_cb (EvDocument *document, int page, EvWindow *ev_window)
 {
-       update_action_sensitivity (ev_window);
+       ev_window_update_actions (ev_window);
 }
 
 static void
@@ -594,8 +629,18 @@ page_changed_cb (EvPageCache *page_cache,
                 gint         page,
                 EvWindow    *ev_window)
 {
-       update_action_sensitivity (ev_window);
-       ev_metadata_manager_set_int (ev_window->priv->loaded_uri, "page", page);
+       gchar *label;
+       
+       ev_window_update_actions (ev_window);
+       
+       if (ev_window->priv->history) {
+               label = ev_page_cache_get_page_label (ev_window->priv->page_cache, page);
+               ev_history_add_page (ev_window->priv->history, page, label);
+               g_free (label);
+       }
+
+       if (!ev_window_is_empty (ev_window))
+               ev_metadata_manager_set_int (ev_window->priv->uri, "page", page);
 }
 
 static void
@@ -609,28 +654,26 @@ update_document_mode (EvWindow *window, EvDocumentMode mode)
        }
 }
 
-static void
-update_sidebar_visibility (EvWindow *window)
-{
-       char *uri = window->priv->uri;
-       GValue sidebar_visibility = { 0, };
-
-       if (ev_metadata_manager_get (uri, "sidebar_visibility", &sidebar_visibility, FALSE)) {
-               set_widget_visibility (window->priv->sidebar,
-                                      g_value_get_boolean (&sidebar_visibility));
-       }
-}
-
 static void
 setup_document_from_metadata (EvWindow *window)
 {
        char *uri = window->priv->uri;
        GValue page = { 0, };
+       gint n_pages;
+       gint new_page;
 
-       /* Page */
+       /* View the previously shown page, but make sure to not open a document on
+        * the last page, since closing it on the last page most likely means the
+        * user was finished reading the document. In that case, reopening should
+        * show the first page. */
        if (uri && ev_metadata_manager_get (uri, "page", &page, TRUE)) {
+               n_pages = ev_page_cache_get_n_pages (window->priv->page_cache);
+               new_page = CLAMP (g_value_get_int (&page), 0, n_pages - 1);
+               if (new_page == n_pages - 1)
+                       new_page = 0;
                ev_page_cache_set_current_page (window->priv->page_cache,
-                                               g_value_get_int (&page));
+                                               new_page);
+               g_value_unset (&page);
        }
 }
 
@@ -643,11 +686,11 @@ setup_chrome_from_metadata (EvWindow *window)
        if (ev_metadata_manager_get (NULL, "show_toolbar", &show_toolbar, FALSE)) {
                if (!g_value_get_boolean (&show_toolbar))
                        chrome &= ~EV_CHROME_TOOLBAR;
+               g_value_unset (&show_toolbar);
        }
        window->priv->chrome = chrome;
 }
 
-
 static void
 setup_sidebar_from_metadata (EvWindow *window, EvDocument *document)
 {
@@ -655,131 +698,190 @@ setup_sidebar_from_metadata (EvWindow *window, EvDocument *document)
        GtkWidget *sidebar = window->priv->sidebar;
        GtkWidget *links = window->priv->sidebar_links;
        GtkWidget *thumbs = window->priv->sidebar_thumbs;
+       GtkWidget *attachments = window->priv->sidebar_attachments;
        GValue sidebar_size = { 0, };
        GValue sidebar_page = { 0, };
+       GValue sidebar_visibility = { 0, };
 
        if (ev_metadata_manager_get (uri, "sidebar_size", &sidebar_size, FALSE)) {
                gtk_paned_set_position (GTK_PANED (window->priv->hpaned),
                                        g_value_get_int (&sidebar_size));
+               g_value_unset(&sidebar_size);
        }
-
-       if (ev_metadata_manager_get (uri, "sidebar_page", &sidebar_page, FALSE)) {
+       
+       if (document && ev_metadata_manager_get (uri, "sidebar_page", &sidebar_page, FALSE)) {
                const char *page_id = g_value_get_string (&sidebar_page);
-
-               if (strcmp (page_id, "links") == 0 && ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (links), document)) {
+               
+               if (strcmp (page_id, LINKS_SIDEBAR_ID) == 0 && ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (links), document)) {
                        ev_sidebar_set_page (EV_SIDEBAR (sidebar), links);
-               } else if (strcmp (page_id, "thumbnails") && ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (thumbs), document)) {
+               } else if (strcmp (page_id, THUMBNAILS_SIDEBAR_ID) && ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (thumbs), document)) {
+                       ev_sidebar_set_page (EV_SIDEBAR (sidebar), thumbs);
+               } else if (strcmp (page_id, ATTACHMENTS_SIDEBAR_ID) && ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (attachments), document)) {
                        ev_sidebar_set_page (EV_SIDEBAR (sidebar), thumbs);
                }
-       } else {
-               if (ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (links), document)) {
-                       ev_sidebar_set_page (EV_SIDEBAR (sidebar), links);
-               }
+               g_value_unset (&sidebar_page);
+       } else if (document && ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (links), document)) {
+               ev_sidebar_set_page (EV_SIDEBAR (sidebar), links);
        }
 
-       update_sidebar_visibility (window);
+       if (ev_metadata_manager_get (uri, "sidebar_visibility", &sidebar_visibility, FALSE)) {
+               update_chrome_flag (window, EV_CHROME_SIDEBAR, g_value_get_boolean (&sidebar_visibility));
+               g_value_unset (&sidebar_visibility);
+       }
 }
 
 static void
-setup_view_from_metadata (EvWindow *window)
+setup_size_from_metadata (EvWindow *window)
 {
-       EvView *view = EV_VIEW (window->priv->view);
        char *uri = window->priv->uri;
-       GEnumValue *enum_value;
        GValue width = { 0, };
        GValue height = { 0, };
+       GValue width_ratio = { 0, };
+       GValue height_ratio = { 0, };
        GValue maximized = { 0, };
        GValue x = { 0, };
        GValue y = { 0, };
-       GValue sizing_mode = { 0, };
-       GValue zoom = { 0, };
-       GValue continuous = { 0, };
-       GValue dual_page = { 0, };
-       GValue presentation = { 0, };
-       GValue fullscreen = { 0, };
-       GValue rotation = { 0, };
-       gboolean restore_size = TRUE;
-
-       /* Window size */
 
        if (ev_metadata_manager_get (uri, "window_maximized", &maximized, FALSE)) {
                if (g_value_get_boolean (&maximized)) {
                        gtk_window_maximize (GTK_WINDOW (window));
-                       restore_size = FALSE;
+                       return;
                } else {
                        gtk_window_unmaximize (GTK_WINDOW (window));
                }
+               g_value_unset (&maximized);
        }
 
-       if (restore_size &&
-           ev_metadata_manager_get (uri, "window_width", &width, TRUE) &&
-            ev_metadata_manager_get (uri, "window_height", &height, TRUE)) {
-               gtk_window_resize (GTK_WINDOW (window),
-                                  g_value_get_int (&width),
-                                  g_value_get_int (&height));
-       }
-       if (restore_size &&
-           ev_metadata_manager_get (uri, "window_x", &x, TRUE) &&
+       if (ev_metadata_manager_get (uri, "window_x", &x, TRUE) &&
            ev_metadata_manager_get (uri, "window_y", &y, TRUE)) {
                gtk_window_move (GTK_WINDOW (window), g_value_get_int (&x),
                                 g_value_get_int (&y));
+               g_value_unset (&x);
+               g_value_unset (&y);
        }
 
-       /* Sizing mode */
-       if (ev_metadata_manager_get (uri, "sizing_mode", &sizing_mode, FALSE)) {
-               enum_value = g_enum_get_value_by_nick
-                       (EV_SIZING_MODE_CLASS, g_value_get_string (&sizing_mode));
-               g_value_unset (&sizing_mode);
-               ev_view_set_sizing_mode (view, enum_value->value);
+        if (ev_metadata_manager_get (uri, "window_width", &width, TRUE) &&
+           ev_metadata_manager_get (uri, "window_height", &height, TRUE)) {
+               gtk_window_resize (GTK_WINDOW (window),
+                                  g_value_get_int (&width),
+                                  g_value_get_int (&height));
+               g_value_unset (&width);
+               g_value_unset (&height);
+               return;
        }
 
-       /* Zoom */
-       if (ev_metadata_manager_get (uri, "zoom", &zoom, FALSE) &&
-           ev_view_get_sizing_mode (view) == EV_SIZING_FREE) {
-               ev_view_set_zoom (view, g_value_get_double (&zoom), FALSE);
+        if (window->priv->page_cache &&
+           ev_metadata_manager_get (uri, "window_width_ratio", &width_ratio, FALSE) &&
+           ev_metadata_manager_get (uri, "window_height_ratio", &height_ratio, FALSE)) {
+               gint document_width;
+               gint document_height;
+
+               ev_page_cache_get_max_width (window->priv->page_cache, 
+                                            0, 1.0,
+                                            &document_width);
+               ev_page_cache_get_max_height (window->priv->page_cache, 
+                                            0, 1.0,
+                                            &document_height);                 
+               
+               gtk_window_resize (GTK_WINDOW (window),
+                                  g_value_get_double (&width_ratio) * document_width,
+                                  g_value_get_double (&height_ratio) * document_height);
+               g_value_unset (&width_ratio);
+               g_value_unset (&height_ratio);
        }
 
-       /* Continuous */
-       if (ev_metadata_manager_get (uri, "continuous", &continuous, FALSE)) {
-               ev_view_set_continuous (view, g_value_get_boolean (&continuous));
-       }
+}
 
-       /* Dual page */
-       if (ev_metadata_manager_get (uri, "dual-page", &dual_page, FALSE)) {
-               ev_view_set_dual_page (view, g_value_get_boolean (&dual_page));
+static void
+setup_view_from_metadata (EvWindow *window)
+{
+       EvView *view = EV_VIEW (window->priv->view);
+       char *uri = window->priv->uri;
+       GEnumValue *enum_value;
+       GValue sizing_mode = { 0, };
+       GValue zoom = { 0, };
+       GValue continuous = { 0, };
+       GValue dual_page = { 0, };
+       GValue presentation = { 0, };
+       GValue fullscreen = { 0, };
+       GValue rotation = { 0, };
+       GValue maximized = { 0, };
+
+       /* Maximized */
+       if (ev_metadata_manager_get (uri, "window_maximized", &maximized, FALSE)) {
+               if (g_value_get_boolean (&maximized)) {
+                       gtk_window_maximize (GTK_WINDOW (window));
+               } else {
+                       gtk_window_unmaximize (GTK_WINDOW (window));
+               }
+               g_value_unset (&maximized);
+       }
+
+       /* Sizing mode */
+       if (ev_metadata_manager_get (uri, "sizing_mode", &sizing_mode, FALSE)) {
+               enum_value = g_enum_get_value_by_nick
+                       (EV_SIZING_MODE_CLASS, g_value_get_string (&sizing_mode));
+               g_value_unset (&sizing_mode);
+               ev_view_set_sizing_mode (view, enum_value->value);
+       }
+
+       /* Zoom */
+       if (ev_metadata_manager_get (uri, "zoom", &zoom, FALSE) &&
+           ev_view_get_sizing_mode (view) == EV_SIZING_FREE) {
+               gdouble zoom_value;
+
+               zoom_value = g_value_get_double (&zoom);
+               zoom_value *= ev_window_get_screen_dpi (window) / 72.0;
+               ev_view_set_zoom (view, zoom_value, FALSE);
+               g_value_unset (&zoom);
+       }
+
+       /* Continuous */
+       if (ev_metadata_manager_get (uri, "continuous", &continuous, FALSE)) {
+               ev_view_set_continuous (view, g_value_get_boolean (&continuous));
+               g_value_unset (&continuous);
+       }
+
+       /* Dual page */
+       if (ev_metadata_manager_get (uri, "dual-page", &dual_page, FALSE)) {
+               ev_view_set_dual_page (view, g_value_get_boolean (&dual_page));
+               g_value_unset (&dual_page);
        }
 
        /* Presentation */
        if (ev_metadata_manager_get (uri, "presentation", &presentation, FALSE)) {
-               if (g_value_get_boolean (&presentation)) {
+               if (g_value_get_boolean (&presentation) && uri) {
                        ev_window_run_presentation (window);
                }
+               g_value_unset (&presentation);
        }
 
        /* Fullscreen */
        if (ev_metadata_manager_get (uri, "fullscreen", &fullscreen, FALSE)) {
-               if (g_value_get_boolean (&fullscreen)) {
+               if (g_value_get_boolean (&fullscreen) && uri) {
                        ev_window_run_fullscreen (window);
                }
+               g_value_unset (&fullscreen);
        }
 
        /* Rotation */
        if (ev_metadata_manager_get (uri, "rotation", &rotation, TRUE)) {
                if (g_value_get_int (&rotation)) {
                        switch (g_value_get_int (&rotation)) {
-                       case 90:
-                               ev_view_set_rotation (view, 90);
-                               break;
-                       case 180:
-                               ev_view_set_rotation (view, 180);
-                               break;
-                       case 270:
-                               ev_view_set_rotation (view, 270);
-                               break;
-                       default:
-                               break;
+                               case 90:
+                                       ev_view_set_rotation (view, 90);
+                                       break;
+                               case 180:
+                                       ev_view_set_rotation (view, 180);
+                                       break;
+                               case 270:
+                                       ev_view_set_rotation (view, 270);
+                                       break;
+                               default:
+                                       break;
                        }
                }
+               g_value_unset (&rotation);
        }
 }
 
@@ -803,25 +905,33 @@ ev_window_setup_document (EvWindow *ev_window)
                                         ev_window, 0);
        }
 
-       ev_window_set_page_mode (ev_window, PAGE_MODE_DOCUMENT);
        ev_sidebar_set_document (sidebar, document);
 
        if (ev_page_cache_get_n_pages (ev_window->priv->page_cache) > 0) {
                ev_view_set_document (view, document);
        }
+       ev_window_set_page_mode (ev_window, PAGE_MODE_DOCUMENT);
 
        ev_window_title_set_document (ev_window->priv->title, document);
        ev_window_title_set_uri (ev_window->priv->title, ev_window->priv->uri);
 
        action = gtk_action_group_get_action (ev_window->priv->action_group, PAGE_SELECTOR_ACTION);
        ev_page_action_set_document (EV_PAGE_ACTION (action), document);
-       update_action_sensitivity (ev_window);
-
+       ev_window_setup_action_sensitivity (ev_window);
+
+       if (ev_window->priv->history)
+               g_object_unref (ev_window->priv->history);
+       ev_window->priv->history = ev_history_new ();
+       action = gtk_action_group_get_action (ev_window->priv->action_group, NAVIGATION_ACTION);
+        ev_navigation_action_set_history (EV_NAVIGATION_ACTION (action), ev_window->priv->history);
+        ev_navigation_action_set_window (EV_NAVIGATION_ACTION (action), ev_window);
+       
        if (ev_window->priv->properties) {
                ev_properties_dialog_set_document (EV_PROPERTIES_DIALOG (ev_window->priv->properties),
                                                   ev_window->priv->document);
        }
        
+       setup_size_from_metadata (ev_window);
        setup_document_from_metadata (ev_window);
        setup_sidebar_from_metadata (ev_window, document);
 
@@ -837,13 +947,11 @@ password_dialog_response (GtkWidget *password_dialog,
        char *password;
        
        if (response_id == GTK_RESPONSE_OK) {
-               EvDocument *document;
-               gchar *uri;
 
                password = ev_password_dialog_get_password (EV_PASSWORD_DIALOG (password_dialog));
                if (password) {
                        ev_document_doc_mutex_lock ();
-                       ev_document_security_set_password (EV_DOCUMENT_SECURITY (ev_window->priv->password_document),
+                       ev_document_security_set_password (EV_DOCUMENT_SECURITY (ev_window->priv->xfer_job->document),
                                                           password);
                        ev_document_doc_mutex_unlock ();
                }
@@ -851,21 +959,11 @@ password_dialog_response (GtkWidget *password_dialog,
 
                ev_password_dialog_save_password (EV_PASSWORD_DIALOG (password_dialog));
 
-               document = ev_window->priv->password_document;
-               uri = ev_window->priv->password_uri;
-
-               ev_window->priv->password_document = NULL;
-               ev_window->priv->password_uri = NULL;
-
                ev_window_title_set_type (ev_window->priv->title, EV_WINDOW_TITLE_DOCUMENT);
-
-               ev_job_queue_add_job (ev_window->priv->load_job, EV_JOB_PRIORITY_HIGH);
+               ev_job_queue_add_job (ev_window->priv->xfer_job, EV_JOB_PRIORITY_HIGH);
                
-               gtk_widget_destroy (password_dialog);
+               gtk_widget_destroy (password_dialog);
                        
-               g_object_unref (document);
-               g_free (uri);
-
                return;
        }
 
@@ -873,24 +971,23 @@ password_dialog_response (GtkWidget *password_dialog,
        gtk_widget_destroy (password_dialog);
 }
 
-/* Called either by ev_window_load_job_cb or by the "unlock" callback on the
+/* Called either by ev_window_xfer_job_cb or by the "unlock" callback on the
  * password_view page.  It assumes that ev_window->priv->password_* has been set
  * correctly.  These are cleared by password_dialog_response() */
 
 static void
 ev_window_popup_password_dialog (EvWindow *ev_window)
 {
-       g_assert (ev_window->priv->password_document);
-       g_assert (ev_window->priv->password_uri);
+       g_assert (ev_window->priv->xfer_job);
 
        gtk_widget_set_sensitive (ev_window->priv->password_view, FALSE);
 
-       ev_window_title_set_uri (ev_window->priv->title, ev_window->priv->password_uri);
+       ev_window_title_set_uri (ev_window->priv->title, ev_window->priv->uri);
        ev_window_title_set_type (ev_window->priv->title, EV_WINDOW_TITLE_PASSWORD);
 
        if (ev_window->priv->password_dialog == NULL) {
                ev_window->priv->password_dialog =
-                       g_object_new (EV_TYPE_PASSWORD_DIALOG, "uri", ev_window->priv->password_uri, NULL);
+                       g_object_new (EV_TYPE_PASSWORD_DIALOG, "uri", ev_window->priv->uri, NULL);
                gtk_window_set_transient_for (GTK_WINDOW (ev_window->priv->password_dialog), GTK_WINDOW (ev_window));
 
                g_object_add_weak_pointer (G_OBJECT (ev_window->priv->password_dialog),
@@ -905,20 +1002,9 @@ ev_window_popup_password_dialog (EvWindow *ev_window)
        }
 }
 
-
 static void
-ev_window_clear_jobs (EvWindow *ev_window)
+ev_window_clear_xfer_job (EvWindow *ev_window)
 {
-    if (ev_window->priv->load_job != NULL) {
-
-       if (!ev_window->priv->load_job->finished)
-               ev_job_queue_remove_job (ev_window->priv->load_job);
-
-       g_signal_handlers_disconnect_by_func (ev_window->priv->load_job, ev_window_load_job_cb, ev_window);
-       g_object_unref (ev_window->priv->load_job);
-       ev_window->priv->load_job = NULL;
-    }
-
     if (ev_window->priv->xfer_job != NULL) {
 
        if (!ev_window->priv->xfer_job->finished)
@@ -938,7 +1024,7 @@ ev_window_clear_local_uri (EvWindow *ev_window)
     if (ev_window->priv->local_uri) {
            filename = g_filename_from_uri (ev_window->priv->local_uri, NULL, NULL);
            if (filename != NULL) {
-                   unlink (filename);
+                   g_unlink (filename);
                    g_free (filename);
            }
            g_free (ev_window->priv->local_uri);
@@ -946,6 +1032,35 @@ ev_window_clear_local_uri (EvWindow *ev_window)
     }
 }
 
+static void
+ev_window_clear_temp_file (EvWindow *ev_window)
+{
+       GnomeVFSURI *uri;
+       gchar       *filename;
+       const gchar *tempdir;
+
+       if (!ev_window->priv->uri)
+               return;
+
+       uri = gnome_vfs_uri_new (ev_window->priv->uri);
+       if (!gnome_vfs_uri_is_local (uri)) {
+               gnome_vfs_uri_unref (uri);
+               return;
+       }
+       gnome_vfs_uri_unref (uri);
+
+       filename = g_filename_from_uri (ev_window->priv->uri, NULL, NULL);
+       if (!filename)
+               return;
+
+       tempdir = g_get_tmp_dir ();
+       if (g_ascii_strncasecmp (filename, tempdir, strlen (tempdir)) == 0) {
+               g_unlink (filename);
+       }
+
+       g_free (filename);
+}
+
 /* This callback will executed when load job will be finished.
  *
  * Since the flow of the error dialog is very confusing, we assume that both
@@ -955,40 +1070,57 @@ ev_window_clear_local_uri (EvWindow *ev_window)
  * function should _not_ necessarily expect those to exist after being
  * called. */
 static void
-ev_window_load_job_cb  (EvJobLoad *job,
+ev_window_xfer_job_cb  (EvJobXfer *job,
                        gpointer data)
 {
        EvWindow *ev_window = EV_WINDOW (data);
        EvDocument *document = EV_JOB (job)->document;
 
-       g_assert (document);
-       g_assert (document != ev_window->priv->document);
        g_assert (job->uri);
-
-       if (ev_window->priv->password_document) {
-               g_object_unref (ev_window->priv->password_document);
-               ev_window->priv->password_document = NULL;
-       }
-       if (ev_window->priv->password_uri) {
-               g_free (ev_window->priv->password_uri);
-               ev_window->priv->password_uri = NULL;
-       }
+       
+       ev_view_set_loading (EV_VIEW (ev_window->priv->view), FALSE);
 
        /* Success! */
        if (job->error == NULL) {
+
+               if (ev_window->priv->uri)
+                       g_free (ev_window->priv->uri);
+               ev_window->priv->uri = g_strdup (job->uri);
+
+               if (ev_window->priv->local_uri)
+                       g_free (ev_window->priv->local_uri);
+               ev_window->priv->local_uri = 
+                   job->local_uri ? g_strdup (job->local_uri) : NULL;
+               
                if (ev_window->priv->document)
                        g_object_unref (ev_window->priv->document);
                ev_window->priv->document = g_object_ref (document);
+
+               if (!ev_window->priv->unlink_temp_file) {
+                       setup_view_from_metadata (ev_window);
+                       ev_window_add_recent (ev_window, ev_window->priv->uri);
+               }
+
                ev_window_setup_document (ev_window);
-               
-               ev_window_add_recent (ev_window, ev_window->priv->uri);
-               
-               if (ev_window->priv->loaded_uri)
-                       g_free (ev_window->priv->loaded_uri);
-               ev_window->priv->loaded_uri = g_strdup (ev_window->priv->uri);
-               
-               ev_window_clear_jobs (ev_window);
-               
+
+               if (job->dest)
+                       ev_window_goto_dest (ev_window, job->dest);
+
+               switch (job->mode) {
+                       case EV_WINDOW_MODE_FULLSCREEN:
+                               ev_window_run_fullscreen (ev_window);
+                               break;
+                       case EV_WINDOW_MODE_PRESENTATION:
+                               ev_window_run_presentation (ev_window);
+                               break;
+                       case EV_WINDOW_MODE_PREVIEW:
+                               ev_window_run_preview (ev_window);
+                               break;
+                       default:
+                               break;
+               }
+
+               ev_window_clear_xfer_job (ev_window);           
                return;
        }
 
@@ -996,8 +1128,9 @@ ev_window_load_job_cb  (EvJobLoad *job,
            job->error->code == EV_DOCUMENT_ERROR_ENCRYPTED) {
                gchar *base_name, *file_name;
 
-               ev_window->priv->password_document = g_object_ref (document);
-               ev_window->priv->password_uri = g_strdup (job->uri);
+               g_free (ev_window->priv->uri);
+               ev_window->priv->uri = g_strdup (job->uri);
+               setup_view_from_metadata (ev_window);
 
                file_name = gnome_vfs_format_uri_for_display (job->uri);
                base_name = g_path_get_basename (file_name);
@@ -1006,51 +1139,18 @@ ev_window_load_job_cb  (EvJobLoad *job,
                g_free (file_name);
                g_free (base_name);
                ev_window_set_page_mode (ev_window, PAGE_MODE_PASSWORD);
-
+               
                ev_window_popup_password_dialog (ev_window);
        } else {
-               unable_to_load (ev_window, job->error->message);
+               ev_window_error_dialog (GTK_WINDOW (ev_window), 
+                                       _("Unable to open document"),
+                                       job->error);
+               ev_window_clear_xfer_job (ev_window);
        }       
 
        return;
 }
 
-static void
-ev_window_xfer_job_cb  (EvJobXfer *job,
-                       gpointer data)
-{
-       EvWindow *ev_window = EV_WINDOW (data);
-
-
-       
-       if (job->error != NULL) {
-               unable_to_load (ev_window, job->error->message);
-               ev_window_clear_jobs (ev_window);
-       } else {
-               char *uri;
-               
-               EvDocument *document = g_object_ref (EV_JOB (job)->document);
-               
-               if (job->local_uri) {
-                       ev_window->priv->local_uri = g_strdup (job->local_uri);
-                       uri = ev_window->priv->local_uri;
-               } else {
-                       ev_window->priv->local_uri = NULL;
-                       uri = ev_window->priv->uri;
-               }
-               
-               ev_window_clear_jobs (ev_window);
-               
-               ev_window->priv->load_job = ev_job_load_new (document, uri);
-               g_signal_connect (ev_window->priv->load_job,
-                                 "finished",
-                                 G_CALLBACK (ev_window_load_job_cb),
-                                 ev_window);
-               ev_job_queue_add_job (ev_window->priv->load_job, EV_JOB_PRIORITY_HIGH);
-               g_object_unref (document);
-       }               
-}
-
 const char *
 ev_window_get_uri (EvWindow *ev_window)
 {
@@ -1063,33 +1163,39 @@ ev_window_close_dialogs (EvWindow *ev_window)
        if (ev_window->priv->password_dialog)
                gtk_widget_destroy (ev_window->priv->password_dialog);
        ev_window->priv->password_dialog = NULL;
-
-       if (ev_window->priv->print_dialog) {
+       
+#ifdef WITH_PRINT
+       if (ev_window->priv->print_dialog)
                gtk_widget_destroy (ev_window->priv->print_dialog);
-               g_object_unref (ev_window->priv->print_job);
-       }
        ev_window->priv->print_dialog = NULL;
-       ev_window->priv->print_job = NULL;
+#endif
 
+#ifdef WITH_GNOME_PRINT
+       if (ev_window->priv->print_job)
+               g_object_unref (ev_window->priv->print_job);
+       ev_window->priv->print_job = NULL;
+#endif
+       
        if (ev_window->priv->properties)
                gtk_widget_destroy (ev_window->priv->properties);
        ev_window->priv->properties = NULL;
 }
 
 void
-ev_window_open_uri (EvWindow *ev_window, const char *uri)
+ev_window_open_uri (EvWindow       *ev_window,
+                   const char     *uri,
+                   EvLinkDest     *dest,
+                   EvWindowRunMode mode,
+                   gboolean        unlink_temp_file)
 {
-
-       g_free (ev_window->priv->uri);
-       ev_window->priv->uri = g_strdup (uri);
-
-       setup_view_from_metadata (ev_window);
-       
        ev_window_close_dialogs (ev_window);
-       ev_window_clear_jobs (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->unlink_temp_file = unlink_temp_file;
        
-       ev_window->priv->xfer_job = ev_job_xfer_new (uri);
+       ev_window->priv->xfer_job = ev_job_xfer_new (uri, dest, mode);
        g_signal_connect (ev_window->priv->xfer_job,
                          "finished",
                          G_CALLBACK (ev_window_xfer_job_cb),
@@ -1097,6 +1203,12 @@ ev_window_open_uri (EvWindow *ev_window, const char *uri)
        ev_job_queue_add_job (ev_window->priv->xfer_job, EV_JOB_PRIORITY_HIGH);
 }
 
+void
+ev_window_goto_dest (EvWindow *ev_window, EvLinkDest *dest)
+{
+       ev_view_goto_dest (EV_VIEW (ev_window->priv->view), dest);
+}
+
 static void
 file_open_dialog_response_cb (GtkWidget *chooser,
                              gint       response_id,
@@ -1107,11 +1219,15 @@ file_open_dialog_response_cb (GtkWidget *chooser,
 
                uris = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (chooser));
 
-               ev_application_open_uri_list (EV_APP, uris, GDK_CURRENT_TIME);
+               ev_application_open_uri_list (EV_APP, uris,
+                                             gtk_window_get_screen (GTK_WINDOW (ev_window)),
+                                             GDK_CURRENT_TIME);
        
                g_slist_foreach (uris, (GFunc)g_free, NULL);    
                g_slist_free (uris);
        }
+       ev_application_set_chooser_uri (EV_APP, 
+                                       gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (chooser)));
 
        gtk_widget_destroy (chooser);
 }
@@ -1129,10 +1245,17 @@ ev_window_cmd_file_open (GtkAction *action, EvWindow *window)
                                               GTK_STOCK_OPEN, GTK_RESPONSE_OK,
                                               NULL);
 
-       ev_document_types_add_filters (chooser, NULL);
+       ev_document_factory_add_filters (chooser, NULL);
        gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (chooser), TRUE);
        gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (chooser), FALSE);
-
+       if (ev_application_get_chooser_uri (EV_APP) != NULL) {
+               gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (chooser),
+                                         ev_application_get_chooser_uri (EV_APP));
+       } else if (window->priv->uri != NULL) {
+               gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (chooser),
+                                         window->priv->uri);
+       }
+       
        g_signal_connect (chooser, "response",
                          G_CALLBACK (file_open_dialog_response_cb),
                          window);
@@ -1140,6 +1263,119 @@ ev_window_cmd_file_open (GtkAction *action, EvWindow *window)
        gtk_widget_show (chooser);
 }
 
+static gchar *
+ev_window_create_tmp_symlink (const gchar *filename, GError **error)
+{
+       gchar *tmp_filename = NULL;
+       gchar *name;
+       gint   res;
+       guint  i = 0;
+
+       name = g_path_get_basename (filename);
+       
+       do {
+               gchar *basename;
+
+               if (tmp_filename)
+                       g_free (tmp_filename);
+
+               basename = g_strdup_printf ("%s-%d", name, i++);
+               tmp_filename = g_build_filename (ev_tmp_dir (),
+                                                basename, NULL);
+               
+               g_free (basename);
+       } while ((res = symlink (filename, tmp_filename)) != 0 && errno == EEXIST);
+
+       g_free (name);
+       
+       if (res != 0 && errno != EEXIST) {
+               if (error) {
+                       *error = g_error_new (G_FILE_ERROR,
+                                             g_file_error_from_errno (errno),
+                                             _("Couldn't create symlink “%s”: %s"),
+                                             tmp_filename, strerror (errno));
+               }
+
+               g_free (tmp_filename);
+
+               return NULL;
+       }
+       
+       return tmp_filename;
+}
+
+static void
+ev_window_cmd_file_open_copy_at_dest (EvWindow *window, EvLinkDest *dest)
+{
+       GError *error = NULL;
+       gchar *symlink_uri;
+       gchar *old_filename;
+       gchar *new_filename;
+
+       old_filename = g_filename_from_uri (window->priv->uri, NULL, NULL);
+       new_filename = ev_window_create_tmp_symlink (old_filename, &error);
+
+       if (error) {
+               ev_window_error_dialog (GTK_WINDOW (window),
+                                       _("Cannot open a copy."),
+                                       error);
+
+               g_error_free (error);
+               g_free (old_filename);
+               g_free (new_filename);
+
+               return;
+       }
+               
+       g_free (old_filename);
+
+       symlink_uri = g_filename_to_uri (new_filename, NULL, NULL);
+       g_free (new_filename);
+
+       ev_application_open_uri_at_dest (EV_APP,
+                                        symlink_uri,
+                                        gtk_window_get_screen (GTK_WINDOW (window)),
+                                        dest,
+                                        0,
+                                        TRUE,
+                                        GDK_CURRENT_TIME);
+       g_free (symlink_uri);
+}
+
+static void
+ev_window_cmd_file_open_copy (GtkAction *action, EvWindow *window)
+{
+       EvPageCache *page_cache;
+       EvLinkDest  *dest;
+       gint         current_page;
+
+       page_cache = ev_page_cache_get (window->priv->document);
+       current_page = ev_page_cache_get_current_page (page_cache);
+       
+       dest = ev_link_dest_new_page (current_page);
+       ev_window_cmd_file_open_copy_at_dest (window, dest);
+       g_object_unref (dest);
+}
+
+#ifdef HAVE_GTK_RECENT
+static void
+ev_window_cmd_recent_file_activate (GtkAction     *action,
+                                   EvWindow      *window)
+{
+       GtkRecentInfo *info;
+       const gchar   *uri;
+
+       info = g_object_get_data (G_OBJECT (action), "gtk-recent-info");
+       g_assert (info != NULL);
+       
+       uri = gtk_recent_info_get_uri (info);
+       
+       ev_application_open_uri_at_dest (EV_APP, uri,
+                                        gtk_window_get_screen (GTK_WINDOW (window)),
+                                        NULL, 0, FALSE,
+                                        GDK_CURRENT_TIME);
+}
+#else
 static void
 ev_window_cmd_recent_file_activate (GtkAction *action,
                                    EvWindow *ev_window)
@@ -1152,25 +1388,173 @@ 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 */
+
+/*
+ * Doubles underscore to avoid spurious menu accels.
+ */
+static gchar * 
+ev_window_get_recent_file_label (gint index, const gchar *filename)
+{
+       GString *str;
+       gint length;
+       const gchar *p;
+       const gchar *end;
+       g_return_val_if_fail (filename != NULL, NULL);
+       
+       length = strlen (filename);
+       str = g_string_sized_new (length + 10);
+       g_string_printf (str, "_%d.  ", index);
+
+       p = filename;
+       end = filename + length;
+       while (p != end)
+       {
+               const gchar *next;
+               next = g_utf8_next_char (p);
+               switch (*p)
+               {
+                       case '_':
+                               g_string_append (str, "__");
+                               break;
+                       default:
+                               g_string_append_len (str, p, next - p);
+                               break;
+               }
+               p = next;
+       }
+       return g_string_free (str, FALSE);
 }
 
 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 = ev_window_get_recent_file_label (
+                       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_set_data_full (G_OBJECT (action),
+                                       "gtk-recent-info",
+                                       gtk_recent_info_ref (info),
+                                       (GDestroyNotify) gtk_recent_info_unref);
+               
+               g_signal_connect (G_OBJECT (action), "activate",
+                                 G_CALLBACK (ev_window_cmd_recent_file_activate),
+                                 (gpointer) ev_window);
+
+               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), 
@@ -1185,28 +1569,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);
-}
-
-static void
-save_error_dialog (GtkWindow *window, const gchar *file_name)
-{
-       GtkWidget *error_dialog;
-
-       error_dialog = gtk_message_dialog_new (
-               window,
-               (GtkDialogFlags)GTK_DIALOG_DESTROY_WITH_PARENT,
-               GTK_MESSAGE_ERROR,
-               GTK_BUTTONS_CLOSE,
-               _("The file could not be saved as \"%s\"."),
-               file_name);
-
-       /* Easy way to make the text bold while keeping the string
-        * above free from pango markup (FIXME ?) */
-       gtk_message_dialog_format_secondary_text (
-               GTK_MESSAGE_DIALOG (error_dialog), " ");
-
-       gtk_dialog_run (GTK_DIALOG (error_dialog));
-       gtk_widget_destroy (error_dialog);
+#endif /* HAVE_GTK_RECENT */
 }
 
 static void
@@ -1217,129 +1580,435 @@ file_save_dialog_response_cb (GtkWidget *fc,
        gboolean success;
 
        if (response_id == GTK_RESPONSE_OK) {
-               const char *uri;
+               gchar *uri;
+               GError *err = NULL;
 
                uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (fc));
 
                ev_document_doc_mutex_lock ();
-               success = ev_document_save (ev_window->priv->document, uri, NULL);
+               success = ev_document_save (ev_window->priv->document, uri, &err);
                ev_document_doc_mutex_unlock ();
 
-               if (!success) {
-                       save_error_dialog (GTK_WINDOW (fc), uri);
+               if (err) {
+                       gchar *msg;
+                       msg = g_strdup_printf (_("The file could not be saved as “%s”."), uri);
+                       ev_window_error_dialog (GTK_WINDOW (fc), msg, err);
+                       g_free (msg);
                }
+
+               g_free (uri);
        }
 
        gtk_widget_destroy (fc);
 }
 
-static void
-ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
+static void
+ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
+{
+       GtkWidget *fc;
+       gchar *base_name;
+       gchar *file_name;
+
+       fc = gtk_file_chooser_dialog_new (
+               _("Save a Copy"),
+               GTK_WINDOW (ev_window), GTK_FILE_CHOOSER_ACTION_SAVE,
+               GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+               GTK_STOCK_SAVE, GTK_RESPONSE_OK,
+               NULL);
+
+       ev_document_factory_add_filters (fc, ev_window->priv->document);
+       gtk_dialog_set_default_response (GTK_DIALOG (fc), GTK_RESPONSE_OK);
+
+       gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER (fc), TRUE);    
+       file_name = gnome_vfs_format_uri_for_display (ev_window->priv->uri);
+       base_name = g_path_get_basename (file_name);
+       gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (fc), base_name);
+       g_free (file_name);
+       g_free (base_name);
+
+       g_signal_connect (fc, "response",
+                         G_CALLBACK (file_save_dialog_response_cb),
+                         ev_window);
+
+       gtk_widget_show (fc);
+}
+
+#ifdef WITH_GTK_PRINT
+static void
+ev_window_print_page_setup_done_cb (GtkPageSetup *page_setup,
+                                   EvWindow     *window)
+{
+       /* Dialog was canceled */
+       if (!page_setup)
+               return;
+
+       if (window->priv->print_page_setup)
+               g_object_unref (window->priv->print_page_setup);
+       window->priv->print_page_setup = g_object_ref (page_setup);
+}
+#endif /* WITH_GTK_PRINT */
+
+static void
+ev_window_cmd_file_print_setup (GtkAction *action, EvWindow *ev_window)
+{
+#ifdef WITH_GTK_PRINT
+       gtk_print_run_page_setup_dialog_async (
+               GTK_WINDOW (ev_window),
+               ev_window->priv->print_page_setup,
+               ev_window->priv->print_settings,
+               (GtkPageSetupDoneFunc) ev_window_print_page_setup_done_cb,
+               ev_window);
+#endif /* WITH_GTK_PRINT */
+}
+
+#ifdef WITH_GTK_PRINT
+static void
+ev_window_clear_print_job (EvWindow *window)
+{
+       if (window->priv->print_job) {
+               if (!window->priv->print_job->finished)
+                       ev_job_queue_remove_job (window->priv->print_job);
+
+               g_signal_handlers_disconnect_by_func (window->priv->print_job,
+                                                     ev_window_print_job_cb,
+                                                     window);
+               g_object_unref (window->priv->print_job);
+               window->priv->print_job = NULL;
+       }
+}
+
+static void
+ev_window_print_finished (GtkPrintJob *print_job,
+                         EvWindow    *window,
+                         GError      *error)
+{
+       ev_window_clear_print_job (window);
+       
+       if (error) {
+               GtkWidget *dialog;
+               
+               dialog = gtk_message_dialog_new (GTK_WINDOW (window),
+                                                GTK_DIALOG_MODAL,
+                                                GTK_MESSAGE_ERROR,
+                                                GTK_BUTTONS_OK,
+                                                _("Failed to print document"));
+               gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+                                                         error->message);
+
+               gtk_dialog_run (GTK_DIALOG (dialog));
+               gtk_widget_destroy (dialog);
+       }
+}
+
+static void
+ev_window_print_send (EvWindow    *window,
+                     const gchar *filename)
+{
+       GtkPrintJob *job;
+       GError      *error = NULL;
+       
+       if (window->priv->gtk_print_job)
+               g_object_unref (window->priv->gtk_print_job);
+       
+       job = gtk_print_job_new ("evince-print",
+                                window->priv->printer,
+                                window->priv->print_settings,
+                                window->priv->print_page_setup);
+       
+       window->priv->gtk_print_job = job;
+
+       if (gtk_print_job_set_source_file (job, filename, &error)) {
+               gtk_print_job_send (job,
+                                   (GtkPrintJobCompleteFunc)ev_window_print_finished,
+                                   window, NULL);
+       } else {
+               ev_window_clear_print_job (window);
+               g_warning (error->message);
+               g_error_free (error);
+       }
+}
+
+static void
+ev_window_print_job_cb (EvJobPrint *job,
+                       EvWindow   *window)
+{
+       if (job->error) {
+               g_warning (job->error->message);
+               ev_window_clear_print_job (window);
+               return;
+       }
+
+       g_assert (job->temp_file != NULL);
+
+       ev_window_print_send (window, job->temp_file);
+}
+
+static gboolean
+ev_window_print_dialog_response_cb (GtkDialog *dialog,
+                                   gint       response,
+                                   EvWindow  *window)
+{
+       EvPrintRange  *ranges = NULL;
+       EvPrintPageSet page_set;
+       gint           n_ranges = 0;
+       gint           copies;
+       gboolean       collate;
+       gboolean       reverse;
+       gdouble        scale;
+       gint           current_page;
+       gdouble        width;
+       gdouble        height;
+       GtkPrintPages  print_pages;
+       const gchar   *file_format;
+       
+       if (response != GTK_RESPONSE_OK) {
+               gtk_widget_destroy (GTK_WIDGET (dialog));
+               window->priv->print_dialog = NULL;
+
+               return FALSE;
+       }
+
+       if (window->priv->printer)
+               g_object_unref (window->priv->printer);
+       if (window->priv->print_settings)
+               g_object_unref (window->priv->print_settings);
+       if (window->priv->print_page_setup)
+               g_object_unref (window->priv->print_page_setup);
+       
+       window->priv->printer = g_object_ref (
+               gtk_print_unix_dialog_get_selected_printer (GTK_PRINT_UNIX_DIALOG (dialog)));
+       window->priv->print_settings = g_object_ref (
+               gtk_print_unix_dialog_get_settings (GTK_PRINT_UNIX_DIALOG (dialog)));
+       window->priv->print_page_setup = g_object_ref (
+               gtk_print_unix_dialog_get_page_setup (GTK_PRINT_UNIX_DIALOG (dialog)));
+
+       file_format = gtk_print_settings_get (window->priv->print_settings,
+                                             GTK_PRINT_SETTINGS_OUTPUT_FILE_FORMAT);
+       
+       if (!gtk_printer_accepts_ps (window->priv->printer)) {
+               GtkWidget *msgdialog;
+
+               msgdialog = gtk_message_dialog_new (GTK_WINDOW (dialog),
+                                                   GTK_DIALOG_MODAL,
+                                                   GTK_MESSAGE_ERROR,
+                                                   GTK_BUTTONS_OK,
+                                                   _("Printing is not supported on this printer."));
+               
+               gtk_dialog_run (GTK_DIALOG (msgdialog));
+               gtk_widget_destroy (msgdialog);
+
+               return FALSE;
+       }
+
+       ev_window_clear_print_job (window);
+       
+       current_page = gtk_print_unix_dialog_get_current_page (GTK_PRINT_UNIX_DIALOG (dialog));
+       print_pages = gtk_print_settings_get_print_pages (window->priv->print_settings);
+       
+       switch (print_pages) {
+       case GTK_PRINT_PAGES_CURRENT:
+               ranges = g_new0 (EvPrintRange, 1);
+               
+               ranges->start = current_page;
+               ranges->end = current_page;
+               n_ranges = 1;
+                               
+               break;
+       case GTK_PRINT_PAGES_RANGES: {
+               GtkPageRange *page_range;
+               
+               page_range = gtk_print_settings_get_page_ranges (window->priv->print_settings,
+                                                                &n_ranges);
+               if (n_ranges > 0)
+                       ranges = g_memdup (page_range, n_ranges * sizeof (GtkPageRange));
+       }
+               break;
+       default:
+               break;
+       }
+
+       page_set = (EvPrintPageSet)gtk_print_settings_get_page_set (window->priv->print_settings);
+
+       scale = gtk_print_settings_get_scale (window->priv->print_settings) * 0.01;
+       
+       width = gtk_page_setup_get_paper_width (window->priv->print_page_setup,
+                                               GTK_UNIT_PIXEL);
+       height = gtk_page_setup_get_paper_height (window->priv->print_page_setup,
+                                                 GTK_UNIT_PIXEL);
+
+       if (scale != 1.0) {
+               width *= scale;
+               height *= scale;
+       }
+
+       copies = gtk_print_settings_get_n_copies (window->priv->print_settings);
+       collate = gtk_print_settings_get_collate (window->priv->print_settings);
+       reverse = gtk_print_settings_get_reverse (window->priv->print_settings);
+       
+       window->priv->print_job = ev_job_print_new (window->priv->document,
+                                                   file_format ? file_format : "ps",
+                                                   width, height,
+                                                   ranges, n_ranges,
+                                                   page_set,
+                                                   copies, collate,
+                                                   reverse);
+       
+       g_signal_connect (window->priv->print_job, "finished",
+                         G_CALLBACK (ev_window_print_job_cb),
+                         window);
+       /* The priority doesn't matter for this job */
+       ev_job_queue_add_job (window->priv->print_job, EV_JOB_PRIORITY_LOW);
+       
+       gtk_widget_destroy (GTK_WIDGET (dialog));
+       window->priv->print_dialog = NULL;
+
+       return TRUE;
+}
+
+void
+ev_window_print_range (EvWindow *ev_window, int first_page, int last_page)
 {
-       GtkWidget *fc;
-       gchar *base_name;
-       gchar *file_name;
+       GtkWidget           *dialog;
+       EvPageCache         *page_cache;
+       gint                 current_page;
+       gint                 document_last_page;
+       GtkPrintCapabilities capabilities;
 
-       fc = gtk_file_chooser_dialog_new (
-               _("Save a Copy"),
-               GTK_WINDOW (ev_window), GTK_FILE_CHOOSER_ACTION_SAVE,
-               GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-               GTK_STOCK_SAVE, GTK_RESPONSE_OK,
-               NULL);
+       g_return_if_fail (EV_IS_WINDOW (ev_window));
+       g_return_if_fail (ev_window->priv->document != NULL);
 
-       ev_document_types_add_filters (fc, ev_window->priv->document);
-       gtk_dialog_set_default_response (GTK_DIALOG (fc), GTK_RESPONSE_OK);
+       if (ev_window->priv->print_dialog) {
+               gtk_window_present (GTK_WINDOW (ev_window->priv->print_dialog));
+               return;
+       }
        
-       file_name = gnome_vfs_format_uri_for_display (ev_window->priv->uri);
-       base_name = g_path_get_basename (file_name);
-       gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (fc), base_name);
-       g_free (file_name);
-       g_free (base_name);
+       page_cache = ev_page_cache_get (ev_window->priv->document);
+       current_page = ev_page_cache_get_current_page (page_cache);
+       document_last_page = ev_page_cache_get_n_pages (page_cache);
 
-       g_signal_connect (fc, "response",
-                         G_CALLBACK (file_save_dialog_response_cb),
-                         ev_window);
+       if (!ev_window->priv->print_settings)
+               ev_window->priv->print_settings = gtk_print_settings_new ();
 
-       gtk_widget_show (fc);
-}
+       if (first_page != 1 || last_page != document_last_page) {
+               GtkPageRange range;
 
-static void
-ev_window_print (EvWindow *window)
-{
-       EvPageCache *page_cache;
-       int last_page;
+               /* Ranges in GtkPrint are 0 - N */
+               range.start = first_page - 1;
+               range.end = last_page - 1;
+               
+               gtk_print_settings_set_print_pages (ev_window->priv->print_settings,
+                                                   GTK_PRINT_PAGES_RANGES);
+               gtk_print_settings_set_page_ranges (ev_window->priv->print_settings,
+                                                   &range, 1);
+       }
 
-       page_cache = ev_page_cache_get (window->priv->document);
-       last_page = ev_page_cache_get_n_pages (page_cache);
+       dialog = gtk_print_unix_dialog_new (_("Print"), GTK_WINDOW (ev_window));
+       ev_window->priv->print_dialog = dialog;
+       
+       capabilities = GTK_PRINT_CAPABILITY_PAGE_SET |
+               GTK_PRINT_CAPABILITY_COPIES |
+               GTK_PRINT_CAPABILITY_COLLATE |
+               GTK_PRINT_CAPABILITY_REVERSE |
+               GTK_PRINT_CAPABILITY_SCALE |
+               GTK_PRINT_CAPABILITY_GENERATE_PS;
+       
+       if (EV_IS_FILE_EXPORTER (ev_window->priv->document) &&
+           ev_file_exporter_format_supported (EV_FILE_EXPORTER (ev_window->priv->document),
+                                              EV_FILE_FORMAT_PDF)) {
+               capabilities |= GTK_PRINT_CAPABILITY_GENERATE_PDF;
+       }
+       
+       gtk_print_unix_dialog_set_manual_capabilities (GTK_PRINT_UNIX_DIALOG (dialog),
+                                                      capabilities);
 
-       ev_window_print_range (window, 1, last_page);
-}
+       gtk_print_unix_dialog_set_current_page (GTK_PRINT_UNIX_DIALOG (dialog),
+                                               current_page);
+       
+       gtk_print_unix_dialog_set_settings (GTK_PRINT_UNIX_DIALOG (dialog),
+                                           ev_window->priv->print_settings);
+       
+       if (ev_window->priv->print_page_setup)
+               gtk_print_unix_dialog_set_page_setup (GTK_PRINT_UNIX_DIALOG (dialog),
+                                                     ev_window->priv->print_page_setup);
+       
+       g_signal_connect (G_OBJECT (dialog), "response",
+                         G_CALLBACK (ev_window_print_dialog_response_cb),
+                         ev_window);
 
+       gtk_widget_show (dialog);
+}
+#endif /* WITH_GTK_PRINT */
 
+#ifdef WITH_GNOME_PRINT
 static gboolean
-ev_window_print_dialog_response_cb (GtkDialog *print_dialog, gint response, gpointer data)
+ev_window_print_dialog_response_cb (GtkDialog *print_dialog,
+                                   gint       response,
+                                   EvWindow  *ev_window)
 {
-    EvWindow *ev_window = EV_WINDOW (data);
-    EvPrintJob *print_job;
-    GnomePrintConfig *config;
+       EvPrintJob *print_job;
+       GnomePrintConfig *config;
     
-    if (response != GNOME_PRINT_DIALOG_RESPONSE_PRINT) {
-           gtk_widget_destroy (GTK_WIDGET (print_dialog));
-           ev_window->priv->print_dialog = NULL;
-           g_object_unref (ev_window->priv->print_job);
-           ev_window->priv->print_job = NULL;
-           return FALSE;
-    }
+       if (response != GNOME_PRINT_DIALOG_RESPONSE_PRINT) {
+               gtk_widget_destroy (GTK_WIDGET (print_dialog));
+               ev_window->priv->print_dialog = NULL;
+               g_object_unref (ev_window->priv->print_job);
+               ev_window->priv->print_job = NULL;
+               
+               return FALSE;
+       }
 
-    config = gnome_print_dialog_get_config (GNOME_PRINT_DIALOG (print_dialog));
-
-    /* FIXME: Change this when we have the first backend
-     * that can print more than postscript
-     */
-    if (using_pdf_printer (config)) {
-           GtkWidget *dialog;
-           dialog = gtk_message_dialog_new (GTK_WINDOW (print_dialog), GTK_DIALOG_MODAL,
-                                            GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
-                                           _("Generating PDF is not supported"));
-           gtk_dialog_run (GTK_DIALOG (dialog));
-           gtk_widget_destroy (dialog);
-           return FALSE;
-    } else if (!using_postscript_printer (config)) {
-           GtkWidget *dialog;
-
-           dialog = gtk_message_dialog_new (GTK_WINDOW (print_dialog), GTK_DIALOG_MODAL,
-                                            GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
-                                            _("Printing is not supported on this printer."));
-                                            gtk_message_dialog_format_secondary_text (
-                                                       GTK_MESSAGE_DIALOG (dialog),
-                                                       _("You were trying to print to a printer using the \"%s\" driver. This program requires a PostScript printer driver."),
-                                                       gnome_print_config_get (config, (guchar *)"Settings.Engine.Backend.Driver"));
-           gtk_dialog_run (GTK_DIALOG (dialog));
-           gtk_widget_destroy (dialog);
-           return FALSE;
-    }
+       config = gnome_print_dialog_get_config (GNOME_PRINT_DIALOG (print_dialog));
 
-    save_print_config_to_file (config);
-    
-    print_job = g_object_new (EV_TYPE_PRINT_JOB,
-                             "gnome_print_job", ev_window->priv->print_job,
-                             "document", ev_window->priv->document,
-                             "print_dialog", print_dialog,
-                              NULL);
+       /* FIXME: Change this when we have the first backend
+        * that can print more than postscript
+        */
+       if (using_pdf_printer (config)) {
+               GtkWidget *dialog;
+               
+               dialog = gtk_message_dialog_new (GTK_WINDOW (print_dialog), GTK_DIALOG_MODAL,
+                                                GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
+                                                _("Generating PDF is not supported"));
+               gtk_dialog_run (GTK_DIALOG (dialog));
+               gtk_widget_destroy (dialog);
+               
+               return FALSE;
+       } else if (!using_postscript_printer (config)) {
+               GtkWidget *dialog;
+
+               dialog = gtk_message_dialog_new (GTK_WINDOW (print_dialog), GTK_DIALOG_MODAL,
+                                                GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
+                                                _("Printing is not supported on this printer."));
+               gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+                                                         _("You were trying to print to a printer using the “%s” driver. "
+                                                           "This program requires a PostScript printer driver."),
+                                                         gnome_print_config_get (config, (guchar *)"Settings.Engine.Backend.Driver"));
+               gtk_dialog_run (GTK_DIALOG (dialog));
+               gtk_widget_destroy (dialog);
+               
+               return FALSE;
+       }
 
-    if (print_job != NULL) {
-       ev_print_job_print (print_job, GTK_WINDOW (ev_window));
-       g_object_unref (print_job);
-    }
+       save_print_config_to_file (config);
+    
+       print_job = g_object_new (EV_TYPE_PRINT_JOB,
+                                 "gnome_print_job", ev_window->priv->print_job,
+                                 "document", ev_window->priv->document,
+                                 "print_dialog", print_dialog,
+                                 NULL);
+
+       if (print_job != NULL) {
+               ev_print_job_print (print_job, GTK_WINDOW (ev_window));
+               g_object_unref (print_job);
+       }
 
-    g_object_unref (config);
+       g_object_unref (config);
 
-    gtk_widget_destroy (GTK_WIDGET (print_dialog));
-    ev_window->priv->print_dialog = NULL;
-    g_object_unref (ev_window->priv->print_job);
-    ev_window->priv->print_job = NULL;
+       gtk_widget_destroy (GTK_WIDGET (print_dialog));
+       ev_window->priv->print_dialog = NULL;
+       g_object_unref (ev_window->priv->print_job);
+       ev_window->priv->print_job = NULL;
 
-    return FALSE;
+       return FALSE;
 }
 
 void
@@ -1356,11 +2025,16 @@ ev_window_print_range (EvWindow *ev_window, int first_page, int last_page)
        if (ev_window->priv->print_job == NULL)
                ev_window->priv->print_job = gnome_print_job_new (config);
        
-       if (ev_window->priv->print_dialog == NULL)
-               ev_window->priv->print_dialog = gnome_print_dialog_new (ev_window->priv->print_job, (guchar *) _("Print"),
-                                                                      (GNOME_PRINT_DIALOG_RANGE |
-                                                                       GNOME_PRINT_DIALOG_COPIES));
-       gtk_window_set_transient_for (GTK_WINDOW (ev_window->priv->print_dialog), GTK_WINDOW (ev_window));                                                              
+       if (ev_window->priv->print_dialog == NULL) {
+               ev_window->priv->print_dialog =
+                       gnome_print_dialog_new (ev_window->priv->print_job,
+                                               (guchar *) _("Print"),
+                                               (GNOME_PRINT_DIALOG_RANGE |
+                                                GNOME_PRINT_DIALOG_COPIES));
+       }
+       
+       gtk_window_set_transient_for (GTK_WINDOW (ev_window->priv->print_dialog),
+                                     GTK_WINDOW (ev_window));                                                          
        g_object_unref (config);                                                                
 
        pages_label = g_strconcat (_("Pages"), " ", NULL);
@@ -1375,11 +2049,27 @@ ev_window_print_range (EvWindow *ev_window, int first_page, int last_page)
                                           GNOME_PRINT_DIALOG_RESPONSE_PREVIEW,
                                           FALSE);
 
-       g_signal_connect (G_OBJECT (ev_window->priv->print_dialog), "response", G_CALLBACK (ev_window_print_dialog_response_cb), ev_window);
+       g_signal_connect (G_OBJECT (ev_window->priv->print_dialog), "response",
+                         G_CALLBACK (ev_window_print_dialog_response_cb),
+                         ev_window);
        gtk_widget_show (ev_window->priv->print_dialog);
-       return;
 }
-       
+#endif /* WITH_GNOME_PRINT */
+
+static void
+ev_window_print (EvWindow *window)
+{
+       EvPageCache *page_cache;
+       gint         last_page;
+
+       page_cache = ev_page_cache_get (window->priv->document);
+       last_page = ev_page_cache_get_n_pages (page_cache);
+
+#ifdef WITH_PRINT
+       ev_window_print_range (window, 1, last_page);
+#endif
+}
+
 static void
 ev_window_cmd_file_print (GtkAction *action, EvWindow *ev_window)
 {
@@ -1399,7 +2089,9 @@ ev_window_cmd_file_properties (GtkAction *action, EvWindow *ev_window)
                                              GTK_WINDOW (ev_window));
        }
 
+       ev_document_fc_mutex_lock ();
        gtk_widget_show (ev_window->priv->properties);
+       ev_document_fc_mutex_unlock ();
 }
                                        
 static void
@@ -1411,25 +2103,83 @@ ev_window_cmd_file_close_window (GtkAction *action, EvWindow *ev_window)
 }
 
 static void
-find_not_supported_dialog (EvWindow   *ev_window)
+ev_window_cmd_focus_page_selector (GtkAction *act, EvWindow *window)
 {
-       GtkWidget *dialog;
+       GtkAction *action;
+       
+       update_chrome_flag (window, EV_CHROME_RAISE_TOOLBAR, TRUE);
+       ev_window_set_action_sensitive (window, "ViewToolbar", FALSE);
+       
+       action = gtk_action_group_get_action (window->priv->action_group,
+                                             PAGE_SELECTOR_ACTION);
+       ev_page_action_grab_focus (EV_PAGE_ACTION (action));
+}
 
-       /* If you change this so it isn't modal, be sure you don't
-        * allow multiple copies of the dialog...
-        */
+static void
+ev_window_cmd_scroll_forward (GtkAction *action, EvWindow *window)
+{
+       ev_view_scroll (EV_VIEW (window->priv->view), EV_SCROLL_PAGE_FORWARD, FALSE);
+}
 
-       dialog = gtk_message_dialog_new (GTK_WINDOW (ev_window),
-                                        GTK_DIALOG_DESTROY_WITH_PARENT,
-                                        GTK_MESSAGE_ERROR,
-                                        GTK_BUTTONS_CLOSE,
-                                        _("The \"Find\" feature will not work with this document"));
-       gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-                                                 _("Searching for text is only supported for PDF documents."));
-       gtk_dialog_run (GTK_DIALOG (dialog));
-       gtk_widget_destroy (dialog);
+static void
+ev_window_cmd_scroll_backward (GtkAction *action, EvWindow *window)
+{
+       ev_view_scroll (EV_VIEW (window->priv->view), EV_SCROLL_PAGE_BACKWARD, FALSE);
+}
+
+static void
+ev_window_cmd_continuous (GtkAction *action, EvWindow *ev_window)
+{
+       gboolean continuous;
+
+       ev_window_stop_presentation (ev_window);
+       continuous = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
+       g_object_set (G_OBJECT (ev_window->priv->view),
+                     "continuous", continuous,
+                     NULL);
+       ev_window_update_actions (ev_window);
+}
+
+static void
+ev_window_cmd_dual (GtkAction *action, EvWindow *ev_window)
+{
+       gboolean dual_page;
+
+       ev_window_stop_presentation (ev_window);
+       dual_page = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
+       g_object_set (G_OBJECT (ev_window->priv->view),
+                     "dual-page", dual_page,
+                     NULL);
+       ev_window_update_actions (ev_window);
+}
+
+static void
+ev_window_cmd_view_best_fit (GtkAction *action, EvWindow *ev_window)
+{
+       ev_window_stop_presentation (ev_window);
+
+       if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) {
+               ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_BEST_FIT);
+       } else {
+               ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_FREE);
+       }
+       ev_window_update_actions (ev_window);
+}
+
+static void
+ev_window_cmd_view_page_width (GtkAction *action, EvWindow *ev_window)
+{
+       ev_window_stop_presentation (ev_window);
+
+       if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) {
+               ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_FIT_WIDTH);
+       } else {
+               ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_FREE);
+       }
+       ev_window_update_actions (ev_window);
 }
 
+
 static void
 ev_window_cmd_edit_select_all (GtkAction *action, EvWindow *ev_window)
 {
@@ -1443,15 +2193,13 @@ ev_window_cmd_edit_find (GtkAction *action, EvWindow *ev_window)
 {
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
-       if (ev_window->priv->document == NULL) {
-               g_printerr ("We should have set the Find menu item insensitive since there's no document\n");
-       } else if (!EV_IS_DOCUMENT_FIND (ev_window->priv->document)) {
-               find_not_supported_dialog (ev_window);
-       } else {
-               update_chrome_flag (ev_window, EV_CHROME_FINDBAR, TRUE);
+       if (ev_window->priv->document == NULL || !EV_IS_DOCUMENT_FIND (ev_window->priv->document)) {
+               g_error ("Find action should be insensitive since document doesn't support find");
+               return;
+       } 
 
-               gtk_widget_grab_focus (ev_window->priv->find_bar);
-       }
+       update_chrome_flag (ev_window, EV_CHROME_FINDBAR, TRUE);
+       gtk_widget_grab_focus (ev_window->priv->find_bar);
 }
 
 static void
@@ -1462,6 +2210,14 @@ ev_window_cmd_edit_find_next (GtkAction *action, EvWindow *ev_window)
        ev_view_find_next (EV_VIEW (ev_window->priv->view));
 }
 
+static void
+ev_window_cmd_edit_find_previous (GtkAction *action, EvWindow *ev_window)
+{
+        g_return_if_fail (EV_IS_WINDOW (ev_window));
+
+       ev_view_find_previous (EV_VIEW (ev_window->priv->view));
+}
+
 static void
 ev_window_cmd_edit_copy (GtkAction *action, EvWindow *ev_window)
 {
@@ -1484,7 +2240,7 @@ ev_window_update_fullscreen_popup (EvWindow *window)
        if (GTK_WIDGET (window)->window == NULL)
                return;
 
-       toolbar = (window->priv->chrome & EV_CHROME_TOOLBAR) != 0 || 
+       toolbar = (window->priv->chrome & EV_CHROME_FULLSCREEN_TOOLBAR) != 0 || 
                  (window->priv->chrome & EV_CHROME_RAISE_TOOLBAR) != 0;
        popup_width = popup->requisition.width;
        popup_height = popup->requisition.height;
@@ -1528,8 +2284,9 @@ static void
 ev_window_sidebar_position_change_cb (GObject *object, GParamSpec *pspec,
                                      EvWindow *ev_window)
 {
-       ev_metadata_manager_set_int (ev_window->priv->loaded_uri, "sidebar_size",
-                                    gtk_paned_get_position (GTK_PANED (object)));
+       if (!ev_window_is_empty (ev_window))
+               ev_metadata_manager_set_int (ev_window->priv->uri, "sidebar_size",
+                                            gtk_paned_get_position (GTK_PANED (object)));
 }
 
 static void
@@ -1560,14 +2317,18 @@ fullscreen_popup_size_request_cb (GtkWidget *popup, GtkRequisition *req, EvWindo
 }
 
 static gboolean
-fullscreen_timeout_cb (gpointer data)
+fullscreen_timeout_cb (EvWindow *window)
 {
-       EvWindow *window = EV_WINDOW (data);
+       EvView *view = EV_VIEW (window->priv->view);
+
+       if (!view ||
+           (!ev_view_get_fullscreen (EV_VIEW (view)) &&
+            !ev_view_get_presentation (EV_VIEW (view))))
+               return FALSE;
 
-       g_object_set (window->priv->fullscreen_popup, "visible", FALSE, NULL);
+       update_chrome_flag (window, EV_CHROME_FULLSCREEN_TOOLBAR, FALSE);
        ev_view_hide_cursor (EV_VIEW (window->priv->view));
-       g_source_unref (window->priv->fullscreen_timeout_source);
-       window->priv->fullscreen_timeout_source = NULL;
+       window->priv->fullscreen_timeout_id = 0;
 
        return FALSE;
 }
@@ -1575,43 +2336,31 @@ fullscreen_timeout_cb (gpointer data)
 static void
 fullscreen_set_timeout (EvWindow *window)
 {
-       GSource *source;
-
-       if (window->priv->fullscreen_timeout_source != NULL) {
-               g_source_unref (window->priv->fullscreen_timeout_source);
-               g_source_destroy (window->priv->fullscreen_timeout_source);
+       if (window->priv->fullscreen_timeout_id != 0) {
+               g_source_remove (window->priv->fullscreen_timeout_id);
        }
+       
+       window->priv->fullscreen_timeout_id = 
+           g_timeout_add (FULLSCREEN_TIMEOUT, (GSourceFunc)fullscreen_timeout_cb, window);
 
-       source = g_timeout_source_new (FULLSCREEN_TIMEOUT);
-       g_source_set_callback (source, fullscreen_timeout_cb, window, NULL);
-       g_source_attach (source, NULL);
-       window->priv->fullscreen_timeout_source = source;
+       update_chrome_flag (window, EV_CHROME_FULLSCREEN_TOOLBAR, TRUE);
+       update_chrome_visibility (window);
+       ev_view_show_cursor (EV_VIEW (window->priv->view));
 }
 
 static void
 fullscreen_clear_timeout (EvWindow *window)
 {
-       if (window->priv->fullscreen_timeout_source != NULL) {
-               g_source_unref (window->priv->fullscreen_timeout_source);
-               g_source_destroy (window->priv->fullscreen_timeout_source);
+       if (window->priv->fullscreen_timeout_id != 0) {
+               g_source_remove (window->priv->fullscreen_timeout_id);
        }
-
-       window->priv->fullscreen_timeout_source = NULL;
+       
+       window->priv->fullscreen_timeout_id = 0;
+       update_chrome_visibility (window);
        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,
@@ -1619,7 +2368,7 @@ fullscreen_motion_notify_cb (GtkWidget *widget,
 {
        EvWindow *window = EV_WINDOW (user_data);
 
-       show_fullscreen_popup (window);
+       fullscreen_set_timeout (window);
 
        return FALSE;
 }
@@ -1671,7 +2420,7 @@ ev_window_create_fullscreen_popup (EvWindow *window)
        GdkScreen *screen;
 
        window->priv->fullscreen_toolbar = egg_editable_toolbar_new_with_model
-                       (window->priv->ui_manager, ev_application_get_toolbars_model (EV_APP));
+                       (window->priv->ui_manager, ev_application_get_toolbars_model (EV_APP, FALSE), NULL);
 
        popup = gtk_window_new (GTK_WINDOW_POPUP);
        hbox = gtk_hbox_new (FALSE, 0);
@@ -1719,18 +2468,21 @@ ev_window_update_fullscreen_action (EvWindow *window)
 static void
 ev_window_run_fullscreen (EvWindow *window)
 {
-       ev_view_set_fullscreen (EV_VIEW (window->priv->view), TRUE);
        if (window->priv->fullscreen_popup == NULL)
                window->priv->fullscreen_popup
                        = ev_window_create_fullscreen_popup (window);
 
-       update_chrome_visibility (window);
-       gtk_widget_hide (window->priv->sidebar);
-
        g_object_set (G_OBJECT (window->priv->scrolled_window),
                      "shadow-type", GTK_SHADOW_NONE,
                      NULL);
+
+       ev_view_set_fullscreen (EV_VIEW (window->priv->view), TRUE);
+       ev_window_update_fullscreen_action (window);
        
+       gtk_window_fullscreen (GTK_WINDOW (window));
+       gtk_widget_grab_focus (window->priv->view);
+       ev_window_update_fullscreen_popup (window);
+
        g_signal_connect (window->priv->view,
                          "motion-notify-event",
                          G_CALLBACK (fullscreen_motion_notify_cb),
@@ -1741,12 +2493,8 @@ ev_window_run_fullscreen (EvWindow *window)
                          window);
        fullscreen_set_timeout (window);
 
-       gtk_widget_grab_focus (window->priv->view);
-       ev_window_update_fullscreen_action (window);
-       gtk_window_fullscreen (GTK_WINDOW (window));
-       ev_window_update_fullscreen_popup (window);
-
-       ev_metadata_manager_set_boolean (window->priv->loaded_uri, "fullscreen", TRUE);
+       if (!ev_window_is_empty (window))
+               ev_metadata_manager_set_boolean (window->priv->uri, "fullscreen", TRUE);
 }
 
 static void
@@ -1757,25 +2505,24 @@ ev_window_stop_fullscreen (EvWindow *window)
        if (!ev_view_get_fullscreen (EV_VIEW (view)))
                return;
 
-       ev_view_set_fullscreen (view, FALSE);
        g_object_set (G_OBJECT (window->priv->scrolled_window),
                      "shadow-type", GTK_SHADOW_IN,
                      NULL);
 
-       fullscreen_clear_timeout (window);
+       ev_view_set_fullscreen (view, FALSE);
+       ev_window_update_fullscreen_action (window);
+       gtk_window_unfullscreen (GTK_WINDOW (window));
 
-       g_signal_handlers_disconnect_by_func (view,
+       g_signal_handlers_disconnect_by_func (window->priv->view,
                                              (gpointer) fullscreen_motion_notify_cb,
                                              window);
-       g_signal_handlers_disconnect_by_func (view,
+       g_signal_handlers_disconnect_by_func (window->priv->view,
                                              (gpointer) fullscreen_leave_notify_cb,
                                              window);
-       ev_window_update_fullscreen_action (window);
-       gtk_window_unfullscreen (GTK_WINDOW (window));
-       update_chrome_visibility (window);
-       update_sidebar_visibility (window);
+       fullscreen_clear_timeout (window);
 
-       ev_metadata_manager_set_boolean (window->priv->loaded_uri, "fullscreen", FALSE);
+       if (!ev_window_is_empty (window))
+               ev_metadata_manager_set_boolean (window->priv->uri, "fullscreen", FALSE);
 }
 
 static void
@@ -1815,14 +2562,26 @@ ev_window_run_presentation (EvWindow *window)
                      "shadow-type", GTK_SHADOW_NONE,
                      NULL);
 
-       gtk_widget_grab_focus (window->priv->view);
        ev_view_set_presentation (EV_VIEW (window->priv->view), TRUE);
-       gtk_window_fullscreen (GTK_WINDOW (window));
        ev_window_update_presentation_action (window);
-       update_chrome_visibility (window);
-       gtk_widget_hide (window->priv->sidebar);
 
-       ev_metadata_manager_set_boolean (window->priv->loaded_uri, "presentation", TRUE);
+       gtk_widget_grab_focus (window->priv->view);
+       gtk_window_fullscreen (GTK_WINDOW (window));
+
+       g_signal_connect (window->priv->view,
+                         "motion-notify-event",
+                         G_CALLBACK (fullscreen_motion_notify_cb),
+                         window);
+       g_signal_connect (window->priv->view,
+                         "leave-notify-event",
+                         G_CALLBACK (fullscreen_leave_notify_cb),
+                         window);
+       fullscreen_set_timeout (window);
+
+       ev_application_screensaver_disable (EV_APP);
+       
+       if (!ev_window_is_empty (window))
+               ev_metadata_manager_set_boolean (window->priv->uri, "presentation", TRUE);
 }
 
 static void
@@ -1834,13 +2593,23 @@ ev_window_stop_presentation (EvWindow *window)
        g_object_set (G_OBJECT (window->priv->scrolled_window),
                      "shadow-type", GTK_SHADOW_IN,
                      NULL);
+
        ev_view_set_presentation (EV_VIEW (window->priv->view), FALSE);
-       gtk_window_unfullscreen (GTK_WINDOW (window));
        ev_window_update_presentation_action (window);
-       update_chrome_visibility (window);
-       update_sidebar_visibility (window);
+       gtk_window_unfullscreen (GTK_WINDOW (window));
+
+       g_signal_handlers_disconnect_by_func (window->priv->view,
+                                             (gpointer) fullscreen_motion_notify_cb,
+                                             window);
+       g_signal_handlers_disconnect_by_func (window->priv->view,
+                                             (gpointer) fullscreen_leave_notify_cb,
+                                             window);
+       fullscreen_clear_timeout (window);
+
+       ev_application_screensaver_enable (EV_APP);
 
-       ev_metadata_manager_set_boolean (window->priv->loaded_uri, "presentation", FALSE);
+       if (!ev_window_is_empty (window))
+               ev_metadata_manager_set_boolean (window->priv->uri, "presentation", FALSE);
 }
 
 static void
@@ -1859,19 +2628,28 @@ ev_window_cmd_view_presentation (GtkAction *action, EvWindow *window)
        }
 }
 
+static void
+ev_window_run_preview (EvWindow *window)
+{
+       ev_view_set_continuous (EV_VIEW (window->priv->view), FALSE); 
+       
+       update_chrome_flag (window, EV_CHROME_TOOLBAR, FALSE);
+       update_chrome_flag (window, EV_CHROME_MENUBAR, FALSE);
+       update_chrome_flag (window, EV_CHROME_SIDEBAR, FALSE);
+
+       update_chrome_flag (window, EV_CHROME_PREVIEW_TOOLBAR, TRUE);
+
+       update_chrome_visibility (window);
+}
+
 static gboolean
 ev_window_focus_in_event (GtkWidget *widget, GdkEventFocus *event)
 {
        EvWindow *window = EV_WINDOW (widget);
        EvWindowPrivate *priv = window->priv;
-       gboolean fullscreen;
-
-       g_object_get (priv->view,
-                     "fullscreen", &fullscreen,
-                     NULL);
 
-       if (fullscreen)
-               show_fullscreen_popup (window);
+       if (ev_view_get_fullscreen (EV_VIEW (priv->view)))
+               fullscreen_set_timeout (window);
 
        return GTK_WIDGET_CLASS (ev_window_parent_class)->focus_in_event (widget, event);
 }
@@ -1881,14 +2659,11 @@ ev_window_focus_out_event (GtkWidget *widget, GdkEventFocus *event)
 {
        EvWindow *window = EV_WINDOW (widget);
        EvWindowPrivate *priv = window->priv;
-       gboolean fullscreen;
 
-       g_object_get (priv->view,
-                     "fullscreen", &fullscreen,
-                     NULL);
-
-       if (fullscreen)
+       if (ev_view_get_fullscreen (EV_VIEW (priv->view))) {
+               fullscreen_set_timeout (window);
                gtk_widget_hide (priv->fullscreen_popup);
+       }
 
        return GTK_WIDGET_CLASS (ev_window_parent_class)->focus_out_event (widget, event);
 }
@@ -1901,6 +2676,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);
        }
@@ -1909,7 +2702,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);
@@ -1932,14 +2724,14 @@ ev_window_set_page_mode (EvWindow         *window,
        window->priv->page_mode = page_mode;
 
        switch (page_mode) {
-       case PAGE_MODE_DOCUMENT:
-               child = window->priv->view;
-               break;
-       case PAGE_MODE_PASSWORD:
-               child = window->priv->password_view;
-               break;
-       default:
-               g_assert_not_reached ();
+               case PAGE_MODE_DOCUMENT:
+                       child = window->priv->view;
+                       break;
+               case PAGE_MODE_PASSWORD:
+                       child = window->priv->password_view;
+                       break;
+               default:
+                       g_assert_not_reached ();
        }
 
        real_child = gtk_bin_get_child (GTK_BIN (window->priv->scrolled_window));
@@ -1949,18 +2741,9 @@ ev_window_set_page_mode (EvWindow         *window,
                gtk_container_add (GTK_CONTAINER (window->priv->scrolled_window),
                                   child);
        }
-       update_action_sensitivity (window);
+       ev_window_update_actions (window);
 }
 
-static void
-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);
-       ev_application_save_toolbars_model (EV_APP);
-        gtk_widget_destroy (GTK_WIDGET (dialog));
-}
 
 static void
 ev_window_cmd_edit_rotate_left (GtkAction *action, EvWindow *ev_window)
@@ -1974,6 +2757,16 @@ ev_window_cmd_edit_rotate_right (GtkAction *action, EvWindow *ev_window)
        ev_view_rotate_right (EV_VIEW (ev_window->priv->view));
 }
 
+static void
+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);
+       ev_application_save_toolbars_model (EV_APP);
+        gtk_widget_destroy (GTK_WIDGET (dialog));
+}
+
 static void
 ev_window_cmd_edit_toolbar (GtkAction *action, EvWindow *ev_window)
 {
@@ -1993,13 +2786,11 @@ ev_window_cmd_edit_toolbar (GtkAction *action, EvWindow *ev_window)
        gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 400);
          
        editor = egg_toolbar_editor_new (ev_window->priv->ui_manager,
-                                        ev_application_get_toolbars_model (EV_APP));
+                                        ev_application_get_toolbars_model (EV_APP, FALSE));
        gtk_container_set_border_width (GTK_CONTAINER (editor), 5);
        gtk_box_set_spacing (GTK_BOX (EGG_TOOLBAR_EDITOR (editor)), 5);
              
        gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), editor);
-       egg_toolbar_editor_load_actions (EGG_TOOLBAR_EDITOR (editor),
-                                        DATADIR "/evince-toolbar.xml");
 
        egg_editable_toolbar_set_edit_mode
                (EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar), TRUE);
@@ -2094,19 +2885,12 @@ static void
 ev_window_cmd_view_reload (GtkAction *action, EvWindow *ev_window)
 {
        char *uri;
-       int page;
 
        g_return_if_fail (EV_IS_WINDOW (ev_window));
 
-       page = ev_page_cache_get_current_page (ev_window->priv->page_cache);
        uri = g_strdup (ev_window->priv->uri);
 
-       ev_window_open_uri (ev_window, uri);
-
-       /* 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);
+       ev_window_open_uri (ev_window, uri, NULL, 0, FALSE);
 
        g_free (uri);
 }
@@ -2150,10 +2934,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");
@@ -2201,8 +2989,9 @@ save_sizing_mode (EvWindow *window)
        mode = ev_view_get_sizing_mode (EV_VIEW (window->priv->view));
        enum_value = g_enum_get_value (EV_SIZING_MODE_CLASS, mode);
 
-       ev_metadata_manager_set_string (window->priv->loaded_uri, "sizing_mode",
-                                       enum_value->value_nick);
+       if (!ev_window_is_empty (window))
+               ev_metadata_manager_set_string (window->priv->uri, "sizing_mode",
+                                               enum_value->value_nick);
 }
 
 static void     
@@ -2224,30 +3013,30 @@ ev_window_sizing_mode_changed_cb (EvView *view, GParamSpec *pspec,
                update_view_size (NULL, ev_window);
 
        switch (sizing_mode) {
-       case EV_SIZING_BEST_FIT:
-               g_object_set (G_OBJECT (scrolled_window),
-                             "hscrollbar-policy", GTK_POLICY_NEVER,
-                             "vscrollbar-policy", GTK_POLICY_AUTOMATIC,
-                             NULL);
-               g_signal_connect (ev_window->priv->view, "zoom_invalid",
-                                 G_CALLBACK (update_view_size),
-                                 ev_window);
-               break;
-       case EV_SIZING_FIT_WIDTH:
-               g_object_set (G_OBJECT (scrolled_window),
-                             "hscrollbar-policy", GTK_POLICY_NEVER,
-                             "vscrollbar-policy", GTK_POLICY_AUTOMATIC,
-                             NULL);
-               g_signal_connect (ev_window->priv->view, "zoom_invalid",
-                                 G_CALLBACK (update_view_size),
-                                 ev_window);
-               break;
-       case EV_SIZING_FREE:
-               g_object_set (G_OBJECT (scrolled_window),
-                             "hscrollbar-policy", GTK_POLICY_AUTOMATIC,
-                             "vscrollbar-policy", GTK_POLICY_AUTOMATIC,
-                             NULL);
-               break;
+               case EV_SIZING_BEST_FIT:
+                       g_object_set (G_OBJECT (scrolled_window),
+                                     "hscrollbar-policy", GTK_POLICY_NEVER,
+                                     "vscrollbar-policy", GTK_POLICY_AUTOMATIC,
+                                     NULL);
+                       g_signal_connect (ev_window->priv->view, "zoom_invalid",
+                                         G_CALLBACK (update_view_size),
+                                         ev_window);
+                       break;
+               case EV_SIZING_FIT_WIDTH:
+                       g_object_set (G_OBJECT (scrolled_window),
+                                     "hscrollbar-policy", GTK_POLICY_NEVER,
+                                     "vscrollbar-policy", GTK_POLICY_AUTOMATIC,
+                                     NULL);
+                       g_signal_connect (ev_window->priv->view, "zoom_invalid",
+                                         G_CALLBACK (update_view_size),
+                                         ev_window);
+                       break;
+               case EV_SIZING_FREE:
+                       g_object_set (G_OBJECT (scrolled_window),
+                                     "hscrollbar-policy", GTK_POLICY_AUTOMATIC,
+                                     "vscrollbar-policy", GTK_POLICY_AUTOMATIC,
+                                     NULL);
+                       break;
        }
 
        update_sizing_buttons (ev_window);
@@ -2257,11 +3046,14 @@ ev_window_sizing_mode_changed_cb (EvView *view, GParamSpec *pspec,
 static void     
 ev_window_zoom_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_window)
 {
-        update_action_sensitivity (ev_window);
+        ev_window_update_actions (ev_window);
 
-       if (ev_view_get_sizing_mode (view) == EV_SIZING_FREE) {
-               ev_metadata_manager_set_double (ev_window->priv->loaded_uri, "zoom",
-                                               ev_view_get_zoom (view));
+       if (ev_view_get_sizing_mode (view) == EV_SIZING_FREE && !ev_window_is_empty (ev_window)) {
+               gdouble zoom;
+
+               zoom = ev_view_get_zoom (view);
+               zoom *= 72.0 / ev_window_get_screen_dpi (ev_window);
+               ev_metadata_manager_set_double (ev_window->priv->uri, "zoom", zoom);
        }
 }
 
@@ -2297,8 +3089,10 @@ static void
 ev_window_continuous_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_window)
 {
        ev_window_update_continuous_action (ev_window);
-       ev_metadata_manager_set_boolean (ev_window->priv->loaded_uri, "continuous",
-                                        ev_view_get_continuous (EV_VIEW (ev_window->priv->view)));
+
+       if (!ev_window_is_empty (ev_window))
+               ev_metadata_manager_set_boolean (ev_window->priv->uri, "continuous",
+                                                ev_view_get_continuous (EV_VIEW (ev_window->priv->view)));
 }
 
 static void     
@@ -2308,8 +3102,9 @@ ev_window_rotation_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *window
 
        rotation = ev_view_get_rotation (EV_VIEW (window->priv->view));
 
-       ev_metadata_manager_set_int (window->priv->loaded_uri, "rotation",
-                                    rotation);
+       if (!ev_window_is_empty (window))
+               ev_metadata_manager_set_int (window->priv->uri, "rotation",
+                                            rotation);
 
        ev_sidebar_thumbnails_refresh (EV_SIDEBAR_THUMBNAILS (window->priv->sidebar_thumbs),
                                       rotation);
@@ -2318,20 +3113,23 @@ ev_window_rotation_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *window
 static void
 ev_window_has_selection_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *window)
 {
-       update_action_sensitivity (window);
+        ev_window_update_actions (window);
 }
 
 static void     
 ev_window_dual_mode_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_window)
 {
        ev_window_update_dual_page_action (ev_window);
-       ev_metadata_manager_set_boolean (ev_window->priv->loaded_uri, "dual-page",
-                                        ev_view_get_dual_page (EV_VIEW (ev_window->priv->view)));
+
+       if (!ev_window_is_empty (ev_window))
+               ev_metadata_manager_set_boolean (ev_window->priv->uri, "dual-page",
+                                                ev_view_get_dual_page (EV_VIEW (ev_window->priv->view)));
 }
 
 static char *
 build_comments_string (void)
 {
+#ifdef ENABLE_PDF
        PopplerBackend backend;
        const char *backend_name;
        const char *version;
@@ -2350,9 +3148,12 @@ build_comments_string (void)
                        break;
        }
 
-       return g_strdup_printf (_("PostScript and PDF File Viewer.\n"
+       return g_strdup_printf (_("Document Viewer.\n"
                                  "Using poppler %s (%s)"),
                                version, backend_name);
+#else
+       return g_strdup_printf (_("Document Viewer"));
+#endif
 }
 
 static void
@@ -2364,6 +3165,8 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window)
                "Marco Pesenti Gritti <marco@gnome.org>",
                "Nickolay V. Shmyrev <nshmyrev@yandex.ru>",
                "Bryan Clark <clarkbw@gnome.org>",
+               "Carlos Garcia Campos <carlosgc@gnome.org>",
+               "Wouter Bolsterlee <wbolster@gnome.org>",
                NULL
        };
 
@@ -2373,16 +3176,16 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window)
        };
 
        const char *license[] = {
-               N_("Evince is free software; you can redistribute it and/or modify\n"
-                  "it under the terms of the GNU General Public License as published by\n"
-                  "the Free Software Foundation; either version 2 of the License, or\n"
+               N_("Evince is free software; you can redistribute it and/or modify "
+                  "it under the terms of the GNU General Public License as published by "
+                  "the Free Software Foundation; either version 2 of the License, or "
                   "(at your option) any later version.\n"),
-               N_("Evince is distributed in the hope that it will be useful,\n"
-                  "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-                  "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+               N_("Evince is distributed in the hope that it will be useful, "
+                  "but WITHOUT ANY WARRANTY; without even the implied warranty of "
+                  "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the "
                   "GNU General Public License for more details.\n"),
-               N_("You should have received a copy of the GNU General Public License\n"
-                  "along with Evince; if not, write to the Free Software Foundation, Inc.,\n"
+               N_("You should have received a copy of the GNU General Public License "
+                  "along with Evince; if not, write to the Free Software Foundation, Inc., "
                   "59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n")
        };
 
@@ -2408,13 +3211,15 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window)
                "name", _("Evince"),
                "version", VERSION,
                "copyright",
-               _("\xc2\xa9 1996-2005 The Evince authors"),
+               _("\xc2\xa9 1996-2007 The Evince authors"),
                "license", license_trans,
                "website", "http://www.gnome.org/projects/evince",
                "comments", comments,
                "authors", authors,
                "documenters", documenters,
                "translator-credits", _("translator-credits"),
+               "logo-icon-name", "evince",
+               "wrap-license", TRUE,
                NULL);
 
        g_free (comments);
@@ -2434,8 +3239,8 @@ ev_window_view_toolbar_cb (GtkAction *action, EvWindow *ev_window)
 static void
 ev_window_view_sidebar_cb (GtkAction *action, EvWindow *ev_window)
 {
-       set_widget_visibility (ev_window->priv->sidebar,
-                              gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
+       update_chrome_flag (ev_window, EV_CHROME_SIDEBAR,
+                           gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
 }
 
 static void
@@ -2452,89 +3257,128 @@ ev_window_sidebar_current_page_changed_cb (EvSidebar  *ev_sidebar,
                id = LINKS_SIDEBAR_ID;
        } else if (current_page == ev_window->priv->sidebar_thumbs) {
                id = THUMBNAILS_SIDEBAR_ID;
+       } else if (current_page == ev_window->priv->sidebar_attachments) {
+               id = ATTACHMENTS_SIDEBAR_ID;
        } else {
                g_assert_not_reached();
        }
 
        g_object_unref (current_page);
-       ev_metadata_manager_set_string (ev_window->priv->loaded_uri, "sidebar_page", id);
+
+       if (!ev_window_is_empty (ev_window))
+               ev_metadata_manager_set_string (ev_window->priv->uri, "sidebar_page", id);
 }
 
 static void
-ev_window_sidebar_visibility_changed_cb (EvSidebar *ev_sidebar, GParamSpec *pspec,
+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");
-       
-       g_signal_handlers_block_by_func
-               (action, G_CALLBACK (ev_window_view_sidebar_cb), ev_window);
-       gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
-                                     GTK_WIDGET_VISIBLE (ev_sidebar));
-       g_signal_handlers_unblock_by_func
-               (action, G_CALLBACK (ev_window_view_sidebar_cb), ev_window);
 
        if (!ev_view_get_presentation (view) && 
            !ev_view_get_fullscreen (view)) {
-               ev_metadata_manager_set_boolean (ev_window->priv->loaded_uri, "sidebar_visibility",
+
+               gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
+                                             GTK_WIDGET_VISIBLE (ev_sidebar));
+
+               ev_metadata_manager_set_boolean (ev_window->priv->uri, "sidebar_visibility",
                                                 GTK_WIDGET_VISIBLE (ev_sidebar));
        }
 }
 
 static gboolean
-view_menu_popup_cb (EvView         *view,
-                   EvLink         *link,
-                   EvWindow       *ev_window)
+view_menu_popup_cb (EvView   *view,
+                   EvLink   *link,
+                   EvWindow *ev_window)
 {
        GtkWidget *popup;
        gboolean   show_external = FALSE;
        gboolean   show_internal = FALSE;
        GtkAction *action;
+
+       if (ev_view_get_presentation (EV_VIEW (ev_window->priv->view)))
+               return FALSE;
        
        if (ev_window->priv->link)
                g_object_unref (ev_window->priv->link);
+       
        if (link)
                ev_window->priv->link = g_object_ref (link);
        else    
                ev_window->priv->link = NULL;
 
-       popup = ev_window->priv->popup;
+       popup = ev_window->priv->view_popup;
+
+       if (ev_window->priv->link) {
+               EvLinkAction *ev_action;
 
-       if (ev_window->priv->link) 
-               switch (ev_link_get_link_type (ev_window->priv->link)) {
-                       case EV_LINK_TYPE_PAGE:
-                       case EV_LINK_TYPE_PAGE_FIT:
-                       case EV_LINK_TYPE_PAGE_FITH:
-                       case EV_LINK_TYPE_PAGE_FITV:
-                       case EV_LINK_TYPE_PAGE_FITR:
-                       case EV_LINK_TYPE_PAGE_XYZ:
+               ev_action = ev_link_get_action (link);
+               if (!ev_action)
+                       return FALSE;
+               
+               switch (ev_link_action_get_action_type (ev_action)) {
+                       case EV_LINK_ACTION_TYPE_GOTO_DEST:
+                       case EV_LINK_ACTION_TYPE_GOTO_REMOTE:
                                show_internal = TRUE;
                                break;
-                       case EV_LINK_TYPE_EXTERNAL_URI:
-                       case EV_LINK_TYPE_LAUNCH:       
+                       case EV_LINK_ACTION_TYPE_EXTERNAL_URI:
+                       case EV_LINK_ACTION_TYPE_LAUNCH:
                                show_external = TRUE;
                                break;
-                       default:
+                       default:
                                break;
                }
+       }
        
-       action = gtk_action_group_get_action (ev_window->priv->popups_action_group,
+       action = gtk_action_group_get_action (ev_window->priv->view_popup_action_group,
                                              "OpenLink");
        gtk_action_set_visible (action, show_external);
 
-       action = gtk_action_group_get_action (ev_window->priv->popups_action_group,
+       action = gtk_action_group_get_action (ev_window->priv->view_popup_action_group,
                                              "CopyLinkAddress");
        gtk_action_set_visible (action, show_external);
 
-       action = gtk_action_group_get_action (ev_window->priv->popups_action_group,
+       action = gtk_action_group_get_action (ev_window->priv->view_popup_action_group,
                                              "GoLink");
        gtk_action_set_visible (action, show_internal);
 
+       action = gtk_action_group_get_action (ev_window->priv->view_popup_action_group,
+                                             "OpenLinkNewWindow");
+       gtk_action_set_visible (action, show_internal);
+
+       gtk_menu_popup (GTK_MENU (popup), NULL, NULL,
+                       NULL, NULL,
+                       3, gtk_get_current_event_time ());
+       return TRUE;
+}
+
+static gboolean
+attachment_bar_menu_popup_cb (EvSidebarAttachments *attachbar,
+                             GList           *attach_list,
+                             EvWindow        *ev_window)
+{
+       GtkWidget *popup;
+
+       g_assert (attach_list != NULL);
+
+       if (ev_window->priv->attach_list) {
+               g_list_foreach (ev_window->priv->attach_list,
+                               (GFunc) g_object_unref, NULL);
+               g_list_free (ev_window->priv->attach_list);
+       }
+       
+       ev_window->priv->attach_list = attach_list;
+       
+       popup = ev_window->priv->attachment_popup;
+
        gtk_menu_popup (GTK_MENU (popup), NULL, NULL,
                        NULL, NULL,
                        3, gtk_get_current_event_time ());
+
        return TRUE;
 }
 
@@ -2592,9 +3436,7 @@ find_bar_search_changed_cb (EggFindBar *find_bar,
        visible = GTK_WIDGET_VISIBLE (find_bar);
        search_string = egg_find_bar_get_search_string (find_bar);
 
-#if 0
-       g_printerr ("search for '%s'\n", search_string ? search_string : "(nil)");
-#endif
+       ev_view_search_changed (EV_VIEW(ev_window->priv->view));
 
        if (ev_window->priv->document &&
            EV_IS_DOCUMENT_FIND (ev_window->priv->document)) {
@@ -2610,7 +3452,7 @@ find_bar_search_changed_cb (EggFindBar *find_bar,
                        ev_document_find_cancel (EV_DOCUMENT_FIND (ev_window->priv->document));
                        ev_document_doc_mutex_unlock ();
 
-                       update_action_sensitivity (ev_window);
+                       ev_window_update_actions (ev_window);
                        egg_find_bar_set_status_text (EGG_FIND_BAR (ev_window->priv->find_bar),
                                                      NULL);
                        gtk_widget_queue_draw (GTK_WIDGET (ev_window->priv->view));
@@ -2618,6 +3460,12 @@ find_bar_search_changed_cb (EggFindBar *find_bar,
        }
 }
 
+static void
+find_bar_scroll(EggFindBar *find_bar, GtkScrollType scroll, EvWindow* ev_window)
+{
+       ev_view_scroll(EV_VIEW(ev_window->priv->view), scroll, FALSE);
+}
+
 static void
 zoom_control_changed_cb (EphyZoomAction *action,
                         float           zoom,
@@ -2638,7 +3486,9 @@ zoom_control_changed_cb (EphyZoomAction *action,
        ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), mode);
        
        if (mode == EV_SIZING_FREE) {
-               ev_view_set_zoom (EV_VIEW (ev_window->priv->view), zoom, FALSE);
+               ev_view_set_zoom (EV_VIEW (ev_window->priv->view),
+                                 zoom * ev_window_get_screen_dpi (ev_window) / 72.0,
+                                 FALSE);
        }
 }
 
@@ -2667,11 +3517,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;
@@ -2682,10 +3527,36 @@ ev_window_dispose (GObject *object)
                priv->action_group = NULL;
        }
 
-       if (priv->popups_action_group) {
-               g_object_unref (priv->popups_action_group);
-               priv->popups_action_group = NULL;
+       if (priv->view_popup_action_group) {
+               g_object_unref (priv->view_popup_action_group);
+               priv->view_popup_action_group = NULL;
+       }
+
+       if (priv->attachment_popup_action_group) {
+               g_object_unref (priv->attachment_popup_action_group);
+               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);
@@ -2702,36 +3573,58 @@ ev_window_dispose (GObject *object)
                priv->view = NULL;
        }
 
-       if (priv->page_view) {
-               g_object_unref (priv->page_view);
-               priv->page_view = NULL;
+       if (priv->password_view) {
+               g_object_unref (priv->password_view);
+               priv->password_view = NULL;
        }
 
-       if (priv->load_job || priv->xfer_job) {
-               ev_window_clear_jobs (window);
+       if (priv->xfer_job) {
+               ev_window_clear_xfer_job (window);
        }
        
        if (priv->local_uri) {
                ev_window_clear_local_uri (window);
        }
+       
+       ev_window_close_dialogs (window);
 
-       if (priv->password_document) {
-               g_object_unref (priv->password_document);
-               priv->password_document = NULL;
+#ifdef WITH_GTK_PRINT
+       ev_window_clear_print_job (window);
+
+       if (window->priv->gtk_print_job) {
+               g_object_unref (window->priv->gtk_print_job);
+               window->priv->gtk_print_job = NULL;
        }
        
-       if (priv->password_uri) {
-               g_free (priv->password_uri);
-               priv->password_uri = NULL;
+       if (window->priv->printer) {
+               g_object_unref (window->priv->printer);
+               window->priv->printer = NULL;
        }
 
-       ev_window_close_dialogs (window);
+       if (window->priv->print_settings) {
+               g_object_unref (window->priv->print_settings);
+               window->priv->print_settings = NULL;
+       }
+
+       if (window->priv->print_page_setup) {
+               g_object_unref (window->priv->print_page_setup);
+               window->priv->print_page_setup = NULL;
+       }
+#endif
 
        if (priv->link) {
                g_object_unref (priv->link);
                priv->link = NULL;
        }
 
+       if (priv->attach_list) {
+               g_list_foreach (priv->attach_list,
+                               (GFunc) g_object_unref,
+                               NULL);
+               g_list_free (priv->attach_list);
+               priv->attach_list = NULL;
+       }
+
        if (priv->find_bar) {
                g_signal_handlers_disconnect_by_func
                        (window->priv->find_bar,
@@ -2740,20 +3633,26 @@ ev_window_dispose (GObject *object)
                priv->find_bar = NULL;
        }
 
-       if (priv->loaded_uri) {
-               g_free (priv->loaded_uri);
-               priv->loaded_uri = NULL;
-       }
-
        if (priv->uri) {
+               if (priv->unlink_temp_file)
+                       ev_window_clear_temp_file (window);
                g_free (priv->uri);
                priv->uri = NULL;
        }
 
-       if (window->priv->fullscreen_timeout_source) {
-               g_source_unref (window->priv->fullscreen_timeout_source);
-               g_source_destroy (window->priv->fullscreen_timeout_source);
-               window->priv->fullscreen_timeout_source = NULL;
+       if (priv->dest) {
+               g_object_unref (priv->dest);
+               priv->dest = NULL;
+       }
+
+       if (priv->history) {
+               g_object_unref (priv->history);
+               priv->history = NULL;
+       }
+
+       if (priv->fullscreen_timeout_id) {
+               g_source_remove (priv->fullscreen_timeout_id);
+               priv->fullscreen_timeout_id = 0;
        }
        destroy_fullscreen_popup (window);
 
@@ -2788,9 +3687,15 @@ static const GtkActionEntry entries[] = {
        { "FileOpen", GTK_STOCK_OPEN, N_("_Open..."), "<control>O",
          N_("Open an existing document"),
          G_CALLBACK (ev_window_cmd_file_open) },
+       { "FileOpenCopy", NULL, N_("Open a _Copy"), NULL,
+         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",
          N_("Save a copy of the current document"),
          G_CALLBACK (ev_window_cmd_save_as) },
+       { "FilePrintSetup", NULL, N_("Print 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",
          N_("Print this document"),
          G_CALLBACK (ev_window_cmd_file_print) },
@@ -2802,18 +3707,24 @@ static const GtkActionEntry entries[] = {
         /* Edit menu */
         { "EditCopy", GTK_STOCK_COPY, NULL, "<control>C", NULL,
           G_CALLBACK (ev_window_cmd_edit_copy) },
-       { "EditSelectAll", NULL, N_("Select _All"), "<control>A", NULL,
+#ifdef HAVE_GTK_RECENT
+       { "EditSelectAll", GTK_STOCK_SELECT_ALL, N_("Select _All"), "<control>A", NULL,
+#else
+       { "EditSelectAll", NULL, N_("Select _All"), "<control>A", NULL,
+#endif /* HAVE_GTK_RECENT */
          G_CALLBACK (ev_window_cmd_edit_select_all) },
-        { "EditFind", GTK_STOCK_FIND, NULL, "<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,
          G_CALLBACK (ev_window_cmd_edit_find_next) },
+       { "EditFindPrevious", NULL, N_("Find Pre_vious"), "<shift><control>G", NULL,
+         G_CALLBACK (ev_window_cmd_edit_find_previous) },
         { "EditToolbar", NULL, N_("T_oolbar"), NULL, NULL,
           G_CALLBACK (ev_window_cmd_edit_toolbar) },
-       { "EditRotateLeft", NULL, N_("Rotate _Left"), NULL, NULL,
+       { "EditRotateLeft", EV_STOCK_ROTATE_LEFT, N_("Rotate _Left"), NULL, NULL,
          G_CALLBACK (ev_window_cmd_edit_rotate_left) },
-       { "EditRotateRight", NULL, N_("Rotate _Right"), NULL, NULL,
+       { "EditRotateRight", EV_STOCK_ROTATE_RIGHT, N_("Rotate _Right"), NULL, NULL,
          G_CALLBACK (ev_window_cmd_edit_rotate_right) },
 
         /* View menu */
@@ -2901,10 +3812,10 @@ static const GtkActionEntry entries[] = {
 /* Toggle items */
 static const GtkToggleActionEntry toggle_entries[] = {
        /* View Menu */
-       { "ViewToolbar", NULL, N_("_Toolbar"), "<shift><control>T",
+       { "ViewToolbar", NULL, N_("_Toolbar"), NULL,
          N_("Show or hide the toolbar"),
          G_CALLBACK (ev_window_view_toolbar_cb), TRUE },
-        { "ViewSidebar", NULL, N_("Side _Pane"), "F9",
+        { "ViewSidebar", GTK_STOCK_INDEX, N_("Side _Pane"), "F9",
          N_("Show or hide the side pane"),
          G_CALLBACK (ev_window_view_sidebar_cb), TRUE },
         { "ViewContinuous", EV_STOCK_VIEW_CONTINUOUS, N_("_Continuous"), NULL,
@@ -2928,57 +3839,35 @@ static const GtkToggleActionEntry toggle_entries[] = {
 };
 
 /* Popups specific items */
-static const GtkActionEntry popups_entries [] = {
+static const GtkActionEntry view_popup_entries [] = {
        /* Links */
        { "OpenLink", GTK_STOCK_OPEN, N_("_Open Link"), NULL,
-         NULL, G_CALLBACK (ev_popup_cmd_open_link) },
+         NULL, G_CALLBACK (ev_view_popup_cmd_open_link) },
        { "GoLink", GTK_STOCK_GO_FORWARD, N_("_Go To"), NULL,
-         NULL, G_CALLBACK (ev_popup_cmd_open_link) },
+         NULL, G_CALLBACK (ev_view_popup_cmd_open_link) },
+       { "OpenLinkNewWindow", NULL, N_("Open in New _Window"), NULL,
+         NULL, G_CALLBACK (ev_view_popup_cmd_open_link_new_window) },
        { "CopyLinkAddress", NULL, N_("_Copy Link Address"), NULL,
          NULL,
-         G_CALLBACK (ev_popup_cmd_copy_link_address) },
+         G_CALLBACK (ev_view_popup_cmd_copy_link_address) },
 };
 
-static void
-drag_data_received_cb (GtkWidget *widget, GdkDragContext *context,
-                      gint x, gint y, GtkSelectionData *selection_data,
-                      guint info, guint time, gpointer gdata)
-{
-       GList  *uri_list = NULL;
-       GSList *uris = NULL;
-       gchar  *uri;
-
-       uri_list = gnome_vfs_uri_list_parse ((gchar *) selection_data->data);
-
-       if (uri_list) {
-               while (uri_list) {
-                       uri = gnome_vfs_uri_to_string (uri_list->data, GNOME_VFS_URI_HIDE_NONE);
-                       uris = g_slist_append (uris, (gpointer) uri);
-                       
-                       uri_list = g_list_next (uri_list);
-               }
-
-               gnome_vfs_uri_list_free (uri_list);
-               
-               ev_application_open_uri_list (EV_APP, uris, 0);
-               
-               g_slist_free (uris);
-
-               gtk_drag_finish (context, TRUE, FALSE, time);
-       }
-}
+static const GtkActionEntry attachment_popup_entries [] = {
+       { "OpenAttachment", GTK_STOCK_OPEN, N_("_Open..."), NULL,
+         NULL, G_CALLBACK (ev_attachment_popup_cmd_open_attachment) },
+       { "SaveAttachmentAs", GTK_STOCK_SAVE_AS, N_("_Save a Copy..."), NULL,
+         NULL, G_CALLBACK (ev_attachment_popup_cmd_save_attachment_as) },
+};
 
 static void
 activate_link_cb (EvPageAction *page_action, EvLink *link, EvWindow *window)
 {
-       g_return_if_fail (EV_IS_WINDOW (window));
-
-       ev_view_goto_link (EV_VIEW (window->priv->view), link);
+       ev_view_handle_link (EV_VIEW (window->priv->view), link);
        gtk_widget_grab_focus (window->priv->view);
 }
 
 static gboolean
-activate_label_cb (EvPageAction *page_action, char *label, EvWindow *window)
+activate_label_cb (EvPageAction *page_action, const gchar *label, EvWindow *window)
 {
        g_return_val_if_fail (EV_IS_WINDOW (window), FALSE);
 
@@ -3016,6 +3905,17 @@ register_custom_actions (EvWindow *window, GtkActionGroup *group)
                          G_CALLBACK (zoom_control_changed_cb), window);
        gtk_action_group_add_action (group, action);
        g_object_unref (action);
+
+       action = g_object_new (EV_TYPE_NAVIGATION_ACTION,
+                              "name", NAVIGATION_ACTION,
+                              "label", _("Navigation"),
+                              "is_important", TRUE,
+                              "short_label", _("Back"),
+                              "stock_id", GTK_STOCK_GO_DOWN,
+                              "tooltip", _("Move across visited pages"),
+                              NULL);
+       gtk_action_group_add_action (group, action);
+       g_object_unref (action);
 }
 
 static void
@@ -3024,9 +3924,9 @@ set_action_properties (GtkActionGroup *action_group)
        GtkAction *action;
 
        action = gtk_action_group_get_action (action_group, "GoPreviousPage");
+       g_object_set (action, "is-important", TRUE, NULL);
        /*translators: this is the label for toolbar button*/
        g_object_set (action, "short_label", _("Previous"), NULL);
-       g_object_set (action, "is-important", TRUE, NULL);
 
        action = gtk_action_group_get_action (action_group, "GoNextPage");
        g_object_set (action, "is-important", TRUE, NULL);
@@ -3036,22 +3936,18 @@ set_action_properties (GtkActionGroup *action_group)
        action = gtk_action_group_get_action (action_group, "ViewZoomIn");
        /*translators: this is the label for toolbar button*/
        g_object_set (action, "short_label", _("Zoom In"), NULL);
-       action = gtk_action_group_get_action (action_group, "ViewZoomIn");
 
        action = gtk_action_group_get_action (action_group, "ViewZoomOut");
        /*translators: this is the label for toolbar button*/
        g_object_set (action, "short_label", _("Zoom Out"), NULL);
-       action = gtk_action_group_get_action (action_group, "ViewZoomIn");
 
        action = gtk_action_group_get_action (action_group, "ViewBestFit");
        /*translators: this is the label for toolbar button*/
        g_object_set (action, "short_label", _("Best Fit"), NULL);
-       action = gtk_action_group_get_action (action_group, "ViewZoomIn");
 
        action = gtk_action_group_get_action (action_group, "ViewPageWidth");
        /*translators: this is the label for toolbar button*/
        g_object_set (action, "short_label", _("Fit Width"), NULL);
-       action = gtk_action_group_get_action (action_group, "ViewZoomIn");
 
        action = gtk_action_group_get_action (action_group, "LeaveFullscreen");
        g_object_set (action, "is-important", TRUE, NULL);
@@ -3090,33 +3986,11 @@ sidebar_widget_model_set (EvSidebarLinks *ev_sidebar_links,
        g_object_unref (model);
 }
 
-
-static void
-ev_window_set_view_accels_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, "Return", sensitive);
-               set_action_sensitive (window, "ShiftReturn", sensitive);
-               set_action_sensitive (window, "Slash", sensitive);
-               set_action_sensitive (window, "Plus", sensitive);
-               set_action_sensitive (window, "Minus", sensitive);
-               set_action_sensitive (window, "KpPlus", sensitive);
-               set_action_sensitive (window, "KpMinus", sensitive);
-               set_action_sensitive (window, "Equal", sensitive);
-       }
-}
-
 static gboolean
 view_actions_focus_in_cb (GtkWidget *widget, GdkEventFocus *event, EvWindow *window)
 {
        update_chrome_flag (window, EV_CHROME_RAISE_TOOLBAR, FALSE);
-       set_action_sensitive (window, "ViewToolbar", TRUE);
+       ev_window_set_action_sensitive (window, "ViewToolbar", TRUE);
 
        ev_window_set_view_accels_sensitivity (window, TRUE);
 
@@ -3158,7 +4032,8 @@ window_state_event_cb (EvWindow *window, GdkEventWindowState *event, gpointer du
                gboolean maximized;
 
                maximized = event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED;
-               ev_metadata_manager_set_boolean (window->priv->loaded_uri, "window_maximized", maximized);
+               if (!ev_window_is_empty (window))
+                       ev_metadata_manager_set_boolean (window->priv->uri, "window_maximized", maximized);
        }
 
        return FALSE;
@@ -3167,9 +4042,9 @@ window_state_event_cb (EvWindow *window, GdkEventWindowState *event, gpointer du
 static gboolean
 window_configure_event_cb (EvWindow *window, GdkEventConfigure *event, gpointer dummy)
 {
-       char *uri = window->priv->loaded_uri;
+       char *uri = window->priv->uri;
        GdkWindowState state;
-       int x, y, width, height;
+       int x, y, width, height, document_width, document_height;
 
        state = gdk_window_get_state (GTK_WIDGET (window)->window);
 
@@ -3177,10 +4052,20 @@ window_configure_event_cb (EvWindow *window, GdkEventConfigure *event, gpointer
                gtk_window_get_position (GTK_WINDOW (window), &x, &y);
                gtk_window_get_size (GTK_WINDOW (window), &width, &height);
 
-               ev_metadata_manager_set_int (uri, "window_x", x);
-               ev_metadata_manager_set_int (uri, "window_y", y);
-               ev_metadata_manager_set_int (uri, "window_width", width);
-               ev_metadata_manager_set_int (uri, "window_height", height);
+               if (!ev_window_is_empty (window) && window->priv->page_cache) {
+                       ev_page_cache_get_max_width (window->priv->page_cache, 
+                                                    0, 1.0,
+                                                    &document_width);
+                       ev_page_cache_get_max_height (window->priv->page_cache, 
+                                                     0, 1.0,
+                                                     &document_height);                        
+                       ev_metadata_manager_set_int (uri, "window_x", x);
+                       ev_metadata_manager_set_int (uri, "window_y", y);
+                       ev_metadata_manager_set_double (uri, "window_width_ratio", 
+                                                       (double)width/document_width);
+                       ev_metadata_manager_set_double (uri, "window_height_ratio", 
+                                                       (double)height/document_height);
+               }
        }
 
        return FALSE;
@@ -3189,13 +4074,13 @@ window_configure_event_cb (EvWindow *window, GdkEventConfigure *event, gpointer
 static void
 sidebar_links_link_activated_cb (EvSidebarLinks *sidebar_links, EvLink *link, EvWindow *window)
 {
-       ev_view_goto_link (EV_VIEW (window->priv->view), link);
+       ev_view_handle_link (EV_VIEW (window->priv->view), link);
 }
 
 static void
-launch_link (EvWindow *window, EvLink *link)
+launch_action (EvWindow *window, EvLinkAction *action)
 {
-       const char *filename = ev_link_get_filename (link);
+       const char *filename = ev_link_action_get_filename (action);
        char *uri = NULL;
 
        if (filename  && g_path_is_absolute (filename)) {
@@ -3227,52 +4112,233 @@ launch_link (EvWindow *window, EvLink *link)
 }
 
 static void
-launch_external_uri (EvWindow *window, EvLink *link)
+launch_external_uri (EvWindow *window, EvLinkAction *action)
+{
+       gnome_vfs_url_show (ev_link_action_get_uri (action));
+}
+
+static void
+open_remote_link (EvWindow *window, EvLinkAction *action)
 {
-       const char *uri;
-       char *escaped;
+       gchar *uri;
+       gchar *dir;
+
+       dir = g_path_get_dirname (window->priv->uri);
+       
+       uri = g_build_filename (dir, ev_link_action_get_filename (action),
+                               NULL);
+       g_free (dir);
+
+       ev_application_open_uri_at_dest (EV_APP, uri,
+                                        gtk_window_get_screen (GTK_WINDOW (window)),
+                                        ev_link_action_get_dest (action),
+                                        0,
+                                        FALSE,
+                                        GDK_CURRENT_TIME);
 
-       uri = ev_link_get_uri (link);
-       escaped = gnome_vfs_escape_host_and_path_string (uri);
+       g_free (uri);
+}
 
-       gnome_vfs_url_show (escaped);
-       g_free (escaped);
+static void
+do_action_named (EvWindow *window, EvLinkAction *action)
+{
+       const gchar *name = ev_link_action_get_name (action);
+
+       if (g_ascii_strcasecmp (name, "FirstPage") == 0) {
+               ev_window_cmd_go_first_page (NULL, window);
+       } else if (g_ascii_strcasecmp (name, "PrevPage") == 0) {
+               ev_window_cmd_go_previous_page (NULL, window);
+       } else if (g_ascii_strcasecmp (name, "NextPage") == 0) {
+               ev_window_cmd_go_next_page (NULL, window);
+       } else if (g_ascii_strcasecmp (name, "LastPage") == 0) {
+               ev_window_cmd_go_last_page (NULL, window);
+       } else if (g_ascii_strcasecmp (name, "GoToPage") == 0) {
+               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 "
+                          "(http://bugzilla.gnome.org) with a testcase.",
+                          name);
+       }
 }
 
 static void
-view_external_link_cb (EvView *view, EvLink *link, EvWindow *window)
+view_external_link_cb (EvView *view, EvLinkAction *action, EvWindow *window)
 {
-       switch (ev_link_get_link_type (link)) {
-       case EV_LINK_TYPE_EXTERNAL_URI:
-               launch_external_uri (window, link);
-               break;
-       case EV_LINK_TYPE_LAUNCH:
-               launch_link (window, link);
-               break;
-       default:
-               g_assert_not_reached ();
+       switch (ev_link_action_get_action_type (action)) {
+               case EV_LINK_ACTION_TYPE_EXTERNAL_URI:
+                       launch_external_uri (window, action);
+                       break;
+               case EV_LINK_ACTION_TYPE_LAUNCH:
+                       launch_action (window, action);
+                       break;
+               case EV_LINK_ACTION_TYPE_GOTO_REMOTE:
+                       open_remote_link (window, action);
+                       break;
+               case EV_LINK_ACTION_TYPE_NAMED:
+                       do_action_named (window, action);
+                       break;
+               default:
+                       g_assert_not_reached ();
        }
 }
 
 static void
-ev_popup_cmd_open_link (GtkAction *action, EvWindow *window)
+ev_view_popup_cmd_open_link (GtkAction *action, EvWindow *window)
+{
+       ev_view_handle_link (EV_VIEW (window->priv->view), window->priv->link);
+}
+
+static void
+ev_view_popup_cmd_open_link_new_window (GtkAction *action, EvWindow *window)
 {
-       ev_view_goto_link (EV_VIEW (window->priv->view), window->priv->link);
+       EvLinkAction *ev_action = NULL;
+       EvLinkDest   *dest;
+
+       ev_action = ev_link_get_action (window->priv->link);
+       if (!ev_action)
+               return;
+
+       dest = ev_link_action_get_dest (ev_action);
+       if (!dest)
+               return;
+
+       ev_window_cmd_file_open_copy_at_dest (window, dest);
 }
 
 static void
-ev_popup_cmd_copy_link_address (GtkAction *action, EvWindow *window)
+ev_view_popup_cmd_copy_link_address (GtkAction *action, EvWindow *window)
 {
        GtkClipboard *clipboard;
+       EvLinkAction *ev_action;
        const gchar *uri;
 
-       uri = ev_link_get_uri (window->priv->link);
+       ev_action = ev_link_get_action (window->priv->link);
+       if (!ev_action)
+               return;
+
+       uri = ev_link_action_get_uri (ev_action);
 
        clipboard = gtk_widget_get_clipboard (GTK_WIDGET (window),
                                              GDK_SELECTION_CLIPBOARD);
        gtk_clipboard_set_text (clipboard, uri, -1);
 }
 
+static void
+ev_attachment_popup_cmd_open_attachment (GtkAction *action, EvWindow *window)
+{
+       GList *l;
+       
+       if (!window->priv->attach_list)
+               return;
+
+       for (l = window->priv->attach_list; l && l->data; l = g_list_next (l)) {
+               EvAttachment *attachment;
+               GError       *error = NULL;
+               
+               attachment = (EvAttachment *) l->data;
+               
+               ev_attachment_open (attachment, &error);
+
+               if (error) {
+                       ev_window_error_dialog (GTK_WINDOW (window),
+                                               _("Unable to open attachment"),
+                                               error);
+                       g_error_free (error);
+               }
+       }
+}
+
+static void
+attachment_save_dialog_response_cb (GtkWidget *fc,
+                                   gint       response_id,
+                                   EvWindow  *ev_window)
+{
+       gchar                *uri;
+       GList                *l;
+       GtkFileChooserAction  fc_action;
+       gboolean              is_dir;
+       
+       if (response_id != GTK_RESPONSE_OK) {
+               gtk_widget_destroy (fc);
+               return;
+       }
+
+       uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (fc));
+       
+       g_object_get (G_OBJECT (fc), "action", &fc_action, NULL);
+       is_dir = (fc_action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+       
+       for (l = ev_window->priv->attach_list; l && l->data; l = g_list_next (l)) {
+               EvAttachment *attachment;
+               gchar        *filename;
+               GError       *error = NULL;
+               
+               attachment = (EvAttachment *) l->data;
+
+               if (is_dir) {
+                       filename = g_strjoin ("/", uri,
+                                             ev_attachment_get_name (attachment),
+                                             NULL);
+               } else {
+                       filename = g_strdup (uri);
+               }
+               
+               ev_attachment_save (attachment, filename, &error);
+               g_free (filename);
+               
+               if (error) {
+                       ev_window_error_dialog (GTK_WINDOW (fc),
+                                               _("The attachment could not be saved."),
+                                               error);
+                       g_error_free (error);
+               }
+       }
+
+       g_free (uri);
+
+       gtk_widget_destroy (fc);
+}
+
+static void
+ev_attachment_popup_cmd_save_attachment_as (GtkAction *action, EvWindow *window)
+{
+       GtkWidget    *fc;
+       EvAttachment *attachment = NULL;
+
+       if (!window->priv->attach_list)
+               return;
+
+       if (g_list_length (window->priv->attach_list) == 1)
+               attachment = (EvAttachment *) window->priv->attach_list->data;
+       
+       fc = gtk_file_chooser_dialog_new (
+               _("Save a Copy"),
+               GTK_WINDOW (window),
+               attachment ? GTK_FILE_CHOOSER_ACTION_SAVE : GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
+               GTK_STOCK_CANCEL,
+               GTK_RESPONSE_CANCEL,
+               GTK_STOCK_SAVE, GTK_RESPONSE_OK,
+               NULL);
+
+       gtk_dialog_set_default_response (GTK_DIALOG (fc), GTK_RESPONSE_OK);
+       gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (fc), TRUE);
+
+       if (attachment)
+               gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (fc),
+                                                  ev_attachment_get_name (attachment));
+
+       g_signal_connect (fc, "response",
+                         G_CALLBACK (attachment_save_dialog_response_cb),
+                         window);
+
+       gtk_widget_show (fc);
+}
+
 static void
 ev_window_init (EvWindow *ev_window)
 {
@@ -3285,6 +4351,8 @@ ev_window_init (EvWindow *ev_window)
                          G_CALLBACK (window_configure_event_cb), NULL);
        g_signal_connect (ev_window, "window_state_event",
                          G_CALLBACK (window_state_event_cb), NULL);
+       g_signal_connect (ev_window, "notify",
+                         G_CALLBACK (fullscreen_timeout_cb), NULL);
 
        ev_window->priv = EV_WINDOW_GET_PRIVATE (ev_window);
 
@@ -3316,11 +4384,21 @@ ev_window_init (EvWindow *ev_window)
 
        ev_window_set_view_accels_sensitivity (ev_window, FALSE);
 
-       action_group = gtk_action_group_new ("PopupsActions");
-       ev_window->priv->popups_action_group = action_group;
+       action_group = gtk_action_group_new ("ViewPopupActions");
+       ev_window->priv->view_popup_action_group = action_group;
+       gtk_action_group_set_translation_domain (action_group, NULL);
+       gtk_action_group_add_actions (action_group, view_popup_entries,
+                                     G_N_ELEMENTS (view_popup_entries),
+                                     ev_window);
+       gtk_ui_manager_insert_action_group (ev_window->priv->ui_manager,
+                                           action_group, 0);
+
+       action_group = gtk_action_group_new ("AttachmentPopupActions");
+       ev_window->priv->attachment_popup_action_group = action_group;
        gtk_action_group_set_translation_domain (action_group, NULL);
-       gtk_action_group_add_actions (action_group, popups_entries,
-                                     G_N_ELEMENTS (popups_entries), ev_window);
+       gtk_action_group_add_actions (action_group, attachment_popup_entries,
+                                     G_N_ELEMENTS (attachment_popup_entries),
+                                     ev_window);
        gtk_ui_manager_insert_action_group (ev_window->priv->ui_manager,
                                            action_group, 0);
 
@@ -3330,7 +4408,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");
@@ -3347,14 +4436,25 @@ ev_window_init (EvWindow *ev_window)
                            FALSE, FALSE, 0);
        gtk_widget_show (toolbar_dock);
 
-       ev_window->priv->toolbar = egg_editable_toolbar_new_with_model
-                               (ev_window->priv->ui_manager, ev_application_get_toolbars_model (EV_APP));
+       ev_window->priv->toolbar = GTK_WIDGET 
+         (g_object_new (EGG_TYPE_EDITABLE_TOOLBAR,
+                        "ui-manager", ev_window->priv->ui_manager,
+                        "popup-path", "/ToolbarPopup",
+                        "model", ev_application_get_toolbars_model (EV_APP, FALSE),
+                        NULL));
+
        egg_editable_toolbar_show (EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar),
                                   "DefaultToolBar");
        gtk_box_pack_start (GTK_BOX (toolbar_dock), ev_window->priv->toolbar,
                            TRUE, TRUE, 0);
        gtk_widget_show (ev_window->priv->toolbar);
 
+       /* Preview toolbar */
+       ev_window->priv->preview_toolbar = egg_editable_toolbar_new_with_model
+                               (ev_window->priv->ui_manager, ev_application_get_toolbars_model (EV_APP, TRUE), NULL);
+       gtk_box_pack_start (GTK_BOX (ev_window->priv->main_box), ev_window->priv->preview_toolbar,
+                           FALSE, FALSE, 0);
+
        /* Add the main area */
        ev_window->priv->hpaned = gtk_hpaned_new ();
        g_signal_connect (ev_window->priv->hpaned,
@@ -3373,6 +4473,7 @@ ev_window_init (EvWindow *ev_window)
        gtk_widget_show (ev_window->priv->sidebar);
 
        /* Stub sidebar, for now */
+
        sidebar_widget = ev_sidebar_links_new ();
        ev_window->priv->sidebar_links = sidebar_widget;
        g_signal_connect (sidebar_widget,
@@ -3388,6 +4489,16 @@ ev_window_init (EvWindow *ev_window)
        ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar),
                             sidebar_widget);
 
+       sidebar_widget = ev_sidebar_attachments_new ();
+       ev_window->priv->sidebar_attachments = sidebar_widget;
+       g_signal_connect_object (sidebar_widget,
+                                "popup",
+                                G_CALLBACK (attachment_bar_menu_popup_cb),
+                                ev_window, 0);
+       gtk_widget_show (sidebar_widget);
+       ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar),
+                            sidebar_widget);
+
        sidebar_widget = ev_sidebar_thumbnails_new ();
        ev_window->priv->sidebar_thumbs = sidebar_widget;
        g_signal_connect (sidebar_widget,
@@ -3399,7 +4510,6 @@ ev_window_init (EvWindow *ev_window)
        ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar),
                             sidebar_widget);
 
-
        ev_window->priv->scrolled_window =
                GTK_WIDGET (g_object_new (GTK_TYPE_SCROLLED_WINDOW,
                                          "shadow-type", GTK_SHADOW_IN,
@@ -3431,6 +4541,7 @@ ev_window_init (EvWindow *ev_window)
        gtk_widget_show (ev_window->priv->view);
        gtk_widget_show (ev_window->priv->password_view);
 
+       /* Find Bar */
        ev_window->priv->find_bar = egg_find_bar_new ();
        gtk_box_pack_end (GTK_BOX (ev_window->priv->main_box),
                          ev_window->priv->find_bar,
@@ -3438,7 +4549,6 @@ ev_window_init (EvWindow *ev_window)
 
        /* We own a ref on these widgets, as we can swap them in and out */
        g_object_ref (ev_window->priv->view);
-       //g_object_ref (ev_window->priv->page_view);
        g_object_ref (ev_window->priv->password_view);
 
        gtk_container_add (GTK_CONTAINER (ev_window->priv->scrolled_window),
@@ -3508,37 +4618,37 @@ ev_window_init (EvWindow *ev_window)
                          "notify::visible",
                          G_CALLBACK (find_bar_search_changed_cb),
                          ev_window);
+       g_signal_connect (ev_window->priv->find_bar,
+                         "scroll",
+                         G_CALLBACK (find_bar_scroll),
+                         ev_window);
 
        /* Popups */
-       ev_window->priv->popup = gtk_ui_manager_get_widget (ev_window->priv->ui_manager,
-                                                          "/DocumentPopup");
+       ev_window->priv->view_popup = gtk_ui_manager_get_widget (ev_window->priv->ui_manager,
+                                                                "/DocumentPopup");
        ev_window->priv->link = NULL;
 
+       ev_window->priv->attachment_popup = gtk_ui_manager_get_widget (ev_window->priv->ui_manager,
+                                                                      "/AttachmentPopup");
+       ev_window->priv->attach_list = NULL;
+
        /* 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));
-       gtk_drag_dest_set (GTK_WIDGET (ev_window), GTK_DEST_DEFAULT_ALL, ev_drop_types,
-                          sizeof (ev_drop_types) / sizeof (ev_drop_types[0]),
-                          GDK_ACTION_COPY);
-       g_signal_connect (G_OBJECT (ev_window), "drag_data_received",
-                         G_CALLBACK (drag_data_received_cb), NULL);
-
        /* Set it user interface params */
-
        ev_window_setup_recent (ev_window);
+
        setup_chrome_from_metadata (ev_window);
        set_chrome_actions (ev_window);
        update_chrome_visibility (ev_window);
-       update_sidebar_visibility (ev_window);
 
-       gtk_window_set_default_size (GTK_WINDOW (ev_window),
-                                    600, 600);
+       gtk_window_set_default_size (GTK_WINDOW (ev_window), 600, 600);
+
        setup_view_from_metadata (ev_window);
+       setup_sidebar_from_metadata (ev_window, NULL);
 
         ev_window_sizing_mode_changed_cb (EV_VIEW (ev_window->priv->view), NULL, ev_window);
-       update_action_sensitivity (ev_window);
+       ev_window_setup_action_sensitivity (ev_window);
 }
 
 GtkWidget *