]> www.fi.muni.cz Git - evince.git/blobdiff - shell/ev-window.c
Updated list of documenters in about dialog
[evince.git] / shell / ev-window.c
index 03f98cbbb93c1bf28d8bb5512a16d9fbf657e732..9ef85aab2d7051d56b362c5ebb27c0b5808597ad 100644 (file)
@@ -1,10 +1,12 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; c-indent-level: 8 -*- */
 /* this file is part of evince, a gnome document viewer
  *
+ *  Copyright (C) 2009 Juanjo Marín <juanj.marin@juntadeandalucia.es>
+ *  Copyright (C) 2008 Carlos Garcia Campos
  *  Copyright (C) 2004 Martin Kretzschmar
  *  Copyright (C) 2004 Red Hat, Inc.
  *  Copyright (C) 2000, 2001, 2002, 2003, 2004 Marco Pesenti Gritti
- *  Copyright (C) 2003, 2004, 2005 Christian Persch
+ *  Copyright © 2003, 2004, 2005, 2009 Christian Persch
  *
  *  Author:
  *    Martin Kretzschmar <martink@gnome.org>
@@ -21,7 +23,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <math.h>
 
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkprintunixdialog.h>
-#include <gconf/gconf-client.h>
 
 #include "egg-editable-toolbar.h"
 #include "egg-toolbar-editor.h"
@@ -55,7 +56,9 @@
 #include "ev-document-fonts.h"
 #include "ev-document-images.h"
 #include "ev-document-links.h"
-#include "ev-document-thumbnails.h"
+#include "ev-document-annotations.h"
+#include "ev-document-type-builtins.h"
+#include "ev-document-misc.h"
 #include "ev-file-exporter.h"
 #include "ev-file-helpers.h"
 #include "ev-file-monitor.h"
 #include "ev-job-scheduler.h"
 #include "ev-jobs.h"
 #include "ev-message-area.h"
-#include "ev-metadata-manager.h"
-#include "ev-mount-operation.h"
+#include "ev-metadata.h"
 #include "ev-navigation-action.h"
 #include "ev-open-recent-action.h"
 #include "ev-page-action.h"
-#include "ev-password.h"
 #include "ev-password-view.h"
 #include "ev-properties-dialog.h"
+#include "ev-sidebar-annotations.h"
 #include "ev-sidebar-attachments.h"
+#include "ev-sidebar-bookmarks.h"
 #include "ev-sidebar.h"
 #include "ev-sidebar-links.h"
 #include "ev-sidebar-page.h"
 #include "ev-sidebar-thumbnails.h"
+#include "ev-sidebar-layers.h"
 #include "ev-stock-icons.h"
 #include "ev-utils.h"
+#include "ev-keyring.h"
 #include "ev-view.h"
+#include "ev-view-presentation.h"
+#include "ev-view-type-builtins.h"
 #include "ev-window.h"
 #include "ev-window-title.h"
+#include "ev-print-operation.h"
+#include "ev-progress-message-area.h"
+#include "ev-annotation-properties-dialog.h"
+#include "ev-bookmarks.h"
+#include "ev-bookmark-action.h"
 
 #ifdef ENABLE_DBUS
 #include "ev-media-player-keys.h"
 #endif /* ENABLE_DBUS */
 
-#ifdef ENABLE_PDF
-#include <poppler.h>
-#endif
-
 typedef enum {
        PAGE_MODE_DOCUMENT,
        PAGE_MODE_PASSWORD
@@ -103,10 +111,15 @@ typedef enum {
        EV_CHROME_RAISE_TOOLBAR = 1 << 3,
        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;
 
+typedef enum {
+       EV_SAVE_DOCUMENT,
+       EV_SAVE_ATTACHMENT,
+       EV_SAVE_IMAGE
+} EvSaveType;
+
 struct _EvWindowPrivate {
        /* UI */
        EvChrome chrome;
@@ -120,16 +133,32 @@ struct _EvWindowPrivate {
        GtkWidget *find_bar;
        GtkWidget *scrolled_window;
        GtkWidget *view;
+       GtkWidget *presentation_view;
        GtkWidget *message_area;
        GtkWidget *password_view;
        GtkWidget *sidebar_thumbs;
        GtkWidget *sidebar_links;
        GtkWidget *sidebar_attachments;
+       GtkWidget *sidebar_layers;
+       GtkWidget *sidebar_annots;
+       GtkWidget *sidebar_bookmarks;
+
+       /* Settings */
+       GSettings *settings;
+       GSettings *default_settings;
+       GSettings *lockdown_settings;
+
+       /* Menubar accels */
+       guint           menubar_accel_keyval;
+       GdkModifierType menubar_accel_modifier;
+
+       /* Progress Messages */
+       guint progress_idle;
+       GCancellable *progress_cancellable;
 
        /* Dialogs */
        GtkWidget *properties;
        GtkWidget *print_dialog;
-       GtkWidget *password_dialog;
 
        /* UI Builders */
        GtkActionGroup   *action_group;
@@ -138,75 +167,104 @@ struct _EvWindowPrivate {
        GtkRecentManager *recent_manager;
        GtkActionGroup   *recent_action_group;
        guint             recent_ui_id;
+       GtkActionGroup   *bookmarks_action_group;
+       guint             bookmarks_ui_id;
        GtkUIManager     *ui_manager;
 
        /* Fullscreen mode */
        GtkWidget *fullscreen_toolbar;
 
-       /* Presentation mode */
-       guint      presentation_timeout_id;
-
-       /* Preview mode */
-       GtkWidget *preview_toolbar;
-       gchar     *print_settings_file;
-
        /* Popup view */
-       GtkWidget *view_popup;
-       EvLink    *link;
-       EvImage   *image;
+       GtkWidget    *view_popup;
+       EvLink       *link;
+       EvImage      *image;
+       EvAnnotation *annot;
 
        /* Popup attachment */
        GtkWidget    *attachment_popup;
        GList        *attach_list;
 
        /* Document */
+       EvDocumentModel *model;
        char *uri;
+       glong uri_mtime;
        char *local_uri;
-       EvLinkDest *dest;
-       gboolean unlink_temp_file;
        gboolean in_reload;
        EvFileMonitor *monitor;
        guint setup_document_idle;
        
        EvDocument *document;
        EvHistory *history;
-       EvPageCache *page_cache;
        EvWindowPageMode page_mode;
        EvWindowTitle *title;
+       EvMetadata *metadata;
+       EvBookmarks *bookmarks;
+       gboolean is_new_doc;
+
+       /* Load params */
+       EvLinkDest       *dest;
+       gchar            *search_string;
+       EvWindowRunMode   window_mode;
 
        EvJob            *load_job;
        EvJob            *reload_job;
        EvJob            *thumbnail_job;
        EvJob            *save_job;
-       EvJob            *print_job;
        EvJob            *find_job;
 
        /* Printing */
-       gboolean          print_preview;
-       GtkPrintJob      *gtk_print_job;
-       GtkPrinter       *printer;
+       GQueue           *print_queue;
        GtkPrintSettings *print_settings;
        GtkPageSetup     *print_page_setup;
+       gboolean          close_after_print;
 
+#ifdef ENABLE_DBUS
+       /* DBus */
+       guint  dbus_object_id;
+       gchar *dbus_object_path;
+#endif
 };
 
 #define EV_WINDOW_GET_PRIVATE(object) \
        (G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_WINDOW, EvWindowPrivate))
 
+#define EV_WINDOW_IS_PRESENTATION(w) (w->priv->presentation_view != NULL)
+
 #define PAGE_SELECTOR_ACTION   "PageSelector"
 #define ZOOM_CONTROL_ACTION    "ViewZoom"
 #define NAVIGATION_ACTION      "Navigation"
 
-#define GCONF_OVERRIDE_RESTRICTIONS "/apps/evince/override_restrictions"
-#define GCONF_LOCKDOWN_SAVE         "/desktop/gnome/lockdown/disable_save_to_disk"
-#define GCONF_LOCKDOWN_PRINT        "/desktop/gnome/lockdown/disable_printing"
+#define GS_LOCKDOWN_SCHEMA_NAME  "org.gnome.desktop.lockdown"
+#define GS_LOCKDOWN_SAVE         "disable-save-to-disk"
+#define GS_LOCKDOWN_PRINT        "disable-printing"
+#define GS_LOCKDOWN_PRINT_SETUP  "disable-print-setup"
+
+#ifdef ENABLE_DBUS
+#define EV_WINDOW_DBUS_OBJECT_PATH "/org/gnome/evince/Window/%d"
+#define EV_WINDOW_DBUS_INTERFACE   "org.gnome.evince.Window"
+#endif
 
-#define PRESENTATION_TIMEOUT 5
+#define GS_SCHEMA_NAME           "org.gnome.Evince"
+#define GS_OVERRIDE_RESTRICTIONS "override-restrictions"
 
 #define SIDEBAR_DEFAULT_SIZE    132
 #define LINKS_SIDEBAR_ID "links"
 #define THUMBNAILS_SIDEBAR_ID "thumbnails"
 #define ATTACHMENTS_SIDEBAR_ID "attachments"
+#define LAYERS_SIDEBAR_ID "layers"
+#define ANNOTS_SIDEBAR_ID "annotations"
+#define BOOKMARKS_SIDEBAR_ID "bookmarks"
+
+#define EV_PRINT_SETTINGS_FILE  "print-settings"
+#define EV_PRINT_SETTINGS_GROUP "Print Settings"
+#define EV_PAGE_SETUP_GROUP     "Page Setup"
+
+#define EV_TOOLBARS_FILENAME "evince-toolbar.xml"
+
+#define MIN_SCALE 0.05409
+#define PAGE_CACHE_SIZE 52428800 /* 50MB */
+
+#define MAX_RECENT_ITEM_LEN (40)
 
 static const gchar *document_print_settings[] = {
        GTK_PRINT_SETTINGS_N_COPIES,
@@ -216,30 +274,32 @@ static const gchar *document_print_settings[] = {
        GTK_PRINT_SETTINGS_SCALE,
        GTK_PRINT_SETTINGS_PRINT_PAGES,
        GTK_PRINT_SETTINGS_PAGE_RANGES,
-       GTK_PRINT_SETTINGS_PAGE_SET
+       GTK_PRINT_SETTINGS_PAGE_SET,
+       GTK_PRINT_SETTINGS_OUTPUT_URI
 };
 
 static void    ev_window_update_actions                (EvWindow         *ev_window);
 static void     ev_window_sidebar_visibility_changed_cb (EvSidebar        *ev_sidebar,
                                                         GParamSpec       *pspec,
                                                         EvWindow         *ev_window);
+static void     ev_window_view_toolbar_cb               (GtkAction        *action,
+                                                        EvWindow         *ev_window);
 static void     ev_window_set_page_mode                 (EvWindow         *window,
                                                         EvWindowPageMode  page_mode);
 static void    ev_window_load_job_cb                   (EvJob            *job,
                                                         gpointer          data);
-static void     ev_window_reload_document               (EvWindow         *window);
+static void     ev_window_reload_document               (EvWindow         *window,
+                                                        EvLinkDest *dest);
 static void     ev_window_reload_job_cb                 (EvJob            *job,
                                                         EvWindow         *window);
 static void     ev_window_set_icon_from_thumbnail       (EvJobThumbnail   *job,
                                                         EvWindow         *ev_window);
-static void     ev_window_print_job_cb                  (EvJob            *job,
-                                                        EvWindow         *window);
 static void     ev_window_save_job_cb                   (EvJob            *save,
                                                         EvWindow         *window);
-static void     ev_window_sizing_mode_changed_cb        (EvView           *view,
+static void     ev_window_sizing_mode_changed_cb        (EvDocumentModel  *model,
                                                         GParamSpec       *pspec,
                                                         EvWindow         *ev_window);
-static void     ev_window_zoom_changed_cb              (EvView           *view,
+static void     ev_window_zoom_changed_cb              (EvDocumentModel  *model,
                                                         GParamSpec       *pspec,
                                                         EvWindow         *ev_window);
 static void     ev_window_add_recent                    (EvWindow         *window,
@@ -254,7 +314,6 @@ static void     ev_window_stop_presentation             (EvWindow         *windo
                                                         gboolean          unfullscreen_window);
 static void     ev_window_cmd_view_presentation         (GtkAction        *action,
                                                         EvWindow         *window);
-static void     ev_window_run_preview                   (EvWindow         *window);
 static void     ev_view_popup_cmd_open_link             (GtkAction        *action,
                                                         EvWindow         *window);
 static void     ev_view_popup_cmd_open_link_new_window  (GtkAction        *action,
@@ -265,6 +324,8 @@ static void     ev_view_popup_cmd_save_image_as         (GtkAction        *actio
                                                         EvWindow         *window);
 static void     ev_view_popup_cmd_copy_image            (GtkAction        *action,
                                                         EvWindow         *window);
+static void     ev_view_popup_cmd_annot_properties      (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, 
@@ -282,15 +343,33 @@ static void     ev_window_cmd_edit_find                 (GtkAction        *actio
 static void     find_bar_search_changed_cb              (EggFindBar       *find_bar,
                                                         GParamSpec       *param,
                                                         EvWindow         *ev_window);
-static void     ev_window_do_preview_print              (EvWindow         *window);
+static void     view_external_link_cb                   (EvWindow         *window,
+                                                        EvLinkAction     *action);
 static void     ev_window_load_file_remote              (EvWindow         *ev_window,
                                                         GFile            *source_file);
 static void     ev_window_media_player_key_pressed      (EvWindow         *window,
                                                         const gchar      *key,
                                                         gpointer          user_data);
+static void     ev_window_update_max_min_scale          (EvWindow         *window);
+#ifdef ENABLE_DBUS
+static void    ev_window_emit_closed                   (EvWindow         *window);
+static void    ev_window_emit_doc_loaded               (EvWindow         *window);
+#endif
+static void     ev_window_setup_bookmarks               (EvWindow         *window);
+
+static guint ev_window_n_copies = 0;
 
 G_DEFINE_TYPE (EvWindow, ev_window, GTK_TYPE_WINDOW)
 
+static gdouble
+get_screen_dpi (EvWindow *window)
+{
+       GdkScreen *screen;
+
+       screen = gtk_window_get_screen (GTK_WINDOW (window));
+       return ev_document_misc_get_screen_dpi (screen);
+}
+
 static void
 ev_window_set_action_sensitive (EvWindow   *ev_window,
                                const char *name,
@@ -307,7 +386,6 @@ ev_window_setup_action_sensitivity (EvWindow *ev_window)
 {
        EvDocument *document = ev_window->priv->document;
        const EvDocumentInfo *info = NULL;
-
        gboolean has_document = FALSE;
        gboolean ok_to_print = TRUE;
        gboolean ok_to_copy = TRUE;
@@ -317,15 +395,10 @@ ev_window_setup_action_sensitivity (EvWindow *ev_window)
        gboolean has_pages = FALSE;
        gboolean can_find = FALSE;
 
-       GConfClient *client;
-
        if (document) {
                has_document = TRUE;
-               info = ev_page_cache_get_info (ev_window->priv->page_cache);
-       }
-
-       if (has_document && ev_window->priv->page_cache) {
-               has_pages = ev_page_cache_get_n_pages (ev_window->priv->page_cache) > 0;
+               has_pages = ev_document_get_n_pages (document) > 0;
+               info = ev_document_get_info (document);
        }
 
        if (!info || info->fields_mask == 0) {
@@ -340,35 +413,36 @@ ev_window_setup_action_sensitivity (EvWindow *ev_window)
                can_find = TRUE;
        }
 
-       client = gconf_client_get_default ();
-       override_restrictions = gconf_client_get_bool (client, 
-                                                      GCONF_OVERRIDE_RESTRICTIONS, 
-                                                      NULL);
+       if (has_document && ev_window->priv->settings) {
+               override_restrictions =
+                       g_settings_get_boolean (ev_window->priv->settings,
+                                               GS_OVERRIDE_RESTRICTIONS);
+       }
+
        if (!override_restrictions && info && info->fields_mask & EV_DOCUMENT_INFO_PERMISSIONS) {
                ok_to_print = (info->permissions & EV_DOCUMENT_PERMISSIONS_OK_TO_PRINT);
                ok_to_copy = (info->permissions & EV_DOCUMENT_PERMISSIONS_OK_TO_COPY);
        }
 
-       if (has_document && !EV_IS_FILE_EXPORTER(document))
+       if (has_document && !ev_print_operation_exists_for_document(document))
                ok_to_print = FALSE;
 
-       
-       if (gconf_client_get_bool (client, GCONF_LOCKDOWN_SAVE, NULL)) {
+       if (has_document && ev_window->priv->lockdown_settings &&
+           g_settings_get_boolean (ev_window->priv->lockdown_settings, GS_LOCKDOWN_SAVE)) {
                ok_to_copy = FALSE;
        }
 
-       if (gconf_client_get_bool (client, GCONF_LOCKDOWN_PRINT, NULL)) {
+       if (has_document && ev_window->priv->lockdown_settings &&
+           g_settings_get_boolean (ev_window->priv->lockdown_settings, GS_LOCKDOWN_PRINT)) {
                ok_to_print = FALSE;
        }
 
-       g_object_unref (client);
-
        /* File menu */
        ev_window_set_action_sensitive (ev_window, "FileOpenCopy", has_document);
        ev_window_set_action_sensitive (ev_window, "FileSaveAs", has_document && ok_to_copy);
-       ev_window_set_action_sensitive (ev_window, "FilePrintSetup", has_pages && ok_to_print);
        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);
+       ev_window_set_action_sensitive (ev_window, "FileOpenContainingFolder", has_document);
 
         /* Edit menu */
        ev_window_set_action_sensitive (ev_window, "EditSelectAll", has_pages && can_get_text);
@@ -384,12 +458,16 @@ ev_window_setup_action_sensitivity (EvWindow *ev_window)
        ev_window_set_action_sensitive (ev_window, "ViewPageWidth", has_pages);
        ev_window_set_action_sensitive (ev_window, "ViewReload", has_pages);
        ev_window_set_action_sensitive (ev_window, "ViewAutoscroll", has_pages);
+       ev_window_set_action_sensitive (ev_window, "ViewInvertedColors", has_pages);
+
+       /* Bookmarks menu */
+       ev_window_set_action_sensitive (ev_window, "BookmarksAdd",
+                                       has_pages && ev_window->priv->bookmarks);
 
        /* 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,  FALSE);
-       ev_window_set_action_sensitive (ev_window, "PreviewPrint", has_pages && ok_to_print);
 
         ev_window_update_actions (ev_window);
 }
@@ -402,10 +480,11 @@ ev_window_update_actions (EvWindow *ev_window)
        gboolean has_pages = FALSE;
        gboolean presentation_mode;
        gboolean can_find_in_page = FALSE;
+       EvSizingMode sizing_mode;
 
-       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);
+       if (ev_window->priv->document) {
+               page = ev_document_model_get_page (ev_window->priv->model);
+               n_pages = ev_document_get_n_pages (ev_window->priv->document);
                has_pages = n_pages > 0;
        }
 
@@ -419,8 +498,10 @@ ev_window_update_actions (EvWindow *ev_window)
                                        has_pages && can_find_in_page);
        ev_window_set_action_sensitive (ev_window, "EditFindPrevious",
                                        has_pages && can_find_in_page);
+        ev_window_set_action_sensitive (ev_window, "F3",
+                                        has_pages && can_find_in_page);
 
-       presentation_mode = ev_view_get_presentation (view);
+       presentation_mode = EV_WINDOW_IS_PRESENTATION (ev_window);
        
        ev_window_set_action_sensitive (ev_window, "ViewZoomIn",
                                        has_pages &&
@@ -444,18 +525,17 @@ ev_window_update_actions (EvWindow *ev_window)
                ev_window_set_action_sensitive (ev_window, "GoLastPage", FALSE);
        }
 
-       if (has_pages &&
-           ev_view_get_sizing_mode (view) != EV_SIZING_FIT_WIDTH &&
-           ev_view_get_sizing_mode (view) != EV_SIZING_BEST_FIT) {
+       sizing_mode = ev_document_model_get_sizing_mode (ev_window->priv->model);
+       if (has_pages && sizing_mode != EV_SIZING_FIT_WIDTH && sizing_mode != EV_SIZING_BEST_FIT) {
                GtkAction *action;
                float      zoom;
                float      real_zoom;
 
-               action = gtk_action_group_get_action (ev_window->priv->action_group, 
+               action = gtk_action_group_get_action (ev_window->priv->action_group,
                                                      ZOOM_CONTROL_ACTION);
 
-               real_zoom = ev_view_get_zoom (EV_VIEW (ev_window->priv->view));
-               real_zoom *= 72.0 / get_screen_dpi (GTK_WINDOW (ev_window));
+               real_zoom = ev_document_model_get_scale (ev_window->priv->model);
+               real_zoom *= 72.0 / get_screen_dpi (ev_window);
                zoom = ephy_zoom_get_nearest_zoom_level (real_zoom);
 
                ephy_zoom_action_set_zoom_level (EPHY_ZOOM_ACTION (action), zoom);
@@ -484,6 +564,8 @@ ev_window_set_view_accels_sensitivity (EvWindow *window, gboolean 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, "p", sensitive);
+               ev_window_set_action_sensitive (window, "n", sensitive);
 
                ev_window_set_action_sensitive (window, "Slash", sensitive && can_find);
        }
@@ -506,10 +588,9 @@ update_chrome_visibility (EvWindow *window)
        EvWindowPrivate *priv = window->priv;
        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));
+       presentation = EV_WINDOW_IS_PRESENTATION (window);
+       fullscreen = ev_document_model_get_fullscreen (priv->model);
        fullscreen_mode = fullscreen || presentation;
 
        menubar = (priv->chrome & EV_CHROME_MENUBAR) != 0 && !fullscreen_mode;
@@ -518,19 +599,14 @@ update_chrome_visibility (EvWindow *window)
        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 && !presentation;
-       preview_toolbar = (priv->chrome& EV_CHROME_PREVIEW_TOOLBAR);
+       sidebar = (priv->chrome & EV_CHROME_SIDEBAR) != 0 && priv->document && !presentation;
 
        set_widget_visibility (priv->menubar, menubar); 
        set_widget_visibility (priv->toolbar, toolbar);
        set_widget_visibility (priv->find_bar, findbar);
        set_widget_visibility (priv->sidebar, sidebar);
        
-       if (priv->preview_toolbar)
-               set_widget_visibility (priv->preview_toolbar, preview_toolbar);
-
        ev_window_set_action_sensitive (window, "EditToolbar", toolbar);
-       gtk_widget_set_sensitive (priv->menubar, menubar);
 
        if (priv->fullscreen_toolbar != NULL) {
                set_widget_visibility (priv->fullscreen_toolbar, fullscreen_toolbar);
@@ -555,16 +631,8 @@ update_sizing_buttons (EvWindow *window)
        GtkActionGroup *action_group = window->priv->action_group;
        GtkAction *action;
        gboolean best_fit, page_width;
-       EvSizingMode sizing_mode;
-
-       if (window->priv->view == NULL)
-               return;
-
-       g_object_get (window->priv->view,
-                     "sizing_mode", &sizing_mode,
-                     NULL);
 
-       switch (sizing_mode) {
+       switch (ev_document_model_get_sizing_mode (window->priv->model)) {
                case EV_SIZING_BEST_FIT:
                        best_fit = TRUE;
                        page_width = FALSE;
@@ -603,6 +671,22 @@ update_sizing_buttons (EvWindow *window)
        }
 }
 
+static void
+update_chrome_actions (EvWindow *window)
+{
+       EvWindowPrivate *priv = window->priv;
+       GtkActionGroup *action_group = priv->action_group;
+       GtkAction *action;
+
+       action= gtk_action_group_get_action (action_group, "ViewToolbar");
+       g_signal_handlers_block_by_func
+               (action, G_CALLBACK (ev_window_view_toolbar_cb), window);
+       gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
+                                     (priv->chrome & EV_CHROME_TOOLBAR) != 0);
+       g_signal_handlers_unblock_by_func
+               (action, G_CALLBACK (ev_window_view_toolbar_cb), window);
+}
+
 /**
  * ev_window_is_empty:
  * @ev_window: The instance of the #EvWindow.
@@ -654,73 +738,79 @@ ev_window_message_area_response_cb (EvMessageArea *area,
 }
 
 static void
-ev_window_error_message (GtkWindow *window, const gchar *msg, GError *error)
+ev_window_error_message (EvWindow    *window,
+                        GError      *error,
+                        const gchar *format,
+                        ...)
 {
        GtkWidget *area;
+       va_list    args;
+       gchar     *msg = NULL;
 
-       if (EV_WINDOW (window)->priv->message_area)
+       if (window->priv->message_area)
                return;
 
+       va_start (args, format);
+       msg = g_strdup_vprintf (format, args);
+       va_end (args);
+       
        area = ev_message_area_new (GTK_MESSAGE_ERROR,
                                    msg,
                                    GTK_STOCK_CLOSE,
-                                   GTK_RESPONSE_CANCEL,
+                                   GTK_RESPONSE_CLOSE,
                                    NULL);
+       g_free (msg);
+       
        if (error)
                ev_message_area_set_secondary_text (EV_MESSAGE_AREA (area), error->message);
        g_signal_connect (area, "response",
                          G_CALLBACK (ev_window_message_area_response_cb),
                          window);
        gtk_widget_show (area);
-       ev_window_set_message_area (EV_WINDOW (window), area);
+       ev_window_set_message_area (window, area);
 }
 
 static void
-ev_window_warning_message (GtkWindow *window, const gchar *msg)
+ev_window_warning_message (EvWindow    *window,
+                          const gchar *format,
+                          ...)
 {
        GtkWidget *area;
+       va_list    args;
+       gchar     *msg = NULL;
 
-       if (EV_WINDOW (window)->priv->message_area)
+       if (window->priv->message_area)
                return;
 
+       va_start (args, format);
+       msg = g_strdup_vprintf (format, args);
+       va_end (args);
+
        area = ev_message_area_new (GTK_MESSAGE_WARNING,
                                    msg,
                                    GTK_STOCK_CLOSE,
-                                   GTK_RESPONSE_CANCEL,
+                                   GTK_RESPONSE_CLOSE,
                                    NULL);
+       g_free (msg);
        
        g_signal_connect (area, "response",
                          G_CALLBACK (ev_window_message_area_response_cb),
                          window);
        gtk_widget_show (area);
-       ev_window_set_message_area (EV_WINDOW (window), area);
-}
-
-static void
-page_changed_cb (EvPageCache *page_cache,
-                gint         page,
-                EvWindow    *ev_window)
-{
-       ev_window_update_actions (ev_window);
-
-       ev_window_update_find_status_message (ev_window);
-
-       if (!ev_window_is_empty (ev_window))
-               ev_metadata_manager_set_int (ev_window->priv->uri, "page", page);
+       ev_window_set_message_area (window, area);
 }
 
-typedef struct _FindTask {
+typedef struct _PageTitleData {
        const gchar *page_label;
-       gchar *chapter;
-} FindTask;
+       gchar       *page_title;
+} PageTitleData;
 
 static gboolean
-ev_window_find_chapter (GtkTreeModel *tree_model,
-                       GtkTreePath  *path,
-                       GtkTreeIter  *iter,
-                       gpointer      data)
+ev_window_find_page_title (GtkTreeModel  *tree_model,
+                          GtkTreePath   *path,
+                          GtkTreeIter   *iter,
+                          PageTitleData *data)
 {
-       FindTask *task = (FindTask *)data;
        gchar *page_string;
        
        gtk_tree_model_get (tree_model, iter,
@@ -730,9 +820,9 @@ ev_window_find_chapter (GtkTreeModel *tree_model,
        if (!page_string)
                return FALSE;
        
-       if (!strcmp (page_string, task->page_label)) {
+       if (!strcmp (page_string, data->page_label)) {
                gtk_tree_model_get (tree_model, iter,
-                                   EV_DOCUMENT_LINKS_COLUMN_MARKUP, &task->chapter
+                                   EV_DOCUMENT_LINKS_COLUMN_MARKUP, &data->page_title
                                    -1);
                g_free (page_string);
                return TRUE;
@@ -742,12 +832,41 @@ ev_window_find_chapter (GtkTreeModel *tree_model,
        return FALSE;
 }
 
+static gchar *
+ev_window_get_page_title (EvWindow    *window,
+                         const gchar *page_label)
+{
+       if (EV_IS_DOCUMENT_LINKS (window->priv->document) &&
+           ev_document_links_has_document_links (EV_DOCUMENT_LINKS (window->priv->document))) {
+               PageTitleData data;
+               GtkTreeModel *model;
+
+               data.page_label = page_label;
+               data.page_title = NULL;
+
+               g_object_get (G_OBJECT (window->priv->sidebar_links),
+                             "model", &model,
+                             NULL);
+               if (model) {
+                       gtk_tree_model_foreach (model,
+                                               (GtkTreeModelForeachFunc)ev_window_find_page_title,
+                                               &data);
+
+                       g_object_unref (model);
+               }
+
+               return data.page_title;
+       }
+
+       return NULL;
+}
+
 static void
 ev_window_add_history (EvWindow *window, gint page, EvLink *link)
 {
        gchar *page_label = NULL;
+       gchar *page_title;
        gchar *link_title;
-       FindTask find_task;
        EvLink *real_link;
        EvLinkAction *action;
        EvLinkDest *dest;
@@ -761,44 +880,28 @@ ev_window_add_history (EvWindow *window, gint page, EvLink *link)
        if (link) {
                action = g_object_ref (ev_link_get_action (link));
                dest = ev_link_action_get_dest (action);
-               page = ev_link_dest_get_page (dest);
-               page_label = ev_view_page_label_from_dest (EV_VIEW (window->priv->view), dest);
+               page_label = ev_document_links_get_dest_page_label (EV_DOCUMENT_LINKS (window->priv->document), dest);
        } else {
                dest = ev_link_dest_new_page (page);
                action = ev_link_action_new_dest (dest);
-               page_label = ev_page_cache_get_page_label (window->priv->page_cache, page);
+               page_label = ev_document_get_page_label (window->priv->document, page);
        }
 
        if (!page_label)
                return;
-       
-       find_task.page_label = page_label;
-       find_task.chapter = NULL;
-       
-       if (ev_document_links_has_document_links (EV_DOCUMENT_LINKS (window->priv->document))) {
-               GtkTreeModel *model;
-       
-               g_object_get (G_OBJECT (window->priv->sidebar_links), "model", &model, NULL);
-               
-               if (model) {
-                       gtk_tree_model_foreach (model,
-                                               ev_window_find_chapter,
-                                               &find_task);
-       
-                       g_object_unref (model);
-               }
-       }
 
-       if (find_task.chapter)
-               link_title = g_strdup_printf (_("Page %s - %s"), page_label, find_task.chapter);
-       else
+       page_title = ev_window_get_page_title (window, page_label);
+       if (page_title) {
+               link_title = g_strdup_printf (_("Page %s — %s"), page_label, page_title);
+               g_free (page_title);
+       } else {
                link_title = g_strdup_printf (_("Page %s"), page_label);
-       
+       }
+
        real_link = ev_link_new (link_title, action);
        
        ev_history_add_link (window->priv->history, real_link);
 
-       g_free (find_task.chapter);
        g_free (link_title);
        g_free (page_label);
        g_object_unref (real_link);
@@ -807,56 +910,119 @@ ev_window_add_history (EvWindow *window, gint page, EvLink *link)
 static void
 view_handle_link_cb (EvView *view, EvLink *link, EvWindow *window)
 {
-       int current_page = ev_page_cache_get_current_page (window->priv->page_cache);
+       int current_page = ev_document_model_get_page (window->priv->model);
        
        ev_window_add_history (window, 0, link);
        ev_window_add_history (window, current_page, NULL);
 }
 
 static void
-history_changed_cb (EvPageCache *page_cache,
-                   gint         page,
-                   EvWindow    *window)
+view_selection_changed_cb (EvView   *view,
+                          EvWindow *window)
 {
-       int current_page = ev_page_cache_get_current_page (window->priv->page_cache);
-
-       ev_window_add_history (window, page, NULL);
-       ev_window_add_history (window, current_page, NULL);
+       ev_window_set_action_sensitive (window, "EditCopy",
+                                       ev_view_get_has_selection (view));
+}
 
-       return;
+static void
+view_layers_changed_cb (EvView   *view,
+                       EvWindow *window)
+{
+       ev_sidebar_layers_update_layers_state (EV_SIDEBAR_LAYERS (window->priv->sidebar_layers));
 }
 
 static void
-update_document_mode (EvWindow *window, EvDocumentMode mode)
+ev_window_page_changed_cb (EvWindow        *ev_window,
+                          gint             old_page,
+                          gint             new_page,
+                          EvDocumentModel *model)
 {
-       if (mode == EV_DOCUMENT_MODE_PRESENTATION) {
-               ev_window_run_presentation (window);
+       ev_window_update_actions (ev_window);
+
+       ev_window_update_find_status_message (ev_window);
+
+       if (abs (new_page - old_page) > 1) {
+               ev_window_add_history (ev_window, new_page, NULL);
+               ev_window_add_history (ev_window, old_page, NULL);
        }
-       else if (mode == EV_DOCUMENT_MODE_FULL_SCREEN) {
-               ev_window_run_fullscreen (window);
+
+       if (ev_window->priv->metadata && !ev_window_is_empty (ev_window))
+               ev_metadata_set_int (ev_window->priv->metadata, "page", new_page);
+}
+
+static const gchar *
+ev_window_sidebar_get_current_page_id (EvWindow *ev_window)
+{
+       GtkWidget   *current_page;
+       const gchar *id;
+
+       g_object_get (ev_window->priv->sidebar,
+                     "current_page", &current_page,
+                     NULL);
+
+       if (current_page == ev_window->priv->sidebar_links) {
+               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 if (current_page == ev_window->priv->sidebar_layers) {
+               id = LAYERS_SIDEBAR_ID;
+       } else if (current_page == ev_window->priv->sidebar_annots) {
+               id = ANNOTS_SIDEBAR_ID;
+       } else if (current_page == ev_window->priv->sidebar_bookmarks) {
+               id = BOOKMARKS_SIDEBAR_ID;
+       } else {
+               g_assert_not_reached();
        }
+
+       g_object_unref (current_page);
+
+       return id;
 }
 
 static void
-setup_document_from_metadata (EvWindow *window)
+ev_window_sidebar_set_current_page (EvWindow    *window,
+                                   const gchar *page_id)
 {
-       char *uri = window->priv->uri;
-       GValue page = { 0, };
-       gint n_pages;
-       gint new_page;
+       EvDocument *document = window->priv->document;
+       EvSidebar  *sidebar = EV_SIDEBAR (window->priv->sidebar);
+       GtkWidget  *links = window->priv->sidebar_links;
+       GtkWidget  *thumbs = window->priv->sidebar_thumbs;
+       GtkWidget  *attachments = window->priv->sidebar_attachments;
+       GtkWidget  *annots = window->priv->sidebar_annots;
+       GtkWidget  *layers = window->priv->sidebar_layers;
+       GtkWidget  *bookmarks = window->priv->sidebar_bookmarks;
+
+       if (strcmp (page_id, LINKS_SIDEBAR_ID) == 0 &&
+           ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (links), document)) {
+               ev_sidebar_set_page (sidebar, links);
+       } else if (strcmp (page_id, THUMBNAILS_SIDEBAR_ID) == 0 &&
+                  ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (thumbs), document)) {
+               ev_sidebar_set_page (sidebar, thumbs);
+       } else if (strcmp (page_id, ATTACHMENTS_SIDEBAR_ID) == 0 &&
+                  ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (attachments), document)) {
+               ev_sidebar_set_page (sidebar, attachments);
+       } else if (strcmp (page_id, LAYERS_SIDEBAR_ID) == 0 &&
+                  ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (layers), document)) {
+               ev_sidebar_set_page (sidebar, layers);
+       } else if (strcmp (page_id, ANNOTS_SIDEBAR_ID) == 0 &&
+                  ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (annots), document)) {
+               ev_sidebar_set_page (sidebar, annots);
+       } else if (strcmp (page_id, BOOKMARKS_SIDEBAR_ID) == 0 &&
+                  ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (bookmarks), document)) {
+               ev_sidebar_set_page (sidebar, bookmarks);
+       }
+}
 
-       /* 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 (!window->priv->in_reload && new_page == n_pages - 1)
-                       new_page = 0;
-               ev_page_cache_set_current_page (window->priv->page_cache,
-                                               new_page);
-               g_value_unset (&page);
+static void
+update_document_mode (EvWindow *window, EvDocumentMode mode)
+{
+       if (mode == EV_DOCUMENT_MODE_PRESENTATION) {
+               ev_window_run_presentation (window);
+       }
+       else if (mode == EV_DOCUMENT_MODE_FULL_SCREEN) {
+               ev_window_run_fullscreen (window);
        }
 }
 
@@ -864,225 +1030,290 @@ static void
 setup_chrome_from_metadata (EvWindow *window)
 {
        EvChrome chrome = EV_CHROME_NORMAL;
-       GValue show_toolbar = { 0, };
+       gboolean show_toolbar = TRUE;
+
+       if (ev_window_is_empty (window)) {
+               window->priv->chrome = chrome;
+
+               return;
+       }
 
-       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);
+       if (!window->priv->metadata) {
+               show_toolbar = g_settings_get_boolean (window->priv->default_settings, "show-toolbar");
+       } else if (!ev_metadata_get_boolean (window->priv->metadata, "show_toolbar", &show_toolbar)) {
+               if (window->priv->is_new_doc)
+                       show_toolbar = g_settings_get_boolean (window->priv->default_settings, "show-toolbar");
        }
+
+       if (!show_toolbar)
+               chrome &= ~EV_CHROME_TOOLBAR;
+
        window->priv->chrome = chrome;
 }
 
 static void
-setup_sidebar_from_metadata (EvWindow *window, EvDocument *document)
+setup_sidebar_from_metadata (EvWindow *window)
 {
-       char *uri = window->priv->uri;
-       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, };
+       EvDocument *document = window->priv->document;
+       GSettings  *settings =  window->priv->default_settings;
+       gchar      *page_id;
+       gint        sidebar_size;
+       gboolean    sidebar_visibility = TRUE;
 
-       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_window_is_empty (window))
+               return;
+
+       if (!window->priv->metadata) {
+               sidebar_visibility = g_settings_get_boolean (settings, "show-sidebar");
+       } else if (!ev_metadata_get_boolean (window->priv->metadata, "sidebar_visibility", &sidebar_visibility)) {
+               if (window->priv->is_new_doc)
+                       sidebar_visibility = g_settings_get_boolean (settings, "show-sidebar");
        }
-       
-       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_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_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), attachments);
+
+       update_chrome_flag (window, EV_CHROME_SIDEBAR, sidebar_visibility);
+       update_chrome_visibility (window);
+
+       if (!window->priv->metadata) {
+               /* Set default values */
+               gtk_paned_set_position (GTK_PANED (window->priv->hpaned),
+                                       g_settings_get_int (settings, "sidebar-size"));
+               if (document) {
+                       page_id = g_settings_get_string (settings, "sidebar-page");
+                       ev_window_sidebar_set_current_page (window, page_id);
+                       g_free (page_id);
                }
-               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);
+
+               return;
        }
 
-       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);
-               update_chrome_visibility (window);
+       if (ev_metadata_get_int (window->priv->metadata, "sidebar_size", &sidebar_size)) {
+               gtk_paned_set_position (GTK_PANED (window->priv->hpaned), sidebar_size);
+       } else if (window->priv->is_new_doc) {
+               gtk_paned_set_position (GTK_PANED (window->priv->hpaned),
+                                       g_settings_get_int (settings, "sidebar-size"));
        }
-}
 
-static void
-setup_size_from_metadata (EvWindow *window)
-{
-       char *uri = window->priv->uri;
-       GValue width = { 0, };
-       GValue height = { 0, };
-       GValue width_ratio = { 0, };
-       GValue height_ratio = { 0, };
-       GValue maximized = { 0, };
-       GValue x = { 0, };
-       GValue y = { 0, };
-
-       if (ev_metadata_manager_get (uri, "window_maximized", &maximized, FALSE)) {
-               if (g_value_get_boolean (&maximized)) {
-                       gtk_window_maximize (GTK_WINDOW (window));
-                       return;
-               } else {
-                       gtk_window_unmaximize (GTK_WINDOW (window));
+       if (!document)
+               return;
+
+       if (ev_metadata_get_string (window->priv->metadata, "sidebar_page", &page_id)) {
+               ev_window_sidebar_set_current_page (window, page_id);
+       } else if (window->priv->is_new_doc) {
+               page_id = g_settings_get_string (settings, "sidebar-page");
+               ev_window_sidebar_set_current_page (window, page_id);
+               g_free (page_id);
+       }
+}
+
+static void
+setup_model_from_metadata (EvWindow *window)
+{
+       GSettings *settings = window->priv->default_settings;
+       gint       page;
+       gchar     *sizing_mode;
+       gdouble    zoom;
+       gint       rotation;
+       gboolean   inverted_colors = FALSE;
+       gboolean   continuous = FALSE;
+       gboolean   dual_page = FALSE;
+       gboolean   fullscreen = FALSE;
+
+       if (!window->priv->metadata) {
+               /* Set default values */
+               ev_document_model_set_sizing_mode (window->priv->model,
+                                                  g_settings_get_enum (settings, "sizing-mode"));
+               ev_document_model_set_inverted_colors (window->priv->model,
+                                                      g_settings_get_boolean (settings, "inverted-colors"));
+               ev_document_model_set_continuous (window->priv->model,
+                                                 g_settings_get_boolean (settings, "continuous"));
+               ev_document_model_set_dual_page (window->priv->model,
+                                                g_settings_get_boolean (settings, "dual-page"));
+               fullscreen = g_settings_get_boolean (settings, "fullscreen");
+               if (fullscreen)
+                       ev_window_run_fullscreen (window);
+
+               return;
+       }
+
+       /* Current page */
+       if (!window->priv->dest &&
+           ev_metadata_get_int (window->priv->metadata, "page", &page)) {
+               ev_document_model_set_page (window->priv->model, page);
+       }
+
+       /* Sizing mode */
+       if (ev_metadata_get_string (window->priv->metadata, "sizing_mode", &sizing_mode)) {
+               GEnumValue *enum_value;
+
+               enum_value = g_enum_get_value_by_nick
+                       (g_type_class_peek (EV_TYPE_SIZING_MODE), sizing_mode);
+               ev_document_model_set_sizing_mode (window->priv->model, enum_value->value);
+       } else if (window->priv->is_new_doc) {
+               ev_document_model_set_sizing_mode (window->priv->model,
+                                                  g_settings_get_enum (settings, "sizing-mode"));
+       }
+
+       /* Zoom */
+       if (ev_document_model_get_sizing_mode (window->priv->model) == EV_SIZING_FREE &&
+           ev_metadata_get_double (window->priv->metadata, "zoom", &zoom)) {
+               zoom *= get_screen_dpi (window) / 72.0;
+               ev_document_model_set_scale (window->priv->model, zoom);
+       }
+
+       /* Rotation */
+       if (ev_metadata_get_int (window->priv->metadata, "rotation", &rotation)) {
+               switch (rotation) {
+               case 90:
+                       rotation = 90;
+                       break;
+               case 180:
+                       rotation = 180;
+                       break;
+               case 270:
+                       rotation = 270;
+                       break;
+               default:
+                       rotation = 0;
+                       break;
                }
-               g_value_unset (&maximized);
+               ev_document_model_set_rotation (window->priv->model, rotation);
        }
 
-       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);
+       /* Inverted Colors */
+       if (ev_metadata_get_boolean (window->priv->metadata, "inverted-colors", &inverted_colors)) {
+               ev_document_model_set_inverted_colors (window->priv->model, inverted_colors);
+       } else if (window->priv->is_new_doc) {
+               ev_document_model_set_inverted_colors (window->priv->model,
+                                                      g_settings_get_boolean (settings, "inverted-colors"));
        }
 
-        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;
+       /* Continuous */
+       if (ev_metadata_get_boolean (window->priv->metadata, "continuous", &continuous)) {
+               ev_document_model_set_continuous (window->priv->model, continuous);
+       } else if (window->priv->is_new_doc) {
+               ev_document_model_set_continuous (window->priv->model,
+                                                 g_settings_get_boolean (settings, "continuous"));
        }
 
-        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;
-               
+       /* Dual page */
+       if (ev_metadata_get_boolean (window->priv->metadata, "dual-page", &dual_page)) {
+               ev_document_model_set_dual_page (window->priv->model, dual_page);
+       } else if (window->priv->is_new_doc) {
+               ev_document_model_set_dual_page (window->priv->model,
+                                                g_settings_get_boolean (settings, "dual-page"));
+       }
+
+       /* Fullscreen */
+       if (!ev_metadata_get_boolean (window->priv->metadata, "fullscreen", &fullscreen)) {
+               if (window->priv->is_new_doc)
+                       fullscreen = g_settings_get_boolean (settings, "fullscreen");
+       }
+
+       if (fullscreen)
+               ev_window_run_fullscreen (window);
+}
+
+static void
+setup_document_from_metadata (EvWindow *window)
+{
+       gint    page, n_pages;
+       gint    width;
+       gint    height;
+       gdouble width_ratio;
+       gdouble height_ratio;
+
+       setup_sidebar_from_metadata (window);
+
+       if (window->priv->metadata) {
+               /* 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. */
+               page = ev_document_model_get_page (window->priv->model);
+               n_pages = ev_document_get_n_pages (window->priv->document);
+               if (page == n_pages - 1)
+                       ev_document_model_set_page (window->priv->model, 0);
+
+               if (ev_metadata_get_int (window->priv->metadata, "window_width", &width) &&
+                   ev_metadata_get_int (window->priv->metadata, "window_height", &height))
+                       return; /* size was already set in setup_size_from_metadata */
+       }
+
+       g_settings_get (window->priv->default_settings, "window-ratio", "(dd)", &width_ratio, &height_ratio);
+       if (width_ratio > 0. && height_ratio > 0.) {
+               gdouble    document_width;
+               gdouble    document_height;
                GdkScreen *screen;
-               
-               gint request_width;
-               gint request_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);                 
-               
-               request_width = g_value_get_double (&width_ratio) * document_width;
-               request_height = g_value_get_double (&height_ratio) * document_height;
-               
+               gint       request_width;
+               gint       request_height;
+
+               ev_document_get_max_page_size (window->priv->document,
+                                              &document_width, &document_height);
+
+               request_width = (gint)(width_ratio * document_width + 0.5);
+               request_height = (gint)(height_ratio * document_height + 0.5);
+
                screen = gtk_window_get_screen (GTK_WINDOW (window));
-               
                if (screen) {
                        request_width = MIN (request_width, gdk_screen_get_width (screen));
-                       request_height = MIN (request_width, gdk_screen_get_height (screen));
+                       request_height = MIN (request_height, gdk_screen_get_height (screen));
+               }
+
+               if (request_width > 0 && request_height > 0) {
+                       gtk_window_resize (GTK_WINDOW (window),
+                                          request_width,
+                                          request_height);
                }
-                               
-               gtk_window_resize (GTK_WINDOW (window),
-                                  request_width,
-                                  request_height);
-               g_value_unset (&width_ratio);
-               g_value_unset (&height_ratio);
        }
 }
 
 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 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)) {
+       gint     width;
+       gint     height;
+       gboolean maximized;
+       gint     x;
+       gint     y;
+
+       if (!window->priv->metadata)
+               return;
+
+       if (ev_metadata_get_boolean (window->priv->metadata, "window_maximized", &maximized)) {
+               if (maximized) {
                        gtk_window_maximize (GTK_WINDOW (window));
+                       return;
                } 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);
+       if (ev_metadata_get_int (window->priv->metadata, "window_x", &x) &&
+           ev_metadata_get_int (window->priv->metadata, "window_y", &y)) {
+               gtk_window_move (GTK_WINDOW (window), x, y);
        }
 
-       /* 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 *= get_screen_dpi (GTK_WINDOW (window)) / 72.0;
-               ev_view_set_zoom (view, zoom_value, FALSE);
-               g_value_unset (&zoom);
+        if (ev_metadata_get_int (window->priv->metadata, "window_width", &width) &&
+           ev_metadata_get_int (window->priv->metadata, "window_height", &height)) {
+               gtk_window_resize (GTK_WINDOW (window), width, height);
        }
+}
 
-       /* Continuous */
-       if (ev_metadata_manager_get (uri, "continuous", &continuous, FALSE)) {
-               ev_view_set_continuous (view, g_value_get_boolean (&continuous));
-               g_value_unset (&continuous);
-       }
+static void
+setup_view_from_metadata (EvWindow *window)
+{
+       gboolean presentation;
 
-       /* 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);
-       }
+       if (!window->priv->metadata)
+               return;
 
        /* Presentation */
-       if (ev_metadata_manager_get (uri, "presentation", &presentation, FALSE)) {
-               if (g_value_get_boolean (&presentation) && uri) {
+       if (ev_metadata_get_boolean (window->priv->metadata, "presentation", &presentation)) {
+               if (presentation) {
                        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) && 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;
-                       }
-               }
-               g_value_unset (&rotation);
-       }
-}
+}
 
 static void
 ev_window_clear_thumbnail_job (EvWindow *ev_window)
@@ -1104,6 +1335,8 @@ ev_window_set_icon_from_thumbnail (EvJobThumbnail *job,
                                   EvWindow       *ev_window)
 {
        if (job->thumbnail) {
+               if (ev_document_model_get_inverted_colors (ev_window->priv->model))
+                       ev_document_misc_invert_pixbuf (job->thumbnail);
                gtk_window_set_icon (GTK_WINDOW (ev_window),
                                     job->thumbnail);
        }
@@ -1112,24 +1345,24 @@ ev_window_set_icon_from_thumbnail (EvJobThumbnail *job,
 }
 
 static void
-ev_window_refresh_window_thumbnail (EvWindow *ev_window, int rotation)
+ev_window_refresh_window_thumbnail (EvWindow *ev_window)
 {
-       gint page_width, page_height;
+       gdouble page_width;
        gdouble scale;
+       gint rotation;
        EvDocument *document = ev_window->priv->document;
-       
-       if (!EV_IS_DOCUMENT_THUMBNAILS (document) ||
-           ev_page_cache_get_n_pages (ev_window->priv->page_cache) <= 0) {
+
+       if (ev_document_get_n_pages (document) <= 0 ||
+           !ev_document_check_dimensions (document)) {
                return;
        }
-       
+
        ev_window_clear_thumbnail_job (ev_window);
-       
-       ev_page_cache_get_size (ev_window->priv->page_cache,
-                               0, 0, 1.0,
-                               &page_width, &page_height);
-       scale = (gdouble)128 / (gdouble)page_width;
-       
+
+       ev_document_get_page_size (document, 0, &page_width, NULL);
+       scale = 128. / page_width;
+       rotation = ev_document_model_get_rotation (ev_window->priv->model);
+
        ev_window->priv->thumbnail_job = ev_job_thumbnail_new (document, 0, rotation, scale);
        g_signal_connect (ev_window->priv->thumbnail_job, "finished",
                          G_CALLBACK (ev_window_set_icon_from_thumbnail),
@@ -1137,26 +1370,55 @@ ev_window_refresh_window_thumbnail (EvWindow *ev_window, int rotation)
        ev_job_scheduler_push_job (ev_window->priv->thumbnail_job, EV_JOB_PRIORITY_NONE);
 }
 
+static void
+override_restrictions_changed (GSettings *settings,
+                              gchar     *key,
+                              EvWindow  *ev_window)
+{
+       ev_window_setup_action_sensitivity (ev_window);
+}
+
+static void
+lockdown_changed (GSettings   *lockdown,
+                 const gchar *key,
+                 EvWindow    *ev_window)
+{
+       ev_window_setup_action_sensitivity (ev_window);
+}
+
 static gboolean
 ev_window_setup_document (EvWindow *ev_window)
 {
        const EvDocumentInfo *info;
        EvDocument *document = ev_window->priv->document;
-       EvSidebar *sidebar = EV_SIDEBAR (ev_window->priv->sidebar);
        GtkAction *action;
 
        ev_window->priv->setup_document_idle = 0;
-       
-       ev_window_refresh_window_thumbnail (ev_window, 0);
+
+       ev_window_refresh_window_thumbnail (ev_window);
 
        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);
 
-       ev_sidebar_set_document (sidebar, document);
+       if (!ev_window->priv->settings) {
+               ev_window->priv->settings = g_settings_new (GS_SCHEMA_NAME);
+               g_signal_connect (ev_window->priv->settings,
+                                 "changed::"GS_OVERRIDE_RESTRICTIONS,
+                                 G_CALLBACK (override_restrictions_changed),
+                                 ev_window);
+       }
+
+#ifdef HAVE_DESKTOP_SCHEMAS
+       if (!ev_window->priv->lockdown_settings) {
+               ev_window->priv->lockdown_settings = g_settings_new (GS_LOCKDOWN_SCHEMA_NAME);
+               g_signal_connect (ev_window->priv->lockdown_settings,
+                                 "changed",
+                                 G_CALLBACK (lockdown_changed),
+                                 ev_window);
+       }
+#endif
 
-       action = gtk_action_group_get_action (ev_window->priv->action_group, PAGE_SELECTOR_ACTION);
-       ev_page_action_set_document (EV_PAGE_ACTION (action), document);
        ev_window_setup_action_sensitivity (ev_window);
 
        if (ev_window->priv->history)
@@ -1167,45 +1429,59 @@ ev_window_setup_document (EvWindow *ev_window)
        
        if (ev_window->priv->properties) {
                ev_properties_dialog_set_document (EV_PROPERTIES_DIALOG (ev_window->priv->properties),
+                                                  ev_window->priv->uri,
                                                   ev_window->priv->document);
        }
        
-       info = ev_page_cache_get_info (ev_window->priv->page_cache);
+       info = ev_document_get_info (document);
        update_document_mode (ev_window, info->mode);
 
+       if (EV_WINDOW_IS_PRESENTATION (ev_window))
+               gtk_widget_grab_focus (ev_window->priv->presentation_view);
+       else
+               gtk_widget_grab_focus (ev_window->priv->view);
+
        return FALSE;
 }
 
 static void
 ev_window_set_document (EvWindow *ev_window, EvDocument *document)
 {
-       EvView *view = EV_VIEW (ev_window->priv->view);
+       if (ev_window->priv->document == document)
+               return;
 
        if (ev_window->priv->document)
                g_object_unref (ev_window->priv->document);
        ev_window->priv->document = g_object_ref (document);
 
-       ev_window_set_message_area (ev_window, NULL);
-       
-       ev_window->priv->page_cache = ev_page_cache_get (ev_window->priv->document);
-       g_signal_connect (ev_window->priv->page_cache, "page-changed",
-                         G_CALLBACK (page_changed_cb), ev_window);
-       g_signal_connect (ev_window->priv->page_cache, "history-changed",
-                         G_CALLBACK (history_changed_cb), ev_window);
+       ev_window_update_max_min_scale (ev_window);
 
-       setup_size_from_metadata (ev_window);
-       setup_sidebar_from_metadata (ev_window, document);
-       setup_document_from_metadata (ev_window);
+       ev_window_set_message_area (ev_window, NULL);
 
-       if (ev_page_cache_get_n_pages (ev_window->priv->page_cache) > 0) {
-               ev_view_set_document (view, document);
-       } else {
-               ev_window_warning_message (GTK_WINDOW (ev_window),
+       if (ev_document_get_n_pages (document) <= 0) {
+               ev_window_warning_message (ev_window, "%s",
                                           _("The document contains no pages"));
+       } else if (!ev_document_check_dimensions (document)) {
+               ev_window_warning_message (ev_window, "%s",
+                                          _("The document contains only empty pages"));
+       }
+
+       if (EV_WINDOW_IS_PRESENTATION (ev_window)) {
+               gint current_page;
+
+               current_page = ev_view_presentation_get_current_page (
+                       EV_VIEW_PRESENTATION (ev_window->priv->presentation_view));
+               gtk_widget_destroy (ev_window->priv->presentation_view);
+               ev_window->priv->presentation_view = NULL;
+
+               /* Update the model with the current presentation page */
+               ev_document_model_set_page (ev_window->priv->model, current_page);
+               ev_window_run_presentation (ev_window);
        }
 
        if (ev_window->priv->setup_document_idle > 0)
                g_source_remove (ev_window->priv->setup_document_idle);
+
        ev_window->priv->setup_document_idle = g_idle_add ((GSourceFunc)ev_window_setup_document, ev_window);
 }
 
@@ -1213,61 +1489,19 @@ static void
 ev_window_document_changed (EvWindow *ev_window,
                            gpointer  user_data)
 {
-       ev_window_reload_document (ev_window);
-}
-
-static void
-password_dialog_response (GtkWidget *password_dialog,
-                         gint       response_id,
-                         EvWindow  *ev_window)
-{
-       if (response_id == GTK_RESPONSE_OK) {
-               ev_job_load_set_password (EV_JOB_LOAD (ev_window->priv->load_job),
-                                         ev_password_dialog_get_password (EV_PASSWORD_DIALOG (password_dialog)));
-
-               ev_password_dialog_save_password (EV_PASSWORD_DIALOG (password_dialog));
-
-               ev_window_title_set_type (ev_window->priv->title, EV_WINDOW_TITLE_DOCUMENT);
-               ev_job_scheduler_push_job (ev_window->priv->load_job, EV_JOB_PRIORITY_NONE);
-               
-               gtk_widget_destroy (password_dialog);
-                       
-               return;
-       }
-
-       gtk_widget_set_sensitive (ev_window->priv->password_view, TRUE);
-       gtk_widget_destroy (password_dialog);
+       ev_window_reload_document (ev_window, NULL);
 }
 
-/* Called either by ev_window_load_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)
+ev_window_password_view_unlock (EvWindow *ev_window)
 {
+       const gchar *password;
+       
        g_assert (ev_window->priv->load_job);
 
-       gtk_widget_set_sensitive (ev_window->priv->password_view, FALSE);
-
-       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->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),
-                                          (gpointer) &(ev_window->priv->password_dialog));
-               g_signal_connect (ev_window->priv->password_dialog,
-                                 "response",
-                                 G_CALLBACK (password_dialog_response),
-                                 ev_window);
-               gtk_widget_show (ev_window->priv->password_dialog);
-       } else {
-               ev_password_dialog_set_bad_pass (EV_PASSWORD_DIALOG (ev_window->priv->password_dialog));
-       }
+       password = ev_password_view_get_password (EV_PASSWORD_VIEW (ev_window->priv->password_view));
+       ev_job_load_set_password (EV_JOB_LOAD (ev_window->priv->load_job), password);
+       ev_job_scheduler_push_job (ev_window->priv->load_job, EV_JOB_PRIORITY_NONE);
 }
 
 static void
@@ -1307,32 +1541,18 @@ ev_window_clear_local_uri (EvWindow *ev_window)
 }
 
 static void
-ev_window_clear_print_settings_file (EvWindow *ev_window)
-{
-       if (ev_window->priv->print_settings_file) {
-               g_unlink (ev_window->priv->print_settings_file);
-               g_free (ev_window->priv->print_settings_file);
-               ev_window->priv->print_settings_file = NULL;
-       }
-}
-
-static void
-ev_window_clear_temp_file (EvWindow *ev_window)
+ev_window_handle_link (EvWindow *ev_window,
+                      EvLinkDest *dest)
 {
-       GFile *file, *tempdir;
-
-       if (!ev_window->priv->uri)
-               return;
-
-       file = g_file_new_for_uri (ev_window->priv->uri);
-       tempdir = g_file_new_for_path (g_get_tmp_dir ());
+       if (dest) {
+               EvLink *link;
+               EvLinkAction *link_action;
 
-       if (g_file_has_prefix (file, tempdir)) {
-               g_file_delete (file, NULL, NULL);
+               link_action = ev_link_action_new_dest (dest);
+               link = ev_link_new (NULL, link_action);
+               ev_view_handle_link (EV_VIEW (ev_window->priv->view), link);
+               g_object_unref (link);
        }
-
-       g_object_unref (file);
-       g_object_unref (tempdir);
 }
 
 /* This callback will executed when load job will be finished.
@@ -1357,49 +1577,60 @@ ev_window_load_job_cb (EvJob *job,
 
        /* Success! */
        if (!ev_job_is_failed (job)) {
-               ev_window_set_document (ev_window, document);
-               
-               if (job_load->mode != EV_WINDOW_MODE_PREVIEW) {
-                       setup_view_from_metadata (ev_window);
-               }
+               ev_document_model_set_document (ev_window->priv->model, document);
 
-               if (!ev_window->priv->unlink_temp_file) {
-                       ev_window_add_recent (ev_window, ev_window->priv->uri);
-               }
+#ifdef ENABLE_DBUS
+               ev_window_emit_doc_loaded (ev_window);
+#endif
+               setup_chrome_from_metadata (ev_window);
+               update_chrome_actions (ev_window);
+               setup_document_from_metadata (ev_window);
+               setup_view_from_metadata (ev_window);
 
-               if (job_load->dest) {
-                       EvLink *link;
-                       EvLinkAction *link_action;
-       
-                       link_action = ev_link_action_new_dest (g_object_ref (job_load->dest));
-                       link = ev_link_new (NULL, link_action);
-                       ev_view_handle_link (EV_VIEW (ev_window->priv->view), link);
-                       g_object_unref (link);
+               ev_window_add_recent (ev_window, ev_window->priv->uri);
+
+               ev_window_title_set_type (ev_window->priv->title,
+                                         EV_WINDOW_TITLE_DOCUMENT);
+               if (job_load->password) {
+                       GPasswordSave flags;
+
+                       flags = ev_password_view_get_password_save_flags (
+                               EV_PASSWORD_VIEW (ev_window->priv->password_view));
+                       ev_keyring_save_password (ev_window->priv->uri,
+                                                 job_load->password,
+                                                 flags);
                }
 
-               switch (job_load->mode) {
+               ev_window_handle_link (ev_window, ev_window->priv->dest);
+               /* Already unrefed by ev_link_action
+                * FIXME: link action should inc dest ref counting
+                * or not unref it at all
+                */
+               ev_window->priv->dest = NULL;
+
+               switch (ev_window->priv->window_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;
                }
 
-               if (job_load->search_string && EV_IS_DOCUMENT_FIND (document)) {
+               if (ev_window->priv->search_string && EV_IS_DOCUMENT_FIND (document)) {
                        ev_window_cmd_edit_find (NULL, ev_window);
                        egg_find_bar_set_search_string (EGG_FIND_BAR (ev_window->priv->find_bar),
-                                                       job_load->search_string);
+                                                       ev_window->priv->search_string);
                }
 
+               g_free (ev_window->priv->search_string);
+               ev_window->priv->search_string = NULL;
+
                /* Create a monitor for the document */
-               ev_window->priv->monitor = ev_file_monitor_new (job_load->uri);
-               g_signal_connect_swapped (G_OBJECT (ev_window->priv->monitor), "changed",
+               ev_window->priv->monitor = ev_file_monitor_new (ev_window->priv->uri);
+               g_signal_connect_swapped (ev_window->priv->monitor, "changed",
                                          G_CALLBACK (ev_window_document_changed),
                                          ev_window);
                
@@ -1407,26 +1638,44 @@ ev_window_load_job_cb (EvJob *job,
                return;
        }
 
-       if (job->error->domain == EV_DOCUMENT_ERROR &&
-           job->error->code == EV_DOCUMENT_ERROR_ENCRYPTED) {
-               GFile *file;
-               gchar *base_name;
-
+       if (g_error_matches (job->error, EV_DOCUMENT_ERROR, EV_DOCUMENT_ERROR_ENCRYPTED)) {
+               gchar *password;
+               
                setup_view_from_metadata (ev_window);
+               
+               /* First look whether password is in keyring */
+               password = ev_keyring_lookup_password (ev_window->priv->uri);
+               if (password) {
+                       if (job_load->password && strcmp (password, job_load->password) == 0) {
+                               /* Password in kering is wrong */
+                               ev_job_load_set_password (job_load, NULL);
+                               /* FIXME: delete password from keyring? */
+                       } else {
+                               ev_job_load_set_password (job_load, password);
+                               ev_job_scheduler_push_job (job, EV_JOB_PRIORITY_NONE);
+                               g_free (password);
+                               return;
+                       }
+
+                       g_free (password);
+               }
+
+               /* We need to ask the user for a password */
+               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);
+
+               ev_password_view_set_uri (EV_PASSWORD_VIEW (ev_window->priv->password_view),
+                                         job_load->uri);
 
-               file = g_file_new_for_uri (job_load->uri);
-               base_name = g_file_get_basename (file);
-               ev_password_view_set_file_name (EV_PASSWORD_VIEW (ev_window->priv->password_view),
-                                               base_name);
-               g_object_unref (file);
-               g_free (base_name);
                ev_window_set_page_mode (ev_window, PAGE_MODE_PASSWORD);
-               
-               ev_window_popup_password_dialog (ev_window);
+
+               ev_job_load_set_password (job_load, NULL);
+               ev_password_view_ask_password (EV_PASSWORD_VIEW (ev_window->priv->password_view));
        } else {
-               ev_window_error_message (GTK_WINDOW (ev_window), 
-                                        _("Unable to open document"),
-                                        job->error);
+               ev_window_error_message (ev_window, job->error, 
+                                        "%s", _("Unable to open document"));
                ev_window_clear_load_job (ev_window);
        }       
 }
@@ -1440,10 +1689,24 @@ ev_window_reload_job_cb (EvJob    *job,
        if (ev_job_is_failed (job)) {
                ev_window_clear_reload_job (ev_window);
                ev_window->priv->in_reload = FALSE;
+               if (ev_window->priv->dest) {
+                       g_object_unref (ev_window->priv->dest);
+                       ev_window->priv->dest = NULL;
+               }
+
                return;
        }
-       
-       ev_window_set_document (ev_window, job->document);
+
+       ev_document_model_set_document (ev_window->priv->model,
+                                       job->document);
+       if (ev_window->priv->dest) {
+               ev_window_handle_link (ev_window, ev_window->priv->dest);
+               /* Already unrefed by ev_link_action
+                * FIXME: link action should inc dest ref counting
+                * or not unref it at all
+                */
+               ev_window->priv->dest = NULL;
+       }
 
        /* Restart the search after reloading */
        widget = gtk_window_get_focus (GTK_WINDOW (ev_window));
@@ -1480,10 +1743,6 @@ ev_window_get_uri (EvWindow *ev_window)
 static void
 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)
                gtk_widget_destroy (ev_window->priv->print_dialog);
        ev_window->priv->print_dialog = NULL;
@@ -1493,17 +1752,123 @@ ev_window_close_dialogs (EvWindow *ev_window)
        ev_window->priv->properties = NULL;
 }
 
+static void
+ev_window_clear_progress_idle (EvWindow *ev_window)
+{
+       if (ev_window->priv->progress_idle > 0)
+               g_source_remove (ev_window->priv->progress_idle);
+       ev_window->priv->progress_idle = 0;
+}
+
+static void
+reset_progress_idle (EvWindow *ev_window)
+{
+       ev_window->priv->progress_idle = 0;
+}
+
+static void
+ev_window_show_progress_message (EvWindow   *ev_window,
+                                guint       interval,
+                                GSourceFunc function)
+{
+       if (ev_window->priv->progress_idle > 0)
+               g_source_remove (ev_window->priv->progress_idle);
+       ev_window->priv->progress_idle =
+               g_timeout_add_seconds_full (G_PRIORITY_DEFAULT,
+                                           interval, function,
+                                           ev_window,
+                                           (GDestroyNotify)reset_progress_idle);
+}
+
+static void
+ev_window_reset_progress_cancellable (EvWindow *ev_window)
+{
+       if (ev_window->priv->progress_cancellable)
+               g_cancellable_reset (ev_window->priv->progress_cancellable);
+       else
+               ev_window->priv->progress_cancellable = g_cancellable_new ();
+}
+
+static void
+ev_window_progress_response_cb (EvProgressMessageArea *area,
+                               gint                   response,
+                               EvWindow              *ev_window)
+{
+       if (response == GTK_RESPONSE_CANCEL)
+               g_cancellable_cancel (ev_window->priv->progress_cancellable);
+       ev_window_set_message_area (ev_window, NULL);
+}
+
+static gboolean 
+show_loading_progress (EvWindow *ev_window)
+{
+       GtkWidget *area;
+       gchar     *text;
+       gchar     *display_name;
+       
+       if (ev_window->priv->message_area)
+               return FALSE;
+
+       text = g_uri_unescape_string (ev_window->priv->uri, NULL);
+       display_name = g_markup_escape_text (text, -1);
+       g_free (text);
+       text = g_strdup_printf (_("Loading document from “%s”"),
+                               display_name);
+
+       area = ev_progress_message_area_new (GTK_STOCK_OPEN,
+                                            text,
+                                            GTK_STOCK_CLOSE,
+                                            GTK_RESPONSE_CLOSE,
+                                            GTK_STOCK_CANCEL,
+                                            GTK_RESPONSE_CANCEL,
+                                            NULL);
+       g_signal_connect (area, "response",
+                         G_CALLBACK (ev_window_progress_response_cb),
+                         ev_window);
+       gtk_widget_show (area);
+       ev_window_set_message_area (ev_window, area);
+
+       g_free (text);
+       g_free (display_name);
+
+       return FALSE;
+}
+
 static void
 ev_window_load_remote_failed (EvWindow *ev_window,
                              GError   *error)
 {
        ev_view_set_loading (EV_VIEW (ev_window->priv->view), FALSE);
        ev_window->priv->in_reload = FALSE;
-       ev_window_error_message (GTK_WINDOW (ev_window),
-                                _("Unable to open document"),
-                                error);
+       ev_window_error_message (ev_window, error, 
+                                "%s", _("Unable to open document"));
        g_free (ev_window->priv->local_uri);
        ev_window->priv->local_uri = NULL;
+       ev_window->priv->uri_mtime = 0;
+}
+
+static void
+set_uri_mtime (GFile        *source,
+              GAsyncResult *async_result,
+              EvWindow     *ev_window)
+{
+       GFileInfo *info;
+       GError *error = NULL;
+
+       info = g_file_query_info_finish (source, async_result, &error);
+
+       if (error) {
+               ev_window->priv->uri_mtime = 0;
+               g_error_free (error);
+       } else {
+               GTimeVal mtime;
+               
+               g_file_info_get_modification_time (info, &mtime);
+               ev_window->priv->uri_mtime = mtime.tv_sec;
+               g_object_unref (info);
+       }
+
+       g_object_unref (source);
 }
 
 static void
@@ -1532,26 +1897,40 @@ window_open_file_copy_ready_cb (GFile        *source,
                                EvWindow     *ev_window)
 {
        GError *error = NULL;
-       
+
+       ev_window_clear_progress_idle (ev_window);
+       ev_window_set_message_area (ev_window, NULL);
+
        g_file_copy_finish (source, async_result, &error);
        if (!error) {
                ev_job_scheduler_push_job (ev_window->priv->load_job, EV_JOB_PRIORITY_NONE);
-               g_object_unref (source);
-               
+               g_file_query_info_async (source,
+                                        G_FILE_ATTRIBUTE_TIME_MODIFIED,
+                                        0, G_PRIORITY_DEFAULT,
+                                        NULL,
+                                        (GAsyncReadyCallback)set_uri_mtime,
+                                        ev_window);
                return;
        }
 
-       if (error->domain == G_IO_ERROR &&
-           error->code == G_IO_ERROR_NOT_MOUNTED) {
+       if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_MOUNTED)) {
                GMountOperation *operation;
 
-               operation = ev_mount_operation_new (GTK_WINDOW (ev_window));
+               operation = gtk_mount_operation_new (GTK_WINDOW (ev_window));
                g_file_mount_enclosing_volume (source,
                                               G_MOUNT_MOUNT_NONE,
                                               operation, NULL,
                                               (GAsyncReadyCallback)mount_volume_ready_cb,
                                               ev_window);
                g_object_unref (operation);
+       } else if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+               ev_window_clear_load_job (ev_window);
+               ev_window_clear_local_uri (ev_window);
+               g_free (ev_window->priv->uri);
+               ev_window->priv->uri = NULL;
+               g_object_unref (source);
+               
+               ev_view_set_loading (EV_VIEW (ev_window->priv->view), FALSE);
        } else {
                ev_window_load_remote_failed (ev_window, error);
                g_object_unref (source);
@@ -1561,34 +1940,80 @@ window_open_file_copy_ready_cb (GFile        *source,
 }
 
 static void
-ev_window_load_file_remote (EvWindow  *ev_window,
-                           GFile     *source_file)
+window_open_file_copy_progress_cb (goffset   n_bytes,
+                                  goffset   total_bytes,
+                                  EvWindow *ev_window)
+{
+       gchar *status;
+       gdouble fraction;
+       
+       if (!ev_window->priv->message_area)
+               return;
+
+       if (total_bytes <= 0)
+               return;
+
+       fraction = n_bytes / (gdouble)total_bytes;
+       status = g_strdup_printf (_("Downloading document (%d%%)"),
+                                 (gint)(fraction * 100));
+       
+       ev_progress_message_area_set_status (EV_PROGRESS_MESSAGE_AREA (ev_window->priv->message_area),
+                                            status);
+       ev_progress_message_area_set_fraction (EV_PROGRESS_MESSAGE_AREA (ev_window->priv->message_area),
+                                              fraction);
+
+       g_free (status);
+}
+
+static void
+ev_window_load_file_remote (EvWindow *ev_window,
+                           GFile    *source_file)
 {
        GFile *target_file;
        
        if (!ev_window->priv->local_uri) {
-               gchar *tmp_name;
-               gchar *base_name;
+               char *base_name, *template;
+                GFile *tmp_file;
+                GError *err = NULL;
 
                /* We'd like to keep extension of source uri since
-                * it helps to resolve some mime types, say cbz */
-               tmp_name = ev_tmp_filename (NULL);
+                * it helps to resolve some mime types, say cbz.
+                 */
                base_name = g_file_get_basename (source_file);
-               ev_window->priv->local_uri = g_strconcat ("file:", tmp_name, "-",
-                                                         base_name, NULL);
+                template = g_strdup_printf ("document.XXXXXX-%s", base_name);
+                g_free (base_name);
+
+                tmp_file = ev_mkstemp_file (template, &err);
+               g_free (template);
+                if (tmp_file == NULL) {
+                        ev_window_error_message (ev_window, err,
+                                                 "%s", _("Failed to load remote file."));
+                        g_error_free (err);
+                        return;
+                }
+
+               ev_window->priv->local_uri = g_file_get_uri (tmp_file);
+               g_object_unref (tmp_file);
+
                ev_job_load_set_uri (EV_JOB_LOAD (ev_window->priv->load_job),
                                     ev_window->priv->local_uri);
-               g_free (base_name);
-               g_free (tmp_name);
        }
+
+       ev_window_reset_progress_cancellable (ev_window);
        
        target_file = g_file_new_for_uri (ev_window->priv->local_uri);
        g_file_copy_async (source_file, target_file,
-                          0, G_PRIORITY_DEFAULT, NULL,
-                          NULL, NULL, /* no progress callback */
-                          (GAsyncReadyCallback) window_open_file_copy_ready_cb,
+                          G_FILE_COPY_OVERWRITE,
+                          G_PRIORITY_DEFAULT,
+                          ev_window->priv->progress_cancellable,
+                          (GFileProgressCallback)window_open_file_copy_progress_cb,
+                          ev_window, 
+                          (GAsyncReadyCallback)window_open_file_copy_ready_cb,
                           ev_window);
        g_object_unref (target_file);
+
+       ev_window_show_progress_message (ev_window, 1,
+                                        (GSourceFunc)show_loading_progress);
 }
 
 void
@@ -1596,9 +2021,7 @@ ev_window_open_uri (EvWindow       *ev_window,
                    const char     *uri,
                    EvLinkDest     *dest,
                    EvWindowRunMode mode,
-                   const gchar    *search_string, 
-                   gboolean        unlink_temp_file,
-                   const gchar    *print_settings)
+                   const gchar    *search_string)
 {
        GFile *source_file;
 
@@ -1606,7 +2029,7 @@ ev_window_open_uri (EvWindow       *ev_window,
        
        if (ev_window->priv->uri &&
            g_ascii_strcasecmp (ev_window->priv->uri, uri) == 0) {
-               ev_window_reload_document (ev_window);
+               ev_window_reload_document (ev_window, dest);
                return;
        }
 
@@ -1618,76 +2041,332 @@ ev_window_open_uri (EvWindow       *ev_window,
        ev_window_close_dialogs (ev_window);
        ev_window_clear_load_job (ev_window);
        ev_window_clear_local_uri (ev_window);
-       ev_window_clear_print_settings_file (ev_window);
-       ev_view_set_loading (EV_VIEW (ev_window->priv->view), TRUE);
 
-       ev_window->priv->unlink_temp_file = unlink_temp_file;
-
-       if (mode == EV_WINDOW_MODE_PREVIEW) {
-               ev_window->priv->print_settings_file = print_settings ? 
-                       g_strdup (print_settings) : NULL;
-       }
+       ev_window->priv->window_mode = mode;
 
        if (ev_window->priv->uri)
                g_free (ev_window->priv->uri);
        ev_window->priv->uri = g_strdup (uri);
 
+       if (ev_window->priv->metadata)
+               g_object_unref (ev_window->priv->metadata);
+       if (ev_window->priv->bookmarks)
+               g_object_unref (ev_window->priv->bookmarks);
+
+       source_file = g_file_new_for_uri (uri);
+       if (!ev_file_is_temp (source_file) && ev_is_metadata_supported_for_file (source_file)) {
+               ev_window->priv->metadata = ev_metadata_new (source_file);
+               ev_window->priv->is_new_doc = ev_metadata_is_empty (ev_window->priv->metadata);
+       } else {
+               ev_window->priv->metadata = NULL;
+       }
+
+       if (ev_window->priv->metadata) {
+               ev_window->priv->bookmarks = ev_bookmarks_new (ev_window->priv->metadata);
+               ev_sidebar_bookmarks_set_bookmarks (EV_SIDEBAR_BOOKMARKS (ev_window->priv->sidebar_bookmarks),
+                                                   ev_window->priv->bookmarks);
+               g_signal_connect_swapped (ev_window->priv->bookmarks, "changed",
+                                         G_CALLBACK (ev_window_setup_bookmarks),
+                                         ev_window);
+       } else {
+               ev_window->priv->bookmarks = NULL;
+       }
+
+       if (ev_window->priv->search_string)
+               g_free (ev_window->priv->search_string);
+       ev_window->priv->search_string = search_string ?
+               g_strdup (search_string) : NULL;
+
+       if (ev_window->priv->dest)
+               g_object_unref (ev_window->priv->dest);
+       ev_window->priv->dest = dest ? g_object_ref (dest) : NULL;
+
        setup_size_from_metadata (ev_window);
-       
-       ev_window->priv->load_job = ev_job_load_new (uri, dest, mode, search_string);
+       setup_model_from_metadata (ev_window);
+       ev_window_setup_bookmarks (ev_window);
+
+       ev_window->priv->load_job = ev_job_load_new (uri);
        g_signal_connect (ev_window->priv->load_job,
                          "finished",
                          G_CALLBACK (ev_window_load_job_cb),
                          ev_window);
 
-       source_file = g_file_new_for_uri (uri);
        if (!g_file_is_native (source_file) && !ev_window->priv->local_uri) {
                ev_window_load_file_remote (ev_window, source_file);
        } else {
+               ev_view_set_loading (EV_VIEW (ev_window->priv->view), TRUE);
                g_object_unref (source_file);
                ev_job_scheduler_push_job (ev_window->priv->load_job, EV_JOB_PRIORITY_NONE);
        }
 }
 
+void
+ev_window_open_document (EvWindow       *ev_window,
+                        EvDocument     *document,
+                        EvLinkDest     *dest,
+                        EvWindowRunMode mode,
+                        const gchar    *search_string)
+{
+       if (document == ev_window->priv->document)
+               return;
+
+       ev_window_close_dialogs (ev_window);
+       ev_window_clear_load_job (ev_window);
+       ev_window_clear_local_uri (ev_window);
+
+       if (ev_window->priv->monitor) {
+               g_object_unref (ev_window->priv->monitor);
+               ev_window->priv->monitor = NULL;
+       }
+
+       if (ev_window->priv->uri)
+               g_free (ev_window->priv->uri);
+       ev_window->priv->uri = g_strdup (ev_document_get_uri (document));
+
+       setup_size_from_metadata (ev_window);
+       setup_model_from_metadata (ev_window);
+
+       ev_document_model_set_document (ev_window->priv->model, document);
+
+       setup_document_from_metadata (ev_window);
+       setup_view_from_metadata (ev_window);
+
+       if (dest) {
+               EvLink *link;
+               EvLinkAction *link_action;
+
+               link_action = ev_link_action_new_dest (dest);
+               link = ev_link_new (NULL, link_action);
+               ev_view_handle_link (EV_VIEW (ev_window->priv->view), link);
+               /* FIXME: link action should inc dest ref counting
+                * or not unref it at all
+                */
+               g_object_ref (dest);
+               g_object_unref (link);
+       }
+
+       switch (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;
+       default:
+               break;
+       }
+
+       if (search_string && EV_IS_DOCUMENT_FIND (document)) {
+               ev_window_cmd_edit_find (NULL, ev_window);
+               egg_find_bar_set_search_string (EGG_FIND_BAR (ev_window->priv->find_bar),
+                                               search_string);
+       }
+
+       /* Create a monitor for the document */
+       ev_window->priv->monitor = ev_file_monitor_new (ev_window->priv->uri);
+       g_signal_connect_swapped (ev_window->priv->monitor, "changed",
+                                 G_CALLBACK (ev_window_document_changed),
+                                 ev_window);
+}
+
 static void
-ev_window_reload_document (EvWindow *ev_window)
+ev_window_reload_local (EvWindow *ev_window)
 {
        const gchar *uri;
-
-       ev_window_clear_reload_job (ev_window);
-       ev_window->priv->in_reload = TRUE;
        
        uri = ev_window->priv->local_uri ? ev_window->priv->local_uri : ev_window->priv->uri;
-       ev_window->priv->reload_job = ev_job_load_new (uri, NULL, 0, NULL);
+       ev_window->priv->reload_job = ev_job_load_new (uri);
        g_signal_connect (ev_window->priv->reload_job, "finished",
                          G_CALLBACK (ev_window_reload_job_cb),
                          ev_window);
        ev_job_scheduler_push_job (ev_window->priv->reload_job, EV_JOB_PRIORITY_NONE);
 }
 
-static void
-file_open_dialog_response_cb (GtkWidget *chooser,
-                             gint       response_id,
-                             EvWindow  *ev_window)
+static gboolean 
+show_reloading_progress (EvWindow *ev_window)
 {
-       gchar *uri;
-
-       if (response_id == GTK_RESPONSE_OK) {
-               GSList *uris;
-
-               uris = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (chooser));
+       GtkWidget *area;
+       gchar     *text;
+       
+       if (ev_window->priv->message_area)
+               return FALSE;
+       
+       text = g_strdup_printf (_("Reloading document from %s"),
+                               ev_window->priv->uri);
+       area = ev_progress_message_area_new (GTK_STOCK_REFRESH,
+                                            text,
+                                            GTK_STOCK_CLOSE,
+                                            GTK_RESPONSE_CLOSE,
+                                            GTK_STOCK_CANCEL,
+                                            GTK_RESPONSE_CANCEL,
+                                            NULL);
+       g_signal_connect (area, "response",
+                         G_CALLBACK (ev_window_progress_response_cb),
+                         ev_window);
+       gtk_widget_show (area);
+       ev_window_set_message_area (ev_window, area);
+       g_free (text);
+
+       return FALSE;
+}
+
+static void
+reload_remote_copy_ready_cb (GFile        *remote,
+                            GAsyncResult *async_result,
+                            EvWindow     *ev_window)
+{
+       GError *error = NULL;
+       
+       ev_window_clear_progress_idle (ev_window);
+       
+       g_file_copy_finish (remote, async_result, &error);
+       if (error) {
+               if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+                       ev_window_error_message (ev_window, error,
+                                                "%s", _("Failed to reload document."));
+               g_error_free (error);
+       } else {
+               ev_window_reload_local (ev_window);
+       }
+               
+       g_object_unref (remote);
+}
+
+static void
+reload_remote_copy_progress_cb (goffset   n_bytes,
+                               goffset   total_bytes,
+                               EvWindow *ev_window)
+{
+       gchar *status;
+       gdouble fraction;
+       
+       if (!ev_window->priv->message_area)
+               return;
+
+       if (total_bytes <= 0)
+               return;
+
+       fraction = n_bytes / (gdouble)total_bytes;
+       status = g_strdup_printf (_("Downloading document (%d%%)"),
+                                 (gint)(fraction * 100));
+       
+       ev_progress_message_area_set_status (EV_PROGRESS_MESSAGE_AREA (ev_window->priv->message_area),
+                                            status);
+       ev_progress_message_area_set_fraction (EV_PROGRESS_MESSAGE_AREA (ev_window->priv->message_area),
+                                              fraction);
+
+       g_free (status);
+}
+
+static void
+query_remote_uri_mtime_cb (GFile        *remote,
+                          GAsyncResult *async_result,
+                          EvWindow     *ev_window)
+{
+       GFileInfo *info;
+       GTimeVal   mtime;
+       GError    *error = NULL;
+
+       info = g_file_query_info_finish (remote, async_result, &error);
+       if (error) {
+               g_error_free (error);
+               g_object_unref (remote);
+               ev_window_reload_local (ev_window);
+
+               return;
+       }
+       
+       g_file_info_get_modification_time (info, &mtime);
+       if (ev_window->priv->uri_mtime != mtime.tv_sec) {
+               GFile *target_file;
+                       
+               /* Remote file has changed */
+               ev_window->priv->uri_mtime = mtime.tv_sec;
+
+               ev_window_reset_progress_cancellable (ev_window);
+               
+               target_file = g_file_new_for_uri (ev_window->priv->local_uri);
+               g_file_copy_async (remote, target_file,
+                                  G_FILE_COPY_OVERWRITE,
+                                  G_PRIORITY_DEFAULT,
+                                  ev_window->priv->progress_cancellable,
+                                  (GFileProgressCallback)reload_remote_copy_progress_cb,
+                                  ev_window, 
+                                  (GAsyncReadyCallback)reload_remote_copy_ready_cb,
+                                  ev_window);
+               g_object_unref (target_file);
+               ev_window_show_progress_message (ev_window, 1,
+                                                (GSourceFunc)show_reloading_progress);
+       } else {
+               g_object_unref (remote);
+               ev_window_reload_local (ev_window);
+       }
+       
+       g_object_unref (info);
+}
+
+static void
+ev_window_reload_remote (EvWindow *ev_window)
+{
+       GFile *remote;
+       
+       remote = g_file_new_for_uri (ev_window->priv->uri);
+       /* Reload the remote uri only if it has changed */
+       g_file_query_info_async (remote,
+                                G_FILE_ATTRIBUTE_TIME_MODIFIED,
+                                0, G_PRIORITY_DEFAULT,
+                                NULL,
+                                (GAsyncReadyCallback)query_remote_uri_mtime_cb,
+                                ev_window);
+}
+
+static void
+ev_window_reload_document (EvWindow *ev_window,
+                          EvLinkDest *dest)
+{
+       gint page;
+
+       
+       ev_window_clear_reload_job (ev_window);
+       ev_window->priv->in_reload = TRUE;
+
+       page = ev_document_model_get_page (ev_window->priv->model);
+       
+       if (ev_window->priv->dest)
+               g_object_unref (ev_window->priv->dest);
+       ev_window->priv->dest = dest ? g_object_ref (dest) : NULL;
+
+       if (ev_window->priv->local_uri) {
+               ev_window_reload_remote (ev_window);
+       } else {
+               ev_window_reload_local (ev_window);
+       }
+}
+
+static void
+file_open_dialog_response_cb (GtkWidget *chooser,
+                             gint       response_id,
+                             EvWindow  *ev_window)
+{
+       if (response_id == GTK_RESPONSE_OK) {
+               GSList *uris;
+               gchar  *uri;
+
+               uris = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (chooser));
 
                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);    
+                                             gtk_get_current_event_time ());
+
+               g_slist_foreach (uris, (GFunc)g_free, NULL);
                g_slist_free (uris);
-       }
 
-       uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (chooser));
-       ev_application_set_chooser_uri (EV_APP, uri);
-       g_free (uri);
+               uri = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (chooser));
+               ev_application_set_filechooser_uri (EV_APP,
+                                                   GTK_FILE_CHOOSER_ACTION_OPEN,
+                                                   uri);
+               g_free (uri);
+       }
 
        gtk_widget_destroy (chooser);
 }
@@ -1695,7 +2374,9 @@ file_open_dialog_response_cb (GtkWidget *chooser,
 static void
 ev_window_cmd_file_open (GtkAction *action, EvWindow *window)
 {
-       GtkWidget *chooser;
+       GtkWidget   *chooser;
+       const gchar *default_uri;
+       gchar       *parent_uri = NULL;
 
        chooser = gtk_file_chooser_dialog_new (_("Open Document"),
                                               GTK_WINDOW (window),
@@ -1708,12 +2389,23 @@ ev_window_cmd_file_open (GtkAction *action, EvWindow *window)
        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);
+
+       default_uri = ev_application_get_filechooser_uri (EV_APP, GTK_FILE_CHOOSER_ACTION_OPEN);
+       if (!default_uri && window->priv->uri) {
+               GFile *file, *parent;
+
+               file = g_file_new_for_uri (window->priv->uri);
+               parent = g_file_get_parent (file);
+               if (parent) {
+                       parent_uri = g_file_get_uri (parent);
+                       default_uri = parent_uri;
+                       g_object_unref (parent);
+               }
+               g_object_unref (file);
+       }
+
+       if (default_uri) {
+               gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (chooser), default_uri);
        } else {
                const gchar *folder;
 
@@ -1721,7 +2413,8 @@ ev_window_cmd_file_open (GtkAction *action, EvWindow *window)
                gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (chooser),
                                                     folder ? folder : g_get_home_dir ());
        }
-       
+       g_free (parent_uri);
+
        g_signal_connect (chooser, "response",
                          G_CALLBACK (file_open_dialog_response_cb),
                          window);
@@ -1729,104 +2422,26 @@ 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)
+ev_window_open_copy_at_dest (EvWindow   *window,
+                            EvLinkDest *dest)
 {
-       GError      *error = NULL;
-       gchar       *symlink_uri;
-       gchar       *old_filename;
-       gchar       *new_filename;
-       const gchar *uri_unc;
-
-       uri_unc = g_object_get_data (G_OBJECT (window->priv->document),
-                                    "uri-uncompressed");
-       old_filename = g_filename_from_uri (uri_unc ? uri_unc : window->priv->uri,
-                                           NULL, NULL);
-       new_filename = ev_window_create_tmp_symlink (old_filename, &error);
+       EvWindow *new_window = EV_WINDOW (ev_window_new ());
 
-       if (error) {
-               ev_window_error_message (GTK_WINDOW (window),
-                                        _("Cannot open a copy."),
-                                        error);
+       ev_window_n_copies++;
 
-               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,
-                                        NULL, 
-                                        TRUE,
-                                        NULL,
-                                        GDK_CURRENT_TIME);
-       g_free (symlink_uri);
+       if (window->priv->metadata)
+               new_window->priv->metadata = g_object_ref (window->priv->metadata);
+       ev_window_open_document (new_window,
+                                window->priv->document,
+                                dest, 0, NULL);
+       gtk_window_present (GTK_WINDOW (new_window));
 }
 
 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);
+       ev_window_open_copy_at_dest (window, NULL);
 }
 
 static void
@@ -1843,8 +2458,7 @@ ev_window_cmd_recent_file_activate (GtkAction *action,
        
        ev_application_open_uri_at_dest (EV_APP, uri,
                                         gtk_window_get_screen (GTK_WINDOW (window)),
-                                        NULL, 0, NULL, FALSE, NULL, 
-                                        GDK_CURRENT_TIME);
+                                        NULL, 0, NULL, gtk_get_current_event_time ());
 }
 
 static void
@@ -1854,8 +2468,7 @@ ev_window_open_recent_action_item_activated (EvOpenRecentAction *action,
 {
        ev_application_open_uri_at_dest (EV_APP, uri,
                                         gtk_window_get_screen (GTK_WINDOW (window)),
-                                        NULL, 0, NULL, FALSE, NULL, 
-                                        GDK_CURRENT_TIME);
+                                        NULL, 0, NULL, gtk_get_current_event_time ());
 }
 
 static void
@@ -1931,6 +2544,23 @@ ev_window_get_recent_file_label (gint index, const gchar *filename)
        return g_string_free (str, FALSE);
 }
 
+static void
+ev_window_recent_action_connect_proxy_cb (GtkActionGroup *action_group,
+                                          GtkAction *action,
+                                          GtkWidget *proxy,
+                                          gpointer data)
+{
+        GtkLabel *label;
+
+        if (!GTK_IS_MENU_ITEM (proxy))
+                return;
+
+        label = GTK_LABEL (gtk_bin_get_child (GTK_BIN (proxy)));
+
+        gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_MIDDLE);
+        gtk_label_set_max_width_chars (label, MAX_RECENT_ITEM_LEN);
+}
+
 static void
 ev_window_setup_recent (EvWindow *ev_window)
 {
@@ -1952,8 +2582,11 @@ ev_window_setup_recent (EvWindow *ev_window)
                g_object_unref (ev_window->priv->recent_action_group);
        }
        ev_window->priv->recent_action_group = gtk_action_group_new ("RecentFilesActions");
+        g_signal_connect (ev_window->priv->recent_action_group, "connect-proxy",
+                          G_CALLBACK (ev_window_recent_action_connect_proxy_cb), NULL);
+
        gtk_ui_manager_insert_action_group (ev_window->priv->ui_manager,
-                                           ev_window->priv->recent_action_group, 0);
+                                           ev_window->priv->recent_action_group, -1);
 
        items = gtk_recent_manager_get_items (ev_window->priv->recent_manager);
        items = g_list_sort (items, (GCompareFunc) compare_recent_items);
@@ -1963,6 +2596,9 @@ ev_window_setup_recent (EvWindow *ev_window)
                GtkAction     *action;
                gchar         *action_name;
                gchar         *label;
+                const gchar   *mime_type;
+                gchar         *content_type;
+                GIcon         *icon = NULL;
 
                info = (GtkRecentInfo *) l->data;
 
@@ -1973,10 +2609,19 @@ ev_window_setup_recent (EvWindow *ev_window)
                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));
-               
+
+                mime_type = gtk_recent_info_get_mime_type (info);
+                content_type = g_content_type_from_mime_type (mime_type);
+                if (content_type != NULL) {
+                        icon = g_content_type_get_icon (content_type);
+                        g_free (content_type);
+                }
+
                action = g_object_new (GTK_TYPE_ACTION,
                                       "name", action_name,
                                       "label", label,
+                                       "gicon", icon,
+                                       "always-show-image", TRUE,
                                       NULL);
 
                g_object_set_data_full (G_OBJECT (action),
@@ -1984,7 +2629,7 @@ ev_window_setup_recent (EvWindow *ev_window)
                                        gtk_recent_info_ref (info),
                                        (GDestroyNotify) gtk_recent_info_unref);
                
-               g_signal_connect (G_OBJECT (action), "activate",
+               g_signal_connect (action, "activate",
                                  G_CALLBACK (ev_window_cmd_recent_file_activate),
                                  (gpointer) ev_window);
 
@@ -2001,6 +2646,8 @@ ev_window_setup_recent (EvWindow *ev_window)
                                       FALSE);
                g_free (action_name);
                g_free (label);
+                if (icon != NULL)
+                        g_object_unref (icon);
 
                if (++n_items == 5)
                        break;
@@ -2010,53 +2657,152 @@ ev_window_setup_recent (EvWindow *ev_window)
        g_list_free (items);
 }
 
+static gboolean 
+show_saving_progress (GFile *dst)
+{
+       EvWindow  *ev_window;
+       GtkWidget *area;
+       gchar     *text;
+       gchar     *uri;
+       EvSaveType save_type;
+
+       ev_window = EV_WINDOW (g_object_get_data (G_OBJECT (dst), "ev-window"));
+       ev_window->priv->progress_idle = 0;
+       
+       if (ev_window->priv->message_area)
+               return FALSE;
+
+       save_type = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dst), "save-type"));
+       uri = g_file_get_uri (dst);
+       switch (save_type) {
+       case EV_SAVE_DOCUMENT:
+               text = g_strdup_printf (_("Saving document to %s"), uri);
+               break;
+       case EV_SAVE_ATTACHMENT:
+               text = g_strdup_printf (_("Saving attachment to %s"), uri);
+               break;
+       case EV_SAVE_IMAGE:
+               text = g_strdup_printf (_("Saving image to %s"), uri);
+               break;
+       default:
+               g_assert_not_reached ();
+       }
+       g_free (uri);
+       area = ev_progress_message_area_new (GTK_STOCK_SAVE,
+                                            text,
+                                            GTK_STOCK_CLOSE,
+                                            GTK_RESPONSE_CLOSE,
+                                            GTK_STOCK_CANCEL,
+                                            GTK_RESPONSE_CANCEL,
+                                            NULL);
+       g_signal_connect (area, "response",
+                         G_CALLBACK (ev_window_progress_response_cb),
+                         ev_window);
+       gtk_widget_show (area);
+       ev_window_set_message_area (ev_window, area);
+       g_free (text);
+
+       return FALSE;
+}
+
 static void
 window_save_file_copy_ready_cb (GFile        *src,
                                GAsyncResult *async_result,
                                GFile        *dst)
 {
-       EvWindow  *window;
-       GtkWidget *dialog;
-       gchar     *name;
-       GError    *error = NULL;
+       EvWindow *ev_window;
+       GError   *error = NULL;
 
+       ev_window = EV_WINDOW (g_object_get_data (G_OBJECT (dst), "ev-window"));
+       ev_window_clear_progress_idle (ev_window);
+       
        if (g_file_copy_finish (src, async_result, &error)) {
                ev_tmp_file_unlink (src);
                return;
        }
 
-       window = g_object_get_data (G_OBJECT (dst), "ev-window");
-       name = g_file_get_basename (dst);
-       dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-                                        GTK_DIALOG_DESTROY_WITH_PARENT,
-                                        GTK_MESSAGE_ERROR,
-                                        GTK_BUTTONS_CLOSE,
+       if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+               gchar *name;
+               
+               name = g_file_get_basename (dst);
+               ev_window_error_message (ev_window, error,
                                         _("The file could not be saved as “%s”."),
                                         name);
-       gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-                                                 "%s", error->message);
-       g_signal_connect (dialog, "response",
-                         G_CALLBACK (gtk_widget_destroy),
-                         NULL);
-       gtk_widget_show (dialog);
+               g_free (name);
+       }
        ev_tmp_file_unlink (src);
-
-       g_free (name);
        g_error_free (error);
 }
 
 static void
-ev_window_save_remote (EvWindow *ev_window,
-                      GFile    *src,
-                      GFile    *dst)
+window_save_file_copy_progress_cb (goffset n_bytes,
+                                  goffset total_bytes,
+                                  GFile  *dst)
 {
+       EvWindow  *ev_window;
+       EvSaveType save_type;
+       gchar     *status;
+       gdouble    fraction;
+
+       ev_window = EV_WINDOW (g_object_get_data (G_OBJECT (dst), "ev-window"));
+       
+       if (!ev_window->priv->message_area)
+               return;
+
+       if (total_bytes <= 0)
+               return;
+
+       fraction = n_bytes / (gdouble)total_bytes;
+       save_type = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dst), "save-type"));
+
+       switch (save_type) {
+       case EV_SAVE_DOCUMENT:
+               status = g_strdup_printf (_("Uploading document (%d%%)"),
+                                         (gint)(fraction * 100));
+               break;
+       case EV_SAVE_ATTACHMENT:
+               status = g_strdup_printf (_("Uploading attachment (%d%%)"),
+                                         (gint)(fraction * 100));
+               break;
+       case EV_SAVE_IMAGE:
+               status = g_strdup_printf (_("Uploading image (%d%%)"),
+                                         (gint)(fraction * 100));
+               break;
+       default:
+               g_assert_not_reached ();
+       }
+       
+       ev_progress_message_area_set_status (EV_PROGRESS_MESSAGE_AREA (ev_window->priv->message_area),
+                                            status);
+       ev_progress_message_area_set_fraction (EV_PROGRESS_MESSAGE_AREA (ev_window->priv->message_area),
+                                              fraction);
+
+       g_free (status);
+}
+
+static void
+ev_window_save_remote (EvWindow  *ev_window,
+                      EvSaveType save_type,
+                      GFile     *src,
+                      GFile     *dst)
+{
+       ev_window_reset_progress_cancellable (ev_window);
        g_object_set_data (G_OBJECT (dst), "ev-window", ev_window);
+       g_object_set_data (G_OBJECT (dst), "save-type", GINT_TO_POINTER (save_type));
        g_file_copy_async (src, dst,
                           G_FILE_COPY_OVERWRITE,
-                          G_PRIORITY_DEFAULT, NULL,
-                          NULL, NULL, /* no progress callback */
-                          (GAsyncReadyCallback) window_save_file_copy_ready_cb,
-                          dst);                
+                          G_PRIORITY_DEFAULT,
+                          ev_window->priv->progress_cancellable,
+                          (GFileProgressCallback)window_save_file_copy_progress_cb,
+                          dst,
+                          (GAsyncReadyCallback)window_save_file_copy_ready_cb,
+                          dst);
+       ev_window->priv->progress_idle =
+               g_timeout_add_seconds_full (G_PRIORITY_DEFAULT,
+                                           1,
+                                           (GSourceFunc)show_saving_progress,
+                                           dst,
+                                           NULL);
 }
 
 static void
@@ -2079,12 +2825,11 @@ ev_window_save_job_cb (EvJob     *job,
                       EvWindow  *window)
 {
        if (ev_job_is_failed (job)) {
-               gchar *msg;
-               
-               msg = g_strdup_printf (_("The file could not be saved as “%s”."),
-                                      EV_JOB_SAVE (job)->uri);
-               ev_window_error_message (GTK_WINDOW (window), msg, job->error);
-               g_free (msg);
+               ev_window_error_message (window, job->error,
+                                        _("The file could not be saved as “%s”."),
+                                        EV_JOB_SAVE (job)->uri);
+       } else {
+               ev_window_add_recent (window, EV_JOB_SAVE (job)->uri);
        }
 
        ev_window_clear_save_job (window);
@@ -2096,14 +2841,32 @@ file_save_dialog_response_cb (GtkWidget *fc,
                              EvWindow  *ev_window)
 {
        gchar *uri;
-       
+       GFile *file, *parent;
+
        if (response_id != GTK_RESPONSE_OK) {
                gtk_widget_destroy (fc);
                return;
        }
-       
+
        uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (fc));
-       
+       file = g_file_new_for_uri (uri);
+       parent = g_file_get_parent (file);
+       g_object_unref (file);
+       if (parent) {
+               gchar *folder_uri;
+
+               folder_uri = g_file_get_uri (parent);
+               ev_application_set_filechooser_uri (EV_APP,
+                                                   GTK_FILE_CHOOSER_ACTION_SAVE,
+                                                   folder_uri);
+               g_free (folder_uri);
+               g_object_unref (parent);
+       }
+
+       /* FIXME: remote copy should be done here rather than in the save job, 
+        * so that we can track progress and cancel the operation
+        */
+
        ev_window_clear_save_job (ev_window);
        ev_window->priv->save_job = ev_job_save_new (ev_window->priv->document,
                                                     uri, ev_window->priv->uri);
@@ -2123,7 +2886,7 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
        GtkWidget *fc;
        gchar *base_name;
        GFile *file;
-       const gchar *folder;
+       const gchar *default_uri;
 
        fc = gtk_file_chooser_dialog_new (
                _("Save a Copy"),
@@ -2134,20 +2897,31 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
 
        ev_document_factory_add_filters (fc, ev_window->priv->document);
        gtk_dialog_set_default_response (GTK_DIALOG (fc), GTK_RESPONSE_OK);
+        gtk_dialog_set_alternative_button_order (GTK_DIALOG (fc),
+                                                GTK_RESPONSE_OK,
+                                                GTK_RESPONSE_CANCEL,
+                                                -1);
 
        gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (fc), FALSE);
        gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (fc), TRUE);
        file = g_file_new_for_uri (ev_window->priv->uri);
        base_name = g_file_get_basename (file);
        gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (fc), base_name);
-       
-       folder = g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS);
-       gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (fc),
-                                            folder ? folder : g_get_home_dir ());
-       
+
+       default_uri = ev_application_get_filechooser_uri (EV_APP, GTK_FILE_CHOOSER_ACTION_SAVE);
+       if (default_uri) {
+               gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (fc), default_uri);
+       } else {
+               const gchar *folder;
+
+               folder = g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS);
+               gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (fc),
+                                                    folder ? folder : g_get_home_dir ());
+       }
+
        g_object_unref (file);
        g_free (base_name);
-        
+
        g_signal_connect (fc, "response",
                          G_CALLBACK (file_save_dialog_response_cb),
                          ev_window);
@@ -2156,455 +2930,757 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
 }
 
 static void
-ev_window_print_page_setup_done_cb (GtkPageSetup *page_setup,
-                                   EvWindow     *window)
+ev_window_cmd_open_containing_folder (GtkAction *action, EvWindow *ev_window)
 {
-       /* Dialog was canceled */
-       if (!page_setup)
-               return;
+       GtkWidget *ev_window_widget;
+       GFile *file;
+       GFile *parent;
+
+       ev_window_widget = GTK_WIDGET (ev_window);
+
+       file = g_file_new_for_uri (ev_window->priv->uri);
+       parent = g_file_get_parent (file);
+
+       if (parent) {
+               char *parent_uri;
+
+               parent_uri = g_file_get_uri (parent);
+               if (parent_uri) {
+                       GdkScreen *screen;
+                       guint32 timestamp;
+                       GError *error;
+
+                       screen = gtk_widget_get_screen (ev_window_widget);
+                       timestamp = gtk_get_current_event_time ();
+
+                       error = NULL;
+                       if (!gtk_show_uri (screen, parent_uri, timestamp, &error)) {
+                               ev_window_error_message (ev_window, error, _("Could not open the containing folder"));
+                               g_error_free (error);
+                       }
+
+                       g_free (parent_uri);
+               }
+       }
 
-       if (window->priv->print_page_setup)
-               g_object_unref (window->priv->print_page_setup);
-       window->priv->print_page_setup = g_object_ref (page_setup);
+       if (file)
+               g_object_unref (file);
+
+       if (parent)
+               g_object_unref (parent);
+       
 }
 
-static void
-ev_window_cmd_file_print_setup (GtkAction *action, EvWindow *ev_window)
+static GKeyFile *
+get_print_settings_file (void)
 {
-       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);
+       GKeyFile *print_settings_file;
+       gchar    *filename;
+        GError *error = NULL;
+
+       print_settings_file = g_key_file_new ();
+
+       filename = g_build_filename (ev_application_get_dot_dir (EV_APP, FALSE),
+                                     EV_PRINT_SETTINGS_FILE, NULL);
+        if (!g_key_file_load_from_file (print_settings_file,
+                                        filename,
+                                        G_KEY_FILE_KEEP_COMMENTS |
+                                        G_KEY_FILE_KEEP_TRANSLATIONS,
+                                        &error)) {
+
+                /* Don't warn if the file simply doesn't exist */
+                if (!g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT))
+                       g_warning ("%s", error->message);
+
+                g_error_free (error);
+       }
+
+       g_free (filename);
+
+       return print_settings_file;
 }
 
 static void
-ev_window_clear_print_job (EvWindow *window)
+save_print_setting_file (GKeyFile *key_file)
 {
-       if (window->priv->print_job) {
-               if (!ev_job_is_finished (window->priv->print_job))
-                       ev_job_cancel (window->priv->print_job);
+       gchar  *filename;
+       gchar  *data;
+       gsize  data_length;
+       GError *error = NULL;
 
-               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;
+       filename = g_build_filename (ev_application_get_dot_dir (EV_APP, TRUE),
+                                    EV_PRINT_SETTINGS_FILE, NULL);
+       data = g_key_file_to_data (key_file, &data_length, NULL);
+       g_file_set_contents (filename, data, data_length, &error);
+       if (error) {
+               g_warning ("Failed to save print settings: %s", error->message);
+               g_error_free (error);
        }
+       g_free (data);
+       g_free (filename);
+}
 
-       if (window->priv->gtk_print_job) {
-               g_object_unref (window->priv->gtk_print_job);
-               window->priv->gtk_print_job = NULL;
+static void
+ev_window_save_print_settings (EvWindow         *window,
+                              GtkPrintSettings *print_settings)
+{
+       GKeyFile *key_file;
+       gint      i;
+
+       key_file = get_print_settings_file ();
+       gtk_print_settings_to_key_file (print_settings, key_file, EV_PRINT_SETTINGS_GROUP);
+
+       /* Save print settings that are specific to the document */
+       for (i = 0; i < G_N_ELEMENTS (document_print_settings); i++) {
+               /* Remove it from global settings */
+               g_key_file_remove_key (key_file, EV_PRINT_SETTINGS_GROUP,
+                                      document_print_settings[i], NULL);
+
+               if (window->priv->metadata) {
+                       const gchar *value;
+
+                       value = gtk_print_settings_get (print_settings,
+                                                       document_print_settings[i]);
+                       ev_metadata_set_string (window->priv->metadata,
+                                               document_print_settings[i], value);
+               }
        }
+
+       save_print_setting_file (key_file);
+       g_key_file_free (key_file);
 }
 
 static void
-ev_window_load_print_settings_from_metadata (EvWindow *window)
+ev_window_save_print_page_setup (EvWindow     *window,
+                                GtkPageSetup *page_setup)
 {
-       gchar *uri = window->priv->uri;
-       gint   i;
-       
+       GKeyFile *key_file;
+
+       key_file = get_print_settings_file ();
+       gtk_page_setup_to_key_file (page_setup, key_file, EV_PAGE_SETUP_GROUP);
+
+       /* Do not save document settings in global file */
+       g_key_file_remove_key (key_file, EV_PAGE_SETUP_GROUP,
+                              "page-setup-orientation", NULL);
+       g_key_file_remove_key (key_file, EV_PAGE_SETUP_GROUP,
+                              "page-setup-margin-top", NULL);
+       g_key_file_remove_key (key_file, EV_PAGE_SETUP_GROUP,
+                              "page-setup-margin-bottom", NULL);
+       g_key_file_remove_key (key_file, EV_PAGE_SETUP_GROUP,
+                              "page-setup-margin-left", NULL);
+       g_key_file_remove_key (key_file, EV_PAGE_SETUP_GROUP,
+                              "page-setup-margin-right", NULL);
+
+       save_print_setting_file (key_file);
+       g_key_file_free (key_file);
+
+       if (!window->priv->metadata)
+               return;
+
+       /* Save page setup options that are specific to the document */
+       ev_metadata_set_int (window->priv->metadata, "page-setup-orientation",
+                            gtk_page_setup_get_orientation (page_setup));
+       ev_metadata_set_double (window->priv->metadata, "page-setup-margin-top",
+                               gtk_page_setup_get_top_margin (page_setup, GTK_UNIT_MM));
+       ev_metadata_set_double (window->priv->metadata, "page-setup-margin-bottom",
+                               gtk_page_setup_get_bottom_margin (page_setup, GTK_UNIT_MM));
+       ev_metadata_set_double (window->priv->metadata, "page-setup-margin-left",
+                               gtk_page_setup_get_left_margin (page_setup, GTK_UNIT_MM));
+       ev_metadata_set_double (window->priv->metadata, "page-setup-margin-right",
+                               gtk_page_setup_get_right_margin (page_setup, GTK_UNIT_MM));
+}
+
+static void
+ev_window_load_print_settings_from_metadata (EvWindow         *window,
+                                            GtkPrintSettings *print_settings)
+{
+       gint i;
+
+       if (!window->priv->metadata)
+               return;
+
        /* Load print setting that are specific to the document */
        for (i = 0; i < G_N_ELEMENTS (document_print_settings); i++) {
-               GValue   value = { 0, };
-               gboolean success;
+               gchar *value = NULL;
 
-               success = ev_metadata_manager_get (uri, document_print_settings[i], &value, TRUE);
-               gtk_print_settings_set (window->priv->print_settings,
-                                       document_print_settings[i],
-                                       success ? g_value_get_string (&value) : NULL);
+               ev_metadata_get_string (window->priv->metadata,
+                                       document_print_settings[i], &value);
+               gtk_print_settings_set (print_settings,
+                                       document_print_settings[i], value);
        }
 }
 
 static void
-ev_window_save_print_settings (EvWindow *window)
+ev_window_load_print_page_setup_from_metadata (EvWindow     *window,
+                                              GtkPageSetup *page_setup)
 {
-       gchar *uri = window->priv->uri;
-       gint   i;
+       gint          int_value;
+       gdouble       double_value;
+       GtkPaperSize *paper_size = gtk_page_setup_get_paper_size (page_setup);
+
+       /* Load page setup options that are specific to the document */
+       if (window->priv->metadata &&
+           ev_metadata_get_int (window->priv->metadata, "page-setup-orientation", &int_value)) {
+               gtk_page_setup_set_orientation (page_setup, int_value);
+       } else {
+               gtk_page_setup_set_orientation (page_setup, GTK_PAGE_ORIENTATION_PORTRAIT);
+       }
+
+       if (window->priv->metadata &&
+           ev_metadata_get_double (window->priv->metadata, "page-setup-margin-top", &double_value)) {
+               gtk_page_setup_set_top_margin (page_setup, double_value, GTK_UNIT_MM);
+       } else {
+               gtk_page_setup_set_top_margin (page_setup,
+                                              gtk_paper_size_get_default_top_margin (paper_size, GTK_UNIT_MM),
+                                              GTK_UNIT_MM);
+       }
+
+       if (window->priv->metadata &&
+           ev_metadata_get_double (window->priv->metadata, "page-setup-margin-bottom", &double_value)) {
+               gtk_page_setup_set_bottom_margin (page_setup, double_value, GTK_UNIT_MM);
+       } else {
+               gtk_page_setup_set_bottom_margin (page_setup,
+                                                 gtk_paper_size_get_default_bottom_margin (paper_size, GTK_UNIT_MM),
+                                                 GTK_UNIT_MM);
+       }
+
+       if (window->priv->metadata &&
+           ev_metadata_get_double (window->priv->metadata, "page-setup-margin-left", &double_value)) {
+               gtk_page_setup_set_left_margin (page_setup, double_value, GTK_UNIT_MM);
+       } else {
+               gtk_page_setup_set_left_margin (page_setup,
+                                               gtk_paper_size_get_default_left_margin (paper_size, GTK_UNIT_MM),
+                                               GTK_UNIT_MM);
+       }
+
+       if (window->priv->metadata &&
+           ev_metadata_get_double (window->priv->metadata, "page-setup-margin-right", &double_value)) {
+               gtk_page_setup_set_right_margin (page_setup, double_value, GTK_UNIT_MM);
+       } else {
+               gtk_page_setup_set_right_margin (page_setup,
+                                                gtk_paper_size_get_default_right_margin (paper_size, GTK_UNIT_MM),
+                                                GTK_UNIT_MM);
+       }
+}
+
+static GtkPrintSettings *
+get_print_settings (GKeyFile *key_file)
+{
+       GtkPrintSettings *print_settings;
+
+       print_settings = g_key_file_has_group (key_file, EV_PRINT_SETTINGS_GROUP) ?
+               gtk_print_settings_new_from_key_file (key_file, EV_PRINT_SETTINGS_GROUP, NULL) :
+               gtk_print_settings_new ();
+
+       return print_settings ? print_settings : gtk_print_settings_new ();
+}
+
+static GtkPageSetup *
+get_print_page_setup (GKeyFile *key_file)
+{
+       GtkPageSetup *page_setup;
+
+       page_setup = g_key_file_has_group (key_file, EV_PAGE_SETUP_GROUP) ?
+               gtk_page_setup_new_from_key_file (key_file, EV_PAGE_SETUP_GROUP, NULL) :
+               gtk_page_setup_new ();
+
+       return page_setup ? page_setup : gtk_page_setup_new ();
+}
+
+static void
+ev_window_print_cancel (EvWindow *ev_window)
+{
+       EvPrintOperation *op;
        
-       /* Save print settings that are specific to the document */
-       for (i = 0; i < G_N_ELEMENTS (document_print_settings); i++) {
-               const gchar *value;
+       if (!ev_window->priv->print_queue)
+               return;
 
-               value = gtk_print_settings_get (window->priv->print_settings,
-                                               document_print_settings[i]);
-               ev_metadata_manager_set_string (uri, document_print_settings[i], value);
+       while ((op = g_queue_peek_tail (ev_window->priv->print_queue))) {
+               ev_print_operation_cancel (op);
        }
 }
 
 static void
-ev_window_print_finished (GtkPrintJob *print_job,
-                         EvWindow    *window,
-                         GError      *error)
+ev_window_print_update_pending_jobs_message (EvWindow *ev_window,
+                                            gint      n_jobs)
 {
-       ev_window_clear_print_job (window);
+       gchar *text = NULL;
        
-       if (error) {
+       if (!EV_IS_PROGRESS_MESSAGE_AREA (ev_window->priv->message_area) ||
+           !ev_window->priv->print_queue)
+               return;
+
+       if (n_jobs == 0) {
+               ev_window_set_message_area (ev_window, NULL);
+               return;
+       }
+       
+       if (n_jobs > 1) {
+               text = g_strdup_printf (ngettext ("%d pending job in queue",
+                                                 "%d pending jobs in queue",
+                                                 n_jobs - 1), n_jobs - 1);
+       }
+
+       ev_message_area_set_secondary_text (EV_MESSAGE_AREA (ev_window->priv->message_area),
+                                           text);
+       g_free (text);
+}
+
+static gboolean
+destroy_window (GtkWidget *window)
+{
+       gtk_widget_destroy (window);
+       
+       return FALSE;
+}
+
+static void
+ev_window_print_operation_done (EvPrintOperation       *op,
+                               GtkPrintOperationResult result,
+                               EvWindow               *ev_window)
+{
+       gint n_jobs;
+
+       switch (result) {
+       case GTK_PRINT_OPERATION_RESULT_APPLY: {
+               GtkPrintSettings *print_settings;
+
+               print_settings = ev_print_operation_get_print_settings (op);
+               ev_window_save_print_settings (ev_window, print_settings);
+
+               if (ev_print_operation_get_embed_page_setup (op)) {
+                       GtkPageSetup *page_setup;
+
+                       page_setup = ev_print_operation_get_default_page_setup (op);
+                       ev_window_save_print_page_setup (ev_window, page_setup);
+               }
+       }
+
+               break;
+       case GTK_PRINT_OPERATION_RESULT_ERROR: {
                GtkWidget *dialog;
+               GError    *error = NULL;
+
+
+               ev_print_operation_get_error (op, &error);
                
-               dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-                                                GTK_DIALOG_MODAL,
+               /* The message area is already used by
+                * the printing progress, so it's better to
+                * use a popup dialog in this case
+                */
+               dialog = gtk_message_dialog_new (GTK_WINDOW (ev_window),
+                                                GTK_DIALOG_DESTROY_WITH_PARENT,
                                                 GTK_MESSAGE_ERROR,
-                                                GTK_BUTTONS_OK,
-                                                _("Failed to print document"));
+                                                GTK_BUTTONS_CLOSE,
+                                                "%s", _("Failed to print document"));
                gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
                                                          "%s", error->message);
+               g_signal_connect (dialog, "response",
+                                 G_CALLBACK (gtk_widget_destroy),
+                                 NULL);
+               gtk_widget_show (dialog);
+               
+               g_error_free (error);
+       }
+               break;
+       case GTK_PRINT_OPERATION_RESULT_CANCEL:
+       default:
+               break;
+       }
 
-               gtk_dialog_run (GTK_DIALOG (dialog));
-               gtk_widget_destroy (dialog);
+       g_queue_remove (ev_window->priv->print_queue, op);
+       g_object_unref (op);
+       n_jobs = g_queue_get_length (ev_window->priv->print_queue);
+       ev_window_print_update_pending_jobs_message (ev_window, n_jobs);
+
+       if (n_jobs == 0 && ev_window->priv->close_after_print)
+               g_idle_add ((GSourceFunc)destroy_window,
+                           ev_window);
+}
+
+static void
+ev_window_print_progress_response_cb (EvProgressMessageArea *area,
+                                     gint                   response,
+                                     EvWindow              *ev_window)
+{
+       if (response == GTK_RESPONSE_CANCEL) {
+               EvPrintOperation *op;
+
+               op = g_queue_peek_tail (ev_window->priv->print_queue);
+               ev_print_operation_cancel (op);
        } else {
-               /* If printed successfully, save print settings */
-               ev_application_set_print_settings (EV_APP,
-                                                  window->priv->print_settings);
-               ev_window_save_print_settings (window);
+               gtk_widget_hide (GTK_WIDGET (area));
        }
 }
 
 static void
-ev_window_print_send (EvWindow    *window,
-                     const gchar *filename)
+ev_window_print_operation_status_changed (EvPrintOperation *op,
+                                         EvWindow         *ev_window)
 {
-       GtkPrintSettings *settings;
-       EvFileExporterCapabilities capabilities;
-       
-       /* Some printers take into account some print settings,
-        * and others don't. However we have exported the document
-        * to a ps or pdf file according to such print settings. So,
-        * we want to send the exported file to printer with those
-        * settings set to default values. 
-        */
-       settings = gtk_print_settings_copy (window->priv->print_settings);
-       capabilities = ev_file_exporter_get_capabilities (EV_FILE_EXPORTER (window->priv->document));
-
-       gtk_print_settings_set_page_ranges (settings, NULL, 0);
-       gtk_print_settings_set_print_pages (settings, GTK_PRINT_PAGES_ALL);
-       if (capabilities & EV_FILE_EXPORTER_CAN_COPIES)
-               gtk_print_settings_set_n_copies (settings, 1);
-       if (capabilities & EV_FILE_EXPORTER_CAN_PAGE_SET)
-               gtk_print_settings_set_page_set (settings, GTK_PAGE_SET_ALL);
-       if (capabilities & EV_FILE_EXPORTER_CAN_SCALE)
-               gtk_print_settings_set_scale (settings, 1.0);
-       if (capabilities & EV_FILE_EXPORTER_CAN_COLLATE)
-               gtk_print_settings_set_collate (settings, FALSE);
-       if (capabilities & EV_FILE_EXPORTER_CAN_REVERSE)
-               gtk_print_settings_set_reverse (settings, FALSE);
-       if (capabilities & EV_FILE_EXPORTER_CAN_NUMBER_UP) {
-               gtk_print_settings_set_number_up (settings, 1);
-               gtk_print_settings_set_int (settings, "cups-"GTK_PRINT_SETTINGS_NUMBER_UP, 1);
-       }
-       
-       if (window->priv->print_preview) {
-               gchar *uri;
-               gchar *print_settings_file = NULL;
+       const gchar *status;
+       gdouble      fraction;
 
-               ev_application_set_print_settings (EV_APP,
-                                                  window->priv->print_settings);
-               
-#if GTK_CHECK_VERSION (2, 11, 0)
-               print_settings_file = ev_tmp_filename ("print-settings");
-               gtk_print_settings_to_file (settings, print_settings_file, NULL);
-#endif
-               uri = g_filename_to_uri (filename, NULL, NULL);
-               ev_application_open_uri_at_dest (EV_APP,
-                                                uri, 
-                                                gtk_window_get_screen (GTK_WINDOW (window)),
-                                                NULL,
-                                                EV_WINDOW_MODE_PREVIEW,
-                                                NULL, 
-                                                TRUE,
-                                                print_settings_file,
-                                                GDK_CURRENT_TIME);
-               g_free (print_settings_file);
-               g_free (uri);
-       } else {
-               GtkPrintJob *job;
-               GError      *error = NULL;
+       status = ev_print_operation_get_status (op);
+       fraction = ev_print_operation_get_progress (op);
        
-               job = gtk_print_job_new (gtk_window_get_title (GTK_WINDOW (window)),
-                                        window->priv->printer,
-                                        settings,
-                                        window->priv->print_page_setup);
-
-               if (window->priv->gtk_print_job)
-                       g_object_unref (window->priv->gtk_print_job);
-               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 ("%s", error->message);
-                       g_error_free (error);
-               }
+       if (!ev_window->priv->message_area) {
+               GtkWidget   *area;
+               const gchar *job_name;
+               gchar       *text;
+
+               job_name = ev_print_operation_get_job_name (op);
+               text = g_strdup_printf (_("Printing job “%s”"), job_name);
+
+               area = ev_progress_message_area_new (GTK_STOCK_PRINT,
+                                                    text,
+                                                    GTK_STOCK_CLOSE,
+                                                    GTK_RESPONSE_CLOSE,
+                                                    GTK_STOCK_CANCEL,
+                                                    GTK_RESPONSE_CANCEL,
+                                                    NULL);
+               ev_window_print_update_pending_jobs_message (ev_window, 1);
+               g_signal_connect (area, "response",
+                                 G_CALLBACK (ev_window_print_progress_response_cb),
+                                 ev_window);
+               gtk_widget_show (area);
+               ev_window_set_message_area (ev_window, area);
+               g_free (text);
        }
 
-       g_object_unref (settings);
+       ev_progress_message_area_set_status (EV_PROGRESS_MESSAGE_AREA (ev_window->priv->message_area),
+                                            status);
+       ev_progress_message_area_set_fraction (EV_PROGRESS_MESSAGE_AREA (ev_window->priv->message_area),
+                                              fraction);
 }
 
 static void
-ev_window_print_job_cb (EvJob    *job,
-                       EvWindow *window)
+ev_window_print_operation_begin_print (EvPrintOperation *op,
+                                      EvWindow         *ev_window)
 {
-       if (ev_job_is_failed (job)) {
-               g_warning ("%s", job->error->message);
-               ev_window_clear_print_job (window);
-               return;
-       }
-
-       g_assert (EV_JOB_PRINT (job)->temp_file != NULL);
+       if (!ev_window->priv->print_queue)
+               ev_window->priv->print_queue = g_queue_new ();
 
-       ev_window_print_send (window, EV_JOB_PRINT (job)->temp_file);
+       g_queue_push_head (ev_window->priv->print_queue, op);
+       ev_window_print_update_pending_jobs_message (ev_window,
+                                                    g_queue_get_length (ev_window->priv->print_queue));
 }
 
-static gboolean
-ev_window_print_dialog_response_cb (GtkDialog *dialog,
-                                   gint       response,
-                                   EvWindow  *window)
+void
+ev_window_print_range (EvWindow *ev_window,
+                      gint      first_page,
+                      gint      last_page)
 {
-       EvPrintRange  *ranges = NULL;
-       EvPrintPageSet page_set;
-       gint           n_ranges = 0;
-       gint           copies;
-       gint           pages_per_sheet;
-       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 &&
-           response != GTK_RESPONSE_APPLY) {
-               gtk_widget_destroy (GTK_WIDGET (dialog));
-               window->priv->print_dialog = NULL;
+       EvPrintOperation *op;
+       GKeyFile         *print_settings_file;
+       GtkPrintSettings *print_settings;
+       GtkPageSetup     *print_page_setup;
+       gint              current_page;
+       gint              document_last_page;
+       gboolean          embed_page_setup;
 
-               return FALSE;
+       g_return_if_fail (EV_IS_WINDOW (ev_window));
+       g_return_if_fail (ev_window->priv->document != NULL);
+
+       if (!ev_window->priv->print_queue)
+               ev_window->priv->print_queue = g_queue_new ();
+
+       op = ev_print_operation_new (ev_window->priv->document);
+       if (!op) {
+               g_warning ("%s", "Printing is not supported for document\n");
+               return;
        }
 
-       window->priv->print_preview = (response == GTK_RESPONSE_APPLY);
+       g_signal_connect (op, "begin_print",
+                         G_CALLBACK (ev_window_print_operation_begin_print),
+                         (gpointer)ev_window);
+       g_signal_connect (op, "status_changed",
+                         G_CALLBACK (ev_window_print_operation_status_changed),
+                         (gpointer)ev_window);
+       g_signal_connect (op, "done",
+                         G_CALLBACK (ev_window_print_operation_done),
+                         (gpointer)ev_window);
 
-       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);
+       current_page = ev_document_model_get_page (ev_window->priv->model);
+       document_last_page = ev_document_get_n_pages (ev_window->priv->document);
 
-               return FALSE;
-       }
+       print_settings_file = get_print_settings_file ();
 
-       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));
+       print_settings = get_print_settings (print_settings_file);
+       ev_window_load_print_settings_from_metadata (ev_window, print_settings);
+
+       print_page_setup = get_print_page_setup (print_settings_file);
+       ev_window_load_print_page_setup_from_metadata (ev_window, print_page_setup);
+
+       if (first_page != 1 || last_page != document_last_page) {
+               GtkPageRange range;
+
+               /* Ranges in GtkPrint are 0 - N */
+               range.start = first_page - 1;
+               range.end = last_page - 1;
+
+               gtk_print_settings_set_print_pages (print_settings,
+                                                   GTK_PRINT_PAGES_RANGES);
+               gtk_print_settings_set_page_ranges (print_settings,
+                                                   &range, 1);
        }
-               break;
-       case GTK_PRINT_PAGES_ALL: {
-               gint n_pages;
 
-               n_pages = ev_page_cache_get_n_pages (ev_page_cache_get (window->priv->document));
-               
-               ranges = g_new0 (EvPrintRange, 1);
+       ev_print_operation_set_job_name (op, gtk_window_get_title (GTK_WINDOW (ev_window)));
+       ev_print_operation_set_current_page (op, current_page);
+       ev_print_operation_set_print_settings (op, print_settings);
+       ev_print_operation_set_default_page_setup (op, print_page_setup);
+       embed_page_setup = ev_window->priv->lockdown_settings ?
+               !g_settings_get_boolean (ev_window->priv->lockdown_settings,
+                                        GS_LOCKDOWN_PRINT_SETUP) :
+               TRUE;
+       ev_print_operation_set_embed_page_setup (op, embed_page_setup);
+
+       g_object_unref (print_settings);
+       g_object_unref (print_page_setup);
+       g_key_file_free (print_settings_file);
+
+       ev_print_operation_run (op, GTK_WINDOW (ev_window));
+}
+
+static void
+ev_window_print (EvWindow *window)
+{
+       ev_window_print_range (window, 1,
+                              ev_document_get_n_pages (window->priv->document));
+}
 
-               ranges->start = 0;
-               ranges->end = n_pages - 1;
-               n_ranges = 1;
+static void
+ev_window_cmd_file_print (GtkAction *action, EvWindow *ev_window)
+{
+       ev_window_print (ev_window);
+}
+
+static void
+ev_window_cmd_file_properties (GtkAction *action, EvWindow *ev_window)
+{
+       if (ev_window->priv->properties == NULL) {
+               ev_window->priv->properties = ev_properties_dialog_new ();
+               ev_properties_dialog_set_document (EV_PROPERTIES_DIALOG (ev_window->priv->properties),
+                                                  ev_window->priv->uri,
+                                                  ev_window->priv->document);
+               g_object_add_weak_pointer (G_OBJECT (ev_window->priv->properties),
+                                          (gpointer) &(ev_window->priv->properties));
+               gtk_window_set_transient_for (GTK_WINDOW (ev_window->priv->properties),
+                                             GTK_WINDOW (ev_window));
        }
+
+       ev_document_fc_mutex_lock ();
+       gtk_widget_show (ev_window->priv->properties);
+       ev_document_fc_mutex_unlock ();
+}
+
+static void
+document_modified_confirmation_dialog_response (GtkDialog *dialog,
+                                               gint       response,
+                                               EvWindow  *ev_window)
+{
+       gtk_widget_destroy (GTK_WIDGET (dialog));
+
+       switch (response) {
+       case GTK_RESPONSE_YES:
+               ev_window_cmd_save_as (NULL, ev_window);
+               break;
+       case GTK_RESPONSE_NO:
+               gtk_widget_destroy (GTK_WIDGET (ev_window));
+               break;
+       case GTK_RESPONSE_CANCEL:
+       default:
                break;
        }
+}
+
+static gboolean
+ev_window_check_document_modified (EvWindow *ev_window)
+{
+       EvDocument  *document = ev_window->priv->document;
+       GtkWidget   *dialog;
+       gchar       *text, *markup;
+       const gchar *secondary_text;
 
-       page_set = (EvPrintPageSet)gtk_print_settings_get_page_set (window->priv->print_settings);
+       if (!document)
+               return FALSE;
 
-       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_POINTS);
-       height = gtk_page_setup_get_paper_height (window->priv->print_page_setup,
-                                                 GTK_UNIT_POINTS);
-       
-       if (scale != 1.0) {
-               width *= scale;
-               height *= scale;
+       if (EV_IS_DOCUMENT_FORMS (document) &&
+           ev_document_forms_document_is_modified (EV_DOCUMENT_FORMS (document))) {
+               secondary_text = _("Document contains form fields that have been filled out. "
+                                  "If you don't save a copy, changes will be permanently lost.");
+       } else if (EV_IS_DOCUMENT_ANNOTATIONS (document) &&
+                  ev_document_annotations_document_is_modified (EV_DOCUMENT_ANNOTATIONS (document))) {
+               secondary_text = _("Document contains new or modified annotations. "
+                                  "If you don't save a copy, changes will be permanently lost.");
+       } else {
+               return FALSE;
        }
 
-       pages_per_sheet = gtk_print_settings_get_number_up (window->priv->print_settings);
-       
-       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,
-                                                   pages_per_sheet,
-                                                   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_scheduler_push_job (window->priv->print_job, EV_JOB_PRIORITY_NONE);
-       
-       gtk_widget_destroy (GTK_WIDGET (dialog));
-       window->priv->print_dialog = NULL;
+
+       text = g_markup_printf_escaped (_("Save a copy of document “%s” before closing?"),
+                                       gtk_window_get_title (GTK_WINDOW (ev_window)));
+
+       dialog = gtk_message_dialog_new (GTK_WINDOW (ev_window),
+                                        GTK_DIALOG_MODAL,
+                                        GTK_MESSAGE_QUESTION,
+                                        GTK_BUTTONS_NONE,
+                                        NULL);
+
+       markup = g_strdup_printf ("<b>%s</b>", text);
+       g_free (text);
+
+       gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (dialog), markup);
+       g_free (markup);
+
+       gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+                                                 "%s", secondary_text);
+
+       gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+                               _("Close _without Saving"),
+                               GTK_RESPONSE_NO,
+                               GTK_STOCK_CANCEL,
+                               GTK_RESPONSE_CANCEL,
+                               _("Save a _Copy"),
+                               GTK_RESPONSE_YES,
+                               NULL);
+       gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);
+        gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                                 GTK_RESPONSE_YES,
+                                                 GTK_RESPONSE_NO,
+                                                 GTK_RESPONSE_CANCEL,
+                                                 -1);
+
+       g_signal_connect (dialog, "response",
+                         G_CALLBACK (document_modified_confirmation_dialog_response),
+                         ev_window);
+       gtk_widget_show (dialog);
 
        return TRUE;
 }
 
-void
-ev_window_print_range (EvWindow *ev_window, int first_page, int last_page)
+static void
+print_jobs_confirmation_dialog_response (GtkDialog *dialog,
+                                        gint       response,
+                                        EvWindow  *ev_window)
+{
+       gtk_widget_destroy (GTK_WIDGET (dialog));       
+       
+       switch (response) {
+       case GTK_RESPONSE_YES:
+               if (!ev_window->priv->print_queue ||
+                   g_queue_is_empty (ev_window->priv->print_queue))
+                       gtk_widget_destroy (GTK_WIDGET (ev_window));
+               else
+                       ev_window->priv->close_after_print = TRUE;
+               break;
+       case GTK_RESPONSE_NO:
+               ev_window->priv->close_after_print = TRUE;
+               if (ev_window->priv->print_queue &&
+                   !g_queue_is_empty (ev_window->priv->print_queue)) {
+                       gtk_widget_set_sensitive (GTK_WIDGET (ev_window), FALSE);
+                       ev_window_print_cancel (ev_window);
+               } else {
+                       gtk_widget_destroy (GTK_WIDGET (ev_window));
+               }
+               break;
+       case GTK_RESPONSE_CANCEL:
+       default:
+               ev_window->priv->close_after_print = FALSE;
+       }
+}
+
+static gboolean
+ev_window_check_print_queue (EvWindow *ev_window)
 {
-       GtkWidget           *dialog;
-       EvPageCache         *page_cache;
-       gint                 current_page;
-       gint                 document_last_page;
-       GtkPrintCapabilities capabilities;
+       GtkWidget *dialog;
+       gchar     *text, *markup;
+       gint       n_print_jobs;
 
-       g_return_if_fail (EV_IS_WINDOW (ev_window));
-       g_return_if_fail (ev_window->priv->document != NULL);
+       n_print_jobs = ev_window->priv->print_queue ?
+               g_queue_get_length (ev_window->priv->print_queue) : 0;
 
-       if (ev_window->priv->print_dialog) {
-               gtk_window_present (GTK_WINDOW (ev_window->priv->print_dialog));
-               return;
-       }
-       
-       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);
+       if (n_print_jobs == 0)
+               return FALSE;
 
-       if (!ev_window->priv->print_settings) {
-               ev_window->priv->print_settings = gtk_print_settings_copy (
-                       ev_application_get_print_settings (EV_APP));
-               ev_window_load_print_settings_from_metadata (ev_window);
-       }
+       dialog = gtk_message_dialog_new (GTK_WINDOW (ev_window),
+                                        GTK_DIALOG_MODAL,
+                                        GTK_MESSAGE_QUESTION,
+                                        GTK_BUTTONS_NONE,
+                                        NULL);
+       if (n_print_jobs == 1) {
+               EvPrintOperation *op;
+               const gchar      *job_name;
 
-       if (first_page != 1 || last_page != document_last_page) {
-               GtkPageRange range;
+               op = g_queue_peek_tail (ev_window->priv->print_queue);
+               job_name = ev_print_operation_get_job_name (op);
 
-               /* 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);
+               text = g_strdup_printf (_("Wait until print job “%s” finishes before closing?"),
+                                       job_name);
+       } else {
+               text = g_strdup_printf (_("There are %d print jobs active. "
+                                         "Wait until print finishes before closing?"),
+                                       n_print_jobs);
        }
 
-       dialog = gtk_print_unix_dialog_new (_("Print"), GTK_WINDOW (ev_window));
-       ev_window->priv->print_dialog = dialog;
-       
-       capabilities = GTK_PRINT_CAPABILITY_PREVIEW |
-               ev_file_exporter_get_capabilities (EV_FILE_EXPORTER (ev_window->priv->document));
-       gtk_print_unix_dialog_set_manual_capabilities (GTK_PRINT_UNIX_DIALOG (dialog),
-                                                      capabilities);
+       markup = g_strdup_printf ("<b>%s</b>", text);
+       g_free (text);
 
-       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_message_dialog_set_markup (GTK_MESSAGE_DIALOG (dialog), markup);
+       g_free (markup);
 
-       gtk_widget_show (dialog);
-}
+       gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s",
+                                                 _("If you close the window, pending print "
+                                                   "jobs will not be printed."));
 
-static void
-ev_window_print (EvWindow *window)
-{
-       EvPageCache *page_cache;
-       gint         last_page;
+       gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+                               _("Cancel _print and Close"),
+                               GTK_RESPONSE_NO,
+                               GTK_STOCK_CANCEL,
+                               GTK_RESPONSE_CANCEL,
+                               _("Close _after Printing"),
+                               GTK_RESPONSE_YES,
+                               NULL);
+       gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);
+        gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                                 GTK_RESPONSE_YES,
+                                                 GTK_RESPONSE_NO,
+                                                 GTK_RESPONSE_CANCEL,
+                                                 -1);
 
-       page_cache = ev_page_cache_get (window->priv->document);
-       last_page = ev_page_cache_get_n_pages (page_cache);
+       g_signal_connect (dialog, "response",
+                         G_CALLBACK (print_jobs_confirmation_dialog_response),
+                         ev_window);
+       gtk_widget_show (dialog);
 
-       ev_window_print_range (window, 1, last_page);
+       return TRUE;
 }
 
-static void
-ev_window_cmd_file_print (GtkAction *action, EvWindow *ev_window)
+static gboolean
+ev_window_close (EvWindow *ev_window)
 {
-       ev_window_print (ev_window);
-}
+       if (EV_WINDOW_IS_PRESENTATION (ev_window)) {
+               gint current_page;
 
-static void
-ev_window_cmd_file_properties (GtkAction *action, EvWindow *ev_window)
-{
-       if (ev_window->priv->properties == NULL) {
-               ev_window->priv->properties = ev_properties_dialog_new ();
-               ev_properties_dialog_set_document (EV_PROPERTIES_DIALOG (ev_window->priv->properties),
-                                                  ev_window->priv->document);
-               g_object_add_weak_pointer (G_OBJECT (ev_window->priv->properties),
-                                          (gpointer) &(ev_window->priv->properties));
-               gtk_window_set_transient_for (GTK_WINDOW (ev_window->priv->properties),
-                                             GTK_WINDOW (ev_window));
+               /* Save current page */
+               current_page = ev_view_presentation_get_current_page (
+                       EV_VIEW_PRESENTATION (ev_window->priv->presentation_view));
+               ev_document_model_set_page (ev_window->priv->model, current_page);
        }
 
-       ev_document_fc_mutex_lock ();
-       gtk_widget_show (ev_window->priv->properties);
-       ev_document_fc_mutex_unlock ();
+       if (ev_window_check_document_modified (ev_window))
+               return FALSE;
+
+       if (ev_window_check_print_queue (ev_window))
+               return FALSE;
+
+       return TRUE;
 }
-                                       
+
 static void
 ev_window_cmd_file_close_window (GtkAction *action, EvWindow *ev_window)
 {
-       g_return_if_fail (EV_IS_WINDOW (ev_window));
-
-       gtk_widget_destroy (GTK_WIDGET (ev_window));
+       if (ev_window_close (ev_window))
+               gtk_widget_destroy (GTK_WIDGET (ev_window));
 }
 
 static void
@@ -2624,13 +3700,13 @@ ev_window_cmd_focus_page_selector (GtkAction *act, EvWindow *window)
 static void
 ev_window_cmd_scroll_forward (GtkAction *action, EvWindow *window)
 {
-       ev_view_scroll (EV_VIEW (window->priv->view), EV_SCROLL_PAGE_FORWARD, FALSE);
+       ev_view_scroll (EV_VIEW (window->priv->view), GTK_SCROLL_PAGE_FORWARD, FALSE);
 }
 
 static void
 ev_window_cmd_scroll_backward (GtkAction *action, EvWindow *window)
 {
-       ev_view_scroll (EV_VIEW (window->priv->view), EV_SCROLL_PAGE_BACKWARD, FALSE);
+       ev_view_scroll (EV_VIEW (window->priv->view), GTK_SCROLL_PAGE_BACKWARD, FALSE);
 }
 
 static void
@@ -2640,10 +3716,7 @@ ev_window_cmd_continuous (GtkAction *action, EvWindow *ev_window)
 
        ev_window_stop_presentation (ev_window, TRUE);
        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);
+       ev_document_model_set_continuous (ev_window->priv->model, continuous);
 }
 
 static void
@@ -2653,10 +3726,7 @@ ev_window_cmd_dual (GtkAction *action, EvWindow *ev_window)
 
        ev_window_stop_presentation (ev_window, TRUE);
        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);
+       ev_document_model_set_dual_page (ev_window->priv->model, dual_page);
 }
 
 static void
@@ -2665,9 +3735,9 @@ ev_window_cmd_view_best_fit (GtkAction *action, EvWindow *ev_window)
        ev_window_stop_presentation (ev_window, TRUE);
 
        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);
+               ev_document_model_set_sizing_mode (ev_window->priv->model, EV_SIZING_BEST_FIT);
        } else {
-               ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_FREE);
+               ev_document_model_set_sizing_mode (ev_window->priv->model, EV_SIZING_FREE);
        }
        ev_window_update_actions (ev_window);
 }
@@ -2678,9 +3748,9 @@ ev_window_cmd_view_page_width (GtkAction *action, EvWindow *ev_window)
        ev_window_stop_presentation (ev_window, TRUE);
 
        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);
+               ev_document_model_set_sizing_mode (ev_window->priv->model, EV_SIZING_FIT_WIDTH);
        } else {
-               ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_FREE);
+               ev_document_model_set_sizing_mode (ev_window->priv->model, EV_SIZING_FREE);
        }
        ev_window_update_actions (ev_window);
 }
@@ -2740,12 +3810,13 @@ ev_window_cmd_edit_copy (GtkAction *action, EvWindow *ev_window)
 }
 
 static void
-ev_window_sidebar_position_change_cb (GObject *object, GParamSpec *pspec,
-                                     EvWindow *ev_window)
+ev_window_sidebar_position_change_cb (GObject    *object,
+                                     GParamSpec *pspec,
+                                     EvWindow   *ev_window)
 {
-       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)));
+       if (ev_window->priv->metadata && !ev_window_is_empty (ev_window))
+               ev_metadata_set_int (ev_window->priv->metadata, "sidebar_size",
+                                    gtk_paned_get_position (GTK_PANED (object)));
 }
 
 static void
@@ -2757,7 +3828,7 @@ ev_window_update_fullscreen_action (EvWindow *window)
        g_signal_handlers_block_by_func
                (action, G_CALLBACK (ev_window_cmd_view_fullscreen), window);
        gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
-                                     ev_view_get_fullscreen (EV_VIEW (window->priv->view)));
+                                     ev_document_model_get_fullscreen (window->priv->model));
        g_signal_handlers_unblock_by_func
                (action, G_CALLBACK (ev_window_cmd_view_fullscreen), window);
 }
@@ -2783,31 +3854,27 @@ fullscreen_toolbar_setup_item_properties (GtkUIManager *ui_manager)
 static void
 fullscreen_toolbar_remove_shadow (GtkWidget *toolbar)
 {
-       static gboolean done = FALSE;
+       GtkCssProvider *provider;
 
-       if (!done) {
-               gtk_rc_parse_string (
-                       "\n"
-                       "   style \"fullscreen-toolbar-style\"\n"
-                       "   {\n"
-                       "      GtkToolbar::shadow-type=GTK_SHADOW_NONE\n"
-                       "   }\n"
-                       "\n"
-                       "    widget \"*.fullscreen-toolbar\" style \"fullscreen-toolbar-style\"\n"
-                       "\n");
-               done = TRUE;
-       }
-       
-       gtk_widget_set_name (toolbar, "fullscreen-toolbar");
+       gtk_widget_set_name (toolbar, "ev-fullscreen-toolbar");
+
+       provider = gtk_css_provider_new ();
+       gtk_css_provider_load_from_data (provider,
+                                        "#ev-fullscreen-toolbar {\n"
+                                        " -GtkToolbar-shadow-type: none; }",
+                                        -1, NULL);
+       gtk_style_context_add_provider (gtk_widget_get_style_context (toolbar),
+                                       GTK_STYLE_PROVIDER (provider),
+                                       GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+       g_object_unref (provider);
 }
 
 static void
 ev_window_run_fullscreen (EvWindow *window)
 {
-       EvView  *view = EV_VIEW (window->priv->view);
        gboolean fullscreen_window = TRUE;
 
-       if (ev_view_get_fullscreen (view))
+       if (ev_document_model_get_fullscreen (window->priv->model))
                return;
        
        if (!window->priv->fullscreen_toolbar) {
@@ -2827,7 +3894,7 @@ ev_window_run_fullscreen (EvWindow *window)
                                       window->priv->fullscreen_toolbar, 1);
        }
 
-       if (ev_view_get_presentation (view)) {
+       if (EV_WINDOW_IS_PRESENTATION (window)) {
                ev_window_stop_presentation (window, FALSE);
                fullscreen_window = FALSE;
        }
@@ -2836,7 +3903,7 @@ ev_window_run_fullscreen (EvWindow *window)
                      "shadow-type", GTK_SHADOW_NONE,
                      NULL);
 
-       ev_view_set_fullscreen (view, TRUE);
+       ev_document_model_set_fullscreen (window->priv->model, TRUE);
        ev_window_update_fullscreen_action (window);
 
        /* If the user doesn't have the main toolbar he/she won't probably want
@@ -2850,32 +3917,30 @@ ev_window_run_fullscreen (EvWindow *window)
                gtk_window_fullscreen (GTK_WINDOW (window));
        gtk_widget_grab_focus (window->priv->view);
 
-       if (!ev_window_is_empty (window))
-               ev_metadata_manager_set_boolean (window->priv->uri, "fullscreen", TRUE);
+       if (window->priv->metadata && !ev_window_is_empty (window))
+               ev_metadata_set_boolean (window->priv->metadata, "fullscreen", TRUE);
 }
 
 static void
 ev_window_stop_fullscreen (EvWindow *window,
                           gboolean  unfullscreen_window)
 {
-       EvView *view = EV_VIEW (window->priv->view);
-
-       if (!ev_view_get_fullscreen (view))
+       if (!ev_document_model_get_fullscreen (window->priv->model))
                return;
 
        g_object_set (G_OBJECT (window->priv->scrolled_window),
                      "shadow-type", GTK_SHADOW_IN,
                      NULL);
 
-       ev_view_set_fullscreen (view, FALSE);
+       ev_document_model_set_fullscreen (window->priv->model, FALSE);
        ev_window_update_fullscreen_action (window);
        update_chrome_flag (window, EV_CHROME_FULLSCREEN_TOOLBAR, FALSE);
        update_chrome_visibility (window);
        if (unfullscreen_window)
                gtk_window_unfullscreen (GTK_WINDOW (window));
 
-       if (!ev_window_is_empty (window))
-               ev_metadata_manager_set_boolean (window->priv->uri, "fullscreen", FALSE);
+       if (window->priv->metadata && !ev_window_is_empty (window))
+               ev_metadata_set_boolean (window->priv->metadata, "fullscreen", FALSE);
 }
 
 static void
@@ -2891,158 +3956,129 @@ ev_window_cmd_view_fullscreen (GtkAction *action, EvWindow *window)
        }
 }
 
-static gboolean
-presentation_timeout_cb (EvWindow *window)
-{
-       EvView *view = EV_VIEW (window->priv->view);
-
-       if (!view || !ev_view_get_presentation (EV_VIEW (view)))
-               return FALSE;
-
-       ev_view_hide_cursor (EV_VIEW (window->priv->view));
-       window->priv->presentation_timeout_id = 0;
-
-       return FALSE;
-}
-
 static void
-presentation_set_timeout (EvWindow *window)
+ev_window_update_presentation_action (EvWindow *window)
 {
-       if (window->priv->presentation_timeout_id > 0) {
-               g_source_remove (window->priv->presentation_timeout_id);
-       }
-
-       window->priv->presentation_timeout_id =
-               g_timeout_add_seconds (PRESENTATION_TIMEOUT,
-                                      (GSourceFunc)presentation_timeout_cb, window);
+       GtkAction *action;
 
-       ev_view_show_cursor (EV_VIEW (window->priv->view));
+       action = gtk_action_group_get_action (window->priv->action_group, "ViewPresentation");
+       g_signal_handlers_block_by_func
+               (action, G_CALLBACK (ev_window_cmd_view_presentation), window);
+       gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
+                                     EV_WINDOW_IS_PRESENTATION (window));
+       g_signal_handlers_unblock_by_func
+               (action, G_CALLBACK (ev_window_cmd_view_presentation), window);
 }
 
 static void
-presentation_clear_timeout (EvWindow *window)
+ev_window_view_presentation_finished (EvWindow *window)
 {
-       if (window->priv->presentation_timeout_id > 0) {
-               g_source_remove (window->priv->presentation_timeout_id);
-       }
-       
-       window->priv->presentation_timeout_id = 0;
-
-       ev_view_show_cursor (EV_VIEW (window->priv->view));
+       ev_window_stop_presentation (window, TRUE);
 }
 
 static gboolean
-presentation_motion_notify_cb (GtkWidget *widget,
-                              GdkEventMotion *event,
-                              gpointer user_data)
+ev_window_view_presentation_focus_in (EvWindow *window)
 {
-       EvWindow *window = EV_WINDOW (user_data);
-
-       presentation_set_timeout (window);
+       ev_application_screensaver_disable (EV_APP);
 
        return FALSE;
 }
 
 static gboolean
-presentation_leave_notify_cb (GtkWidget *widget,
-                             GdkEventCrossing *event,
-                             gpointer user_data)
+ev_window_view_presentation_focus_out (EvWindow *window)
 {
-       EvWindow *window = EV_WINDOW (user_data);
-
-       presentation_clear_timeout (window);
+       ev_application_screensaver_enable (EV_APP);
 
        return FALSE;
 }
 
-static void
-ev_window_update_presentation_action (EvWindow *window)
-{
-       GtkAction *action;
-
-       action = gtk_action_group_get_action (window->priv->action_group, "ViewPresentation");
-       g_signal_handlers_block_by_func
-               (action, G_CALLBACK (ev_window_cmd_view_presentation), window);
-       gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
-                                     ev_view_get_presentation (EV_VIEW (window->priv->view)));
-       g_signal_handlers_unblock_by_func
-               (action, G_CALLBACK (ev_window_cmd_view_presentation), window);
-}
-
 static void
 ev_window_run_presentation (EvWindow *window)
 {
-       EvView  *view = EV_VIEW (window->priv->view);
        gboolean fullscreen_window = TRUE;
+       guint    current_page;
+       guint    rotation;
+       gboolean inverted_colors;
 
-       if (ev_view_get_presentation (view))
+       if (EV_WINDOW_IS_PRESENTATION (window))
                return;
 
-       if (ev_view_get_fullscreen (view)) {
+       if (ev_document_model_get_fullscreen (window->priv->model)) {
                ev_window_stop_fullscreen (window, FALSE);
                fullscreen_window = FALSE;
        }
-       
-       g_object_set (G_OBJECT (window->priv->scrolled_window),
-                     "shadow-type", GTK_SHADOW_NONE,
-                     NULL);
 
-       ev_view_set_presentation (view, TRUE);
-       ev_window_update_presentation_action (window);
+       current_page = ev_document_model_get_page (window->priv->model);
+       rotation = ev_document_model_get_rotation (window->priv->model);
+       inverted_colors = ev_document_model_get_inverted_colors (window->priv->model);
+       window->priv->presentation_view = ev_view_presentation_new (window->priv->document,
+                                                                   current_page,
+                                                                   rotation,
+                                                                   inverted_colors);
+       g_signal_connect_swapped (window->priv->presentation_view, "finished",
+                                 G_CALLBACK (ev_window_view_presentation_finished),
+                                 window);
+       g_signal_connect_swapped (window->priv->presentation_view, "external-link",
+                                 G_CALLBACK (view_external_link_cb),
+                                 window);
+       g_signal_connect_swapped (window->priv->presentation_view, "focus-in-event",
+                                 G_CALLBACK (ev_window_view_presentation_focus_in),
+                                 window);
+       g_signal_connect_swapped (window->priv->presentation_view, "focus-out-event",
+                                 G_CALLBACK (ev_window_view_presentation_focus_out),
+                                 window);
+
+       gtk_box_pack_start (GTK_BOX (window->priv->main_box),
+                           window->priv->presentation_view,
+                           TRUE, TRUE, 0);
 
+       gtk_widget_hide (window->priv->hpaned);
+       ev_window_update_presentation_action (window);
        update_chrome_visibility (window);
-       
-       gtk_widget_grab_focus (window->priv->view);
+
+       gtk_widget_grab_focus (window->priv->presentation_view);
        if (fullscreen_window)
                gtk_window_fullscreen (GTK_WINDOW (window));
 
-       g_signal_connect (window->priv->view,
-                         "motion-notify-event",
-                         G_CALLBACK (presentation_motion_notify_cb),
-                         window);
-       g_signal_connect (window->priv->view,
-                         "leave-notify-event",
-                         G_CALLBACK (presentation_leave_notify_cb),
-                         window);
-       presentation_set_timeout (window);
+       gtk_widget_show (window->priv->presentation_view);
 
        ev_application_screensaver_disable (EV_APP);
-       
-       if (!ev_window_is_empty (window))
-               ev_metadata_manager_set_boolean (window->priv->uri, "presentation", TRUE);
+
+       if (window->priv->metadata && !ev_window_is_empty (window))
+               ev_metadata_set_boolean (window->priv->metadata, "presentation", TRUE);
 }
 
 static void
 ev_window_stop_presentation (EvWindow *window,
                             gboolean  unfullscreen_window)
 {
-       EvView *view = EV_VIEW (window->priv->view);
-       
-       if (!ev_view_get_presentation (view))
+       guint current_page;
+       guint rotation;
+
+       if (!EV_WINDOW_IS_PRESENTATION (window))
                return;
 
-       g_object_set (G_OBJECT (window->priv->scrolled_window),
-                     "shadow-type", GTK_SHADOW_IN,
-                     NULL);
+       current_page = ev_view_presentation_get_current_page (EV_VIEW_PRESENTATION (window->priv->presentation_view));
+       ev_document_model_set_page (window->priv->model, current_page);
+       rotation = ev_view_presentation_get_rotation (EV_VIEW_PRESENTATION (window->priv->presentation_view));
+       ev_document_model_set_rotation (window->priv->model, rotation);
+
+       gtk_container_remove (GTK_CONTAINER (window->priv->main_box),
+                             window->priv->presentation_view);
+       window->priv->presentation_view = NULL;
 
-       ev_view_set_presentation (EV_VIEW (window->priv->view), FALSE);
+       gtk_widget_show (window->priv->hpaned);
        ev_window_update_presentation_action (window);
        update_chrome_visibility (window);
        if (unfullscreen_window)
                gtk_window_unfullscreen (GTK_WINDOW (window));
 
-       g_signal_handlers_disconnect_by_func (window->priv->view,
-                                             (gpointer) presentation_motion_notify_cb,
-                                             window);
-       g_signal_handlers_disconnect_by_func (window->priv->view,
-                                             (gpointer) presentation_leave_notify_cb,
-                                             window);
-       presentation_clear_timeout (window);
+       gtk_widget_grab_focus (window->priv->view);
 
        ev_application_screensaver_enable (EV_APP);
 
-       if (!ev_window_is_empty (window))
-               ev_metadata_manager_set_boolean (window->priv->uri, "presentation", FALSE);
+       if (window->priv->metadata && !ev_window_is_empty (window))
+               ev_metadata_set_boolean (window->priv->metadata, "presentation", FALSE);
 }
 
 static void
@@ -3053,45 +4089,64 @@ ev_window_cmd_view_presentation (GtkAction *action, EvWindow *window)
        presentation = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
        if (presentation) {
                ev_window_run_presentation (window);
+       }
+}
+
+static void
+ev_window_setup_gtk_settings (EvWindow *window)
+{
+       GtkSettings *settings;
+       GdkScreen   *screen;
+       gchar       *menubar_accel_accel;
+
+       screen = gtk_window_get_screen (GTK_WINDOW (window));
+       settings = gtk_settings_get_for_screen (screen);
+
+       g_object_get (settings,
+                     "gtk-menu-bar-accel", &menubar_accel_accel,
+                     NULL);
+       if (menubar_accel_accel != NULL && menubar_accel_accel[0] != '\0') {
+               gtk_accelerator_parse (menubar_accel_accel,
+                                      &window->priv->menubar_accel_keyval,
+                                      &window->priv->menubar_accel_modifier);
+               if (window->priv->menubar_accel_keyval == 0) {
+                       g_warning ("Failed to parse menu bar accelerator '%s'\n",
+                                  menubar_accel_accel);
+               }
        } else {
-               ev_window_stop_presentation (window, TRUE);
+               window->priv->menubar_accel_keyval = 0;
+               window->priv->menubar_accel_modifier = 0;
        }
+
+       g_free (menubar_accel_accel);
 }
 
 static void
-ev_window_run_preview (EvWindow *window)
+ev_window_update_max_min_scale (EvWindow *window)
 {
+       gdouble    dpi;
        GtkAction *action;
-       
-       if (!window->priv->preview_toolbar) {
-               window->priv->preview_toolbar =
-                       gtk_ui_manager_get_widget (window->priv->ui_manager,
-                                                  "/PreviewToolbar");
+       gdouble    min_width, min_height;
+       gdouble    width, height;
+       gdouble    max_scale;
+       gint       rotation = ev_document_model_get_rotation (window->priv->model);
 
-               gtk_box_pack_start (GTK_BOX (window->priv->main_box),
-                                   window->priv->preview_toolbar,
-                                   FALSE, FALSE, 0);
-               gtk_box_reorder_child (GTK_BOX (window->priv->main_box),
-                                      window->priv->preview_toolbar, 1);
-       }
-       
-       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);
+       if (!window->priv->document)
+               return;
+
+       dpi = get_screen_dpi (window) / 72.0;
+
+       ev_document_get_min_page_size (window->priv->document, &min_width, &min_height);
+       width = (rotation == 0 || rotation == 180) ? min_width : min_height;
+       height = (rotation == 0 || rotation == 180) ? min_height : min_width;
+       max_scale = sqrt (PAGE_CACHE_SIZE / (width * dpi * 4 * height * dpi));
 
-       update_chrome_flag (window, EV_CHROME_PREVIEW_TOOLBAR, TRUE);
-       
        action = gtk_action_group_get_action (window->priv->action_group,
-                                             "PreviewPrint");
-#if GTK_CHECK_VERSION (2, 11, 0)
-       gtk_action_set_visible (action, TRUE);
-#else
-       gtk_action_set_visible (action, FALSE);
-#endif
+                                             ZOOM_CONTROL_ACTION);
+       ephy_zoom_action_set_max_zoom_level (EPHY_ZOOM_ACTION (action), max_scale * dpi);
 
-       update_chrome_visibility (window);
+       ev_document_model_set_min_scale (window->priv->model, MIN_SCALE * dpi);
+       ev_document_model_set_max_scale (window->priv->model, max_scale * dpi);
 }
 
 static void
@@ -3099,16 +4154,15 @@ ev_window_screen_changed (GtkWidget *widget,
                          GdkScreen *old_screen)
 {
        EvWindow *window = EV_WINDOW (widget);
-       EvWindowPrivate *priv = window->priv;
        GdkScreen *screen;
 
        screen = gtk_widget_get_screen (widget);
        if (screen == old_screen)
                return;
 
-       ev_view_set_screen_dpi (EV_VIEW (priv->view),
-                               get_screen_dpi (GTK_WINDOW (window)));
-       
+       ev_window_setup_gtk_settings (window);
+       ev_window_update_max_min_scale (window);
+
        if (GTK_WIDGET_CLASS (ev_window_parent_class)->screen_changed) {
                GTK_WIDGET_CLASS (ev_window_parent_class)->screen_changed (widget, old_screen);
        }
@@ -3119,7 +4173,6 @@ ev_window_state_event (GtkWidget           *widget,
                       GdkEventWindowState *event)
 {
        EvWindow *window = EV_WINDOW (widget);
-       EvView   *view = EV_VIEW (window->priv->view);
 
        if (GTK_WIDGET_CLASS (ev_window_parent_class)->window_state_event) {
                GTK_WIDGET_CLASS (ev_window_parent_class)->window_state_event (widget, event);
@@ -3129,14 +4182,14 @@ ev_window_state_event (GtkWidget           *widget,
                return FALSE;
 
        if (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) {
-               if (ev_view_get_fullscreen (view) || ev_view_get_presentation (view))
+               if (ev_document_model_get_fullscreen (window->priv->model) || EV_WINDOW_IS_PRESENTATION (window))
                        return FALSE;
                
                ev_window_run_fullscreen (window);
        } else {
-               if (ev_view_get_fullscreen (view))
+               if (ev_document_model_get_fullscreen (window->priv->model))
                        ev_window_stop_fullscreen (window, FALSE);
-               else if (ev_view_get_presentation (view))
+               else if (EV_WINDOW_IS_PRESENTATION (window))
                        ev_window_stop_presentation (window, FALSE);
        }
 
@@ -3180,52 +4233,93 @@ ev_window_set_page_mode (EvWindow         *window,
 static void
 ev_window_cmd_edit_rotate_left (GtkAction *action, EvWindow *ev_window)
 {
-       ev_view_rotate_left (EV_VIEW (ev_window->priv->view));
+       gint rotation;
+
+       if (EV_WINDOW_IS_PRESENTATION (ev_window)) {
+               rotation = ev_view_presentation_get_rotation (EV_VIEW_PRESENTATION (ev_window->priv->presentation_view));
+               ev_view_presentation_set_rotation (EV_VIEW_PRESENTATION (ev_window->priv->presentation_view),
+                                                  rotation - 90);
+       } else {
+               rotation = ev_document_model_get_rotation (ev_window->priv->model);
+
+               ev_document_model_set_rotation (ev_window->priv->model, rotation - 90);
+       }
 }
 
 static void
 ev_window_cmd_edit_rotate_right (GtkAction *action, EvWindow *ev_window)
 {
-       ev_view_rotate_right (EV_VIEW (ev_window->priv->view));
+       gint rotation;
+
+       if (EV_WINDOW_IS_PRESENTATION (ev_window)) {
+               rotation = ev_view_presentation_get_rotation (EV_VIEW_PRESENTATION (ev_window->priv->presentation_view));
+               ev_view_presentation_set_rotation (EV_VIEW_PRESENTATION (ev_window->priv->presentation_view),
+                                                  rotation + 90);
+       } else {
+               rotation = ev_document_model_get_rotation (ev_window->priv->model);
+
+               ev_document_model_set_rotation (ev_window->priv->model, rotation + 90);
+       }
 }
 
 static void
-ev_window_cmd_edit_toolbar_cb (GtkDialog *dialog, gint response, gpointer data)
+ev_window_cmd_view_inverted_colors (GtkAction *action, EvWindow *ev_window)
 {
-       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);
+       gboolean inverted_colors = ev_document_model_get_inverted_colors (ev_window->priv->model);
+
+       ev_document_model_set_inverted_colors (ev_window->priv->model, !inverted_colors);
+}
+
+static void
+ev_window_cmd_edit_toolbar_cb (GtkDialog *dialog,
+                              gint       response,
+                              EvWindow  *ev_window)
+{
+       EggEditableToolbar *toolbar;
+       gchar              *toolbars_file;
+
+       toolbar = EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar);
+        egg_editable_toolbar_set_edit_mode (toolbar, FALSE);
+
+       toolbars_file = g_build_filename (ev_application_get_dot_dir (EV_APP, TRUE),
+                                         "evince_toolbar.xml", NULL);
+       egg_toolbars_model_save_toolbars (egg_editable_toolbar_get_model (toolbar),
+                                         toolbars_file, "1.0");
+       g_free (toolbars_file);
+
         gtk_widget_destroy (GTK_WIDGET (dialog));
 }
 
 static void
 ev_window_cmd_edit_toolbar (GtkAction *action, EvWindow *ev_window)
 {
-       GtkWidget *dialog;
-       GtkWidget *editor;
+       GtkWidget          *dialog;
+       GtkWidget          *editor;
+       GtkWidget          *content_area;
+       EggEditableToolbar *toolbar;
 
        dialog = gtk_dialog_new_with_buttons (_("Toolbar Editor"),
-                                             GTK_WINDOW (ev_window), 
-                                             GTK_DIALOG_DESTROY_WITH_PARENT, 
+                                             GTK_WINDOW (ev_window),
+                                             GTK_DIALOG_DESTROY_WITH_PARENT,
                                              GTK_STOCK_CLOSE,
-                                             GTK_RESPONSE_CLOSE, 
+                                             GTK_RESPONSE_CLOSE,
                                              NULL);
+       content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
        gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
        gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)), 5);
-       gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 2);
-       gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+       gtk_box_set_spacing (GTK_BOX (content_area), 2);
        gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 400);
-         
+
+       toolbar = EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar);
        editor = egg_toolbar_editor_new (ev_window->priv->ui_manager,
-                                        ev_application_get_toolbars_model (EV_APP));
+                                        egg_editable_toolbar_get_model (toolbar));
+
        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_editable_toolbar_set_edit_mode
-               (EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar), TRUE);
+        gtk_box_pack_start (GTK_BOX (content_area), editor, TRUE, TRUE, 0);
+
+       egg_editable_toolbar_set_edit_mode (toolbar, TRUE);
 
        g_signal_connect (dialog, "response",
                          G_CALLBACK (ev_window_cmd_edit_toolbar_cb),
@@ -3233,12 +4327,40 @@ ev_window_cmd_edit_toolbar (GtkAction *action, EvWindow *ev_window)
        gtk_widget_show_all (dialog);
 }
 
+static void
+ev_window_cmd_edit_save_settings (GtkAction *action, EvWindow *ev_window)
+{
+       EvWindowPrivate *priv = ev_window->priv;
+       EvDocumentModel *model = priv->model;
+       GSettings       *settings = priv->default_settings;
+
+       g_settings_set_boolean (settings, "continuous",
+                               ev_document_model_get_continuous (model));
+       g_settings_set_boolean (settings, "dual-page",
+                               ev_document_model_get_dual_page (model));
+       g_settings_set_boolean (settings, "fullscreen",
+                               ev_document_model_get_fullscreen (model));
+       g_settings_set_boolean (settings, "inverted-colors",
+                               ev_document_model_get_inverted_colors (model));
+       g_settings_set_enum (settings, "sizing-mode",
+                            ev_document_model_get_sizing_mode (model));
+       g_settings_set_boolean (settings, "show-toolbar",
+                               gtk_widget_get_visible (priv->toolbar));
+       g_settings_set_boolean (settings, "show-sidebar",
+                               gtk_widget_get_visible (priv->sidebar));
+       g_settings_set_int (settings, "sidebar-size",
+                           gtk_paned_get_position (GTK_PANED (priv->hpaned)));
+       g_settings_set_string (settings, "sidebar-page",
+                              ev_window_sidebar_get_current_page_id (ev_window));
+       g_settings_apply (settings);
+}
+
 static void
 ev_window_cmd_view_zoom_in (GtkAction *action, EvWindow *ev_window)
 {
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
-       ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_FREE);
+       ev_document_model_set_sizing_mode (ev_window->priv->model, EV_SIZING_FREE);
        ev_view_zoom_in (EV_VIEW (ev_window->priv->view));
 }
 
@@ -3247,7 +4369,7 @@ ev_window_cmd_view_zoom_out (GtkAction *action, EvWindow *ev_window)
 {
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
-       ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_FREE);
+       ev_document_model_set_sizing_mode (ev_window->priv->model, EV_SIZING_FREE);
        ev_view_zoom_out (EV_VIEW (ev_window->priv->view));
 }
 
@@ -3272,18 +4394,16 @@ ev_window_cmd_go_first_page (GtkAction *action, EvWindow *ev_window)
 {
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
-       ev_page_cache_set_current_page (ev_window->priv->page_cache, 0);
+       ev_document_model_set_page (ev_window->priv->model, 0);
 }
 
 static void
 ev_window_cmd_go_last_page (GtkAction *action, EvWindow *ev_window)
 {
-       int n_pages;
-
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
-       n_pages = ev_page_cache_get_n_pages (ev_window->priv->page_cache);
-       ev_page_cache_set_current_page (ev_window->priv->page_cache, n_pages - 1);
+       ev_document_model_set_page (ev_window->priv->model,
+                                   ev_document_get_n_pages (ev_window->priv->document) - 1);
 }
 
 static void
@@ -3293,11 +4413,12 @@ ev_window_cmd_go_forward (GtkAction *action, EvWindow *ev_window)
        
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
-       n_pages = ev_page_cache_get_n_pages (ev_window->priv->page_cache);
-       current_page = ev_page_cache_get_current_page (ev_window->priv->page_cache);
+       n_pages = ev_document_get_n_pages (ev_window->priv->document);
+       current_page = ev_document_model_get_page (ev_window->priv->model);
        
-       if (current_page + 10 < n_pages)
-               ev_page_cache_set_current_page (ev_window->priv->page_cache, current_page + 10);
+       if (current_page + 10 < n_pages) {
+               ev_document_model_set_page (ev_window->priv->model, current_page + 10);
+       }
 }
 
 static void
@@ -3307,209 +4428,143 @@ ev_window_cmd_go_backward (GtkAction *action, EvWindow *ev_window)
        
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
-       current_page = ev_page_cache_get_current_page (ev_window->priv->page_cache);
+       current_page = ev_document_model_get_page (ev_window->priv->model);
        
-       if (current_page - 10 >= 0)
-               ev_page_cache_set_current_page (ev_window->priv->page_cache, current_page - 10);
-}
-
-static void
-ev_window_cmd_view_reload (GtkAction *action, EvWindow *ev_window)
-{
-       ev_window_reload_document (ev_window);
-}
-
-static void
-ev_window_cmd_view_autoscroll (GtkAction *action, EvWindow *ev_window)
-{
-       ev_view_autoscroll_start (EV_VIEW (ev_window->priv->view));
+       if (current_page - 10 >= 0) {
+               ev_document_model_set_page (ev_window->priv->model, current_page - 10);
+       }
 }
 
 static void
-ev_window_cmd_help_contents (GtkAction *action, EvWindow *ev_window)
+ev_window_cmd_bookmark_activate (GtkAction *action,
+                                EvWindow  *window)
 {
-       GError *error = NULL;
-       GdkScreen *screen;
-       char *command;
-       const char *lang;
-       char *uri = NULL;
-
-       int i;
-
-       const char * const * langs = g_get_language_names ();
-
-       for (i = 0; langs[i]; i++) {
-               lang = langs[i];
-               if (strchr (lang, '.')) {
-                       continue;
-               }
+       guint page = ev_bookmark_action_get_page (EV_BOOKMARK_ACTION (action));
 
-               uri = g_build_filename(GNOMEDATADIR,
-                                      "/gnome/help/" PACKAGE,
-                                      lang,
-                                      "/evince.xml",
-                                      NULL);
-                                       
-               if (g_file_test (uri, G_FILE_TEST_EXISTS)) {
-                       break;
-               }
-               g_free (uri);
-               uri = NULL;
-       }
-
-       if (uri == NULL) {
-               g_warning ("Cannot find help");
-               return;
-       }
-       
-       command = g_strconcat ("gnome-help ghelp://", uri,  NULL);
-       g_free (uri);
-       
-       screen = gtk_widget_get_screen (GTK_WIDGET (ev_window));
-       gdk_spawn_command_line_on_screen (screen, command, &error);
-       if (error != NULL) {
-               g_warning ("%s", error->message);
-               g_error_free (error);
-       }
-       g_free (command);
+       ev_document_model_set_page (window->priv->model, page);
 }
 
-static void
-ev_window_cmd_leave_fullscreen (GtkAction *action, EvWindow *window)
+static gint
+compare_bookmarks (EvBookmark *a,
+                  EvBookmark *b)
 {
-       ev_window_stop_fullscreen (window, TRUE);
+       return strcmp (a->title, b->title);
 }
 
 static void
-ev_window_cmd_start_presentation (GtkAction *action, EvWindow *window)
-{
-       ev_window_run_presentation (window);
-}
-
-static gboolean
-ev_window_enumerate_printer_cb (GtkPrinter *printer,
-                               EvWindow   *window)
+ev_window_setup_bookmarks (EvWindow *window)
 {
-       EvWindowPrivate *priv = window->priv;
-       const gchar *printer_name;
+       GList *items, *l;
 
-       printer_name = gtk_print_settings_get_printer (priv->print_settings);
-       if ((printer_name
-            && strcmp (printer_name, gtk_printer_get_name (printer)) == 0) ||
-           (!printer_name && gtk_printer_is_default (printer))) {
-               if (priv->printer)
-                       g_object_unref (priv->printer);
-               priv->printer = g_object_ref (printer);
+       if (!window->priv->bookmarks)
+               return;
 
-               /* Now that we have the printer, we'll start the print */
-               ev_window_do_preview_print (window);
+       if (window->priv->bookmarks_ui_id > 0) {
+               gtk_ui_manager_remove_ui (window->priv->ui_manager,
+                                         window->priv->bookmarks_ui_id);
+               gtk_ui_manager_ensure_update (window->priv->ui_manager);
+       }
+       window->priv->bookmarks_ui_id = gtk_ui_manager_new_merge_id (window->priv->ui_manager);
 
-               return TRUE; /* we're done */
+       if (window->priv->bookmarks_action_group) {
+               gtk_ui_manager_remove_action_group (window->priv->ui_manager,
+                                                   window->priv->bookmarks_action_group);
+               g_object_unref (window->priv->bookmarks_action_group);
        }
+       window->priv->bookmarks_action_group = gtk_action_group_new ("BookmarksActions");
+       gtk_ui_manager_insert_action_group (window->priv->ui_manager,
+                                           window->priv->bookmarks_action_group, -1);
 
-       return FALSE; /* continue the enumeration */
-}
+       items = ev_bookmarks_get_bookmarks (window->priv->bookmarks);
+       items = g_list_sort (items, (GCompareFunc)compare_bookmarks);
 
-static void
-ev_window_preview_print_finished (GtkPrintJob *print_job,
-                                 EvWindow    *window,
-                                 GError      *error)
-{
-       if (error) {
-               GtkWidget *dialog;
+       for (l = items; l && l->data; l = g_list_next (l)) {
+               EvBookmark *bm = (EvBookmark *)l->data;
+               GtkAction  *action;
+
+               action = ev_bookmark_action_new (bm);
+               g_signal_connect (action, "activate",
+                                 G_CALLBACK (ev_window_cmd_bookmark_activate),
+                                 window);
+               gtk_action_group_add_action (window->priv->bookmarks_action_group,
+                                            action);
 
-               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),
-                                                         "%s", error->message);
+               gtk_ui_manager_add_ui (window->priv->ui_manager,
+                                      window->priv->bookmarks_ui_id,
+                                      "/MainMenu/BookmarksMenu/BookmarksItems",
+                                      gtk_action_get_label (action),
+                                      gtk_action_get_name (action),
+                                      GTK_UI_MANAGER_MENUITEM,
+                                      FALSE);
 
-               gtk_dialog_run (GTK_DIALOG (dialog));
-               gtk_widget_destroy (dialog);
+               g_object_unref (action);
        }
 
-       g_object_unref (print_job);
-       gtk_widget_destroy (GTK_WIDGET (window));
+       g_list_free (items);
 }
 
 static void
-ev_window_do_preview_print (EvWindow *window)
+ev_window_cmd_bookmarks_add (GtkAction *action,
+                            EvWindow  *window)
 {
-       EvWindowPrivate  *priv = window->priv;
-       GtkPageSetup     *page_setup;
-       GtkPrintJob      *job;
-       gchar            *filename;
-       GError           *error = NULL;
+       EvBookmark bm;
+       gchar     *page_label;
+       gchar     *page_title;
 
-       g_assert (priv->print_settings != NULL);
-       g_assert (priv->printer != NULL);
+       bm.page = ev_document_model_get_page (window->priv->model);
+       page_label = ev_document_get_page_label (window->priv->document, bm.page);
+       page_title = ev_window_get_page_title (window, page_label);
+       bm.title = page_title ? page_title : g_strdup_printf (_("Page %s"), page_label);
+       g_free (page_label);
 
-       page_setup = gtk_page_setup_new ();
+       /* EvBookmarks takes ownership of bookmark */
+       ev_bookmarks_add (window->priv->bookmarks, &bm);
+}
 
-       job = gtk_print_job_new (gtk_window_get_title (GTK_WINDOW (window)),
-                                priv->printer,
-                                priv->print_settings,
-                                page_setup);
+static void
+ev_window_cmd_view_reload (GtkAction *action, EvWindow *ev_window)
+{
+       ev_window_reload_document (ev_window, NULL);
+}
 
-       g_object_unref (priv->print_settings);
-       priv->print_settings = NULL;
-       g_object_unref (priv->printer);
-       priv->printer = NULL;
-       g_object_unref (page_setup);
+static void
+ev_window_cmd_view_autoscroll (GtkAction *action, EvWindow *ev_window)
+{
+       ev_view_autoscroll_start (EV_VIEW (ev_window->priv->view));
+}
 
-       filename = g_filename_from_uri (priv->local_uri ?
-                                       priv->local_uri : priv->uri,
-                                       NULL, NULL);
+#if OFFLINE_HELP_ENABLED
+#define EV_HELP "ghelp:evince"
+#else
+#define EV_HELP "http://library.gnome.org/users/evince/stable/"
+#endif
 
-       if (gtk_print_job_set_source_file (job, filename, &error)) {
-               gtk_print_job_send (job,
-                                   (GtkPrintJobCompleteFunc)ev_window_preview_print_finished,
-                                   window, NULL);
-       } else {
-               g_warning ("%s", error->message);
+static void
+ev_window_cmd_help_contents (GtkAction *action, EvWindow *ev_window)
+{
+       GError  *error = NULL;
+
+       gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (ev_window)),
+                     EV_HELP,
+                     gtk_get_current_event_time (),
+                     &error);
+       if (error) {
+               ev_window_error_message (ev_window, error, 
+                                        "%s", _("There was an error displaying help"));
                g_error_free (error);
        }
-
-       g_free (filename);
-
-       gtk_widget_hide (GTK_WIDGET (window));
 }
 
 static void
-ev_window_cmd_preview_print (GtkAction *action, EvWindow *window)
+ev_window_cmd_leave_fullscreen (GtkAction *action, EvWindow *window)
 {
-       EvWindowPrivate *priv = window->priv;
-       GtkPrintSettings *print_settings = NULL;
-#if GTK_CHECK_VERSION (2, 11, 0)
-       const gchar      *print_settings_file = priv->print_settings_file;
-
-       if (print_settings_file) {
-               if (g_file_test (print_settings_file, G_FILE_TEST_IS_REGULAR)) {
-                       GError *error = NULL;
-
-                       print_settings = gtk_print_settings_new_from_file (print_settings_file,
-                                                                          &error);
-                       
-                       if (error) {
-                               g_warning ("%s", error->message);
-                               g_error_free (error);
-                               print_settings = NULL;
-                       }
-               }
-       }
-#endif /* GTK 2.11.0 */
-       
-       if (!print_settings)
-               print_settings = gtk_print_settings_new ();
-
-       if (priv->print_settings)
-               g_object_unref (priv->print_settings);
-       priv->print_settings = print_settings;
+       ev_window_stop_fullscreen (window, TRUE);
+}
 
-       gtk_enumerate_printers ((GtkPrinterFunc) ev_window_enumerate_printer_cb,
-                               window, NULL, FALSE);
+static void
+ev_window_cmd_start_presentation (GtkAction *action, EvWindow *window)
+{
+       ev_window_run_presentation (window);
 }
 
 static void
@@ -3526,23 +4581,19 @@ ev_window_cmd_escape (GtkAction *action, EvWindow *window)
                gtk_widget_grab_focus (window->priv->view);
        } else {
                gboolean fullscreen;
-               gboolean presentation;
 
-               g_object_get (window->priv->view,
-                             "fullscreen", &fullscreen,
-                             "presentation", &presentation,
-                             NULL);
+               fullscreen = ev_document_model_get_fullscreen (window->priv->model);
 
                if (fullscreen) {
                        ev_window_stop_fullscreen (window, TRUE);
-               } else if (presentation) {
+               } else if (EV_WINDOW_IS_PRESENTATION (window)) {
                        ev_window_stop_presentation (window, TRUE);
                        gtk_widget_grab_focus (window->priv->view);
                } else {
                        gtk_widget_grab_focus (window->priv->view);
                }
 
-               if (fullscreen && presentation)
+               if (fullscreen && EV_WINDOW_IS_PRESENTATION (window))
                        g_warning ("Both fullscreen and presentation set somehow");
        }
 }
@@ -3553,75 +4604,56 @@ save_sizing_mode (EvWindow *window)
        EvSizingMode mode;
        GEnumValue *enum_value;
 
-       mode = ev_view_get_sizing_mode (EV_VIEW (window->priv->view));
-       enum_value = g_enum_get_value (EV_SIZING_MODE_CLASS, mode);
+       if (!window->priv->metadata || ev_window_is_empty (window))
+               return;
 
-       if (!ev_window_is_empty (window))
-               ev_metadata_manager_set_string (window->priv->uri, "sizing_mode",
-                                               enum_value->value_nick);
+       mode = ev_document_model_get_sizing_mode (window->priv->model);
+       enum_value = g_enum_get_value (g_type_class_peek (EV_TYPE_SIZING_MODE), mode);
+       ev_metadata_set_string (window->priv->metadata, "sizing_mode",
+                               enum_value->value_nick);
 }
 
-static void     
-ev_window_sizing_mode_changed_cb (EvView *view, GParamSpec *pspec,
-                                 EvWindow   *ev_window)
+static void
+ev_window_document_changed_cb (EvDocumentModel *model,
+                              GParamSpec      *pspec,
+                              EvWindow        *ev_window)
 {
-       GtkWidget *scrolled_window;
-       EvSizingMode sizing_mode;
-
-       g_object_get (ev_window->priv->view,
-                     "sizing-mode", &sizing_mode,
-                     NULL);
-
-       scrolled_window = ev_window->priv->scrolled_window;
-
-       g_signal_handlers_disconnect_by_func (ev_window->priv->view, ev_view_update_view_size, scrolled_window);
+       ev_window_set_document (ev_window,
+                               ev_document_model_get_document (model));
+}
 
-       if (sizing_mode != EV_SIZING_FREE)
-               ev_view_update_view_size (EV_VIEW (ev_window->priv->view),
-                                         GTK_SCROLLED_WINDOW (scrolled_window));
+static void
+ev_window_sizing_mode_changed_cb (EvDocumentModel *model,
+                                 GParamSpec      *pspec,
+                                 EvWindow        *ev_window)
+{
+       EvSizingMode sizing_mode = ev_document_model_get_sizing_mode (model);
 
-       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 (ev_view_update_view_size),
-                                         scrolled_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 (ev_view_update_view_size),
-                                         scrolled_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;
-       }
+       g_object_set (ev_window->priv->scrolled_window,
+                     "hscrollbar-policy",
+                     sizing_mode == EV_SIZING_FREE ?
+                     GTK_POLICY_AUTOMATIC : GTK_POLICY_NEVER,
+                     "vscrollbar-policy", GTK_POLICY_AUTOMATIC,
+                     NULL);
 
        update_sizing_buttons (ev_window);
        save_sizing_mode (ev_window);
 }
 
-static void     
-ev_window_zoom_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_window)
+static void
+ev_window_zoom_changed_cb (EvDocumentModel *model, GParamSpec *pspec, EvWindow *ev_window)
 {
         ev_window_update_actions (ev_window);
 
-       if (ev_view_get_sizing_mode (view) == EV_SIZING_FREE && !ev_window_is_empty (ev_window)) {
+       if (!ev_window->priv->metadata)
+               return;
+
+       if (ev_document_model_get_sizing_mode (model) == EV_SIZING_FREE && !ev_window_is_empty (ev_window)) {
                gdouble zoom;
 
-               zoom = ev_view_get_zoom (view);
-               zoom *= 72.0 / get_screen_dpi (GTK_WINDOW(ev_window));
-               ev_metadata_manager_set_double (ev_window->priv->uri, "zoom", zoom);
+               zoom = ev_document_model_get_scale (model);
+               zoom *= 72.0 / get_screen_dpi (ev_window);
+               ev_metadata_set_double (ev_window->priv->metadata, "zoom", zoom);
        }
 }
 
@@ -3634,7 +4666,7 @@ ev_window_update_continuous_action (EvWindow *window)
        g_signal_handlers_block_by_func
                (action, G_CALLBACK (ev_window_cmd_continuous), window);
        gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
-                                     ev_view_get_continuous (EV_VIEW (window->priv->view)));
+                                     ev_document_model_get_continuous (window->priv->model));
        g_signal_handlers_unblock_by_func
                (action, G_CALLBACK (ev_window_cmd_continuous), window);
 }
@@ -3648,81 +4680,96 @@ ev_window_update_dual_page_action (EvWindow *window)
        g_signal_handlers_block_by_func
                (action, G_CALLBACK (ev_window_cmd_dual), window);
        gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
-                                     ev_view_get_dual_page (EV_VIEW (window->priv->view)));
+                                     ev_document_model_get_dual_page (window->priv->model));
        g_signal_handlers_unblock_by_func
                (action, G_CALLBACK (ev_window_cmd_dual), window);
 }
 
-static void     
-ev_window_continuous_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_window)
+static void
+ev_window_continuous_changed_cb (EvDocumentModel *model,
+                                GParamSpec      *pspec,
+                                EvWindow        *ev_window)
 {
        ev_window_update_continuous_action (ev_window);
 
-       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)));
+       if (ev_window->priv->metadata && !ev_window_is_empty (ev_window))
+               ev_metadata_set_boolean (ev_window->priv->metadata, "continuous",
+                                        ev_document_model_get_continuous (model));
 }
 
-static void     
-ev_window_rotation_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *window)
+static void
+ev_window_rotation_changed_cb (EvDocumentModel *model,
+                              GParamSpec      *pspec,
+                              EvWindow        *window)
 {
-       int rotation;
+       gint rotation = ev_document_model_get_rotation (model);
+
+       if (window->priv->metadata && !ev_window_is_empty (window))
+               ev_metadata_set_int (window->priv->metadata, "rotation",
+                                    rotation);
 
-       rotation = ev_view_get_rotation (EV_VIEW (window->priv->view));
+       ev_window_update_max_min_scale (window);
+       ev_window_refresh_window_thumbnail (window);
+}
 
-       if (!ev_window_is_empty (window))
-               ev_metadata_manager_set_int (window->priv->uri, "rotation",
-                                            rotation);
+static void
+ev_window_update_inverted_colors_action (EvWindow *window)
+{
+       GtkAction *action;
 
-       ev_sidebar_thumbnails_refresh (EV_SIDEBAR_THUMBNAILS (window->priv->sidebar_thumbs),
-                                      rotation);
-       ev_window_refresh_window_thumbnail (window, rotation);
+       action = gtk_action_group_get_action (window->priv->action_group, "ViewInvertedColors");
+       g_signal_handlers_block_by_func
+               (action, G_CALLBACK (ev_window_cmd_view_inverted_colors), window);
+       gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
+                                     ev_document_model_get_inverted_colors (window->priv->model));
+       g_signal_handlers_unblock_by_func
+               (action, G_CALLBACK (ev_window_cmd_view_inverted_colors), window);
 }
 
 static void
-ev_window_has_selection_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *window)
+ev_window_inverted_colors_changed_cb (EvDocumentModel *model,
+                                     GParamSpec      *pspec,
+                                     EvWindow        *window)
 {
-        ev_window_update_actions (window);
+       gboolean inverted_colors = ev_document_model_get_inverted_colors (model);
+
+       ev_window_update_inverted_colors_action (window);
+
+       if (window->priv->metadata && !ev_window_is_empty (window))
+               ev_metadata_set_boolean (window->priv->metadata, "inverted-colors",
+                                        inverted_colors);
+
+       ev_window_refresh_window_thumbnail (window);
 }
 
-static void     
-ev_window_dual_mode_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_window)
+static void
+ev_window_dual_mode_changed_cb (EvDocumentModel *model,
+                               GParamSpec      *pspec,
+                               EvWindow        *ev_window)
 {
        ev_window_update_dual_page_action (ev_window);
 
-       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)));
+       if (ev_window->priv->metadata && !ev_window_is_empty (ev_window))
+               ev_metadata_set_boolean (ev_window->priv->metadata, "dual-page",
+                                        ev_document_model_get_dual_page (model));
 }
 
 static char *
-build_comments_string (void)
-{
-#ifdef ENABLE_PDF
-       PopplerBackend backend;
-       const char *backend_name;
-       const char *version;
-
-       backend = poppler_get_backend ();
-       version = poppler_get_version ();
-       switch (backend) {
-               case POPPLER_BACKEND_CAIRO:
-                       backend_name = "cairo";
-                       break;
-               case POPPLER_BACKEND_SPLASH:
-                       backend_name = "splash";
-                       break;
-               default:
-                       backend_name = "unknown";
-                       break;
+build_comments_string (EvDocument *document)
+{
+       gchar *comments = NULL;
+       EvDocumentBackendInfo info;
+
+       if (document && ev_document_get_backend_info (document, &info)) {
+               comments = g_strdup_printf (
+                       _("Document Viewer\nUsing %s (%s)"),
+                       info.name, info.version);
+       } else {
+               comments = g_strdup_printf (
+                       _("Document Viewer"));
        }
 
-       return g_strdup_printf (_("Document Viewer.\n"
-                                 "Using poppler %s (%s)"),
-                               version, backend_name);
-#else
-       return g_strdup_printf (_("Document Viewer"));
-#endif
+       return comments;
 }
 
 static void
@@ -3736,11 +4783,14 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window)
                "Bryan Clark <clarkbw@gnome.org>",
                "Carlos Garcia Campos <carlosgc@gnome.org>",
                "Wouter Bolsterlee <wbolster@gnome.org>",
+                "Christian Persch <chpe" "\100" "gnome.org>",
                NULL
        };
 
        const char *documenters[] = {
                "Nickolay V. Shmyrev <nshmyrev@yandex.ru>",
+               "Phil Bull <philbull@gmail.com>",
+               "Tiffany Antpolski <tiffany.antopolski@gmail.com>",
                NULL
        };
 
@@ -3755,7 +4805,7 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window)
                   "GNU General Public License for more details.\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")
+                  "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA\n")
        };
 
        char *license_trans;
@@ -3773,14 +4823,15 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window)
 
        license_trans = g_strconcat (_(license[0]), "\n", _(license[1]), "\n",
                                     _(license[2]), "\n", NULL);
-       comments = build_comments_string ();
+
+       comments = build_comments_string (ev_window->priv->document);
 
        gtk_show_about_dialog (
                GTK_WINDOW (ev_window),
                "name", _("Evince"),
                "version", VERSION,
                "copyright",
-               _("\xc2\xa9 1996-2007 The Evince authors"),
+               _("© 1996–2010 The Evince authors"),
                "license", license_trans,
                "website", "http://www.gnome.org/projects/evince",
                "comments", comments,
@@ -3803,13 +4854,14 @@ ev_window_view_toolbar_cb (GtkAction *action, EvWindow *ev_window)
        active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
        update_chrome_flag (ev_window, EV_CHROME_TOOLBAR, active);
        update_chrome_visibility (ev_window);
-       ev_metadata_manager_set_boolean (NULL, "show_toolbar", active);
+       if (ev_window->priv->metadata)
+               ev_metadata_set_boolean (ev_window->priv->metadata, "show_toolbar", active);
 }
 
 static void
 ev_window_view_sidebar_cb (GtkAction *action, EvWindow *ev_window)
 {
-       if (ev_view_get_presentation (EV_VIEW (ev_window->priv->view)))
+       if (EV_WINDOW_IS_PRESENTATION (ev_window))
                return;
            
        update_chrome_flag (ev_window, EV_CHROME_SIDEBAR,
@@ -3822,25 +4874,11 @@ ev_window_sidebar_current_page_changed_cb (EvSidebar  *ev_sidebar,
                                           GParamSpec *pspec,
                                           EvWindow   *ev_window)
 {
-       GtkWidget *current_page;
-       const char *id;
-
-       g_object_get (G_OBJECT (ev_sidebar), "current_page", &current_page, NULL);
-
-       if (current_page == ev_window->priv->sidebar_links) {
-               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();
+       if (ev_window->priv->metadata && !ev_window_is_empty (ev_window)) {
+               ev_metadata_set_string (ev_window->priv->metadata,
+                                       "sidebar_page",
+                                       ev_window_sidebar_get_current_page_id (ev_window));
        }
-
-       g_object_unref (current_page);
-
-       if (!ev_window_is_empty (ev_window))
-               ev_metadata_manager_set_string (ev_window->priv->uri, "sidebar_page", id);
 }
 
 static void
@@ -3848,17 +4886,20 @@ ev_window_sidebar_visibility_changed_cb (EvSidebar  *ev_sidebar,
                                         GParamSpec *pspec,
                                         EvWindow   *ev_window)
 {
-       EvView *view = EV_VIEW (ev_window->priv->view);
        GtkAction *action;
 
        action = gtk_action_group_get_action (ev_window->priv->action_group, "ViewSidebar");
 
-       if (!ev_view_get_presentation (view)) {
-               gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
-                                             GTK_WIDGET_VISIBLE (ev_sidebar));
+       if (!EV_WINDOW_IS_PRESENTATION (ev_window)) {
+               gboolean visible = gtk_widget_get_visible (GTK_WIDGET (ev_sidebar));
+
+               gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), visible);
 
-               ev_metadata_manager_set_boolean (ev_window->priv->uri, "sidebar_visibility",
-                                                GTK_WIDGET_VISIBLE (ev_sidebar));
+               if (ev_window->priv->metadata)
+                       ev_metadata_set_boolean (ev_window->priv->metadata, "sidebar_visibility",
+                                                visible);
+               if (!visible)
+                       gtk_widget_grab_focus (ev_window->priv->view);
        }
 }
 
@@ -3941,19 +4982,78 @@ view_menu_image_popup (EvWindow  *ev_window,
        gtk_action_set_visible (action, show_image);
 }
 
+static void
+view_menu_annot_popup (EvWindow     *ev_window,
+                      EvAnnotation *annot)
+{
+       GtkAction *action;
+       gboolean   show_annot = FALSE;
+
+       if (ev_window->priv->annot)
+               g_object_unref (ev_window->priv->annot);
+       ev_window->priv->annot = (annot) ? g_object_ref (annot) : NULL;
+
+       action = gtk_action_group_get_action (ev_window->priv->view_popup_action_group,
+                                             "AnnotProperties");
+       gtk_action_set_visible (action, (annot != NULL && EV_IS_ANNOTATION_MARKUP (annot)));
+
+       if (annot && EV_IS_ANNOTATION_ATTACHMENT (annot)) {
+               EvAttachment *attachment;
+
+               attachment = ev_annotation_attachment_get_attachment (EV_ANNOTATION_ATTACHMENT (annot));
+               if (attachment) {
+                       show_annot = TRUE;
+                       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 = NULL;
+                       }
+                       ev_window->priv->attach_list =
+                               g_list_prepend (ev_window->priv->attach_list,
+                                               g_object_ref (attachment));
+               }
+       }
+
+       action = gtk_action_group_get_action (ev_window->priv->attachment_popup_action_group,
+                                             "OpenAttachment");
+       gtk_action_set_visible (action, show_annot);
+
+       action = gtk_action_group_get_action (ev_window->priv->attachment_popup_action_group,
+                                             "SaveAttachmentAs");
+       gtk_action_set_visible (action, show_annot);
+}
+
 static gboolean
 view_menu_popup_cb (EvView   *view,
-                   GObject  *object,
+                   GList    *items,
                    EvWindow *ev_window)
 {
-       if (ev_view_get_presentation (EV_VIEW (ev_window->priv->view)))
-               return FALSE;
+       GList   *l;
+       gboolean has_link = FALSE;
+       gboolean has_image = FALSE;
+       gboolean has_annot = FALSE;
+
+       for (l = items; l; l = g_list_next (l)) {
+               if (EV_IS_LINK (l->data)) {
+                       view_menu_link_popup (ev_window, EV_LINK (l->data));
+                       has_link = TRUE;
+               } else if (EV_IS_IMAGE (l->data)) {
+                       view_menu_image_popup (ev_window, EV_IMAGE (l->data));
+                       has_image = TRUE;
+               } else if (EV_IS_ANNOTATION (l->data)) {
+                       view_menu_annot_popup (ev_window, EV_ANNOTATION (l->data));
+                       has_annot = TRUE;
+               }
+       }
+
+       if (!has_link)
+               view_menu_link_popup (ev_window, NULL);
+       if (!has_image)
+               view_menu_image_popup (ev_window, NULL);
+       if (!has_annot)
+               view_menu_annot_popup (ev_window, NULL);
 
-       view_menu_link_popup (ev_window,
-                             EV_IS_LINK (object) ? EV_LINK (object) : NULL);
-       view_menu_image_popup (ev_window,
-                              EV_IS_IMAGE (object) ? EV_IMAGE (object) : NULL);
-       
        gtk_menu_popup (GTK_MENU (ev_window->priv->view_popup),
                        NULL, NULL, NULL, NULL,
                        3, gtk_get_current_event_time ());
@@ -3995,17 +5095,23 @@ ev_window_update_find_status_message (EvWindow *ev_window)
                return;
        
        if (ev_job_is_finished (ev_window->priv->find_job)) {
-               gint n_results;
-
-               n_results = ev_job_find_get_n_results (EV_JOB_FIND (ev_window->priv->find_job),
-                                                      ev_page_cache_get_current_page (ev_window->priv->page_cache));
-               /* TRANS: Sometimes this could be better translated as
-                                     "%d hit(s) on this page".  Therefore this string
-                                     contains plural cases. */
-               message = g_strdup_printf (ngettext ("%d found on this page",
-                                                    "%d found on this page",
-                                                    n_results),
-                                          n_results);
+               EvJobFind *job_find = EV_JOB_FIND (ev_window->priv->find_job);
+
+               if (ev_job_find_has_results (job_find)) {
+                       gint n_results;
+
+                       n_results = ev_job_find_get_n_results (job_find,
+                                                              ev_document_model_get_page (ev_window->priv->model));
+                       /* TRANS: Sometimes this could be better translated as
+                          "%d hit(s) on this page".  Therefore this string
+                          contains plural cases. */
+                       message = g_strdup_printf (ngettext ("%d found on this page",
+                                                            "%d found on this page",
+                                                            n_results),
+                                                  n_results);
+               } else {
+                       message = g_strdup (_("Not found"));
+               }
        } else {
                gdouble percent;
 
@@ -4101,8 +5207,8 @@ find_bar_search_changed_cb (EggFindBar *find_bar,
 
        if (search_string && search_string[0]) {
                ev_window->priv->find_job = ev_job_find_new (ev_window->priv->document,
-                                                            ev_page_cache_get_current_page (ev_window->priv->page_cache),
-                                                            ev_page_cache_get_n_pages (ev_window->priv->page_cache),
+                                                            ev_document_model_get_page (ev_window->priv->model),
+                                                            ev_document_get_n_pages (ev_window->priv->document),
                                                             search_string,
                                                             case_sensitive);
                g_signal_connect (ev_window->priv->find_job, "finished",
@@ -4127,7 +5233,7 @@ find_bar_visibility_changed_cb (EggFindBar *find_bar,
 {
        gboolean visible;
 
-       visible = GTK_WIDGET_VISIBLE (find_bar);
+       visible = gtk_widget_get_visible (GTK_WIDGET (find_bar));
 
        if (ev_window->priv->document &&
            EV_IS_DOCUMENT_FIND (ev_window->priv->document)) {
@@ -4143,7 +5249,9 @@ find_bar_visibility_changed_cb (EggFindBar *find_bar,
 }
 
 static void
-find_bar_scroll(EggFindBar *find_bar, GtkScrollType scroll, EvWindow* ev_window)
+find_bar_scroll (EggFindBar   *find_bar,
+                GtkScrollType scroll,
+                EvWindow     *ev_window)
 {
        ev_view_scroll (EV_VIEW (ev_window->priv->view), scroll, FALSE);
 }
@@ -4154,8 +5262,6 @@ zoom_control_changed_cb (EphyZoomAction *action,
                         EvWindow       *ev_window)
 {
        EvSizingMode mode;
-       
-       g_return_if_fail (EV_IS_WINDOW (ev_window));
 
        if (zoom == EPHY_ZOOM_BEST_FIT) {
                mode = EV_SIZING_BEST_FIT;
@@ -4164,28 +5270,66 @@ zoom_control_changed_cb (EphyZoomAction *action,
        } else {
                mode = EV_SIZING_FREE;
        }
-       
-       ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), mode);
-       
+
+       ev_document_model_set_sizing_mode (ev_window->priv->model, mode);
+
        if (mode == EV_SIZING_FREE) {
-               ev_view_set_zoom (EV_VIEW (ev_window->priv->view),
-                                 zoom * get_screen_dpi (GTK_WINDOW (ev_window)) / 72.0,
-                                 FALSE);
+               ev_document_model_set_scale (ev_window->priv->model,
+                                            zoom * get_screen_dpi (ev_window) / 72.0);
+       }
+}
+
+static void
+ev_window_drag_data_received (GtkWidget        *widget,
+                             GdkDragContext   *context,
+                             gint              x,
+                             gint              y,
+                             GtkSelectionData *selection_data,
+                             guint             info,
+                             guint             time)
+
+{
+       EvWindow  *window = EV_WINDOW (widget);
+       gchar    **uris;
+       gint       i = 0;
+       GSList    *uri_list = NULL;
+       GtkWidget *source;
+
+       source = gtk_drag_get_source_widget (context);
+       if (source && widget == gtk_widget_get_toplevel (source)) {
+               gtk_drag_finish (context, FALSE, FALSE, time);
+               return;
+       }
+
+       uris = gtk_selection_data_get_uris (selection_data);
+       if (!uris) {
+               gtk_drag_finish (context, FALSE, FALSE, time);
+               return;
        }
+
+       for (i = 0; uris[i]; i++) {
+               uri_list = g_slist_prepend (uri_list, (gpointer) uris[i]);
+       }
+
+       ev_application_open_uri_list (EV_APP, uri_list,
+                                     gtk_window_get_screen (GTK_WINDOW (window)),
+                                     0);
+       gtk_drag_finish (context, TRUE, FALSE, time);
+
+       g_strfreev (uris);
+       g_slist_free (uri_list);
 }
 
 static void
 ev_window_finalize (GObject *object)
 {
-       GList *windows = ev_application_get_windows (EV_APP);
+       G_OBJECT_CLASS (ev_window_parent_class)->finalize (object);
 
-       if (windows == NULL) {
+       if (ev_window_n_copies == 0) {
                ev_application_shutdown (EV_APP);
        } else {
-               g_list_free (windows);
+               ev_window_n_copies--;
        }
-       
-       G_OBJECT_CLASS (ev_window_parent_class)->finalize (object);
 }
 
 static void
@@ -4200,12 +5344,36 @@ ev_window_dispose (GObject *object)
                                                      ev_window_media_player_key_pressed,
                                                      window);
        }
-       
+
+#ifdef ENABLE_DBUS
+       if (priv->dbus_object_id > 0) {
+               ev_window_emit_closed (window);
+               g_dbus_connection_unregister_object (ev_application_get_dbus_connection (EV_APP),
+                                                    priv->dbus_object_id);
+               priv->dbus_object_id = 0;
+       }
+
+       if (priv->dbus_object_path) {
+               g_free (priv->dbus_object_path);
+               priv->dbus_object_path = NULL;
+       }
+#endif /* ENABLE_DBUS */
+
+       if (priv->bookmarks) {
+               g_object_unref (priv->bookmarks);
+               priv->bookmarks = NULL;
+       }
+
+       if (priv->metadata) {
+               g_object_unref (priv->metadata);
+               priv->metadata = NULL;
+       }
+
        if (priv->setup_document_idle > 0) {
                g_source_remove (priv->setup_document_idle);
                priv->setup_document_idle = 0;
        }
-       
+
        if (priv->monitor) {
                g_object_unref (priv->monitor);
                priv->monitor = NULL;
@@ -4241,6 +5409,11 @@ ev_window_dispose (GObject *object)
                priv->recent_action_group = NULL;
        }
 
+       if (priv->bookmarks_action_group) {
+               g_object_unref (priv->bookmarks_action_group);
+               priv->bookmarks_action_group = NULL;
+       }
+
        if (priv->recent_manager) {
                g_signal_handlers_disconnect_by_func (priv->recent_manager,
                                                      ev_window_setup_recent,
@@ -4248,11 +5421,30 @@ ev_window_dispose (GObject *object)
                priv->recent_manager = NULL;
        }
 
+       if (priv->settings) {
+               g_object_unref (priv->settings);
+               priv->settings = NULL;
+       }
+
+       if (priv->default_settings) {
+               g_settings_apply (priv->default_settings);
+               g_object_unref (priv->default_settings);
+               priv->default_settings = NULL;
+       }
+
+       if (priv->lockdown_settings) {
+               g_object_unref (priv->lockdown_settings);
+               priv->lockdown_settings = NULL;
+       }
+
        priv->recent_ui_id = 0;
 
-       if (priv->page_cache) {
-               g_signal_handlers_disconnect_by_func (priv->page_cache, page_changed_cb, window);
-               priv->page_cache = NULL;
+       if (priv->model) {
+               g_signal_handlers_disconnect_by_func (priv->model,
+                                                     ev_window_page_changed_cb,
+                                                     window);
+               g_object_unref (priv->model);
+               priv->model = NULL;
        }
 
        if (priv->document) {
@@ -4295,28 +5487,13 @@ ev_window_dispose (GObject *object)
                priv->local_uri = NULL;
        }
 
-       ev_window_close_dialogs (window);
-       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;
+       ev_window_clear_progress_idle (window);
+       if (priv->progress_cancellable) {
+               g_object_unref (priv->progress_cancellable);
+               priv->progress_cancellable = NULL;
        }
        
-       if (window->priv->printer) {
-               g_object_unref (window->priv->printer);
-               window->priv->printer = NULL;
-       }
-
-       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;
-       }
+       ev_window_close_dialogs (window);
 
        if (priv->link) {
                g_object_unref (priv->link);
@@ -4328,6 +5505,11 @@ ev_window_dispose (GObject *object)
                priv->image = NULL;
        }
 
+       if (priv->annot) {
+               g_object_unref (priv->annot);
+               priv->annot = NULL;
+       }
+
        if (priv->attach_list) {
                g_list_foreach (priv->attach_list,
                                (GFunc) g_object_unref,
@@ -4345,12 +5527,15 @@ ev_window_dispose (GObject *object)
        }
 
        if (priv->uri) {
-               if (priv->unlink_temp_file)
-                       ev_window_clear_temp_file (window);
                g_free (priv->uri);
                priv->uri = NULL;
        }
 
+       if (priv->search_string) {
+               g_free (priv->search_string);
+               priv->search_string = NULL;
+       }
+       
        if (priv->dest) {
                g_object_unref (priv->dest);
                priv->dest = NULL;
@@ -4361,17 +5546,77 @@ ev_window_dispose (GObject *object)
                priv->history = NULL;
        }
 
-       if (priv->print_settings_file) {
-               ev_window_clear_print_settings_file (window);
-               priv->print_settings_file = NULL;
+       if (priv->print_queue) {
+               g_queue_free (priv->print_queue);
+               priv->print_queue = NULL;
+       }
+
+       G_OBJECT_CLASS (ev_window_parent_class)->dispose (object);
+}
+
+static void
+menubar_deactivate_cb (GtkWidget *menubar,
+                      EvWindow  *window)
+{
+       g_signal_handlers_disconnect_by_func (menubar,
+                                             G_CALLBACK (menubar_deactivate_cb),
+                                             window);
+
+       gtk_menu_shell_deselect (GTK_MENU_SHELL (menubar));
+
+       update_chrome_visibility (window);
+}
+
+static gboolean
+ev_window_key_press_event (GtkWidget   *widget,
+                          GdkEventKey *event)
+{
+       EvWindow        *ev_window = EV_WINDOW (widget);
+       EvWindowPrivate *priv = ev_window->priv;
+       gboolean         handled = FALSE;
+
+       /* Propagate the event to the view first
+        * It's needed to be able to type in
+        * annot popups windows
+        */
+       if (priv->view) {
+               g_object_ref (priv->view);
+               if (gtk_widget_is_sensitive (priv->view))
+                       handled = gtk_widget_event (priv->view, (GdkEvent*) event);
+               g_object_unref (priv->view);
        }
 
-       if (priv->presentation_timeout_id > 0) {
-               g_source_remove (priv->presentation_timeout_id);
-               priv->presentation_timeout_id = 0;
+       if (!handled && !EV_WINDOW_IS_PRESENTATION (ev_window)) {
+               guint modifier = event->state & gtk_accelerator_get_default_mod_mask ();
+
+               if (priv->menubar_accel_keyval != 0 &&
+                   event->keyval == priv->menubar_accel_keyval &&
+                   modifier == priv->menubar_accel_modifier) {
+                       if (!gtk_widget_get_visible (priv->menubar)) {
+                               g_signal_connect (priv->menubar, "deactivate",
+                                                 G_CALLBACK (menubar_deactivate_cb),
+                                                 ev_window);
+
+                               gtk_widget_show (priv->menubar);
+                               gtk_menu_shell_select_first (GTK_MENU_SHELL (priv->menubar),
+                                                            FALSE);
+
+                               handled = TRUE;
+                       }
+               }
        }
 
-       G_OBJECT_CLASS (ev_window_parent_class)->dispose (object);
+       if (!handled)
+               handled = GTK_WIDGET_CLASS (ev_window_parent_class)->key_press_event (widget, event);
+
+       return handled;
+}
+
+static gboolean
+ev_window_delete_event (GtkWidget   *widget,
+                       GdkEventAny *event)
+{
+       return !ev_window_close (EV_WINDOW (widget));
 }
 
 static void
@@ -4383,8 +5628,11 @@ ev_window_class_init (EvWindowClass *ev_window_class)
        g_object_class->dispose = ev_window_dispose;
        g_object_class->finalize = ev_window_finalize;
 
+       widget_class->delete_event = ev_window_delete_event;
+       widget_class->key_press_event = ev_window_key_press_event;
        widget_class->screen_changed = ev_window_screen_changed;
        widget_class->window_state_event = ev_window_state_event;
+       widget_class->drag_data_received = ev_window_drag_data_received;
 
        g_type_class_add_private (g_object_class, sizeof (EvWindowPrivate));
 }
@@ -4395,22 +5643,23 @@ static const GtkActionEntry entries[] = {
         { "Edit", NULL, N_("_Edit") },
        { "View", NULL, N_("_View") },
         { "Go", NULL, N_("_Go") },
+       { "Bookmarks", NULL, N_("_Bookmarks") },
        { "Help", NULL, N_("_Help") },
 
        /* File menu */
-       { "FileOpen", GTK_STOCK_OPEN, N_("_Open..."), "<control>O",
+       { "FileOpen", GTK_STOCK_OPEN, N_("_Open"), "<control>O",
          N_("Open an existing document"),
          G_CALLBACK (ev_window_cmd_file_open) },
        { "FileOpenCopy", NULL, N_("Op_en a Copy"), "<control>N",
          N_("Open a copy of the current document in a new window"),
          G_CALLBACK (ev_window_cmd_file_open_copy) },
-               { "FileSaveAs", GTK_STOCK_SAVE_AS, N_("_Save a Copy..."), "<control>S",
+               { "FileSaveAs", GTK_STOCK_SAVE_AS, N_("_Save a Copy"), "<control>S",
          N_("Save a copy of the current document"),
          G_CALLBACK (ev_window_cmd_save_as) },
-       { "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",
+       { "FileOpenContainingFolder", GTK_STOCK_DIRECTORY, N_("Open Containing _Folder"), NULL,
+         N_("Show the folder which contains this file in the file manager"),
+         G_CALLBACK (ev_window_cmd_open_containing_folder) },
+       { "FilePrint", GTK_STOCK_PRINT, N_("_Print"), "<control>P",
          N_("Print this document"),
          G_CALLBACK (ev_window_cmd_file_print) },
        { "FileProperties", GTK_STOCK_PROPERTIES, N_("P_roperties"), "<alt>Return", NULL,
@@ -4423,7 +5672,7 @@ static const GtkActionEntry entries[] = {
           G_CALLBACK (ev_window_cmd_edit_copy) },
        { "EditSelectAll", GTK_STOCK_SELECT_ALL, N_("Select _All"), "<control>A", NULL,
          G_CALLBACK (ev_window_cmd_edit_select_all) },
-        { "EditFind", GTK_STOCK_FIND, N_("_Find..."), "<control>F",
+        { "EditFind", GTK_STOCK_FIND, N_("_Find"), "<control>F",
           N_("Find a word or phrase in the document"),
           G_CALLBACK (ev_window_cmd_edit_find) },
        { "EditFindNext", NULL, N_("Find Ne_xt"), "<control>G", NULL,
@@ -4432,10 +5681,13 @@ static const GtkActionEntry entries[] = {
          G_CALLBACK (ev_window_cmd_edit_find_previous) },
         { "EditToolbar", NULL, N_("T_oolbar"), NULL, NULL,
           G_CALLBACK (ev_window_cmd_edit_toolbar) },
-       { "EditRotateLeft", EV_STOCK_ROTATE_LEFT, N_("Rotate _Left"), "<alt>Left", NULL,
+       { "EditRotateLeft", EV_STOCK_ROTATE_LEFT, N_("Rotate _Left"), "<control>Left", NULL,
          G_CALLBACK (ev_window_cmd_edit_rotate_left) },
-       { "EditRotateRight", EV_STOCK_ROTATE_RIGHT, N_("Rotate _Right"), "<alt>Right", NULL,
+       { "EditRotateRight", EV_STOCK_ROTATE_RIGHT, N_("Rotate _Right"), "<control>Right", NULL,
          G_CALLBACK (ev_window_cmd_edit_rotate_right) },
+       { "EditSaveSettings", NULL, N_("Save Current Settings as _Default"), "<control>T", NULL,
+         G_CALLBACK (ev_window_cmd_edit_save_settings) },
+
 
         /* View menu */
         { "ViewZoomIn", GTK_STOCK_ZOOM_IN, NULL, "<control>plus",
@@ -4465,6 +5717,11 @@ static const GtkActionEntry entries[] = {
           N_("Go to the last page"),
           G_CALLBACK (ev_window_cmd_go_last_page) },
 
+       /* Bookmarks menu */
+       { "BookmarksAdd", GTK_STOCK_ADD, N_("_Add Bookmark"), "<control>D",
+         N_("Add a bookmark for the current page"),
+         G_CALLBACK (ev_window_cmd_bookmarks_add) },
+
        /* Help menu */
        { "HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1", NULL,
          G_CALLBACK (ev_window_cmd_help_contents) },
@@ -4479,15 +5736,14 @@ static const GtkActionEntry entries[] = {
        { "StartPresentation", EV_STOCK_RUN_PRESENTATION, N_("Start Presentation"), NULL,
          N_("Start a presentation"),
          G_CALLBACK (ev_window_cmd_start_presentation) },
-       { "PreviewPrint", GTK_STOCK_PRINT, N_("Print"), NULL,
-         N_("Print this document"),
-         G_CALLBACK (ev_window_cmd_preview_print) },
 
        /* Accellerators */
        { "Escape", NULL, "", "Escape", "",
          G_CALLBACK (ev_window_cmd_escape) },
         { "Slash", GTK_STOCK_FIND, NULL, "slash", NULL,
           G_CALLBACK (ev_window_cmd_edit_find) },
+        { "F3", NULL, "", "F3", NULL,
+          G_CALLBACK (ev_window_cmd_edit_find_next) },
         { "PageDown", NULL, "", "Page_Down", NULL,
           G_CALLBACK (ev_window_cmd_scroll_forward) },
         { "PageUp", NULL, "", "Page_Up", NULL,
@@ -4504,6 +5760,10 @@ static const GtkActionEntry entries[] = {
           G_CALLBACK (ev_window_cmd_scroll_forward) },
         { "ShiftReturn", NULL, "", "<shift>Return", NULL,
           G_CALLBACK (ev_window_cmd_scroll_backward) },
+       { "p", GTK_STOCK_GO_UP, "", "p", NULL,
+         G_CALLBACK (ev_window_cmd_go_previous_page) },
+       { "n", GTK_STOCK_GO_DOWN, "", "n", NULL,
+         G_CALLBACK (ev_window_cmd_go_next_page) },
         { "Plus", GTK_STOCK_ZOOM_IN, NULL, "plus", NULL,
           G_CALLBACK (ev_window_cmd_view_zoom_in) },
         { "CtrlEqual", GTK_STOCK_ZOOM_IN, NULL, "<control>equal", NULL,
@@ -4557,6 +5817,10 @@ static const GtkToggleActionEntry toggle_entries[] = {
         { "ViewPageWidth", EV_STOCK_ZOOM_WIDTH, N_("Fit Page _Width"), NULL,
           N_("Make the current document fill the window width"),
           G_CALLBACK (ev_window_cmd_view_page_width) },
+       { "ViewInvertedColors", EV_STOCK_INVERTED_COLORS, N_("_Inverted Colors"), "<control>I",
+         N_("Show page contents with the colors inverted"),
+         G_CALLBACK (ev_window_cmd_view_inverted_colors) },
+
 };
 
 /* Popups specific items */
@@ -4570,16 +5834,18 @@ static const GtkActionEntry view_popup_entries [] = {
          NULL, G_CALLBACK (ev_view_popup_cmd_open_link_new_window) },
        { "CopyLinkAddress", NULL, N_("_Copy Link Address"), NULL,
          NULL, G_CALLBACK (ev_view_popup_cmd_copy_link_address) },
-       { "SaveImageAs", NULL, N_("_Save Image As..."), NULL,
+       { "SaveImageAs", NULL, N_("_Save Image As"), NULL,
          NULL, G_CALLBACK (ev_view_popup_cmd_save_image_as) },
        { "CopyImage", NULL, N_("Copy _Image"), NULL,
          NULL, G_CALLBACK (ev_view_popup_cmd_copy_image) },
+       { "AnnotProperties", NULL, N_("Annotation Properties…"), NULL,
+         NULL, G_CALLBACK (ev_view_popup_cmd_annot_properties) }
 };
 
 static const GtkActionEntry attachment_popup_entries [] = {
-       { "OpenAttachment", GTK_STOCK_OPEN, N_("_Open..."), NULL,
+       { "OpenAttachment", GTK_STOCK_OPEN, N_("_Open Attachment"), NULL,
          NULL, G_CALLBACK (ev_attachment_popup_cmd_open_attachment) },
-       { "SaveAttachmentAs", GTK_STOCK_SAVE_AS, N_("_Save a Copy..."), NULL,
+       { "SaveAttachmentAs", GTK_STOCK_SAVE_AS, N_("_Save Attachment As…"), NULL,
          NULL, G_CALLBACK (ev_attachment_popup_cmd_save_attachment_as) },
 };
 
@@ -4604,6 +5870,52 @@ navigation_action_activate_link_cb (EvNavigationAction *action, EvLink *link, Ev
        gtk_widget_grab_focus (window->priv->view);
 }
 
+static void
+sidebar_layers_visibility_changed (EvSidebarLayers *layers,
+                                  EvWindow        *window)
+{
+       ev_view_reload (EV_VIEW (window->priv->view));
+}
+
+static void
+sidebar_annots_annot_activated_cb (EvSidebarAnnotations *sidebar_annots,
+                                  EvMapping            *annot_mapping,
+                                  EvWindow             *window)
+{
+       ev_view_focus_annotation (EV_VIEW (window->priv->view), annot_mapping);
+}
+
+static void
+sidebar_annots_begin_annot_add (EvSidebarAnnotations *sidebar_annots,
+                               EvAnnotationType      annot_type,
+                               EvWindow             *window)
+{
+       ev_view_begin_add_annotation (EV_VIEW (window->priv->view), annot_type);
+}
+
+static void
+view_annot_added (EvView       *view,
+                 EvAnnotation *annot,
+                 EvWindow     *window)
+{
+       ev_sidebar_annotations_annot_added (EV_SIDEBAR_ANNOTATIONS (window->priv->sidebar_annots),
+                                           annot);
+}
+
+static void
+sidebar_annots_annot_add_cancelled (EvSidebarAnnotations *sidebar_annots,
+                                   EvWindow             *window)
+{
+       ev_view_cancel_add_annotation (EV_VIEW (window->priv->view));
+}
+
+static void
+sidebar_bookmarks_add_bookmark (EvSidebarBookmarks *sidebar_bookmarks,
+                               EvWindow           *window)
+{
+       ev_window_cmd_bookmarks_add (NULL, window);
+}
+
 static void
 register_custom_actions (EvWindow *window, GtkActionGroup *group)
 {
@@ -4616,6 +5928,8 @@ register_custom_actions (EvWindow *window, GtkActionGroup *group)
                               "icon_name", "text-x-generic",
                               "visible_overflown", FALSE,
                               NULL);
+       ev_page_action_set_model (EV_PAGE_ACTION (action),
+                                 window->priv->model);
        g_signal_connect (action, "activate_link",
                          G_CALLBACK (activate_link_cb), window);
        gtk_action_group_add_action (group, action);
@@ -4649,7 +5963,7 @@ register_custom_actions (EvWindow *window, GtkActionGroup *group)
 
        action = g_object_new (EV_TYPE_OPEN_RECENT_ACTION,
                               "name", "FileOpenRecent",
-                              "label", _("_Open..."),
+                              "label", _("_Open"),
                               "tooltip", _("Open an existing document"),
                               "stock_id", GTK_STOCK_OPEN,
                               NULL);
@@ -4667,6 +5981,10 @@ set_action_properties (GtkActionGroup *action_group)
 {
        GtkAction *action;
 
+       action = gtk_action_group_get_action (action_group, "FileOpenContainingFolder");
+       /*translators: this is the label for toolbar button*/
+       g_object_set (action, "short_label", _("Open Folder"), NULL);
+
        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*/
@@ -4689,28 +6007,12 @@ set_action_properties (GtkActionGroup *action_group)
        /*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, "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, "LeaveFullscreen");
-       g_object_set (action, "is-important", TRUE, NULL);
-}
-
-static void
-set_chrome_actions (EvWindow *window)
-{
-       EvWindowPrivate *priv = window->priv;
-       GtkActionGroup *action_group = priv->action_group;
-       GtkAction *action;
+       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, "ViewToolbar");
-       g_signal_handlers_block_by_func
-               (action, G_CALLBACK (ev_window_view_toolbar_cb), window);
-       gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
-                                     (priv->chrome & EV_CHROME_TOOLBAR) != 0);
-       g_signal_handlers_unblock_by_func
-               (action, G_CALLBACK (ev_window_view_toolbar_cb), window);
+       action = gtk_action_group_get_action (action_group, "LeaveFullscreen");
+       g_object_set (action, "is-important", TRUE, NULL);
 }
 
 static void
@@ -4726,7 +6028,7 @@ sidebar_widget_model_set (EvSidebarLinks *ev_sidebar_links,
                      NULL);
 
        action = gtk_action_group_get_action (ev_window->priv->action_group, PAGE_SELECTOR_ACTION);
-       ev_page_action_set_model (EV_PAGE_ACTION (action), model);
+       ev_page_action_set_links_model (EV_PAGE_ACTION (action), model);
        g_object_unref (model);
 }
 
@@ -4785,8 +6087,8 @@ window_state_event_cb (EvWindow *window, GdkEventWindowState *event, gpointer du
                gboolean maximized;
 
                maximized = event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED;
-               if (!ev_window_is_empty (window))
-                       ev_metadata_manager_set_boolean (window->priv->uri, "window_maximized", maximized);
+               if (window->priv->metadata && !ev_window_is_empty (window))
+                       ev_metadata_set_boolean (window->priv->metadata, "window_maximized", maximized);
        }
 
        return FALSE;
@@ -4795,32 +6097,26 @@ 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->uri;
        GdkWindowState state;
-       int x, y, width, height, document_width, document_height;
+       gdouble document_width, document_height;
 
-       state = gdk_window_get_state (GTK_WIDGET (window)->window);
+       if (!window->priv->metadata)
+               return FALSE;
+
+       state = gdk_window_get_state (gtk_widget_get_window (GTK_WIDGET (window)));
 
        if (!(state & GDK_WINDOW_STATE_FULLSCREEN)) {
-               gtk_window_get_position (GTK_WINDOW (window), &x, &y);
-               gtk_window_get_size (GTK_WINDOW (window), &width, &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_double (uri, "window_width_ratio", 
-                                                       (double)width / document_width);
-                       ev_metadata_manager_set_double (uri, "window_height_ratio", 
-                                                       (double)height / document_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 (window->priv->document) {
+                       ev_document_get_max_page_size (window->priv->document,
+                                                      &document_width, &document_height);
+                       g_settings_set (window->priv->default_settings, "window-ratio", "(dd)",
+                                       (double)event->width / document_width,
+                                       (double)event->height / document_height);
+
+                       ev_metadata_set_int (window->priv->metadata, "window_x", event->x);
+                       ev_metadata_set_int (window->priv->metadata, "window_y", event->y);
+                       ev_metadata_set_int (window->priv->metadata, "window_width", event->width);
+                       ev_metadata_set_int (window->priv->metadata, "window_height", event->height);
                }
        }
 
@@ -4831,12 +6127,12 @@ static void
 launch_action (EvWindow *window, EvLinkAction *action)
 {
        const char *filename = ev_link_action_get_filename (action);
-       const char *content_type;
        GAppInfo *app_info;
-       GFileInfo *file_info;
        GFile *file;
-       GList *file_list = NULL;
-       
+       GList file_list = {NULL};
+       GAppLaunchContext *context;
+       GError *error = NULL;
+
        if (filename == NULL)
                return;
 
@@ -4844,35 +6140,44 @@ launch_action (EvWindow *window, EvLinkAction *action)
                file = g_file_new_for_path (filename);
        } else {
                GFile *base_file;
+               gchar *dir;
+
+               dir = g_path_get_dirname (window->priv->uri);
+               base_file = g_file_new_for_uri (dir);
+               g_free (dir);
                
-               base_file = g_file_new_for_uri (window->priv->uri);
-               file = g_file_resolve_relative_path (base_file,
-                                                    filename);
-               
+               file = g_file_resolve_relative_path (base_file, filename);
                g_object_unref (base_file);
        }
-       
-       file_info = g_file_query_info (file,
-                                      G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
-                                      0, NULL, NULL);
-       if (file_info == NULL) {
+
+       app_info = g_file_query_default_handler (file, NULL, &error);
+       if (!app_info) {
+               ev_window_error_message (window, error,
+                                        "%s",
+                                        _("Unable to launch external application."));
                g_object_unref (file);
+               g_error_free (error);
+
                return;
        }
-       
-       content_type = g_file_info_get_content_type (file_info);
-       app_info = g_app_info_get_default_for_type (content_type, TRUE);
-       
-       file_list = g_list_append (file_list, file);
 
-       /* FIXME: should we use a GAppLaunchContext? */
-       g_app_info_launch (app_info, file_list,
-                          NULL, NULL);
+       context = G_APP_LAUNCH_CONTEXT (gdk_app_launch_context_new ());
+       gdk_app_launch_context_set_screen (GDK_APP_LAUNCH_CONTEXT (context),
+                                          gtk_window_get_screen (GTK_WINDOW (window)));
+       gdk_app_launch_context_set_timestamp (GDK_APP_LAUNCH_CONTEXT (context),
+                                              gtk_get_current_event_time ());
+       
+       file_list.data = file;
+       if (!g_app_info_launch (app_info, &file_list, context, &error)) {
+               ev_window_error_message (window, error,
+                                        "%s",
+                                        _("Unable to launch external application."));
+               g_error_free (error);
+       }
        
-       g_list_free (file_list);
        g_object_unref (app_info);
-       g_object_unref (file_info);
        g_object_unref (file);
+        /* FIXMEchpe: unref launch context? */
 
        /* According to the PDF spec filename can be an executable. I'm not sure
           allowing to launch executables is a good idea though. -- marco */
@@ -4884,24 +6189,50 @@ launch_external_uri (EvWindow *window, EvLinkAction *action)
        const gchar *uri = ev_link_action_get_uri (action);
        GError *error = NULL;
        gboolean ret;
-       
-       ret = g_app_info_launch_default_for_uri (uri, NULL, &error);
+       GAppLaunchContext *context;
+
+       context = G_APP_LAUNCH_CONTEXT (gdk_app_launch_context_new ());
+       gdk_app_launch_context_set_screen (GDK_APP_LAUNCH_CONTEXT (context),
+                                          gtk_window_get_screen (GTK_WINDOW (window)));
+       gdk_app_launch_context_set_timestamp (GDK_APP_LAUNCH_CONTEXT (context),
+                                             gtk_get_current_event_time ());
+
+       if (!g_strstr_len (uri, strlen (uri), "://") &&
+           !g_str_has_prefix (uri, "mailto:")) {
+               gchar *new_uri;
+
+               /* Not a valid uri, assume http if it starts with www */
+               if (g_str_has_prefix (uri, "www.")) {
+                       new_uri = g_strdup_printf ("http://%s", uri);
+               } else {
+                       GFile *file, *parent;
+
+                       file = g_file_new_for_uri (window->priv->uri);
+                       parent = g_file_get_parent (file);
+                       g_object_unref (file);
+                       if (parent) {
+                               gchar *parent_uri = g_file_get_uri (parent);
+
+                               new_uri = g_build_filename (parent_uri, uri, NULL);
+                               g_free (parent_uri);
+                               g_object_unref (parent);
+                       } else {
+                               new_uri = g_strdup_printf ("file:///%s", uri);
+                       }
+               }
+               ret = g_app_info_launch_default_for_uri (new_uri, context, &error);
+               g_free (new_uri);
+       } else {
+               ret = g_app_info_launch_default_for_uri (uri, context, &error);
+       }
+
        if (ret == FALSE) {
-               GtkWidget *dialog;
-       
-               dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-                                                GTK_DIALOG_DESTROY_WITH_PARENT,
-                                                GTK_MESSAGE_ERROR,
-                                                GTK_BUTTONS_CLOSE,
-                                                _("Unable to open external link"));
-               gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-                                                         error->message, uri);
-               g_signal_connect (dialog, "response",
-                                 G_CALLBACK (gtk_widget_destroy),
-                                 NULL);
-               gtk_widget_show (dialog);
-               g_error_free(error);
+               ev_window_error_message (window, error,
+                                        "%s", _("Unable to open external link"));
+               g_error_free (error);
        }
+
+        /* FIXMEchpe: unref launch context? */
 }
 
 static void
@@ -4921,9 +6252,7 @@ open_remote_link (EvWindow *window, EvLinkAction *action)
                                         ev_link_action_get_dest (action),
                                         0,
                                         NULL, 
-                                        FALSE,
-                                        NULL,
-                                        GDK_CURRENT_TIME);
+                                        gtk_get_current_event_time ());
 
        g_free (uri);
 }
@@ -4947,6 +6276,8 @@ do_action_named (EvWindow *window, EvLinkAction *action)
                ev_window_cmd_edit_find (NULL, window);
        } else if (g_ascii_strcasecmp (name, "Close") == 0) {
                ev_window_cmd_file_close_window (NULL, window);
+       } else if (g_ascii_strcasecmp (name, "Print") == 0) {
+               ev_window_cmd_file_print (NULL, window);
        } else {
                g_warning ("Unimplemented named action: %s, please post a "
                           "bug report in Evince bugzilla "
@@ -4956,7 +6287,7 @@ do_action_named (EvWindow *window, EvLinkAction *action)
 }
 
 static void
-view_external_link_cb (EvView *view, EvLinkAction *action, EvWindow *window)
+view_external_link_cb (EvWindow *window, EvLinkAction *action)
 {
        switch (ev_link_action_get_action_type (action)) {
                case EV_LINK_ACTION_TYPE_GOTO_DEST: {
@@ -4966,7 +6297,7 @@ view_external_link_cb (EvView *view, EvLinkAction *action, EvWindow *window)
                        if (!dest)
                                return;
 
-                       ev_window_cmd_file_open_copy_at_dest (window, dest);
+                       ev_window_open_copy_at_dest (window, dest);
                }
                        break;
                case EV_LINK_ACTION_TYPE_EXTERNAL_URI:
@@ -5006,7 +6337,7 @@ ev_view_popup_cmd_open_link_new_window (GtkAction *action, EvWindow *window)
        if (!dest)
                return;
 
-       ev_window_cmd_file_open_copy_at_dest (window, dest);
+       ev_window_open_copy_at_dest (window, dest);
 }
 
 static void
@@ -5022,6 +6353,30 @@ ev_view_popup_cmd_copy_link_address (GtkAction *action, EvWindow *window)
                                   ev_action);
 }
 
+static GFile *
+create_file_from_uri_for_format (const gchar     *uri,
+                                GdkPixbufFormat *format)
+{
+       GFile  *target_file;
+       gchar **extensions;
+       gchar  *uri_extension;
+       gint    i;
+
+       extensions = gdk_pixbuf_format_get_extensions (format);
+       for (i = 0; extensions[i]; i++) {
+               if (g_str_has_suffix (uri, extensions[i])) {
+                       g_strfreev (extensions);
+                       return g_file_new_for_uri (uri);
+               }
+       }
+
+       uri_extension = g_strconcat (uri, ".", extensions[0], NULL);
+       target_file = g_file_new_for_uri (uri_extension);
+       g_free (uri_extension);
+       g_strfreev (extensions);
+
+       return target_file;
+}
 
 static void
 image_save_dialog_response_cb (GtkWidget *fc,
@@ -5033,7 +6388,6 @@ image_save_dialog_response_cb (GtkWidget *fc,
        GError          *error = NULL;
        GdkPixbuf       *pixbuf;
        gchar           *uri;
-       gchar          **extensions;
        gchar           *filename;
        gchar           *file_format;
        GdkPixbufFormat *format;
@@ -5052,34 +6406,35 @@ image_save_dialog_response_cb (GtkWidget *fc,
                format = get_gdk_pixbuf_format_by_extension (uri);
        }
 
+       if (format == NULL && g_strrstr (uri, ".") == NULL) {
+               /* no extension found and no extension provided within uri */
+               format = get_gdk_pixbuf_format_by_extension (".png");
+               if (format == NULL) {
+                       /* no .png support, try .jpeg */
+                       format = get_gdk_pixbuf_format_by_extension (".jpeg");
+               }
+       }
+
        if (format == NULL) {
-               ev_window_error_message (GTK_WINDOW (ev_window),
-                                        _("Couldn't find appropriate format to save image"),
-                                        NULL);
+               ev_window_error_message (ev_window, NULL, 
+                                        "%s",
+                                        _("Couldn't find appropriate format to save image"));
                g_free (uri);
                gtk_widget_destroy (fc);
 
                return;
        }
 
-       extensions = gdk_pixbuf_format_get_extensions (format);
-       if (g_str_has_suffix(uri, extensions[0])) {
-               gchar *uri_extension;
-               
-               uri_extension = g_strconcat (uri, ".", extensions[0], NULL);
-               target_file = g_file_new_for_uri (uri_extension);
-               g_free (uri_extension);
-       } else {
-               target_file = g_file_new_for_uri (uri);
-       }
-       g_strfreev(extensions);
+       target_file = create_file_from_uri_for_format (uri, format);
        g_free (uri);
-       
+
        is_native = g_file_is_native (target_file);
        if (is_native) {
                filename = g_file_get_path (target_file);
        } else {
-               filename = ev_tmp_filename ("saveimage");
+                /* Create a temporary local file to save to */
+                if (ev_mkstemp ("saveimage.XXXXXX", &filename, &error) == -1)
+                        goto has_error;
        }
 
        ev_document_doc_mutex_lock ();
@@ -5092,10 +6447,10 @@ image_save_dialog_response_cb (GtkWidget *fc,
        g_free (file_format);
        g_object_unref (pixbuf);
        
+    has_error:
        if (error) {
-               ev_window_error_message (GTK_WINDOW (ev_window),
-                                        _("The image could not be saved."),
-                                        error);
+               ev_window_error_message (ev_window, error, 
+                                        "%s", _("The image could not be saved."));
                g_error_free (error);
                g_free (filename);
                g_object_unref (target_file);
@@ -5107,9 +6462,10 @@ image_save_dialog_response_cb (GtkWidget *fc,
        if (!is_native) {
                GFile *source_file;
                
-               source_file = g_file_new_for_uri (filename);
+               source_file = g_file_new_for_path (filename);
                
-               ev_window_save_remote (ev_window, source_file, target_file);
+               ev_window_save_remote (ev_window, EV_SAVE_IMAGE,
+                                      source_file, target_file);
                g_object_unref (source_file);
        }
        
@@ -5135,6 +6491,11 @@ ev_view_popup_cmd_save_image_as (GtkAction *action, EvWindow *window)
                                          NULL);
 
        gtk_dialog_set_default_response (GTK_DIALOG (fc), GTK_RESPONSE_OK);
+        gtk_dialog_set_alternative_button_order (GTK_DIALOG (fc),
+                                                 GTK_RESPONSE_OK,
+                                                 GTK_RESPONSE_CANCEL,
+                                                 -1);
+
        gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (fc), FALSE);
        gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (fc), TRUE);
        
@@ -5167,26 +6528,89 @@ ev_view_popup_cmd_copy_image (GtkAction *action, EvWindow *window)
        g_object_unref (pixbuf);
 }
 
+static void
+ev_view_popup_cmd_annot_properties (GtkAction *action,
+                                   EvWindow  *window)
+{
+       const gchar                  *author;
+       GdkColor                      color;
+       gdouble                       opacity;
+       gboolean                      popup_is_open;
+       EvAnnotationPropertiesDialog *dialog;
+       EvAnnotation                 *annot = window->priv->annot;
+       EvAnnotationsSaveMask         mask = EV_ANNOTATIONS_SAVE_NONE;
+
+       if (!annot)
+               return;
+
+       dialog = EV_ANNOTATION_PROPERTIES_DIALOG (ev_annotation_properties_dialog_new_with_annotation (window->priv->annot));
+       if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_APPLY) {
+               gtk_widget_destroy (GTK_WIDGET (dialog));
+
+               return;
+       }
+
+       /* Set annotations changes */
+       author = ev_annotation_properties_dialog_get_author (dialog);
+       if (ev_annotation_markup_set_label (EV_ANNOTATION_MARKUP (annot), author))
+               mask |= EV_ANNOTATIONS_SAVE_LABEL;
+
+       ev_annotation_properties_dialog_get_color (dialog, &color);
+       if (ev_annotation_set_color (annot, &color))
+               mask |= EV_ANNOTATIONS_SAVE_COLOR;
+
+       opacity = ev_annotation_properties_dialog_get_opacity (dialog);
+       if (ev_annotation_markup_set_opacity (EV_ANNOTATION_MARKUP (annot), opacity))
+               mask |= EV_ANNOTATIONS_SAVE_OPACITY;
+
+       popup_is_open = ev_annotation_properties_dialog_get_popup_is_open (dialog);
+       if (ev_annotation_markup_set_popup_is_open (EV_ANNOTATION_MARKUP (annot), popup_is_open))
+               mask |= EV_ANNOTATIONS_SAVE_POPUP_IS_OPEN;
+
+       if (EV_IS_ANNOTATION_TEXT (annot)) {
+               EvAnnotationTextIcon icon;
+
+               icon = ev_annotation_properties_dialog_get_text_icon (dialog);
+               if (ev_annotation_text_set_icon (EV_ANNOTATION_TEXT (annot), icon))
+                       mask |= EV_ANNOTATIONS_SAVE_TEXT_ICON;
+       }
+
+       if (mask != EV_ANNOTATIONS_SAVE_NONE) {
+               ev_document_doc_mutex_lock ();
+               ev_document_annotations_save_annotation (EV_DOCUMENT_ANNOTATIONS (window->priv->document),
+                                                        window->priv->annot,
+                                                        mask);
+               ev_document_doc_mutex_unlock ();
+
+               /* FIXME: update annot region only */
+               ev_view_reload (EV_VIEW (window->priv->view));
+       }
+
+       gtk_widget_destroy (GTK_WIDGET (dialog));
+}
+
 static void
 ev_attachment_popup_cmd_open_attachment (GtkAction *action, EvWindow *window)
 {
-       GList *l;
+       GList     *l;
+       GdkScreen *screen;
        
        if (!window->priv->attach_list)
                return;
 
+       screen = gtk_window_get_screen (GTK_WINDOW (window));
+
        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);
+               ev_attachment_open (attachment, screen, gtk_get_current_event_time (), &error);
 
                if (error) {
-                       ev_window_error_message (GTK_WINDOW (window),
-                                                _("Unable to open attachment"),
-                                                error);
+                       ev_window_error_message (window, error, 
+                                                "%s", _("Unable to open attachment"));
                        g_error_free (error);
                }
        }
@@ -5217,7 +6641,7 @@ attachment_save_dialog_response_cb (GtkWidget *fc,
        
        for (l = ev_window->priv->attach_list; l && l->data; l = g_list_next (l)) {
                EvAttachment *attachment;
-               GFile        *save_to;
+               GFile        *save_to = NULL;
                GError       *error = NULL;
                
                attachment = (EvAttachment *) l->data;
@@ -5225,20 +6649,21 @@ attachment_save_dialog_response_cb (GtkWidget *fc,
                if (is_native) {
                        if (is_dir) {
                                save_to = g_file_get_child (target_file,
+                                    /* FIXMEchpe: file name encoding! */
                                                            ev_attachment_get_name (attachment));
                        } else {
                                save_to = g_object_ref (target_file);
                        }
                } else {
-                       save_to = ev_tmp_file_get ("saveattachment");
+                       save_to = ev_mkstemp_file ("saveattachment.XXXXXX", &error);
                }
 
-               ev_attachment_save (attachment, save_to, &error);
+                if (save_to)
+                        ev_attachment_save (attachment, save_to, &error);
                
                if (error) {
-                       ev_window_error_message (GTK_WINDOW (ev_window),
-                                                _("The attachment could not be saved."),
-                                                error);
+                       ev_window_error_message (ev_window, error, 
+                                                "%s", _("The attachment could not be saved."));
                        g_error_free (error);
                        g_object_unref (save_to);
 
@@ -5255,7 +6680,8 @@ attachment_save_dialog_response_cb (GtkWidget *fc,
                                dest_file = g_object_ref (target_file);
                        }
 
-                       ev_window_save_remote (ev_window, save_to, dest_file);
+                       ev_window_save_remote (ev_window, EV_SAVE_ATTACHMENT,
+                                              save_to, dest_file);
 
                        g_object_unref (dest_file);
                }
@@ -5291,6 +6717,11 @@ ev_attachment_popup_cmd_save_attachment_as (GtkAction *action, EvWindow *window)
                NULL);
 
        gtk_dialog_set_default_response (GTK_DIALOG (fc), GTK_RESPONSE_OK);
+        gtk_dialog_set_alternative_button_order (GTK_DIALOG (fc),
+                                                 GTK_RESPONSE_OK,
+                                                 GTK_RESPONSE_CANCEL,
+                                                 -1);
+
        gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (fc), TRUE);
        gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (fc), FALSE);
 
@@ -5324,9 +6755,15 @@ ev_window_media_player_key_pressed (EvWindow    *window,
        if (strcmp (key, "Play") == 0) {
                ev_window_run_presentation (window);
        } else if (strcmp (key, "Previous") == 0) {
-               ev_window_cmd_go_previous_page (NULL, window);
+               if (EV_WINDOW_IS_PRESENTATION (window))
+                       ev_view_presentation_previous_page (EV_VIEW_PRESENTATION (window->priv->presentation_view));
+               else
+                       ev_window_cmd_go_previous_page (NULL, window);
        } else if (strcmp (key, "Next") == 0) {
-               ev_window_cmd_go_next_page (NULL, window);
+               if (EV_WINDOW_IS_PRESENTATION (window))
+                       ev_view_presentation_next_page (EV_VIEW_PRESENTATION (window->priv->presentation_view));
+               else
+                       ev_window_cmd_go_next_page (NULL, window);
        } else if (strcmp (key, "FastForward") == 0) {
                ev_window_cmd_go_last_page (NULL, window);
        } else if (strcmp (key, "Rewind") == 0) {
@@ -5334,6 +6771,232 @@ ev_window_media_player_key_pressed (EvWindow    *window,
        }
 }
 
+static EggToolbarsModel *
+get_toolbars_model (void)
+{
+       EggToolbarsModel *toolbars_model;
+       gchar            *toolbars_file;
+       gchar            *toolbars_path;
+       gint              i;
+
+       toolbars_model = egg_toolbars_model_new ();
+
+       toolbars_file = g_build_filename (ev_application_get_dot_dir (EV_APP, FALSE),
+                                         "evince_toolbar.xml", NULL);
+       toolbars_path = g_build_filename (ev_application_get_data_dir (EV_APP),
+                                        "evince-toolbar.xml", NULL);
+       egg_toolbars_model_load_names (toolbars_model, toolbars_path);
+
+       if (!egg_toolbars_model_load_toolbars (toolbars_model, toolbars_file)) {
+               egg_toolbars_model_load_toolbars (toolbars_model, toolbars_path);
+                goto skip_conversion;
+       }
+
+       /* Open item doesn't exist anymore,
+        * convert it to OpenRecent for compatibility
+        */
+       for (i = 0; i < egg_toolbars_model_n_items (toolbars_model, 0); i++) {
+               const gchar *item;
+
+               item = egg_toolbars_model_item_nth (toolbars_model, 0, i);
+               if (g_ascii_strcasecmp (item, "FileOpen") == 0) {
+                       egg_toolbars_model_remove_item (toolbars_model, 0, i);
+                       egg_toolbars_model_add_item (toolbars_model, 0, i,
+                                                    "FileOpenRecent");
+                       egg_toolbars_model_save_toolbars (toolbars_model, toolbars_file, "1.0");
+                       break;
+               }
+       }
+
+    skip_conversion:
+       g_free (toolbars_file);
+       g_free (toolbars_path);
+
+       egg_toolbars_model_set_flags (toolbars_model, 0, EGG_TB_MODEL_NOT_REMOVABLE);
+
+       return toolbars_model;
+}
+
+#ifdef ENABLE_DBUS
+static void
+ev_window_sync_source (EvWindow     *window,
+                      EvSourceLink *link)
+{
+       GDBusConnection *connection;
+       GError          *error = NULL;
+       guint32          timestamp;
+       gchar           *uri_input;
+       GFile           *input_gfile;
+
+       if (window->priv->dbus_object_id <= 0)
+               return;
+
+       connection = ev_application_get_dbus_connection (EV_APP);
+       if (!connection)
+               return;
+
+       timestamp = gtk_get_current_event_time ();
+       if (g_path_is_absolute (link->filename)) {
+               input_gfile = g_file_new_for_path (link->filename);
+       } else {
+               GFile *gfile, *parent_gfile;
+
+               gfile = g_file_new_for_uri (window->priv->uri);
+               parent_gfile = g_file_get_parent (gfile);
+
+               /* parent_gfile should never be NULL */
+               if (parent_gfile == NULL) {
+                       g_printerr ("Document URI is '/'\n");
+                       return;
+               }
+
+               input_gfile = g_file_get_child (parent_gfile, link->filename);
+               g_object_unref (parent_gfile);
+               g_object_unref (gfile);
+       }
+
+       uri_input = g_file_get_uri (input_gfile);
+       g_object_unref (input_gfile);
+
+       g_dbus_connection_emit_signal (connection,
+                                      NULL,
+                                      window->priv->dbus_object_path,
+                                      EV_WINDOW_DBUS_INTERFACE,
+                                      "SyncSource",
+                                      g_variant_new ("(s(ii)u)",
+                                                     uri_input,
+                                                     link->line,
+                                                     link->col,
+                                                     timestamp),
+                                      &error);
+       g_free (uri_input);
+       if (error) {
+               g_printerr ("Failed to emit DBus signal SyncSource: %s\n",
+                           error->message);
+               g_error_free (error);
+       }
+}
+
+static void
+ev_window_emit_closed (EvWindow *window)
+{
+       GDBusConnection *connection;
+       GError          *error = NULL;
+
+       if (window->priv->dbus_object_id <= 0)
+               return;
+
+       connection = ev_application_get_dbus_connection (EV_APP);
+       if (!connection)
+               return;
+
+       g_dbus_connection_emit_signal (connection,
+                                      NULL,
+                                      window->priv->dbus_object_path,
+                                      EV_WINDOW_DBUS_INTERFACE,
+                                      "Closed",
+                                      NULL,
+                                      &error);
+       if (error) {
+               g_printerr ("Failed to emit DBus signal Closed: %s\n",
+                           error->message);
+               g_error_free (error);
+
+               return;
+       }
+
+       /* If this is the last window call g_dbus_connection_flush_sync()
+        * to make sure the signal is emitted.
+        */
+       if (ev_application_get_n_windows (EV_APP) == 1)
+               g_dbus_connection_flush_sync (connection, NULL, NULL);
+}
+
+static void
+ev_window_emit_doc_loaded (EvWindow *window)
+{
+       GDBusConnection *connection;
+       GError          *error = NULL;
+
+       if (window->priv->dbus_object_id <= 0)
+               return;
+
+       connection = ev_application_get_dbus_connection (EV_APP);
+       if (!connection)
+               return;
+
+       g_dbus_connection_emit_signal (connection,
+                                      NULL,
+                                      window->priv->dbus_object_path,
+                                      EV_WINDOW_DBUS_INTERFACE,
+                                      "DocumentLoaded",
+                                      g_variant_new("(s)", window->priv->uri),
+                                      &error);
+       if (error) {
+               g_printerr ("Failed to emit DBus signal DocumentLoaded: %s\n",
+                           error->message);
+               g_error_free (error);
+
+               return;
+       }
+}
+
+static void
+method_call_cb (GDBusConnection       *connection,
+                const gchar           *sender,
+                const gchar           *object_path,
+                const gchar           *interface_name,
+                const gchar           *method_name,
+                GVariant              *parameters,
+                GDBusMethodInvocation *invocation,
+                gpointer               user_data)
+{
+        EvWindow *window = EV_WINDOW (user_data);
+
+        if (g_strcmp0 (method_name, "SyncView") != 0)
+                return;
+
+       if (window->priv->document && ev_document_has_synctex (window->priv->document)) {
+               EvSourceLink link;
+               guint32      timestamp;
+
+               g_variant_get (parameters, "(&s(ii)u)", &link.filename, &link.line, &link.col, &timestamp);
+               ev_view_highlight_forward_search (EV_VIEW (window->priv->view), &link);
+               gtk_window_present_with_time (GTK_WINDOW (window), timestamp);
+       }
+
+       g_dbus_method_invocation_return_value (invocation, g_variant_new ("()"));
+}
+
+static const char introspection_xml[] =
+        "<node>"
+          "<interface name='org.gnome.evince.Window'>"
+            "<method name='SyncView'>"
+              "<arg type='s' name='source_file' direction='in'/>"
+              "<arg type='(ii)' name='source_point' direction='in'/>"
+              "<arg type='u' name='timestamp' direction='in'/>"
+            "</method>"
+           "<signal name='SyncSource'>"
+             "<arg type='s' name='source_file' direction='out'/>"
+             "<arg type='(ii)' name='source_point' direction='out'/>"
+             "<arg type='u' name='timestamp' direction='out'/>"
+           "</signal>"
+            "<signal name='Closed'/>"
+           "<signal name='DocumentLoaded'>"
+             "<arg type='s' name='uri' direction='out'/>"
+           "</signal>"
+          "</interface>"
+        "</node>";
+
+static const GDBusInterfaceVTable interface_vtable = {
+       method_call_cb,
+       NULL,
+       NULL
+};
+
+static GDBusNodeInfo *introspection_data;
+#endif /* ENABLE_DBUS */
+
 static void
 ev_window_init (EvWindow *ev_window)
 {
@@ -5341,7 +7004,14 @@ ev_window_init (EvWindow *ev_window)
        GtkAccelGroup *accel_group;
        GError *error = NULL;
        GtkWidget *sidebar_widget;
+       GtkWidget *menuitem;
+       EggToolbarsModel *toolbars_model;
        GObject *mpkeys;
+       gchar *ui_path;
+#ifdef ENABLE_DBUS
+       GDBusConnection *connection;
+       static gint window_id = 0;
+#endif
 
        g_signal_connect (ev_window, "configure_event",
                          G_CALLBACK (window_configure_event_cb), NULL);
@@ -5350,6 +7020,37 @@ ev_window_init (EvWindow *ev_window)
 
        ev_window->priv = EV_WINDOW_GET_PRIVATE (ev_window);
 
+#ifdef ENABLE_DBUS
+       connection = ev_application_get_dbus_connection (EV_APP);
+        if (connection) {
+               if (!introspection_data) {
+                       introspection_data = g_dbus_node_info_new_for_xml (introspection_xml, &error);
+                       if (error) g_warning ("%s\n", error->message);
+               }
+                g_assert (introspection_data != NULL);
+
+               ev_window->priv->dbus_object_path = g_strdup_printf (EV_WINDOW_DBUS_OBJECT_PATH, window_id++);
+                ev_window->priv->dbus_object_id =
+                    g_dbus_connection_register_object (connection,
+                                                       ev_window->priv->dbus_object_path,
+                                                       introspection_data->interfaces[0],
+                                                       &interface_vtable,
+                                                       ev_window, NULL,
+                                                       &error);
+                if (ev_window->priv->dbus_object_id == 0) {
+                        g_printerr ("Failed to register bus object %s: %s\n",
+                                   ev_window->priv->dbus_object_path, error->message);
+                        g_error_free (error);
+                       g_free (ev_window->priv->dbus_object_path);
+                       ev_window->priv->dbus_object_path = NULL;
+                       error = NULL;
+                }
+        }
+
+#endif /* ENABLE_DBUS */
+
+       ev_window->priv->model = ev_document_model_new ();
+
        ev_window->priv->page_mode = PAGE_MODE_DOCUMENT;
        ev_window->priv->title = ev_window_title_new (ev_window);
 
@@ -5396,20 +7097,17 @@ ev_window_init (EvWindow *ev_window)
        gtk_ui_manager_insert_action_group (ev_window->priv->ui_manager,
                                            action_group, 0);
 
-       if (!gtk_ui_manager_add_ui_from_file (ev_window->priv->ui_manager,
-                                             DATADIR"/evince-ui.xml",
-                                             &error)) {
+       ui_path = g_build_filename (ev_application_get_data_dir (EV_APP),
+                                   "evince-ui.xml", NULL);
+       if (!gtk_ui_manager_add_ui_from_file (
+               ev_window->priv->ui_manager, ui_path, &error))
+       {
                g_warning ("building menus failed: %s", error->message);
                g_error_free (error);
        }
-       
-#if GTK_CHECK_VERSION(2,11,4)
+       g_free (ui_path);
+
        ev_window->priv->recent_manager = gtk_recent_manager_get_default ();
-#else
-       /* It's fine to just use the one of the default screen here */
-       ev_window->priv->recent_manager = gtk_recent_manager_get_for_screen (
-               gdk_screen_get_default ());
-#endif
        ev_window->priv->recent_action_group = NULL;
        ev_window->priv->recent_ui_id = 0;
        g_signal_connect_swapped (ev_window->priv->recent_manager,
@@ -5423,13 +7121,25 @@ ev_window_init (EvWindow *ev_window)
        gtk_box_pack_start (GTK_BOX (ev_window->priv->main_box),
                            ev_window->priv->menubar,
                            FALSE, FALSE, 0);
-
-       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),
-                        NULL));
+       menuitem = gtk_ui_manager_get_widget (ev_window->priv->ui_manager,
+                                             "/MainMenu/EditMenu/EditRotateLeftMenu");
+       gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (menuitem), TRUE);
+       menuitem = gtk_ui_manager_get_widget (ev_window->priv->ui_manager,
+                                             "/MainMenu/EditMenu/EditRotateRightMenu");
+       gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (menuitem), TRUE);
+
+       toolbars_model = get_toolbars_model ();
+       ev_window->priv->toolbar = GTK_WIDGET
+               (g_object_new (EGG_TYPE_EDITABLE_TOOLBAR,
+                              "ui-manager", ev_window->priv->ui_manager,
+                              "popup-path", "/ToolbarPopup",
+                              "model", toolbars_model,
+                              NULL));
+       g_object_unref (toolbars_model);
+
+       gtk_style_context_add_class
+               (gtk_widget_get_style_context (GTK_WIDGET (ev_window->priv->toolbar)),
+                GTK_STYLE_CLASS_PRIMARY_TOOLBAR);
 
        egg_editable_toolbar_show (EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar),
                                   "DefaultToolBar");
@@ -5439,7 +7149,7 @@ ev_window_init (EvWindow *ev_window)
        gtk_widget_show (ev_window->priv->toolbar);
 
        /* Add the main area */
-       ev_window->priv->hpaned = gtk_hpaned_new ();
+       ev_window->priv->hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
        g_signal_connect (ev_window->priv->hpaned,
                          "notify::position",
                          G_CALLBACK (ev_window_sidebar_position_change_cb),
@@ -5451,6 +7161,8 @@ ev_window_init (EvWindow *ev_window)
        gtk_widget_show (ev_window->priv->hpaned);
        
        ev_window->priv->sidebar = ev_sidebar_new ();
+       ev_sidebar_set_model (EV_SIDEBAR (ev_window->priv->sidebar),
+                             ev_window->priv->model);
        gtk_paned_pack1 (GTK_PANED (ev_window->priv->hpaned),
                         ev_window->priv->sidebar, FALSE, FALSE);
        gtk_widget_show (ev_window->priv->sidebar);
@@ -5493,6 +7205,44 @@ ev_window_init (EvWindow *ev_window)
        ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar),
                             sidebar_widget);
 
+       sidebar_widget = ev_sidebar_layers_new ();
+       ev_window->priv->sidebar_layers = sidebar_widget;
+       g_signal_connect (sidebar_widget,
+                         "layers_visibility_changed",
+                         G_CALLBACK (sidebar_layers_visibility_changed),
+                         ev_window);
+       gtk_widget_show (sidebar_widget);
+       ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar),
+                            sidebar_widget);
+
+       sidebar_widget = ev_sidebar_annotations_new ();
+       ev_window->priv->sidebar_annots = sidebar_widget;
+       g_signal_connect (sidebar_widget,
+                         "annot_activated",
+                         G_CALLBACK (sidebar_annots_annot_activated_cb),
+                         ev_window);
+       g_signal_connect (sidebar_widget,
+                         "begin_annot_add",
+                         G_CALLBACK (sidebar_annots_begin_annot_add),
+                         ev_window);
+       g_signal_connect (sidebar_widget,
+                         "annot_add_cancelled",
+                         G_CALLBACK (sidebar_annots_annot_add_cancelled),
+                         ev_window);
+       gtk_widget_show (sidebar_widget);
+       ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar),
+                            sidebar_widget);
+
+       sidebar_widget = ev_sidebar_bookmarks_new ();
+       ev_window->priv->sidebar_bookmarks = sidebar_widget;
+       g_signal_connect (sidebar_widget,
+                         "add-bookmark",
+                         G_CALLBACK (sidebar_bookmarks_add_bookmark),
+                         ev_window);
+       gtk_widget_show (sidebar_widget);
+       ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar),
+                            sidebar_widget);
+
        ev_window->priv->view_box = gtk_vbox_new (FALSE, 0);
        ev_window->priv->scrolled_window =
                GTK_WIDGET (g_object_new (GTK_TYPE_SCROLLED_WINDOW,
@@ -5508,12 +7258,13 @@ ev_window_init (EvWindow *ev_window)
        gtk_widget_show (ev_window->priv->view_box);
 
        ev_window->priv->view = ev_view_new ();
-       ev_view_set_screen_dpi (EV_VIEW (ev_window->priv->view),
-                               get_screen_dpi (GTK_WINDOW (ev_window)));
-       ev_window->priv->password_view = ev_password_view_new ();
+       ev_view_set_page_cache_size (EV_VIEW (ev_window->priv->view), PAGE_CACHE_SIZE);
+       ev_view_set_model (EV_VIEW (ev_window->priv->view), ev_window->priv->model);
+
+       ev_window->priv->password_view = ev_password_view_new (GTK_WINDOW (ev_window));
        g_signal_connect_swapped (ev_window->priv->password_view,
                                  "unlock",
-                                 G_CALLBACK (ev_window_popup_password_dialog),
+                                 G_CALLBACK (ev_window_password_view_unlock),
                                  ev_window);
        g_signal_connect_object (ev_window->priv->view, "focus_in_event",
                                 G_CALLBACK (view_actions_focus_in_cb),
@@ -5521,17 +7272,29 @@ ev_window_init (EvWindow *ev_window)
        g_signal_connect_object (ev_window->priv->view, "focus_out_event",
                                 G_CALLBACK (view_actions_focus_out_cb),
                                 ev_window, 0);
-       g_signal_connect_object (ev_window->priv->view, "external-link",
-                                G_CALLBACK (view_external_link_cb),
-                                ev_window, 0);
+       g_signal_connect_swapped (ev_window->priv->view, "external-link",
+                                 G_CALLBACK (view_external_link_cb),
+                                 ev_window);
        g_signal_connect_object (ev_window->priv->view, "handle-link",
                                 G_CALLBACK (view_handle_link_cb),
                                 ev_window, 0);
-
-       g_signal_connect_object (ev_window->priv->view,
-                                "popup",
+       g_signal_connect_object (ev_window->priv->view, "popup",
                                 G_CALLBACK (view_menu_popup_cb),
                                 ev_window, 0);
+       g_signal_connect_object (ev_window->priv->view, "selection-changed",
+                                G_CALLBACK (view_selection_changed_cb),
+                                ev_window, 0);
+       g_signal_connect_object (ev_window->priv->view, "annot-added",
+                                G_CALLBACK (view_annot_added),
+                                ev_window, 0);
+       g_signal_connect_object (ev_window->priv->view, "layers-changed",
+                                G_CALLBACK (view_layers_changed_cb),
+                                ev_window, 0);
+#ifdef ENABLE_DBUS
+       g_signal_connect_swapped (ev_window->priv->view, "sync-source",
+                                 G_CALLBACK (ev_window_sync_source),
+                                 ev_window);
+#endif
        gtk_widget_show (ev_window->priv->view);
        gtk_widget_show (ev_window->priv->password_view);
 
@@ -5548,29 +7311,38 @@ ev_window_init (EvWindow *ev_window)
        gtk_container_add (GTK_CONTAINER (ev_window->priv->scrolled_window),
                           ev_window->priv->view);
 
-       g_signal_connect (ev_window->priv->view,
-                         "notify::sizing-mode",
-                         G_CALLBACK (ev_window_sizing_mode_changed_cb),
+       /* Connect to model signals */
+       g_signal_connect_swapped (ev_window->priv->model,
+                                 "page-changed",
+                                 G_CALLBACK (ev_window_page_changed_cb),
+                                 ev_window);
+       g_signal_connect (ev_window->priv->model,
+                         "notify::document",
+                         G_CALLBACK (ev_window_document_changed_cb),
                          ev_window);
-       g_signal_connect (ev_window->priv->view,
-                         "notify::zoom",
+       g_signal_connect (ev_window->priv->model,
+                         "notify::scale",
                          G_CALLBACK (ev_window_zoom_changed_cb),
                          ev_window);
-       g_signal_connect (ev_window->priv->view,
-                         "notify::dual-page",
-                         G_CALLBACK (ev_window_dual_mode_changed_cb),
+       g_signal_connect (ev_window->priv->model,
+                         "notify::sizing-mode",
+                         G_CALLBACK (ev_window_sizing_mode_changed_cb),
+                         ev_window);
+       g_signal_connect (ev_window->priv->model,
+                         "notify::rotation",
+                         G_CALLBACK (ev_window_rotation_changed_cb),
                          ev_window);
-       g_signal_connect (ev_window->priv->view,
+       g_signal_connect (ev_window->priv->model,
                          "notify::continuous",
                          G_CALLBACK (ev_window_continuous_changed_cb),
                          ev_window);
-       g_signal_connect (ev_window->priv->view,
-                         "notify::rotation",
-                         G_CALLBACK (ev_window_rotation_changed_cb),
+       g_signal_connect (ev_window->priv->model,
+                         "notify::dual-page",
+                         G_CALLBACK (ev_window_dual_mode_changed_cb),
                          ev_window);
-       g_signal_connect (ev_window->priv->view,
-                         "notify::has-selection",
-                         G_CALLBACK (ev_window_has_selection_changed_cb),
+       g_signal_connect (ev_window->priv->model,
+                         "notify::inverted-colors",
+                         G_CALLBACK (ev_window_inverted_colors_changed_cb),
                          ev_window);
 
        /* Connect sidebar signals */
@@ -5629,24 +7401,36 @@ ev_window_init (EvWindow *ev_window)
                                          G_CALLBACK (ev_window_media_player_key_pressed),
                                          ev_window);
        }
-       
+
        /* Give focus to the document view */
        gtk_widget_grab_focus (ev_window->priv->view);
 
+       ev_window->priv->default_settings = g_settings_new (GS_SCHEMA_NAME".Default");
+       g_settings_delay (ev_window->priv->default_settings);
+
        /* Set it user interface params */
        ev_window_setup_recent (ev_window);
 
+       ev_window_setup_gtk_settings (ev_window);
+
        setup_chrome_from_metadata (ev_window);
-       set_chrome_actions (ev_window);
+       update_chrome_actions (ev_window);
        update_chrome_visibility (ev_window);
 
        gtk_window_set_default_size (GTK_WINDOW (ev_window), 600, 600);
 
        setup_view_from_metadata (ev_window);
-       setup_sidebar_from_metadata (ev_window, NULL);
+       setup_sidebar_from_metadata (ev_window);
 
-        ev_window_sizing_mode_changed_cb (EV_VIEW (ev_window->priv->view), NULL, ev_window);
+        ev_window_sizing_mode_changed_cb (ev_window->priv->model, NULL, ev_window);
        ev_window_setup_action_sensitivity (ev_window);
+
+       /* Drag and Drop */
+       gtk_drag_dest_set (GTK_WIDGET (ev_window),
+                          GTK_DEST_DEFAULT_ALL,
+                          NULL, 0,
+                          GDK_ACTION_COPY);
+       gtk_drag_dest_add_uri_targets (GTK_WIDGET (ev_window));
 }
 
 /**
@@ -5667,3 +7451,13 @@ ev_window_new (void)
 
        return ev_window;
 }
+
+const gchar *
+ev_window_get_dbus_object_path (EvWindow *ev_window)
+{
+#ifdef ENABLE_DBUS
+       return ev_window->priv->dbus_object_path;
+#else
+       return NULL;
+#endif
+}