]> www.fi.muni.cz Git - evince.git/blobdiff - shell/ev-window.c
Fix for the bug 319133 - Find entry should allow text scroll.
[evince.git] / shell / ev-window.c
index 2a67b891652034be3ede47daee5395e21a9b017a..61e7b1f6ae390e8d5ee1434b75c59c84126c1c46 100644 (file)
@@ -29,6 +29,7 @@
 #endif
 
 #include "ev-window.h"
+#include "ev-window-title.h"
 #include "ev-page-action.h"
 #include "ev-sidebar.h"
 #include "ev-sidebar-links.h"
 #include "ev-view.h"
 #include "ev-password.h"
 #include "ev-password-view.h"
-#include "ev-print-job.h"
+#include "ev-properties-dialog.h"
+#include "ev-ps-exporter.h"
 #include "ev-document-thumbnails.h"
 #include "ev-document-links.h"
+#include "ev-document-fonts.h"
 #include "ev-document-find.h"
 #include "ev-document-security.h"
+#include "ev-document-types.h"
 #include "ev-job-queue.h"
+#include "ev-jobs.h"
+#include "ev-sidebar-page.h"
 #include "eggfindbar.h"
-#include "egg-recent-view-gtk.h"
+#include "egg-recent-view-uimanager.h"
 #include "egg-recent-view.h"
+#include "egg-toolbar-editor.h"
+#include "egg-editable-toolbar.h"
 #include "egg-recent-model.h"
+#include "egg-toolbars-model.h"
+#include "ephy-zoom.h"
+#include "ephy-zoom-action.h"
+#include "ev-application.h"
+#include "ev-stock-icons.h"
+#include "ev-metadata-manager.h"
+#include "ev-file-helpers.h"
+#include "ev-utils.h"
+#include "ev-debug.h"
 
-#include "ev-poppler.h"
-#include "pixbuf-document.h"
-#include "ps-document.h"
-#ifdef ENABLE_DVI
-#include "dvi-document.h"
-#endif
-#ifdef ENABLE_DJVU
-#include "djvu-document.h"
+#ifdef WITH_GNOME_PRINT
+#include "ev-print-job.h"
+#include <libgnomeprintui/gnome-print-dialog.h>
 #endif
 
+#include <poppler.h>
+
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gnome.h>
-
-#include <libgnomevfs/gnome-vfs-mime-utils.h>
-#include <libgnomevfs/gnome-vfs-uri.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
-#include <libgnomeprintui/gnome-print-dialog.h>
-
 #include <gconf/gconf-client.h>
 
 #include <string.h>
 
-#include "ev-application.h"
-#include "ev-stock-icons.h"
-
-typedef enum {
-       EV_SIZING_BEST_FIT,
-       EV_SIZING_FIT_WIDTH,
-       EV_SIZING_FREE,
-} EvSizingMode;
-
 typedef enum {
-       PAGE_MODE_SINGLE_PAGE,
-       PAGE_MODE_CONTINUOUS_PAGE,
-       PAGE_MODE_PASSWORD,
+       PAGE_MODE_DOCUMENT,
+       PAGE_MODE_PASSWORD
 } EvWindowPageMode;
 
 typedef enum {
        EV_CHROME_MENUBAR       = 1 << 0,
        EV_CHROME_TOOLBAR       = 1 << 1,
-       EV_CHROME_SIDEBAR       = 1 << 2,
-       EV_CHROME_FINDBAR       = 1 << 3,
-       EV_CHROME_STATUSBAR     = 1 << 4,
-       EV_CHROME_NORMAL        = EV_CHROME_MENUBAR | EV_CHROME_TOOLBAR | EV_CHROME_SIDEBAR | EV_CHROME_STATUSBAR
+       EV_CHROME_FINDBAR       = 1 << 2,
+       EV_CHROME_RAISE_TOOLBAR = 1 << 3,
+       EV_CHROME_NORMAL        = EV_CHROME_MENUBAR | EV_CHROME_TOOLBAR
 } EvChrome;
 
 struct _EvWindowPrivate {
+       /* UI */
+       EvChrome chrome;
+
        GtkWidget *main_box;
        GtkWidget *menubar;
        GtkWidget *toolbar_dock;
        GtkWidget *toolbar;
        GtkWidget *hpaned;
        GtkWidget *sidebar;
-       GtkWidget *thumbs_sidebar;
        GtkWidget *find_bar;
        GtkWidget *scrolled_window;
        GtkWidget *view;
-       GtkWidget *page_view;
        GtkWidget *password_view;
+       GtkWidget *sidebar_thumbs;
+       GtkWidget *sidebar_links;
+
+       /* Dialogs */
+       GtkWidget *properties;
+#ifdef WITH_GNOME_PRINT
+       GtkWidget *print_dialog;
+#endif
+       GtkWidget *password_dialog;
+
+       /* UI Builders */
        GtkActionGroup *action_group;
-       GtkUIManager *ui_manager;
-       GtkWidget *statusbar;
-       guint help_message_cid;
-       guint view_message_cid;
+       GtkActionGroup *popups_action_group;
+       GtkUIManager   *ui_manager;
+
+       /* Fullscreen mode */
        GtkWidget *fullscreen_toolbar;
        GtkWidget *fullscreen_popup;
-       char *uri;
+       GSource   *fullscreen_timeout_source;
+       
+       /* Popup link */
+       GtkWidget *popup;
+       EvLink    *link;
 
+       /* Document */
+       char *uri;
+       char *local_uri;
+       
        EvDocument *document;
+       EvDocument *password_document;
        EvPageCache *page_cache;
-
        EvWindowPageMode page_mode;
-       /* These members are used temporarily when in PAGE_MODE_PASSWORD */
-       EvDocument *password_document;
-       GtkWidget *password_dialog;
-       char *password_uri;
-
-       EvChrome chrome;
-       gboolean fullscreen_mode;
-       EvSizingMode sizing_mode;
-       GSource *fullscreen_timeout_source;
-
-       /* recent file stuff */
-       EggRecentModel *recent_model;
-       EggRecentViewGtk *recent_view;
+       EvWindowTitle *title;
+       EggRecentViewUIManager *recent_view;
+
+       /* Job used to load document */
+       EvJob *xfer_job;
+       EvJob *load_job;
+#ifdef WITH_GNOME_PRINT
+       GnomePrintJob *print_job;
+#endif
 };
 
-static GtkTargetEntry ev_drop_types[] = {
+static const GtkTargetEntry ev_drop_types[] = {
        { "text/uri-list", 0, 0 }
 };
 
@@ -144,28 +158,53 @@ static GtkTargetEntry ev_drop_types[] = {
        (G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_WINDOW, EvWindowPrivate))
 
 #define PAGE_SELECTOR_ACTION   "PageSelector"
+#define ZOOM_CONTROL_ACTION    "ViewZoom"
 
-#define GCONF_CHROME_TOOLBAR   "/apps/evince/show_toolbar"
-#define GCONF_CHROME_SIDEBAR   "/apps/evince/show_sidebar"
-#define GCONF_CHROME_STATUSBAR "/apps/evince/show_statusbar"
+#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 GCONF_SIDEBAR_SIZE      "/apps/evince/sidebar_size"
+#define FULLSCREEN_TIMEOUT 5 * 1000
 
 #define SIDEBAR_DEFAULT_SIZE    132
-#define VIEW_SPACING           10
-
-static void     ev_window_update_fullscreen_popup (EvWindow         *window);
-static void     ev_window_sidebar_visibility_changed_cb (EvSidebar *ev_sidebar, GParamSpec *pspec,
-                                                        EvWindow   *ev_window);
-static void     ev_window_set_page_mode           (EvWindow         *window,
-                                                  EvWindowPageMode  page_mode);
-static gboolean start_loading_document            (EvWindow         *ev_window,
-                                                  EvDocument       *document,
-                                                  const char       *uri);
-static void     ev_window_set_sizing_mode         (EvWindow         *ev_window,
-                                                  EvSizingMode      sizing_mode);
-
-static void    ev_window_add_recent (EvWindow *window, const char *filename);
+#define LINKS_SIDEBAR_ID "links"
+#define THUMBNAILS_SIDEBAR_ID "thumbnails"
+
+static void     ev_window_update_fullscreen_popup       (EvWindow         *window);
+static void     ev_window_sidebar_visibility_changed_cb (EvSidebar        *ev_sidebar,
+                                                        GParamSpec       *pspec,
+                                                        EvWindow         *ev_window);
+static void     ev_window_set_page_mode                 (EvWindow         *window,
+                                                        EvWindowPageMode  page_mode);
+static void    ev_window_load_job_cb                   (EvJobLoad *job,
+                                                        gpointer data);
+static void    ev_window_xfer_job_cb                   (EvJobXfer *job,
+                                                        gpointer data);
+static void     ev_window_sizing_mode_changed_cb        (EvView           *view,
+                                                        GParamSpec       *pspec,
+                                                        EvWindow         *ev_window);
+static void     ev_window_zoom_changed_cb              (EvView           *view,
+                                                        GParamSpec       *pspec,
+                                                        EvWindow         *ev_window);
+static void     ev_window_add_recent                    (EvWindow         *window,
+                                                        const char       *filename);
+static void     ev_window_run_fullscreen                (EvWindow         *window);
+static void     ev_window_stop_fullscreen               (EvWindow         *window);
+static void     ev_window_cmd_view_fullscreen           (GtkAction        *action,
+                                                        EvWindow         *window);
+static void     ev_window_run_presentation              (EvWindow         *window);
+static void     ev_window_stop_presentation             (EvWindow         *window);
+static void     ev_window_cmd_view_presentation         (GtkAction        *action,
+                                                        EvWindow         *window);
+static void     show_fullscreen_popup                   (EvWindow         *window);
+static void     ev_popup_cmd_open_link                  (GtkAction        *action,
+                                                        EvWindow         *window);
+static void     ev_popup_cmd_copy_link_address          (GtkAction        *action,
+                                                        EvWindow         *window);
+static void    ev_window_cmd_view_best_fit             (GtkAction        *action, 
+                                                        EvWindow         *ev_window);
+static void    ev_window_cmd_view_page_width           (GtkAction        *action, 
+                                                        EvWindow         *ev_window);
 
 G_DEFINE_TYPE (EvWindow, ev_window, GTK_TYPE_WINDOW)
 
@@ -182,40 +221,98 @@ set_action_sensitive (EvWindow   *ev_window,
 static void
 update_action_sensitivity (EvWindow *ev_window)
 {
+       EvView *view;
        EvDocument *document;
+       const EvDocumentInfo *info = NULL;
        EvWindowPageMode page_mode;
        gboolean sensitive, has_pages = FALSE, has_document;
        int n_pages = 0, page = -1;
+       gboolean ok_to_print = TRUE;
+       gboolean ok_to_copy = TRUE;
+       gboolean has_properties = TRUE;
+       gboolean override_restrictions = FALSE;
+       gboolean can_get_text = FALSE;
+       gboolean ok_to_copy_text = FALSE;
+       GConfClient *client;
+
+       view = EV_VIEW (ev_window->priv->view);
 
        document = ev_window->priv->document;
+
+       if (document)
+               info = ev_page_cache_get_info (ev_window->priv->page_cache);
+
        page_mode = ev_window->priv->page_mode;
        has_document = document != NULL;
+
        if (has_document && ev_window->priv->page_cache) {
                page = ev_page_cache_get_current_page (ev_window->priv->page_cache);
                n_pages = ev_page_cache_get_n_pages (ev_window->priv->page_cache);
                has_pages = has_document && n_pages > 0;
        }
 
+       client = gconf_client_get_default ();
+       override_restrictions = gconf_client_get_bool (client, 
+                                                      GCONF_OVERRIDE_RESTRICTIONS, 
+                                                      NULL);
+       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_PS_EXPORTER(document))
+               ok_to_print = FALSE;
+
+       if (!info || info->fields_mask == 0) {
+               has_properties = FALSE;
+       }
+       
+       if (gconf_client_get_bool (client, GCONF_LOCKDOWN_SAVE, NULL)) {
+               ok_to_copy = FALSE;
+       }
+
+       if (gconf_client_get_bool (client, GCONF_LOCKDOWN_PRINT, NULL)) {
+               ok_to_print = FALSE;
+       }
+       
+       g_object_unref (client);
+
+       if (has_document && ev_document_can_get_text (document)) {
+               can_get_text = TRUE;
+               ok_to_copy_text = ev_view_get_has_selection (view);
+       }
+       
+#ifndef WITH_GNOME_PRINT
+       ok_to_print = FALSE;
+#endif
+
        /* File menu */
        /* "FileOpen": always sensitive */
-       set_action_sensitive (ev_window, "FileSaveAs", has_document);
-       set_action_sensitive (ev_window, "FilePrint", has_pages);
+       set_action_sensitive (ev_window, "FileSaveAs", has_document && ok_to_copy);
+       set_action_sensitive (ev_window, "FilePrint", has_pages && ok_to_print);
+       set_action_sensitive (ev_window, "FileProperties", has_document && has_properties);
        /* "FileCloseWindow": always sensitive */
 
         /* Edit menu */
-
        sensitive = has_pages && ev_document_can_get_text (document);
-       set_action_sensitive (ev_window, "EditCopy", sensitive);
-       set_action_sensitive (ev_window, "EditSelectAll", sensitive);
+       set_action_sensitive (ev_window, "EditCopy", sensitive && ok_to_copy_text);
+       set_action_sensitive (ev_window, "EditSelectAll", sensitive && can_get_text);
        set_action_sensitive (ev_window, "EditFind",
                              has_pages && EV_IS_DOCUMENT_FIND (document));
+       set_action_sensitive (ev_window, "Slash",
+                             has_pages && EV_IS_DOCUMENT_FIND (document));
        set_action_sensitive (ev_window, "EditFindNext",
-                             ev_view_can_find_next (EV_VIEW (ev_window->priv->view)));
+                             ev_view_can_find_next (view));
+       set_action_sensitive (ev_window, "EditRotateLeft", has_pages);
+       set_action_sensitive (ev_window, "EditRotateRight", has_pages);
 
         /* View menu */
-       set_action_sensitive (ev_window, "ViewZoomIn", has_pages);
-       set_action_sensitive (ev_window, "ViewZoomOut", has_pages);
-       set_action_sensitive (ev_window, "ViewNormalSize", has_pages);
+       set_action_sensitive (ev_window, "ViewContinuous", has_pages);
+       set_action_sensitive (ev_window, "ViewDual", has_pages);
+       set_action_sensitive (ev_window, "ViewZoomIn",
+                             has_pages && ev_view_can_zoom_in (view));
+       set_action_sensitive (ev_window, "ViewZoomOut",
+                             has_pages && ev_view_can_zoom_out (view));
        set_action_sensitive (ev_window, "ViewBestFit", has_pages);
        set_action_sensitive (ev_window, "ViewPageWidth", has_pages);
        set_action_sensitive (ev_window, "ViewReload", has_pages);
@@ -233,20 +330,25 @@ update_action_sensitivity (EvWindow *ev_window)
                set_action_sensitive (ev_window, "GoLastPage", FALSE);
        }
 
-       /* Page View radio group */
-       if (document) {
-               set_action_sensitive (ev_window, "SinglePage", page_mode != PAGE_MODE_PASSWORD);
-               set_action_sensitive (ev_window, "ContinuousPage", page_mode != PAGE_MODE_PASSWORD);
-       } else {
-               set_action_sensitive (ev_window, "SinglePage", FALSE);
-               set_action_sensitive (ev_window, "ContinuousPage", FALSE);
-       }
-       /* Help menu */
-       /* "HelpContents": always sensitive */
-       /* "HelpAbout": always sensitive */
-
        /* Toolbar-specific actions: */
        set_action_sensitive (ev_window, PAGE_SELECTOR_ACTION, has_pages);
+       set_action_sensitive (ev_window, ZOOM_CONTROL_ACTION,  has_pages);
+
+       if (has_pages &&
+           ev_view_get_sizing_mode (view) != EV_SIZING_FIT_WIDTH &&
+           ev_view_get_sizing_mode (view) != EV_SIZING_BEST_FIT) {
+               GtkAction *action;
+               float      zoom;
+               float      real_zoom;
+
+               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));
+               zoom = ephy_zoom_get_nearest_zoom_level (real_zoom);
+
+               ephy_zoom_action_set_zoom_level (EPHY_ZOOM_ACTION (action), zoom);
+       }
 }
 
 static void
@@ -264,77 +366,67 @@ static void
 update_chrome_visibility (EvWindow *window)
 {
        EvWindowPrivate *priv = window->priv;
-       gboolean menubar, toolbar, sidebar, findbar, statusbar, fullscreen_toolbar;
-
-       menubar = (priv->chrome & EV_CHROME_MENUBAR) != 0 && !priv->fullscreen_mode;
-       toolbar = (priv->chrome & EV_CHROME_TOOLBAR) != 0 && !priv->fullscreen_mode;
-       sidebar = (priv->chrome & EV_CHROME_SIDEBAR) != 0 && !priv->fullscreen_mode;
-       fullscreen_toolbar = (priv->chrome & EV_CHROME_TOOLBAR) != 0;
-       statusbar = (priv->chrome & EV_CHROME_STATUSBAR) != 0 && !priv->fullscreen_mode;
+       gboolean menubar, toolbar, findbar, fullscreen_toolbar;
+       gboolean fullscreen_mode, presentation, fullscreen;
+
+       presentation = ev_view_get_presentation (EV_VIEW (priv->view));
+       fullscreen = ev_view_get_fullscreen (EV_VIEW (priv->view));
+       fullscreen_mode = fullscreen || presentation;
+
+       menubar = (priv->chrome & EV_CHROME_MENUBAR) != 0 && !fullscreen_mode;
+       toolbar = ((priv->chrome & EV_CHROME_TOOLBAR) != 0  || 
+                  (priv->chrome & EV_CHROME_RAISE_TOOLBAR) != 0) && !fullscreen_mode;
+       fullscreen_toolbar = ((priv->chrome & EV_CHROME_TOOLBAR) != 0 ||
+                             (priv->chrome & EV_CHROME_RAISE_TOOLBAR) != 0);
        findbar = (priv->chrome & EV_CHROME_FINDBAR) != 0;
 
        set_widget_visibility (priv->menubar, menubar);
+       
        set_widget_visibility (priv->toolbar_dock, toolbar);
-       set_widget_visibility (priv->sidebar, sidebar);
+       set_action_sensitive (window, "EditToolbar", toolbar);
+
        set_widget_visibility (priv->find_bar, findbar);
-       set_widget_visibility (priv->statusbar, statusbar);
-       set_widget_visibility (priv->fullscreen_toolbar, fullscreen_toolbar);
 
        if (priv->fullscreen_popup != NULL) {
-               set_widget_visibility (priv->fullscreen_popup, priv->fullscreen_mode);
+               if (fullscreen)
+                       show_fullscreen_popup (window);
+               else
+                       set_widget_visibility (priv->fullscreen_popup, FALSE);
+
+               set_widget_visibility (priv->fullscreen_toolbar, fullscreen_toolbar);
        }
 }
 
 static void
-update_chrome_flag (EvWindow *window, EvChrome flag, const char *pref, gboolean active)
+update_chrome_flag (EvWindow *window, EvChrome flag, gboolean active)
 {
        EvWindowPrivate *priv = window->priv;
-       GConfClient *client;
        
        if (active) {
                priv->chrome |= flag;
-       }
-       else {
+       } else {
                priv->chrome &= ~flag;
        }
 
-       if (pref != NULL) {
-               client = gconf_client_get_default ();
-               gconf_client_set_bool (client, pref, active, NULL);
-               g_object_unref (client);
-       }
-
        update_chrome_visibility (window);
 }
 
-static void
-ev_window_cmd_view_best_fit (GtkAction *action, EvWindow *ev_window)
-{
-       if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) {
-               ev_window_set_sizing_mode (ev_window, EV_SIZING_BEST_FIT);
-       } else {
-               ev_window_set_sizing_mode (ev_window, EV_SIZING_FREE);
-       }
-}
-
-static void
-ev_window_cmd_view_page_width (GtkAction *action, EvWindow *ev_window)
-{
-       if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) {
-               ev_window_set_sizing_mode (ev_window, EV_SIZING_FIT_WIDTH);
-       } else {
-               ev_window_set_sizing_mode (ev_window, EV_SIZING_FREE);
-       }
-}
-
 static void
 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;
 
-       switch (window->priv->sizing_mode) {
+       g_object_get (window->priv->view,
+                     "sizing_mode", &sizing_mode,
+                     NULL);
+
+       switch (sizing_mode) {
        case EV_SIZING_BEST_FIT:
                best_fit = TRUE;
                page_width = FALSE;
@@ -362,21 +454,104 @@ update_sizing_buttons (EvWindow *window)
        gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), page_width);
        g_signal_handlers_unblock_by_func
                (action, G_CALLBACK (ev_window_cmd_view_page_width), window);
+
+       action = gtk_action_group_get_action (window->priv->action_group, 
+                                             ZOOM_CONTROL_ACTION);     
+       if (best_fit) {
+               ephy_zoom_action_set_zoom_level (EPHY_ZOOM_ACTION (action), 
+                                                EPHY_ZOOM_BEST_FIT);
+       } else if (page_width) {
+               ephy_zoom_action_set_zoom_level (EPHY_ZOOM_ACTION (action), 
+                                                EPHY_ZOOM_FIT_WIDTH);
+       }
 }
 
-void
-ev_window_open_page (EvWindow *ev_window, int page)
+static void
+ev_window_cmd_focus_page_selector (GtkAction *act, EvWindow *window)
 {
-       if (ev_window->priv->page_cache) {
-           page = CLAMP (page, 0, ev_page_cache_get_n_pages (ev_window->priv->page_cache));
-           ev_page_cache_set_current_page (ev_window->priv->page_cache, page);
+       GtkAction *action;
+       
+       update_chrome_flag (window, EV_CHROME_RAISE_TOOLBAR, TRUE);
+       set_action_sensitive (window, "ViewToolbar", FALSE);
+       
+       action = gtk_action_group_get_action (window->priv->action_group,
+                                             PAGE_SELECTOR_ACTION);
+       ev_page_action_grab_focus (EV_PAGE_ACTION (action));
+}
+
+static void
+ev_window_cmd_scroll_forward (GtkAction *action, EvWindow *window)
+{
+       ev_view_scroll (EV_VIEW (window->priv->view), EV_SCROLL_PAGE_FORWARD, 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);
+}
+
+static void
+ev_window_cmd_continuous (GtkAction *action, EvWindow *ev_window)
+{
+       gboolean continuous;
+
+       ev_window_stop_presentation (ev_window);
+       continuous = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
+       g_object_set (G_OBJECT (ev_window->priv->view),
+                     "continuous", continuous,
+                     NULL);
+       update_action_sensitivity (ev_window);
+}
+
+static void
+ev_window_cmd_dual (GtkAction *action, EvWindow *ev_window)
+{
+       gboolean dual_page;
+
+       ev_window_stop_presentation (ev_window);
+       dual_page = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
+       g_object_set (G_OBJECT (ev_window->priv->view),
+                     "dual-page", dual_page,
+                     NULL);
+       update_action_sensitivity (ev_window);
+}
+
+static void
+ev_window_cmd_view_best_fit (GtkAction *action, EvWindow *ev_window)
+{
+       ev_window_stop_presentation (ev_window);
+
+       if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) {
+               ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_BEST_FIT);
+       } else {
+               ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_FREE);
+       }
+       update_action_sensitivity (ev_window);
+}
+
+static void
+ev_window_cmd_view_page_width (GtkAction *action, EvWindow *ev_window)
+{
+       ev_window_stop_presentation (ev_window);
+
+       if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) {
+               ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_FIT_WIDTH);
+       } else {
+               ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_FREE);
        }
+       update_action_sensitivity (ev_window);
 }
 
+
 void
-ev_window_open_link (EvWindow *ev_window, EvLink *link)
+ev_window_open_page_label (EvWindow   *ev_window, 
+                          const char *label)
 {
-       ev_view_go_to_link (EV_VIEW (ev_window->priv->view), link);
+       if (ev_window->priv->page_cache) {
+               ev_page_cache_set_page_label (ev_window->priv->page_cache, 
+                                             label);
+       }
 }
 
 gboolean
@@ -384,7 +559,17 @@ ev_window_is_empty (const EvWindow *ev_window)
 {
        g_return_val_if_fail (EV_IS_WINDOW (ev_window), FALSE);
 
-       return ev_window->priv->document == NULL;
+       return (ev_window->priv->document == NULL) && 
+               (ev_window->priv->load_job == NULL) &&
+               (ev_window->priv->xfer_job == NULL);
+}
+
+static void
+unable_to_load_dialog_response_cb (GtkWidget *dialog,
+                                  gint       response_id,
+                                  EvWindow  *ev_window)
+{
+       gtk_widget_destroy (dialog);
 }
 
 static void
@@ -400,152 +585,227 @@ unable_to_load (EvWindow   *ev_window,
                                         _("Unable to open document"));
        gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
                                                  "%s", error_message);
-       gtk_dialog_run (GTK_DIALOG (dialog));
-       gtk_widget_destroy (dialog);
+       g_signal_connect (dialog, "response",
+                         G_CALLBACK (unable_to_load_dialog_response_cb),
+                         ev_window);
+       gtk_widget_show (dialog);
 }
 
-/* Would be nice to have this in gdk-pixbuf */
-static gboolean
-mime_type_supported_by_gdk_pixbuf (const gchar *mime_type)
+static void
+find_changed_cb (EvDocument *document, int page, EvWindow *ev_window)
 {
-       GSList *formats, *list;
-       gboolean retval = FALSE;
-
-       formats = gdk_pixbuf_get_formats ();
-
-       list = formats;
-       while (list) {
-               GdkPixbufFormat *format = list->data;
-               int i;
-               gchar **mime_types;
-
-               if (gdk_pixbuf_format_is_disabled (format))
-                       continue;
-
-               mime_types = gdk_pixbuf_format_get_mime_types (format);
-
-               for (i = 0; mime_types[i] != NULL; i++) {
-                       if (strcmp (mime_types[i], mime_type) == 0) {
-                               retval = TRUE;
-                               break;
-                       }
-               }
+       update_action_sensitivity (ev_window);
+}
 
-               if (retval)
-                       break;
+static void
+page_changed_cb (EvPageCache *page_cache,
+                gint         page,
+                EvWindow    *ev_window)
+{
+       update_action_sensitivity (ev_window);
+       if (!ev_window_is_empty (ev_window))
+               ev_metadata_manager_set_int (ev_window->priv->uri, "page", page);
+}
 
-               list = list->next;
+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);
        }
+}
 
-       g_slist_free (formats);
+static void
+update_sidebar_visibility (EvWindow *window)
+{
+       char *uri = window->priv->uri;
+       GValue sidebar_visibility = { 0, };
 
-       return retval;
+       if (ev_metadata_manager_get (uri, "sidebar_visibility", &sidebar_visibility, FALSE)) {
+               set_widget_visibility (window->priv->sidebar,
+                                      g_value_get_boolean (&sidebar_visibility));
+       }
 }
 
 static void
-update_window_title (EvDocument *document, GParamSpec *pspec, EvWindow *ev_window)
+setup_document_from_metadata (EvWindow *window)
 {
-       char *title = NULL;
-       char *doc_title = NULL;
-       gboolean password_needed;
+       char *uri = window->priv->uri;
+       GValue page = { 0, };
+       gint new_page;
 
-       password_needed = (ev_window->priv->password_document != NULL);
-       if (document) {
-               doc_title = ev_page_cache_get_title (ev_window->priv->page_cache);
-
-               /* Make sure we get a valid title back */
-               if (doc_title) {
-                       if (doc_title[0] == '\000' ||
-                           !g_utf8_validate (doc_title, -1, NULL)) {
-                               g_free (doc_title);
-                               doc_title = NULL;
-                       }
-               }
+       if (uri && ev_metadata_manager_get (uri, "page", &page, TRUE)) {
+               new_page = CLAMP (g_value_get_int (&page), 0, ev_page_cache_get_n_pages (window->priv->page_cache) - 1);
+               ev_page_cache_set_current_page (window->priv->page_cache,
+                                               new_page);
        }
+}
 
-       if (doc_title) {
-               char *p;
+static void
+setup_chrome_from_metadata (EvWindow *window)
+{
+       EvChrome chrome = EV_CHROME_NORMAL;
+       GValue show_toolbar = { 0, };
 
-               for (p = doc_title; *p; ++p) {
-                       /* an '\n' byte is always ASCII, no need for UTF-8 special casing */
-                       if (*p == '\n')
-                               *p = ' ';
-               }
+       if (ev_metadata_manager_get (NULL, "show_toolbar", &show_toolbar, FALSE)) {
+               if (!g_value_get_boolean (&show_toolbar))
+                       chrome &= ~EV_CHROME_TOOLBAR;
        }
+       window->priv->chrome = chrome;
+}
 
-       if (doc_title == NULL && ev_window->priv->uri) {
-               char *basename;
 
-               basename = g_path_get_basename (ev_window->priv->uri);
-               doc_title = gnome_vfs_unescape_string_for_display (basename);
-               g_free (basename);
+static void
+setup_sidebar_from_metadata (EvWindow *window, EvDocument *document)
+{
+       char *uri = window->priv->uri;
+       GtkWidget *sidebar = window->priv->sidebar;
+       GtkWidget *links = window->priv->sidebar_links;
+       GtkWidget *thumbs = window->priv->sidebar_thumbs;
+       GValue sidebar_size = { 0, };
+       GValue sidebar_page = { 0, };
+
+       if (ev_metadata_manager_get (uri, "sidebar_size", &sidebar_size, FALSE)) {
+               gtk_paned_set_position (GTK_PANED (window->priv->hpaned),
+                                       g_value_get_int (&sidebar_size));
        }
 
-       if (password_needed) {
-               if (doc_title == NULL) {
-                       title = g_strdup (_("Document Viewer - Password Required"));
-               } else {
-                       title = g_strdup_printf (_("%s - Password Required"), doc_title);
+       if (ev_metadata_manager_get (uri, "sidebar_page", &sidebar_page, FALSE)) {
+               const char *page_id = g_value_get_string (&sidebar_page);
+
+               if (strcmp (page_id, "links") == 0 && ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (links), document)) {
+                       ev_sidebar_set_page (EV_SIDEBAR (sidebar), links);
+               } else if (strcmp (page_id, "thumbnails") && ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (thumbs), document)) {
+                       ev_sidebar_set_page (EV_SIDEBAR (sidebar), thumbs);
                }
        } else {
-               if (doc_title == NULL) {
-                       title = g_strdup (_("Document Viewer"));
-               } else {
-                       title = g_strdup (doc_title);
+               if (ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (links), document)) {
+                       ev_sidebar_set_page (EV_SIDEBAR (sidebar), links);
                }
        }
 
-       gtk_window_set_title (GTK_WINDOW (ev_window), title);
-
-       g_free (doc_title);
-       g_free (title);
+       update_sidebar_visibility (window);
 }
 
 static void
-hide_sidebar_and_actions (EvWindow *ev_window)
+setup_view_from_metadata (EvWindow *window)
 {
-       GtkAction *action;
-       /* Alsthough we update the hiddenness of the sidebar, we don't want to
-        * store the value */
-       g_signal_handlers_disconnect_by_func (ev_window->priv->sidebar,
-                                             ev_window_sidebar_visibility_changed_cb,
-                                             ev_window);
-       gtk_widget_hide (ev_window->priv->sidebar);
-       action = gtk_action_group_get_action (ev_window->priv->action_group, "ViewSidebar");
-       gtk_action_set_sensitive (action, FALSE);
+       EvView *view = EV_VIEW (window->priv->view);
+       char *uri = window->priv->uri;
+       GEnumValue *enum_value;
+       GValue width = { 0, };
+       GValue height = { 0, };
+       GValue maximized = { 0, };
+       GValue x = { 0, };
+       GValue y = { 0, };
+       GValue sizing_mode = { 0, };
+       GValue zoom = { 0, };
+       GValue continuous = { 0, };
+       GValue dual_page = { 0, };
+       GValue presentation = { 0, };
+       GValue fullscreen = { 0, };
+       GValue rotation = { 0, };
+       gboolean restore_size = TRUE;
+
+       /* Window size */
+
+       if (ev_metadata_manager_get (uri, "window_maximized", &maximized, FALSE)) {
+               if (g_value_get_boolean (&maximized)) {
+                       gtk_window_maximize (GTK_WINDOW (window));
+                       restore_size = FALSE;
+               } else {
+                       gtk_window_unmaximize (GTK_WINDOW (window));
+               }
+       }
 
-}
+       if (restore_size &&
+           ev_metadata_manager_get (uri, "window_width", &width, TRUE) &&
+            ev_metadata_manager_get (uri, "window_height", &height, TRUE)) {
+               gtk_window_resize (GTK_WINDOW (window),
+                                  g_value_get_int (&width),
+                                  g_value_get_int (&height));
+       }
+       if (restore_size &&
+           ev_metadata_manager_get (uri, "window_x", &x, TRUE) &&
+           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));
+       }
 
-static void
-find_changed_cb (EvDocument *document, int page, EvWindow *ev_window)
-{
-       update_action_sensitivity (ev_window);
-}
+       /* 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);
+       }
 
-static void
-page_changed_cb (EvPageCache *page_cache,
-                gint         page,
-                EvWindow    *ev_window)
-{
-       update_action_sensitivity (ev_window);
+       /* Zoom */
+       if (ev_metadata_manager_get (uri, "zoom", &zoom, FALSE) &&
+           ev_view_get_sizing_mode (view) == EV_SIZING_FREE) {
+               ev_view_set_zoom (view, g_value_get_double (&zoom), FALSE);
+       }
+
+       /* Continuous */
+       if (ev_metadata_manager_get (uri, "continuous", &continuous, FALSE)) {
+               ev_view_set_continuous (view, g_value_get_boolean (&continuous));
+       }
+
+       /* Dual page */
+       if (ev_metadata_manager_get (uri, "dual-page", &dual_page, FALSE)) {
+               ev_view_set_dual_page (view, g_value_get_boolean (&dual_page));
+       }
+
+       /* Presentation */
+       if (ev_metadata_manager_get (uri, "presentation", &presentation, FALSE)) {
+               if (g_value_get_boolean (&presentation) && uri) {
+                       ev_window_run_presentation (window);
+               }
+       }
+
+       /* Fullscreen */
+       if (ev_metadata_manager_get (uri, "fullscreen", &fullscreen, FALSE)) {
+               if (g_value_get_boolean (&fullscreen) && uri) {
+                       ev_window_run_fullscreen (window);
+               }
+       }
+
+       /* 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;
+                       }
+               }
+       }
 }
 
 static void
 ev_window_setup_document (EvWindow *ev_window)
 {
+       const EvDocumentInfo *info;
        EvDocument *document;
        EvView *view = EV_VIEW (ev_window->priv->view);
        EvSidebar *sidebar = EV_SIDEBAR (ev_window->priv->sidebar);
        GtkAction *action;
 
        document = ev_window->priv->document;
-       ev_window->priv->page_cache = ev_document_get_page_cache (ev_window->priv->document);
+       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_object (G_OBJECT (document),
-                                "notify::title",
-                                G_CALLBACK (update_window_title),
-                                ev_window, 0);
        if (EV_IS_DOCUMENT_FIND (document)) {
                g_signal_connect_object (G_OBJECT (document),
                                         "find_changed",
@@ -553,21 +813,30 @@ ev_window_setup_document (EvWindow *ev_window)
                                         ev_window, 0);
        }
 
-       ev_window_set_page_mode (ev_window, PAGE_MODE_SINGLE_PAGE);
-
-       if (ev_sidebar_supports_document (sidebar, document)) 
-               ev_sidebar_set_document (sidebar, document);
-       else
-               hide_sidebar_and_actions (ev_window);
+       ev_sidebar_set_document (sidebar, document);
 
        if (ev_page_cache_get_n_pages (ev_window->priv->page_cache) > 0) {
                ev_view_set_document (view, document);
        }
+       ev_window_set_page_mode (ev_window, PAGE_MODE_DOCUMENT);
+
+       ev_window_title_set_document (ev_window->priv->title, document);
+       ev_window_title_set_uri (ev_window->priv->title, ev_window->priv->uri);
 
-       update_window_title (document, NULL, ev_window);
        action = gtk_action_group_get_action (ev_window->priv->action_group, PAGE_SELECTOR_ACTION);
        ev_page_action_set_document (EV_PAGE_ACTION (action), document);
        update_action_sensitivity (ev_window);
+
+       if (ev_window->priv->properties) {
+               ev_properties_dialog_set_document (EV_PROPERTIES_DIALOG (ev_window->priv->properties),
+                                                  ev_window->priv->document);
+       }
+       
+       setup_document_from_metadata (ev_window);
+       setup_sidebar_from_metadata (ev_window, document);
+
+       info = ev_page_cache_get_info (ev_window->priv->page_cache);
+       update_document_mode (ev_window, info->mode);
 }
 
 static void
@@ -578,31 +847,26 @@ password_dialog_response (GtkWidget *password_dialog,
        char *password;
        
        if (response_id == GTK_RESPONSE_OK) {
-               EvDocument *document;
-               gchar *uri;
 
-               password = ev_password_dialog_get_password (password_dialog);
+               password = ev_password_dialog_get_password (EV_PASSWORD_DIALOG (password_dialog));
                if (password) {
-                       g_mutex_lock (EV_DOC_MUTEX);
+                       ev_document_doc_mutex_lock ();
                        ev_document_security_set_password (EV_DOCUMENT_SECURITY (ev_window->priv->password_document),
                                                           password);
-                       g_mutex_unlock (EV_DOC_MUTEX);
+                       ev_document_doc_mutex_unlock ();
                }
                g_free (password);
 
-               document = ev_window->priv->password_document;
-               uri = ev_window->priv->password_uri;
+               ev_password_dialog_save_password (EV_PASSWORD_DIALOG (password_dialog));
 
+               g_object_unref (ev_window->priv->password_document);
                ev_window->priv->password_document = NULL;
-               ev_window->priv->password_uri = NULL;
-
-               if (start_loading_document (ev_window, document, uri)) {
-                       gtk_widget_destroy (password_dialog);
-               }
-
-               g_object_unref (document);
-               g_free (uri);
 
+               ev_window_title_set_type (ev_window->priv->title, EV_WINDOW_TITLE_DOCUMENT);
+               ev_job_queue_add_job (ev_window->priv->load_job, EV_JOB_PRIORITY_HIGH);
+               
+               gtk_widget_destroy (password_dialog);
+                       
                return;
        }
 
@@ -610,7 +874,7 @@ password_dialog_response (GtkWidget *password_dialog,
        gtk_widget_destroy (password_dialog);
 }
 
-/* Called either by start_loading_document or by the "unlock" callback on the
+/* 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() */
 
@@ -618,34 +882,71 @@ static void
 ev_window_popup_password_dialog (EvWindow *ev_window)
 {
        g_assert (ev_window->priv->password_document);
-       g_assert (ev_window->priv->password_uri);
 
        gtk_widget_set_sensitive (ev_window->priv->password_view, FALSE);
 
-       update_window_title (ev_window->priv->password_document, NULL, ev_window);
-       if (ev_window->priv->password_dialog == NULL) {
-               gchar *basename, *file_name;
+       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);
 
-               basename = g_path_get_basename (ev_window->priv->password_uri);
-               file_name = gnome_vfs_unescape_string_for_display (basename);
+       if (ev_window->priv->password_dialog == NULL) {
                ev_window->priv->password_dialog =
-                       ev_password_dialog_new (GTK_WIDGET (ev_window), file_name);
+                       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);
-               g_free (basename);
-               g_free (file_name);
                gtk_widget_show (ev_window->priv->password_dialog);
        } else {
-               ev_password_dialog_set_bad_pass (ev_window->priv->password_dialog);
+               ev_password_dialog_set_bad_pass (EV_PASSWORD_DIALOG (ev_window->priv->password_dialog));
        }
 }
 
-/* This wil try to load the document.  It might be called multiple times on the
- * same document by the password dialog.
+
+static void
+ev_window_clear_jobs (EvWindow *ev_window)
+{
+    if (ev_window->priv->load_job != NULL) {
+
+       if (!ev_window->priv->load_job->finished)
+               ev_job_queue_remove_job (ev_window->priv->load_job);
+
+       g_signal_handlers_disconnect_by_func (ev_window->priv->load_job, ev_window_load_job_cb, ev_window);
+       g_object_unref (ev_window->priv->load_job);
+       ev_window->priv->load_job = NULL;
+    }
+
+    if (ev_window->priv->xfer_job != NULL) {
+
+       if (!ev_window->priv->xfer_job->finished)
+               ev_job_queue_remove_job (ev_window->priv->xfer_job);
+
+       g_signal_handlers_disconnect_by_func (ev_window->priv->xfer_job, ev_window_xfer_job_cb, ev_window);
+       g_object_unref (ev_window->priv->xfer_job);
+       ev_window->priv->xfer_job = NULL;
+    }
+}
+
+static void
+ev_window_clear_local_uri (EvWindow *ev_window)
+{
+    char *filename;
+    
+    if (ev_window->priv->local_uri) {
+           filename = g_filename_from_uri (ev_window->priv->local_uri, NULL, NULL);
+           if (filename != NULL) {
+                   unlink (filename);
+                   g_free (filename);
+           }
+           g_free (ev_window->priv->local_uri);
+           ev_window->priv->local_uri = NULL;
+    }
+}
+
+/* This callback will executed when load job will be finished.
  *
  * Since the flow of the error dialog is very confusing, we assume that both
  * document and uri will go away after this function is called, and thus we need
@@ -653,193 +954,207 @@ ev_window_popup_password_dialog (EvWindow *ev_window)
  * ev_window->priv->password_{uri,document}, and thus people who call this
  * function should _not_ necessarily expect those to exist after being
  * called. */
-static gboolean
-start_loading_document (EvWindow   *ev_window,
-                       EvDocument *document,
-                       const char *uri)
+static void
+ev_window_load_job_cb  (EvJobLoad *job,
+                       gpointer data)
 {
-       gboolean result;
-       GError *error = NULL;
+       EvWindow *ev_window = EV_WINDOW (data);
+       EvDocument *document = EV_JOB (job)->document;
 
        g_assert (document);
        g_assert (document != ev_window->priv->document);
-       g_assert (uri);
+       g_assert (job->uri);
+       
+       ev_view_set_loading (EV_VIEW (ev_window->priv->view), FALSE);
+
        if (ev_window->priv->password_document) {
                g_object_unref (ev_window->priv->password_document);
                ev_window->priv->password_document = NULL;
        }
-       if (ev_window->priv->password_uri) {
-               g_free (ev_window->priv->password_uri);
-               ev_window->priv->password_uri = NULL;
-       }
-
-       result = ev_document_load (document, uri, &error);
 
        /* Success! */
-       if (result) {
+       if (job->error == NULL) {
+               
                if (ev_window->priv->document)
                        g_object_unref (ev_window->priv->document);
                ev_window->priv->document = g_object_ref (document);
+               
                ev_window_setup_document (ev_window);
+               ev_window_add_recent (ev_window, ev_window->priv->uri);         
+               ev_window_clear_jobs (ev_window);
                
-               ev_window_add_recent (ev_window, uri);
-
-               return TRUE;
+               return;
        }
 
-       /* unable to load the document */
-       g_assert (error != NULL);
-
-       if (error->domain == EV_DOCUMENT_ERROR &&
-           error->code == EV_DOCUMENT_ERROR_ENCRYPTED) {
-               char *file_name;
+       if (job->error->domain == EV_DOCUMENT_ERROR &&
+           job->error->code == EV_DOCUMENT_ERROR_ENCRYPTED) {
+               gchar *base_name, *file_name;
 
                ev_window->priv->password_document = g_object_ref (document);
-               ev_window->priv->password_uri = g_strdup (uri);
 
-               file_name = g_path_get_basename (uri);
+               file_name = gnome_vfs_format_uri_for_display (job->uri);
+               base_name = g_path_get_basename (file_name);
                ev_password_view_set_file_name (EV_PASSWORD_VIEW (ev_window->priv->password_view),
-                                               file_name);
+                                               base_name);
                g_free (file_name);
+               g_free (base_name);
                ev_window_set_page_mode (ev_window, PAGE_MODE_PASSWORD);
 
                ev_window_popup_password_dialog (ev_window);
        } else {
-               unable_to_load (ev_window, error->message);
-       }
-       g_error_free (error);
+               unable_to_load (ev_window, job->error->message);
+       }       
 
-       return FALSE;
+       return;
 }
 
-static gboolean
-is_file_supported (const gchar *mime_type)
-{
-       static char *supported_types [] = {
-               "application/pdf",
-               "application/postscript",
-               "application/x-dvi",
-               "image/vnd.djvu",
-               "application/x-gzpostscript",
-               "image/x-eps",
-               NULL
-       };
-       gint   i;
-       
-       g_return_val_if_fail (mime_type != NULL, FALSE);
+static void
+ev_window_xfer_job_cb  (EvJobXfer *job,
+                       gpointer data)
+{
+       EvWindow *ev_window = EV_WINDOW (data);
+
 
-       if (mime_type_supported_by_gdk_pixbuf (mime_type))
-               return TRUE;
-       
-       for (i = 0; supported_types[i] != NULL; i++) {
-               if (g_ascii_strcasecmp (mime_type, supported_types[i]) == 0)
-                       return TRUE;
-       }
        
-       return FALSE;
+       if (job->error != NULL) {
+               unable_to_load (ev_window, job->error->message);
+               ev_window_clear_jobs (ev_window);
+               ev_view_set_loading (EV_VIEW (ev_window->priv->view), FALSE);
+       } else {
+               char *uri;
+               
+               EvDocument *document = g_object_ref (EV_JOB (job)->document);
+               
+               if (job->local_uri) {
+                       ev_window->priv->local_uri = g_strdup (job->local_uri);
+                       uri = ev_window->priv->local_uri;
+               } else {
+                       ev_window->priv->local_uri = NULL;
+                       uri = ev_window->priv->uri;
+               }
+               
+               ev_window_clear_jobs (ev_window);
+               
+               ev_window->priv->load_job = ev_job_load_new (document, uri);
+               g_signal_connect (ev_window->priv->load_job,
+                                 "finished",
+                                 G_CALLBACK (ev_window_load_job_cb),
+                                 ev_window);
+               ev_job_queue_add_job (ev_window->priv->load_job, EV_JOB_PRIORITY_HIGH);
+               g_object_unref (document);
+       }               
 }
 
-void
-ev_window_open (EvWindow *ev_window, const char *uri)
+const char *
+ev_window_get_uri (EvWindow *ev_window)
 {
-       EvDocument *document = NULL;
-       char *mime_type;
+       return ev_window->priv->uri;
+}
 
-       g_free (ev_window->priv->uri);
-       ev_window->priv->uri = g_strdup (uri);
+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;
 
-       mime_type = gnome_vfs_get_mime_type (uri);
-
-       if (mime_type == NULL)
-               document = NULL;
-       else if (!strcmp (mime_type, "application/pdf"))
-               document = g_object_new (PDF_TYPE_DOCUMENT, NULL);
-       else if (!strcmp (mime_type, "application/postscript") ||
-                !strcmp (mime_type, "application/x-gzpostscript") ||
-                !strcmp (mime_type, "image/x-eps"))
-               document = g_object_new (PS_TYPE_DOCUMENT, NULL);
-#ifdef ENABLE_DJVU
-       else if (!strcmp (mime_type, "image/vnd.djvu"))
-               document = g_object_new (DJVU_TYPE_DOCUMENT, NULL);
-#endif         
-       else if (mime_type_supported_by_gdk_pixbuf (mime_type))
-               document = g_object_new (PIXBUF_TYPE_DOCUMENT, NULL);
-#ifdef ENABLE_DVI
-       else if (!strcmp (mime_type, "application/x-dvi"))
-               document = g_object_new (DVI_TYPE_DOCUMENT, NULL);
+#ifdef WITH_GNOME_PRINT
+       if (ev_window->priv->print_dialog) {
+               gtk_widget_destroy (ev_window->priv->print_dialog);
+               g_object_unref (ev_window->priv->print_job);
+       }
+       ev_window->priv->print_dialog = NULL;
+       ev_window->priv->print_job = NULL;
 #endif
 
-       if (document) {
-               start_loading_document (ev_window, document, uri);
-               /* See the comment on start_loading_document on ref counting.
-                * As the password dialog flow is confusing, we're very explicit
-                * on ref counting. */
-               g_object_unref (document);
-       } else {
-               char *error_message;
+       if (ev_window->priv->properties)
+               gtk_widget_destroy (ev_window->priv->properties);
+       ev_window->priv->properties = NULL;
+}
 
-               error_message = g_strdup_printf (_("Unhandled MIME type: '%s'"),
-                                                mime_type?mime_type:"<Unknown MIME Type>");
-               unable_to_load (ev_window, error_message);
-               g_free (error_message);
-       }
+void
+ev_window_open_uri (EvWindow *ev_window, const char *uri)
+{
+
+       g_free (ev_window->priv->uri);
+       ev_window->priv->uri = g_strdup (uri);
 
-       g_free (mime_type);
+       setup_view_from_metadata (ev_window);
+       
+       ev_window_close_dialogs (ev_window);
+       ev_window_clear_jobs (ev_window);
+       ev_window_clear_local_uri (ev_window);
+       ev_view_set_loading (EV_VIEW (ev_window->priv->view), TRUE);
+       
+       ev_window->priv->xfer_job = ev_job_xfer_new (uri);
+       g_signal_connect (ev_window->priv->xfer_job,
+                         "finished",
+                         G_CALLBACK (ev_window_xfer_job_cb),
+                         ev_window);
+       ev_job_queue_add_job (ev_window->priv->xfer_job, EV_JOB_PRIORITY_HIGH);
 }
 
 static void
-ev_window_open_uri_list (EvWindow *ev_window, GList *uri_list)
+file_open_dialog_response_cb (GtkWidget *chooser,
+                             gint       response_id,
+                             EvWindow  *ev_window)
 {
-       GList *list;
-       gchar *uri, *mime_type;
-       
-       g_return_if_fail (uri_list != NULL);
-       
-       list = uri_list;
-       while (list) {
-               uri = gnome_vfs_uri_to_string (list->data, GNOME_VFS_URI_HIDE_NONE);
-               mime_type = gnome_vfs_get_mime_type (uri);
-               
-               if (is_file_supported (mime_type)) {
-                       if (ev_window_is_empty (EV_WINDOW (ev_window))) {
-                               ev_window_open (ev_window, uri);
-                               
-                               gtk_widget_show (GTK_WIDGET (ev_window));
-                       } else {
-                               EvWindow *new_window;
-                               
-                               new_window = ev_application_new_window (EV_APP);
-                               ev_window_open (new_window, uri);
-                               
-                               gtk_widget_show (GTK_WIDGET (new_window));
-                       }
-               }
+       if (response_id == GTK_RESPONSE_OK) {
+               GSList *uris;
 
-               g_free (mime_type);
-               g_free (uri);
+               uris = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (chooser));
 
-               list = g_list_next (list);
+               ev_application_open_uri_list (EV_APP, uris, GDK_CURRENT_TIME);
+       
+               g_slist_foreach (uris, (GFunc)g_free, NULL);    
+               g_slist_free (uris);
        }
+       ev_application_set_chooser_uri (EV_APP, 
+                                       gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (chooser)));
+
+       gtk_widget_destroy (chooser);
 }
 
 static void
-ev_window_cmd_file_open (GtkAction *action, EvWindow *ev_window)
+ev_window_cmd_file_open (GtkAction *action, EvWindow *window)
 {
-       ev_application_open (EV_APP, NULL);
+       GtkWidget *chooser;
+
+       chooser = gtk_file_chooser_dialog_new (_("Open Document"),
+                                              GTK_WINDOW (window),
+                                              GTK_FILE_CHOOSER_ACTION_OPEN,
+                                              GTK_STOCK_CANCEL,
+                                              GTK_RESPONSE_CANCEL,
+                                              GTK_STOCK_OPEN, GTK_RESPONSE_OK,
+                                              NULL);
+
+       ev_document_types_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));
+       
+       g_signal_connect (chooser, "response",
+                         G_CALLBACK (file_open_dialog_response_cb),
+                         window);
+
+       gtk_widget_show (chooser);
 }
 
 static void
-ev_window_cmd_recent_file_activate (EggRecentViewGtk *view, EggRecentItem *item,
+ev_window_cmd_recent_file_activate (GtkAction *action,
                                    EvWindow *ev_window)
 {
        char *uri;
-       GtkWidget *window;
+       EggRecentItem *item;
+
+       item = egg_recent_view_uimanager_get_item (ev_window->priv->recent_view,
+                                                  action);
 
        uri = egg_recent_item_get_uri (item);
 
-       window = GTK_WIDGET (ev_application_get_empty_window (EV_APP));
-       gtk_widget_show (window);
-       ev_window_open (EV_WINDOW (window), uri);
+       ev_application_open_uri (EV_APP, uri, NULL, GDK_CURRENT_TIME, NULL);
        
        g_free (uri);
 }
@@ -849,92 +1164,31 @@ ev_window_add_recent (EvWindow *window, const char *filename)
 {
        EggRecentItem *item;
 
-       if (strstr (filename, "file:///") == NULL)
-               return;
-
        item = egg_recent_item_new_from_uri (filename);
        egg_recent_item_add_group (item, "Evince");
-       egg_recent_model_add_full (window->priv->recent_model, item);
+       egg_recent_model_add_full (ev_application_get_recent_model (EV_APP), item);
 }
 
 static void
 ev_window_setup_recent (EvWindow *ev_window)
 {
-       GtkWidget *menu_item;
-       GtkWidget *menu;
-
-       menu_item = gtk_ui_manager_get_widget (ev_window->priv->ui_manager, "/MainMenu/FileMenu");
-       menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menu_item));
-       menu_item = gtk_ui_manager_get_widget (ev_window->priv->ui_manager, "/MainMenu/FileMenu/RecentFilesMenu");
-
-       g_return_if_fail (menu != NULL);
-       g_return_if_fail (menu_item != NULL);
 
-       /* it would be better if we just filtered by mime-type, but there
-        * doesn't seem to be an easy way to figure out which mime-types we
-        * can handle */
-       ev_window->priv->recent_model = egg_recent_model_new (EGG_RECENT_MODEL_SORT_MRU);
+       ev_window->priv->recent_view = egg_recent_view_uimanager_new (ev_window->priv->ui_manager,
+                                                                     "/MainMenu/FileMenu/RecentFilesMenu",
+                                                                     G_CALLBACK (ev_window_cmd_recent_file_activate), 
+                                                                     ev_window);       
 
-       ev_window->priv->recent_view = egg_recent_view_gtk_new (menu, menu_item);
-       egg_recent_view_gtk_show_icons (EGG_RECENT_VIEW_GTK (ev_window->priv->recent_view), FALSE);
-       egg_recent_model_set_limit (ev_window->priv->recent_model, 5);
+        egg_recent_view_uimanager_show_icons (EGG_RECENT_VIEW_UIMANAGER (ev_window->priv->recent_view), FALSE);
 
        egg_recent_view_set_model (EGG_RECENT_VIEW (ev_window->priv->recent_view),
-                                  ev_window->priv->recent_model);
+                                  ev_application_get_recent_model (EV_APP));
 
-       egg_recent_model_set_filter_groups (ev_window->priv->recent_model,
-                                           "Evince", NULL);
-
-       egg_recent_view_gtk_set_trailing_sep (ev_window->priv->recent_view, TRUE);
+       egg_recent_view_uimanager_set_trailing_sep (ev_window->priv->recent_view, TRUE);
        
        g_signal_connect (ev_window->priv->recent_view, "activate",
                        G_CALLBACK (ev_window_cmd_recent_file_activate), ev_window);
 }
 
-/* FIXME
-static gboolean
-overwrite_existing_file (GtkWindow *window, const gchar *file_name)
-{
-       GtkWidget *msgbox;
-       gchar *utf8_file_name;
-       AtkObject *obj;
-       gint ret;
-
-       utf8_file_name = g_filename_to_utf8 (file_name, -1, NULL, NULL, NULL);
-       msgbox = gtk_message_dialog_new (
-               window,
-               (GtkDialogFlags)GTK_DIALOG_DESTROY_WITH_PARENT,
-               GTK_MESSAGE_QUESTION,
-               GTK_BUTTONS_NONE,
-               _("A file named \"%s\" already exists."),
-               utf8_file_name);
-       g_free (utf8_file_name);
-
-       gtk_message_dialog_format_secondary_text (
-               GTK_MESSAGE_DIALOG (msgbox),
-               _("Do you want to replace it with the one you are saving?"));
-
-       gtk_dialog_add_button (GTK_DIALOG (msgbox),
-                              GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
-
-       gtk_dialog_add_button (GTK_DIALOG (msgbox),
-                              _("_Replace"), GTK_RESPONSE_YES);
-
-       gtk_dialog_set_default_response (GTK_DIALOG (msgbox),
-                                        GTK_RESPONSE_CANCEL);
-
-       obj = gtk_widget_get_accessible (msgbox);
-
-       if (GTK_IS_ACCESSIBLE (obj))
-               atk_object_set_name (obj, _("Question"));
-
-       ret = gtk_dialog_run (GTK_DIALOG (msgbox));
-       gtk_widget_destroy (msgbox);
-
-       return (ret == GTK_RESPONSE_YES);
-}
-*/
-
 static void
 save_error_dialog (GtkWindow *window, const gchar *file_name)
 {
@@ -957,154 +1211,206 @@ save_error_dialog (GtkWindow *window, const gchar *file_name)
        gtk_widget_destroy (error_dialog);
 }
 
+static void
+file_save_dialog_response_cb (GtkWidget *fc,
+                             gint       response_id,
+                             EvWindow  *ev_window)
+{
+       gboolean success;
+
+       if (response_id == GTK_RESPONSE_OK) {
+               const char *uri;
+
+               uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (fc));
+
+               ev_document_doc_mutex_lock ();
+               success = ev_document_save (ev_window->priv->document, uri, NULL);
+               ev_document_doc_mutex_unlock ();
+
+               if (!success) {
+                       save_error_dialog (GTK_WINDOW (fc), uri);
+               }
+       }
+
+       gtk_widget_destroy (fc);
+}
+
 static void
 ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
 {
        GtkWidget *fc;
-       GtkFileFilter *pdf_filter, *all_filter;
-       gchar *uri = NULL;
-       gboolean success;
+       gchar *base_name;
+       gchar *file_name;
 
        fc = gtk_file_chooser_dialog_new (
                _("Save a Copy"),
-               NULL, GTK_FILE_CHOOSER_ACTION_SAVE,
+               GTK_WINDOW (ev_window), GTK_FILE_CHOOSER_ACTION_SAVE,
                GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
                GTK_STOCK_SAVE, GTK_RESPONSE_OK,
                NULL);
-       gtk_window_set_modal (GTK_WINDOW (fc), TRUE);
-
-       pdf_filter = gtk_file_filter_new ();
-       gtk_file_filter_set_name (pdf_filter, _("PDF Documents"));
-       gtk_file_filter_add_mime_type (pdf_filter, "application/pdf");
-       gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (fc), pdf_filter);
-
-       all_filter = gtk_file_filter_new ();
-       gtk_file_filter_set_name (all_filter, _("All Files"));
-       gtk_file_filter_add_pattern (all_filter, "*");
-       gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (fc), all_filter);
-       gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (fc), pdf_filter);
 
+       ev_document_types_add_filters (fc, ev_window->priv->document);
        gtk_dialog_set_default_response (GTK_DIALOG (fc), GTK_RESPONSE_OK);
 
+#ifdef HAVE_GTK_FILE_CHOOSER_SET_DO_OVERWRITE_CONFIRMATION
+       gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER (fc), TRUE);    
+#endif 
+       file_name = gnome_vfs_format_uri_for_display (ev_window->priv->uri);
+       base_name = g_path_get_basename (file_name);
+       gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (fc), base_name);
+       g_free (file_name);
+       g_free (base_name);
+
+       g_signal_connect (fc, "response",
+                         G_CALLBACK (file_save_dialog_response_cb),
+                         ev_window);
+
        gtk_widget_show (fc);
+}
 
-       while (gtk_dialog_run (GTK_DIALOG (fc)) == GTK_RESPONSE_OK) {
-               uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (fc));
+static void
+ev_window_print (EvWindow *window)
+{
+       EvPageCache *page_cache;
+       int last_page;
 
-/* FIXME
-               if (g_file_test (uri, G_FILE_TEST_EXISTS) &&
-                   !overwrite_existing_file (GTK_WINDOW (fc), uri))
-                               continue;
-*/
-               
-               g_mutex_lock (EV_DOC_MUTEX);
-               success = ev_document_save (ev_window->priv->document, uri, NULL);
-               g_mutex_unlock (EV_DOC_MUTEX);
+       page_cache = ev_page_cache_get (window->priv->document);
+       last_page = ev_page_cache_get_n_pages (page_cache);
 
-               if (success)
-                       break;
-               else
-                       save_error_dialog (GTK_WINDOW (fc), uri);
-       }
-       gtk_widget_destroy (fc);
+#ifdef WITH_GNOME_PRINT
+       ev_window_print_range (window, 1, last_page);
+#endif
 }
 
+
+#ifdef WITH_GNOME_PRINT
 static gboolean
-using_postscript_printer (GnomePrintConfig *config)
-{
-       const guchar *driver;
-       const guchar *transport;
+ev_window_print_dialog_response_cb (GtkDialog *print_dialog, gint response, gpointer data)
+{
+    EvWindow *ev_window = EV_WINDOW (data);
+    EvPrintJob *print_job;
+    GnomePrintConfig *config;
+    
+    if (response != GNOME_PRINT_DIALOG_RESPONSE_PRINT) {
+           gtk_widget_destroy (GTK_WIDGET (print_dialog));
+           ev_window->priv->print_dialog = NULL;
+           g_object_unref (ev_window->priv->print_job);
+           ev_window->priv->print_job = NULL;
+           return FALSE;
+    }
+
+    config = gnome_print_dialog_get_config (GNOME_PRINT_DIALOG (print_dialog));
+
+    /* FIXME: Change this when we have the first backend
+     * that can print more than postscript
+     */
+    if (using_pdf_printer (config)) {
+           GtkWidget *dialog;
+           dialog = gtk_message_dialog_new (GTK_WINDOW (print_dialog), GTK_DIALOG_MODAL,
+                                            GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
+                                           _("Generating PDF is not supported"));
+           gtk_dialog_run (GTK_DIALOG (dialog));
+           gtk_widget_destroy (dialog);
+           return FALSE;
+    } else if (!using_postscript_printer (config)) {
+           GtkWidget *dialog;
+
+           dialog = gtk_message_dialog_new (GTK_WINDOW (print_dialog), GTK_DIALOG_MODAL,
+                                            GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
+                                            _("Printing is not supported on this printer."));
+                                            gtk_message_dialog_format_secondary_text (
+                                                       GTK_MESSAGE_DIALOG (dialog),
+                                                       _("You were trying to print to a printer using the \"%s\" driver. This program requires a PostScript printer driver."),
+                                                       gnome_print_config_get (config, (guchar *)"Settings.Engine.Backend.Driver"));
+           gtk_dialog_run (GTK_DIALOG (dialog));
+           gtk_widget_destroy (dialog);
+           return FALSE;
+    }
+
+    save_print_config_to_file (config);
+    
+    print_job = g_object_new (EV_TYPE_PRINT_JOB,
+                             "gnome_print_job", ev_window->priv->print_job,
+                             "document", ev_window->priv->document,
+                             "print_dialog", print_dialog,
+                              NULL);
 
-       driver = gnome_print_config_get (
-               config, (const guchar *)"Settings.Engine.Backend.Driver");
+    if (print_job != NULL) {
+       ev_print_job_print (print_job, GTK_WINDOW (ev_window));
+       g_object_unref (print_job);
+    }
 
-       transport = gnome_print_config_get (
-               config, (const guchar *)"Settings.Transport.Backend");
+    g_object_unref (config);
 
-       if (driver) {
-               if (!strcmp ((const gchar *)driver, "gnome-print-ps"))
-                       return TRUE;
-               else
-                       return FALSE;
-       } else  if (transport) {
-               if (!strcmp ((const gchar *)transport, "CUPS"))
-                       return TRUE;
-       }
+    gtk_widget_destroy (GTK_WIDGET (print_dialog));
+    ev_window->priv->print_dialog = NULL;
+    g_object_unref (ev_window->priv->print_job);
+    ev_window->priv->print_job = NULL;
 
-       return FALSE;
+    return FALSE;
 }
 
-static void
-ev_window_print (EvWindow *ev_window)
+void
+ev_window_print_range (EvWindow *ev_window, int first_page, int last_page)
 {
        GnomePrintConfig *config;
-       GnomePrintJob *job;
-       GtkWidget *print_dialog;
-       EvPrintJob *print_job = NULL;
+       gchar *pages_label;
 
         g_return_if_fail (EV_IS_WINDOW (ev_window));
        g_return_if_fail (ev_window->priv->document != NULL);
 
-       config = gnome_print_config_default ();
-       job = gnome_print_job_new (config);
+       config = load_print_config_from_file ();
 
-       print_dialog = gnome_print_dialog_new (job, (guchar *) _("Print"),
-                                              (GNOME_PRINT_DIALOG_RANGE |
-                                               GNOME_PRINT_DIALOG_COPIES));
-       gtk_dialog_set_response_sensitive (GTK_DIALOG (print_dialog),
+       if (ev_window->priv->print_job == NULL)
+               ev_window->priv->print_job = gnome_print_job_new (config);
+       
+       if (ev_window->priv->print_dialog == NULL)
+               ev_window->priv->print_dialog = gnome_print_dialog_new (ev_window->priv->print_job, (guchar *) _("Print"),
+                                                                      (GNOME_PRINT_DIALOG_RANGE |
+                                                                       GNOME_PRINT_DIALOG_COPIES));
+       gtk_window_set_transient_for (GTK_WINDOW (ev_window->priv->print_dialog), GTK_WINDOW (ev_window));                                                              
+       g_object_unref (config);                                                                
+
+       pages_label = g_strconcat (_("Pages"), " ", NULL);
+       gnome_print_dialog_construct_range_page (GNOME_PRINT_DIALOG (ev_window->priv->print_dialog),
+                                                GNOME_PRINT_RANGE_ALL |
+                                                GNOME_PRINT_RANGE_RANGE,
+                                                first_page, last_page,
+                                                NULL, (const guchar *)pages_label);
+       g_free (pages_label);
+                                                
+       gtk_dialog_set_response_sensitive (GTK_DIALOG (ev_window->priv->print_dialog),
                                           GNOME_PRINT_DIALOG_RESPONSE_PREVIEW,
                                           FALSE);
 
-       while (TRUE) {
-               int response;
-               response = gtk_dialog_run (GTK_DIALOG (print_dialog));
-
-               if (response != GNOME_PRINT_DIALOG_RESPONSE_PRINT)
-                       break;
-
-               /* FIXME: Change this when we have the first backend
-                * that can print more than postscript
-                */
-               if (!using_postscript_printer (config)) {
-                       GtkWidget *dialog;
-
-                       dialog = gtk_message_dialog_new (
-                               GTK_WINDOW (print_dialog), GTK_DIALOG_MODAL,
-                               GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
-                               _("Printing is not supported on this printer."));
-                       gtk_message_dialog_format_secondary_text (
-                               GTK_MESSAGE_DIALOG (dialog),
-                               _("You were trying to print to a printer using the \"%s\" driver. This program requires a PostScript printer driver."),
-                               gnome_print_config_get (
-                                       config, (guchar *)"Settings.Engine.Backend.Driver"));
-                       gtk_dialog_run (GTK_DIALOG (dialog));
-                       gtk_widget_destroy (dialog);
-
-                       continue;
-               }
-
-               print_job = g_object_new (EV_TYPE_PRINT_JOB,
-                                         "gnome_print_job", job,
-                                         "document", ev_window->priv->document,
-                                         "print_dialog", print_dialog,
-                                         NULL);
-               break;
-       }
-
-       gtk_widget_destroy (print_dialog);
-
-       if (print_job != NULL) {
-               ev_print_job_print (print_job, GTK_WINDOW (ev_window));
-               g_object_unref (print_job);
-       }
+       g_signal_connect (G_OBJECT (ev_window->priv->print_dialog), "response", G_CALLBACK (ev_window_print_dialog_response_cb), ev_window);
+       gtk_widget_show (ev_window->priv->print_dialog);
+       return;
 }
-
+#endif /* WITH_GNOME_PRINT */
+       
 static void
 ev_window_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->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));
+       }
+
+       gtk_widget_show (ev_window->priv->properties);
+}
+                                       
 static void
 ev_window_cmd_file_close_window (GtkAction *action, EvWindow *ev_window)
 {
@@ -1151,7 +1457,7 @@ ev_window_cmd_edit_find (GtkAction *action, EvWindow *ev_window)
        } else if (!EV_IS_DOCUMENT_FIND (ev_window->priv->document)) {
                find_not_supported_dialog (ev_window);
        } else {
-               update_chrome_flag (ev_window, EV_CHROME_FINDBAR, NULL, TRUE);
+               update_chrome_flag (ev_window, EV_CHROME_FINDBAR, TRUE);
 
                gtk_widget_grab_focus (ev_window->priv->find_bar);
        }
@@ -1178,19 +1484,24 @@ ev_window_update_fullscreen_popup (EvWindow *window)
 {
        GtkWidget *popup = window->priv->fullscreen_popup;
        int popup_width, popup_height;
+       GdkScreen *screen;
        GdkRectangle screen_rect;
        gboolean toolbar;
 
        g_return_if_fail (popup != NULL);
 
-       toolbar = (window->priv->chrome & EV_CHROME_TOOLBAR) != 0;
+       if (GTK_WIDGET (window)->window == NULL)
+               return;
+
+       toolbar = (window->priv->chrome & EV_CHROME_TOOLBAR) != 0 || 
+                 (window->priv->chrome & EV_CHROME_RAISE_TOOLBAR) != 0;
        popup_width = popup->requisition.width;
        popup_height = popup->requisition.height;
 
-       /* FIXME multihead */
-       gdk_screen_get_monitor_geometry (gdk_screen_get_default (),
+       screen = gtk_widget_get_screen (GTK_WIDGET (window));
+       gdk_screen_get_monitor_geometry (screen,
                        gdk_screen_get_monitor_at_window
-                        (gdk_screen_get_default (),
+                        (screen,
                          GTK_WIDGET (window)->window),
                          &screen_rect);
        if (toolbar) {
@@ -1226,14 +1537,9 @@ static void
 ev_window_sidebar_position_change_cb (GObject *object, GParamSpec *pspec,
                                      EvWindow *ev_window)
 {
-       GConfClient *client;
-       int sidebar_size;
-
-       sidebar_size = gtk_paned_get_position (GTK_PANED (object));
-
-       client = gconf_client_get_default ();
-       gconf_client_set_int (client, GCONF_SIDEBAR_SIZE, sidebar_size, NULL);
-       g_object_unref (client);
+       if (!ev_window_is_empty (ev_window))
+               ev_metadata_manager_set_int (ev_window->priv->uri, "sidebar_size",
+                                            gtk_paned_get_position (GTK_PANED (object)));
 }
 
 static void
@@ -1241,11 +1547,6 @@ destroy_fullscreen_popup (EvWindow *window)
 {
        if (window->priv->fullscreen_popup != NULL)
        {
-               /* FIXME multihead */
-               g_signal_handlers_disconnect_by_func
-                       (gdk_screen_get_default (),
-                        G_CALLBACK (screen_size_changed_cb), window);
-
                gtk_widget_destroy (window->priv->fullscreen_popup);
                window->priv->fullscreen_popup = NULL;
        }
@@ -1275,6 +1576,7 @@ fullscreen_timeout_cb (gpointer data)
 
        g_object_set (window->priv->fullscreen_popup, "visible", FALSE, NULL);
        ev_view_hide_cursor (EV_VIEW (window->priv->view));
+       g_source_unref (window->priv->fullscreen_timeout_source);
        window->priv->fullscreen_timeout_source = NULL;
 
        return FALSE;
@@ -1285,10 +1587,12 @@ fullscreen_set_timeout (EvWindow *window)
 {
        GSource *source;
 
-       if (window->priv->fullscreen_timeout_source != NULL)
+       if (window->priv->fullscreen_timeout_source != NULL) {
+               g_source_unref (window->priv->fullscreen_timeout_source);
                g_source_destroy (window->priv->fullscreen_timeout_source);
+       }
 
-       source = g_timeout_source_new (1000);
+       source = g_timeout_source_new (FULLSCREEN_TIMEOUT);
        g_source_set_callback (source, fullscreen_timeout_cb, window, NULL);
        g_source_attach (source, NULL);
        window->priv->fullscreen_timeout_source = source;
@@ -1297,11 +1601,25 @@ fullscreen_set_timeout (EvWindow *window)
 static void
 fullscreen_clear_timeout (EvWindow *window)
 {
-       if (window->priv->fullscreen_timeout_source != NULL)
+       if (window->priv->fullscreen_timeout_source != NULL) {
+               g_source_unref (window->priv->fullscreen_timeout_source);
                g_source_destroy (window->priv->fullscreen_timeout_source);
+       }
+
+       window->priv->fullscreen_timeout_source = NULL;
+       ev_view_show_cursor (EV_VIEW (window->priv->view));
+}
+
+
+static void
+show_fullscreen_popup (EvWindow *window)
+{
+       if (!GTK_WIDGET_VISIBLE (window->priv->fullscreen_popup)) {
+               g_object_set (window->priv->fullscreen_popup, "visible", TRUE, NULL);
+               ev_view_show_cursor (EV_VIEW (window->priv->view));
+       }
 
-       window->priv->fullscreen_timeout_source = NULL;
-       ev_view_show_cursor (EV_VIEW (window->priv->view));
+       fullscreen_set_timeout (window);        
 }
 
 static gboolean
@@ -1311,12 +1629,7 @@ fullscreen_motion_notify_cb (GtkWidget *widget,
 {
        EvWindow *window = EV_WINDOW (user_data);
 
-       if (!GTK_WIDGET_VISIBLE (window->priv->fullscreen_popup)) {
-               g_object_set (window->priv->fullscreen_popup, "visible", TRUE, NULL);
-               ev_view_show_cursor (EV_VIEW (window->priv->view));
-       }
-
-       fullscreen_set_timeout (window);
+       show_fullscreen_popup (window);
 
        return FALSE;
 }
@@ -1365,6 +1678,10 @@ ev_window_create_fullscreen_popup (EvWindow *window)
        GtkWidget *popup;
        GtkWidget *hbox;
        GtkWidget *button;
+       GdkScreen *screen;
+
+       window->priv->fullscreen_toolbar = egg_editable_toolbar_new_with_model
+                       (window->priv->ui_manager, ev_application_get_toolbars_model (EV_APP));
 
        popup = gtk_window_new (GTK_WINDOW_POPUP);
        hbox = gtk_hbox_new (FALSE, 0);
@@ -1380,29 +1697,50 @@ ev_window_create_fullscreen_popup (EvWindow *window)
 
        gtk_window_set_resizable (GTK_WINDOW (popup), FALSE);
 
-       /* FIXME multihead */
-       g_signal_connect (gdk_screen_get_default (), "size-changed",
-                         G_CALLBACK (screen_size_changed_cb), window);
-       g_signal_connect (popup, "size_request",
-                         G_CALLBACK (fullscreen_popup_size_request_cb), window);
+       screen = gtk_widget_get_screen (GTK_WIDGET (window));
+       g_signal_connect_object (screen, "size-changed",
+                                G_CALLBACK (screen_size_changed_cb),
+                                window, 0);
+       g_signal_connect_object (popup, "size_request",
+                                G_CALLBACK (fullscreen_popup_size_request_cb),
+                                window, 0);
+
+       gtk_window_set_screen (GTK_WINDOW (popup),
+                              gtk_widget_get_screen (GTK_WIDGET (window)));
 
        return popup;
 }
 
+
 static void
-ev_window_fullscreen (EvWindow *window)
+ev_window_update_fullscreen_action (EvWindow *window)
 {
-       window->priv->fullscreen_mode = TRUE;
+       GtkAction *action;
+
+       action = gtk_action_group_get_action (window->priv->action_group, "ViewFullscreen");
+       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)));
+       g_signal_handlers_unblock_by_func
+               (action, G_CALLBACK (ev_window_cmd_view_fullscreen), window);
+}
 
+static void
+ev_window_run_fullscreen (EvWindow *window)
+{
+       ev_view_set_fullscreen (EV_VIEW (window->priv->view), TRUE);
        if (window->priv->fullscreen_popup == NULL)
                window->priv->fullscreen_popup
                        = ev_window_create_fullscreen_popup (window);
+
        update_chrome_visibility (window);
+       gtk_widget_hide (window->priv->sidebar);
 
        g_object_set (G_OBJECT (window->priv->scrolled_window),
                      "shadow-type", GTK_SHADOW_NONE,
                      NULL);
-
+       
        g_signal_connect (window->priv->view,
                          "motion-notify-event",
                          G_CALLBACK (fullscreen_motion_notify_cb),
@@ -1414,17 +1752,23 @@ ev_window_fullscreen (EvWindow *window)
        fullscreen_set_timeout (window);
 
        gtk_widget_grab_focus (window->priv->view);
-
+       ev_window_update_fullscreen_action (window);
+       gtk_window_fullscreen (GTK_WINDOW (window));
        ev_window_update_fullscreen_popup (window);
+
+       if (!ev_window_is_empty (window))
+               ev_metadata_manager_set_boolean (window->priv->uri, "fullscreen", TRUE);
 }
 
 static void
-ev_window_unfullscreen (EvWindow *window)
+ev_window_stop_fullscreen (EvWindow *window)
 {
        EvView *view = EV_VIEW (window->priv->view);
 
-       window->priv->fullscreen_mode = FALSE;
+       if (!ev_view_get_fullscreen (EV_VIEW (view)))
+               return;
 
+       ev_view_set_fullscreen (view, FALSE);
        g_object_set (G_OBJECT (window->priv->scrolled_window),
                      "shadow-type", GTK_SHADOW_IN,
                      NULL);
@@ -1434,65 +1778,99 @@ ev_window_unfullscreen (EvWindow *window)
        g_signal_handlers_disconnect_by_func (view,
                                              (gpointer) fullscreen_motion_notify_cb,
                                              window);
-
-       ev_view_set_show_border (view, TRUE);
-       ev_view_set_spacing (view, VIEW_SPACING);       
+       g_signal_handlers_disconnect_by_func (view,
+                                             (gpointer) fullscreen_leave_notify_cb,
+                                             window);
+       ev_window_update_fullscreen_action (window);
+       gtk_window_unfullscreen (GTK_WINDOW (window));
        update_chrome_visibility (window);
+       update_sidebar_visibility (window);
+
+       if (!ev_window_is_empty (window))
+               ev_metadata_manager_set_boolean (window->priv->uri, "fullscreen", FALSE);
 }
 
 static void
 ev_window_cmd_view_fullscreen (GtkAction *action, EvWindow *window)
 {
-       EvView *view;
        gboolean fullscreen;
 
         g_return_if_fail (EV_IS_WINDOW (window));
+       ev_window_stop_presentation (window);
 
-       view = EV_VIEW (window->priv->view);
        fullscreen = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
-
        if (fullscreen) {
-               gtk_window_fullscreen (GTK_WINDOW (window));
+               ev_window_run_fullscreen (window);
        } else {
-               gtk_window_unfullscreen (GTK_WINDOW (window));
+               ev_window_stop_fullscreen (window);
        }
+}
+
+static void
+ev_window_update_presentation_action (EvWindow *window)
+{
+       GtkAction *action;
 
-       ev_view_set_show_border (view, FALSE);
-       ev_view_set_spacing (view, 0);  
+       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 gboolean
-ev_window_state_event_cb (GtkWidget *widget, GdkEventWindowState *event, EvWindow *window)
+static void
+ev_window_run_presentation (EvWindow *window)
 {
-       if (event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN)
-       {
-               GtkActionGroup *action_group;
-               GtkAction *action;
-               gboolean fullscreen;
+       g_object_set (G_OBJECT (window->priv->scrolled_window),
+                     "shadow-type", GTK_SHADOW_NONE,
+                     NULL);
 
-               fullscreen = event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN;
+       gtk_widget_grab_focus (window->priv->view);
+       ev_view_set_presentation (EV_VIEW (window->priv->view), TRUE);
+       gtk_window_fullscreen (GTK_WINDOW (window));
+       ev_window_update_presentation_action (window);
+       update_chrome_visibility (window);
+       gtk_widget_hide (window->priv->sidebar);
 
-               if (fullscreen)
-               {
-                       ev_window_fullscreen (window);
-               }
-               else
-               {
-                       ev_window_unfullscreen (window);
-               }
+       if (!ev_window_is_empty (window))
+               ev_metadata_manager_set_boolean (window->priv->uri, "presentation", TRUE);
+}
+
+static void
+ev_window_stop_presentation (EvWindow *window)
+{
+       if (!ev_view_get_presentation (EV_VIEW (window->priv->view)))
+               return;
+
+       g_object_set (G_OBJECT (window->priv->scrolled_window),
+                     "shadow-type", GTK_SHADOW_IN,
+                     NULL);
+       ev_view_set_presentation (EV_VIEW (window->priv->view), FALSE);
+       gtk_window_unfullscreen (GTK_WINDOW (window));
+       ev_window_update_presentation_action (window);
+       update_chrome_visibility (window);
+       update_sidebar_visibility (window);
 
-               action_group = window->priv->action_group;
+       if (!ev_window_is_empty (window))
+               ev_metadata_manager_set_boolean (window->priv->uri, "presentation", FALSE);
+}
 
-               action = gtk_action_group_get_action (action_group, "ViewFullscreen");
-               g_signal_handlers_block_by_func
-                       (action, G_CALLBACK (ev_window_cmd_view_fullscreen), window);
-               gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), fullscreen);
-               g_signal_handlers_unblock_by_func
-                       (action, G_CALLBACK (ev_window_cmd_view_fullscreen), window);
+static void
+ev_window_cmd_view_presentation (GtkAction *action, EvWindow *window)
+{
+       gboolean presentation;
 
-       }
+        g_return_if_fail (EV_IS_WINDOW (window));
+       ev_window_stop_fullscreen (window);
 
-       return FALSE;
+       presentation = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
+       if (presentation) {
+               ev_window_run_presentation (window);
+       } else {
+               ev_window_stop_presentation (window);
+       }
 }
 
 static gboolean
@@ -1500,11 +1878,14 @@ ev_window_focus_in_event (GtkWidget *widget, GdkEventFocus *event)
 {
        EvWindow *window = EV_WINDOW (widget);
        EvWindowPrivate *priv = window->priv;
+       gboolean fullscreen;
 
-       if (priv->fullscreen_mode)
-       {
-               gtk_widget_show (priv->fullscreen_popup);
-       }
+       g_object_get (priv->view,
+                     "fullscreen", &fullscreen,
+                     NULL);
+
+       if (fullscreen)
+               show_fullscreen_popup (window);
 
        return GTK_WIDGET_CLASS (ev_window_parent_class)->focus_in_event (widget, event);
 }
@@ -1514,15 +1895,44 @@ ev_window_focus_out_event (GtkWidget *widget, GdkEventFocus *event)
 {
        EvWindow *window = EV_WINDOW (widget);
        EvWindowPrivate *priv = window->priv;
+       gboolean fullscreen;
 
-       if (priv->fullscreen_mode)
-       {
+       g_object_get (priv->view,
+                     "fullscreen", &fullscreen,
+                     NULL);
+
+       if (fullscreen)
                gtk_widget_hide (priv->fullscreen_popup);
-       }
 
        return GTK_WIDGET_CLASS (ev_window_parent_class)->focus_out_event (widget, event);
 }
 
+static void
+ev_window_screen_changed (GtkWidget *widget,
+                         GdkScreen *old_screen)
+{
+       EvWindow *window = EV_WINDOW (widget);
+       EvWindowPrivate *priv = window->priv;
+       GdkScreen *screen;
+
+       if (GTK_WIDGET_CLASS (ev_window_parent_class)->screen_changed) {
+               GTK_WIDGET_CLASS (ev_window_parent_class)->screen_changed (widget, old_screen);
+       }
+
+       if (priv->fullscreen_popup != NULL) {
+               g_signal_handlers_disconnect_by_func
+                       (old_screen, G_CALLBACK (screen_size_changed_cb), window);
+
+               screen = gtk_widget_get_screen (widget);
+               g_signal_connect_object (screen, "size-changed",
+                                        G_CALLBACK (screen_size_changed_cb),
+                                        window, 0);
+               gtk_window_set_screen (GTK_WINDOW (priv->fullscreen_popup), screen);
+
+               ev_window_update_fullscreen_popup (window);
+       }
+}
+
 static void
 ev_window_set_page_mode (EvWindow         *window,
                         EvWindowPageMode  page_mode)
@@ -1536,15 +1946,12 @@ ev_window_set_page_mode (EvWindow         *window,
        window->priv->page_mode = page_mode;
 
        switch (page_mode) {
-       case PAGE_MODE_SINGLE_PAGE:
+       case PAGE_MODE_DOCUMENT:
                child = window->priv->view;
                break;
        case PAGE_MODE_PASSWORD:
                child = window->priv->password_view;
                break;
-       case PAGE_MODE_CONTINUOUS_PAGE:
-               child = window->priv->page_view;
-               break;
        default:
                g_assert_not_reached ();
        }
@@ -1560,31 +1967,79 @@ ev_window_set_page_mode (EvWindow         *window,
 }
 
 static void
-ev_window_cmd_view_zoom_in (GtkAction *action, EvWindow *ev_window)
+ev_window_cmd_edit_toolbar_cb (GtkDialog *dialog, gint response, gpointer data)
 {
-        g_return_if_fail (EV_IS_WINDOW (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);
+        gtk_widget_destroy (GTK_WIDGET (dialog));
+}
 
-       ev_window_set_sizing_mode (ev_window, EV_SIZING_FREE);
+static void
+ev_window_cmd_edit_rotate_left (GtkAction *action, EvWindow *ev_window)
+{
+       ev_view_rotate_left (EV_VIEW (ev_window->priv->view));
+}
 
-       ev_view_zoom_in (EV_VIEW (ev_window->priv->view));
+static void
+ev_window_cmd_edit_rotate_right (GtkAction *action, EvWindow *ev_window)
+{
+       ev_view_rotate_right (EV_VIEW (ev_window->priv->view));
 }
 
 static void
-ev_window_cmd_view_zoom_out (GtkAction *action, EvWindow *ev_window)
+ev_window_cmd_edit_toolbar (GtkAction *action, EvWindow *ev_window)
 {
-        g_return_if_fail (EV_IS_WINDOW (ev_window));
+       GtkWidget *dialog;
+       GtkWidget *editor;
+
+       dialog = gtk_dialog_new_with_buttons (_("Toolbar Editor"),
+                                             GTK_WINDOW (ev_window), 
+                                             GTK_DIALOG_DESTROY_WITH_PARENT, 
+                                             GTK_STOCK_CLOSE,
+                                             GTK_RESPONSE_CLOSE, 
+                                             NULL);
+       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_window_set_default_size (GTK_WINDOW (dialog), 500, 400);
+         
+       editor = egg_toolbar_editor_new (ev_window->priv->ui_manager,
+                                        ev_application_get_toolbars_model (EV_APP));
+       gtk_container_set_border_width (GTK_CONTAINER (editor), 5);
+       gtk_box_set_spacing (GTK_BOX (EGG_TOOLBAR_EDITOR (editor)), 5);
+             
+       gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), editor);
+       egg_toolbar_editor_load_actions (EGG_TOOLBAR_EDITOR (editor),
+                                        DATADIR "/evince-toolbar.xml");
+
+       egg_editable_toolbar_set_edit_mode
+               (EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar), TRUE);
+
+       g_signal_connect (dialog, "response",
+                         G_CALLBACK (ev_window_cmd_edit_toolbar_cb),
+                         ev_window);
+       gtk_widget_show_all (dialog);
+}
 
-       ev_window_set_sizing_mode (ev_window, EV_SIZING_FREE);
+static void
+ev_window_cmd_view_zoom_in (GtkAction *action, EvWindow *ev_window)
+{
+        g_return_if_fail (EV_IS_WINDOW (ev_window));
 
-       ev_view_zoom_out (EV_VIEW (ev_window->priv->view));
+       ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_FREE);
+       ev_view_zoom_in (EV_VIEW (ev_window->priv->view));
 }
 
 static void
-ev_window_cmd_view_normal_size (GtkAction *action, EvWindow *ev_window)
+ev_window_cmd_view_zoom_out (GtkAction *action, EvWindow *ev_window)
 {
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
-       ev_view_set_size (EV_VIEW (ev_window->priv->view), -1, -1);
+       ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_FREE);
+       ev_view_zoom_out (EV_VIEW (ev_window->priv->view));
 }
 
 static void
@@ -1592,7 +2047,7 @@ ev_window_cmd_go_previous_page (GtkAction *action, EvWindow *ev_window)
 {
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
-       ev_page_cache_prev_page (ev_window->priv->page_cache);
+       ev_view_previous_page (EV_VIEW (ev_window->priv->view));
 }
 
 static void
@@ -1600,7 +2055,7 @@ ev_window_cmd_go_next_page (GtkAction *action, EvWindow *ev_window)
 {
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
-       ev_page_cache_next_page (ev_window->priv->page_cache);
+       ev_view_next_page (EV_VIEW (ev_window->priv->view));
 }
 
 static void
@@ -1622,6 +2077,33 @@ ev_window_cmd_go_last_page (GtkAction *action, EvWindow *ev_window)
        ev_page_cache_set_current_page (ev_window->priv->page_cache, n_pages - 1);
 }
 
+static void
+ev_window_cmd_go_forward (GtkAction *action, EvWindow *ev_window)
+{
+       int n_pages, current_page;
+       
+        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);
+       
+       if (current_page + 10 < n_pages)
+               ev_page_cache_set_current_page (ev_window->priv->page_cache, current_page + 10);
+}
+
+static void
+ev_window_cmd_go_backward (GtkAction *action, EvWindow *ev_window)
+{
+       int current_page;
+       
+        g_return_if_fail (EV_IS_WINDOW (ev_window));
+
+       current_page = ev_page_cache_get_current_page (ev_window->priv->page_cache);
+       
+       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)
 {
@@ -1633,8 +2115,12 @@ ev_window_cmd_view_reload (GtkAction *action, EvWindow *ev_window)
        page = ev_page_cache_get_current_page (ev_window->priv->page_cache);
        uri = g_strdup (ev_window->priv->uri);
 
-       ev_window_open (ev_window, uri);
-       ev_window_open_page (ev_window, page);
+       ev_window_open_uri (ev_window, uri);
+
+       /* In case the number of pages in the document has changed. */
+       page = CLAMP (page, 0, ev_page_cache_get_n_pages (ev_window->priv->page_cache) - 1);
+
+       ev_page_cache_set_current_page (ev_window->priv->page_cache, page);
 
        g_free (uri);
 }
@@ -1667,75 +2153,99 @@ ev_window_cmd_escape (GtkAction *action, EvWindow *window)
 
        widget = gtk_window_get_focus (GTK_WINDOW (window));
        if (widget && gtk_widget_get_ancestor (widget, EGG_TYPE_FIND_BAR)) {
-               update_chrome_flag (window, EV_CHROME_FINDBAR, NULL, FALSE);
+               update_chrome_flag (window, EV_CHROME_FINDBAR, FALSE);
+               gtk_widget_grab_focus (window->priv->view);
        } else {
-               gtk_window_unfullscreen (GTK_WINDOW (window));
+               gboolean fullscreen;
+               gboolean presentation;
+
+               g_object_get (window->priv->view,
+                             "fullscreen", &fullscreen,
+                             "presentation", &presentation,
+                             NULL);
+
+               if (fullscreen)
+                       ev_window_stop_fullscreen (window);
+               if (presentation)
+                       ev_window_stop_presentation (window);
+
+               if (fullscreen && presentation)
+                       g_warning ("Both fullscreen and presentation set somehow");
        }
 }
 
 static void
-update_view_size (EvWindow *window)
+update_view_size (EvView *view, EvWindow *window)
 {
        int width, height;
        GtkRequisition vsb_requisition;
+       GtkRequisition hsb_requisition;
        int scrollbar_spacing;
 
+       /* Calculate the width available for the */
        width = window->priv->scrolled_window->allocation.width;
        height = window->priv->scrolled_window->allocation.height;
 
-       if (gtk_scrolled_window_get_shadow_type
-               (GTK_SCROLLED_WINDOW (window->priv->scrolled_window)) == GTK_SHADOW_IN)
-       {
+       if (gtk_scrolled_window_get_shadow_type (GTK_SCROLLED_WINDOW (window->priv->scrolled_window)) == GTK_SHADOW_IN) {
                width -= 2 * window->priv->view->style->xthickness;
                height -= 2 * window->priv->view->style->ythickness;
        }
 
-       if (window->priv->sizing_mode == EV_SIZING_BEST_FIT) {
-               ev_view_set_size (EV_VIEW (window->priv->view),
-                                 MAX (1, width), MAX (1, height));
-       } else if (window->priv->sizing_mode == EV_SIZING_FIT_WIDTH) {
-               gtk_widget_size_request (GTK_SCROLLED_WINDOW (window->priv->scrolled_window)->vscrollbar,
-                                        &vsb_requisition);
-               gtk_widget_style_get (window->priv->scrolled_window,
-                                     "scrollbar_spacing", &scrollbar_spacing,
-                                     NULL);
-               ev_view_set_size (EV_VIEW (window->priv->view),
-                                 width - vsb_requisition.width - scrollbar_spacing, -1);
-       }
+       gtk_widget_size_request (GTK_SCROLLED_WINDOW (window->priv->scrolled_window)->vscrollbar,
+                                &vsb_requisition);
+       gtk_widget_size_request (GTK_SCROLLED_WINDOW (window->priv->scrolled_window)->hscrollbar,
+                                &hsb_requisition);
+       gtk_widget_style_get (window->priv->scrolled_window,
+                             "scrollbar_spacing", &scrollbar_spacing,
+                             NULL);
+
+       ev_view_set_zoom_for_size (EV_VIEW (window->priv->view),
+                                  MAX (1, width),
+                                  MAX (1, height),
+                                  vsb_requisition.width + scrollbar_spacing,
+                                  hsb_requisition.height + scrollbar_spacing);
 }
 
 static void
-size_allocate_cb (GtkWidget     *scrolled_window,
-                 GtkAllocation *allocation,
-                 EvWindow      *window)
+save_sizing_mode (EvWindow *window)
 {
-       update_view_size (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 (!ev_window_is_empty (window))
+               ev_metadata_manager_set_string (window->priv->uri, "sizing_mode",
+                                               enum_value->value_nick);
 }
 
-static void
-ev_window_set_sizing_mode (EvWindow     *ev_window,
-                          EvSizingMode  sizing_mode)
+static void     
+ev_window_sizing_mode_changed_cb (EvView *view, GParamSpec *pspec,
+                                 EvWindow   *ev_window)
 {
        GtkWidget *scrolled_window;
+       EvSizingMode sizing_mode;
 
-       if (ev_window->priv->sizing_mode == sizing_mode)
-               return;
+       g_object_get (ev_window->priv->view,
+                     "sizing-mode", &sizing_mode,
+                     NULL);
 
        scrolled_window = ev_window->priv->scrolled_window;
-       ev_window->priv->sizing_mode = sizing_mode;
 
-       g_signal_handlers_disconnect_by_func (scrolled_window, size_allocate_cb, ev_window);
+       g_signal_handlers_disconnect_by_func (ev_window->priv->view, update_view_size, ev_window);
 
-       update_view_size (ev_window);
+       if (sizing_mode != EV_SIZING_FREE)
+               update_view_size (NULL, ev_window);
 
        switch (sizing_mode) {
        case EV_SIZING_BEST_FIT:
                g_object_set (G_OBJECT (scrolled_window),
                              "hscrollbar-policy", GTK_POLICY_NEVER,
-                             "vscrollbar-policy", GTK_POLICY_NEVER,
+                             "vscrollbar-policy", GTK_POLICY_AUTOMATIC,
                              NULL);
-               g_signal_connect (scrolled_window, "size-allocate",
-                                 G_CALLBACK (size_allocate_cb),
+               g_signal_connect (ev_window->priv->view, "zoom_invalid",
+                                 G_CALLBACK (update_view_size),
                                  ev_window);
                break;
        case EV_SIZING_FIT_WIDTH:
@@ -1743,8 +2253,8 @@ ev_window_set_sizing_mode (EvWindow     *ev_window,
                              "hscrollbar-policy", GTK_POLICY_NEVER,
                              "vscrollbar-policy", GTK_POLICY_AUTOMATIC,
                              NULL);
-               g_signal_connect (scrolled_window, "size-allocate",
-                                 G_CALLBACK (size_allocate_cb),
+               g_signal_connect (ev_window->priv->view, "zoom_invalid",
+                                 G_CALLBACK (update_view_size),
                                  ev_window);
                break;
        case EV_SIZING_FREE:
@@ -1756,18 +2266,129 @@ ev_window_set_sizing_mode (EvWindow     *ev_window,
        }
 
        update_sizing_buttons (ev_window);
+       save_sizing_mode (ev_window);
+}
+
+static void     
+ev_window_zoom_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_window)
+{
+        update_action_sensitivity (ev_window);
+
+       if (ev_view_get_sizing_mode (view) == EV_SIZING_FREE && !ev_window_is_empty (ev_window)) {
+               ev_metadata_manager_set_double (ev_window->priv->uri, "zoom",
+                                               ev_view_get_zoom (view));
+       }
+}
+
+static void
+ev_window_update_continuous_action (EvWindow *window)
+{
+       GtkAction *action;
+
+       action = gtk_action_group_get_action (window->priv->action_group, "ViewContinuous");
+       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)));
+       g_signal_handlers_unblock_by_func
+               (action, G_CALLBACK (ev_window_cmd_continuous), window);
+}
+
+static void
+ev_window_update_dual_page_action (EvWindow *window)
+{
+       GtkAction *action;
+
+       action = gtk_action_group_get_action (window->priv->action_group, "ViewDual");
+       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)));
+       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)
+{
+       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)));
+}
+
+static void     
+ev_window_rotation_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *window)
+{
+       int rotation;
+
+       rotation = ev_view_get_rotation (EV_VIEW (window->priv->view));
+
+       if (!ev_window_is_empty (window))
+               ev_metadata_manager_set_int (window->priv->uri, "rotation",
+                                            rotation);
+
+       ev_sidebar_thumbnails_refresh (EV_SIDEBAR_THUMBNAILS (window->priv->sidebar_thumbs),
+                                      rotation);
+}
+
+static void
+ev_window_has_selection_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *window)
+{
+       update_action_sensitivity (window);
+}
+
+static void     
+ev_window_dual_mode_changed_cb (EvView *view, 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)));
+}
+
+static char *
+build_comments_string (void)
+{
+       PopplerBackend backend;
+       const char *backend_name;
+       const char *version;
+
+       backend = poppler_get_backend ();
+       version = poppler_get_version ();
+       switch (backend) {
+               case POPPLER_BACKEND_CAIRO:
+                       backend_name = "cairo";
+                       break;
+               case POPPLER_BACKEND_SPLASH:
+                       backend_name = "splash";
+                       break;
+               default:
+                       backend_name = "unknown";
+                       break;
+       }
+
+       return g_strdup_printf (_("PostScript and PDF File Viewer.\n"
+                                 "Using poppler %s (%s)"),
+                               version, backend_name);
 }
 
 static void
 ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window)
 {
        const char *authors[] = {
-               N_("Many..."),
+               "Martin Kretzschmar <m_kretzschmar@gmx.net>",
+               "Jonathan Blandford <jrb@gnome.org>",
+               "Marco Pesenti Gritti <marco@gnome.org>",
+               "Nickolay V. Shmyrev <nshmyrev@yandex.ru>",
+               "Bryan Clark <clarkbw@gnome.org>",
                NULL
        };
 
        const char *documenters[] = {
-               N_("Not so many..."),
+               "Nickolay V. Shmyrev <nshmyrev@yandex.ru>",
                NULL
        };
 
@@ -1786,6 +2407,7 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window)
        };
 
        char *license_trans;
+       char *comments;
 
 #ifdef ENABLE_NLS
        const char **p;
@@ -1799,139 +2421,147 @@ 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 ();
 
        gtk_show_about_dialog (
                GTK_WINDOW (ev_window),
                "name", _("Evince"),
                "version", VERSION,
                "copyright",
-               _("\xc2\xa9 1996-2004 The Evince authors"),
+               _("\xc2\xa9 1996-2005 The Evince authors"),
                "license", license_trans,
                "website", "http://www.gnome.org/projects/evince",
-               "comments", _("PostScript and PDF File Viewer."),
+               "comments", comments,
                "authors", authors,
                "documenters", documenters,
                "translator-credits", _("translator-credits"),
                NULL);
 
+       g_free (comments);
        g_free (license_trans);
 }
 
 static void
 ev_window_view_toolbar_cb (GtkAction *action, EvWindow *ev_window)
 {
-       update_chrome_flag (ev_window, EV_CHROME_TOOLBAR,
-                           GCONF_CHROME_TOOLBAR,
-                           gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
+       gboolean active;
+       
+       active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
+       update_chrome_flag (ev_window, EV_CHROME_TOOLBAR, active);
+       ev_metadata_manager_set_boolean (NULL, "show_toolbar", active);
 }
 
 static void
-ev_window_view_statusbar_cb (GtkAction *action, EvWindow *ev_window)
+ev_window_view_sidebar_cb (GtkAction *action, EvWindow *ev_window)
 {
-       update_chrome_flag (ev_window, EV_CHROME_STATUSBAR,
-                           GCONF_CHROME_STATUSBAR,
-                           gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
+       set_widget_visibility (ev_window->priv->sidebar,
+                              gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
 }
 
 static void
-ev_window_view_sidebar_cb (GtkAction *action, EvWindow *ev_window)
+ev_window_sidebar_current_page_changed_cb (EvSidebar  *ev_sidebar,
+                                          GParamSpec *pspec,
+                                          EvWindow   *ev_window)
 {
-       update_chrome_flag (ev_window, EV_CHROME_SIDEBAR,
-                           GCONF_CHROME_SIDEBAR,
-                           gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
+       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 {
+               g_assert_not_reached();
+       }
+
+       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
 ev_window_sidebar_visibility_changed_cb (EvSidebar *ev_sidebar, GParamSpec *pspec,
                                         EvWindow   *ev_window)
 {
+       EvView *view = EV_VIEW (ev_window->priv->view);
        GtkAction *action;
-       gboolean visible;
-
-       visible = GTK_WIDGET_VISIBLE (ev_sidebar);
 
-       /* In fullscreen mode the sidebar is not visible,
-        * but we don't want to update the chrome
-        */
-       if (ev_window->priv->fullscreen_mode)
-               return;
-       
        action = gtk_action_group_get_action (ev_window->priv->action_group, "ViewSidebar");
        
        g_signal_handlers_block_by_func
                (action, G_CALLBACK (ev_window_view_sidebar_cb), ev_window);
-       gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), visible);
+       gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
+                                     GTK_WIDGET_VISIBLE (ev_sidebar));
        g_signal_handlers_unblock_by_func
                (action, G_CALLBACK (ev_window_view_sidebar_cb), ev_window);
 
-       update_chrome_flag (ev_window, EV_CHROME_SIDEBAR,
-                           GCONF_CHROME_SIDEBAR, visible);
-}
-
-static void
-menu_item_select_cb (GtkMenuItem *proxy, EvWindow *ev_window)
-{
-       GtkAction *action;
-       char *message;
-
-       action = g_object_get_data (G_OBJECT (proxy), "gtk-action");
-       g_return_if_fail (action != NULL);
-
-       g_object_get (G_OBJECT (action), "tooltip", &message, NULL);
-       if (message) {
-               gtk_statusbar_push (GTK_STATUSBAR (ev_window->priv->statusbar),
-                                   ev_window->priv->help_message_cid, message);
-               g_free (message);
+       if (!ev_view_get_presentation (view) && 
+           !ev_view_get_fullscreen (view) &&
+           !ev_window_is_empty (ev_window)) {
+               ev_metadata_manager_set_boolean (ev_window->priv->uri, "sidebar_visibility",
+                                                GTK_WIDGET_VISIBLE (ev_sidebar));
        }
 }
 
-static void
-menu_item_deselect_cb (GtkMenuItem *proxy, EvWindow *ev_window)
-{
-       gtk_statusbar_pop (GTK_STATUSBAR (ev_window->priv->statusbar),
-                          ev_window->priv->help_message_cid);
-}
-
-static void
-connect_proxy_cb (GtkUIManager *ui_manager, GtkAction *action,
-                 GtkWidget *proxy, EvWindow *ev_window)
+static gboolean
+view_menu_popup_cb (EvView         *view,
+                   EvLink         *link,
+                   EvWindow       *ev_window)
 {
-       if (GTK_IS_MENU_ITEM (proxy)) {
-               g_signal_connect (proxy, "select",
-                                 G_CALLBACK (menu_item_select_cb), ev_window);
-               g_signal_connect (proxy, "deselect",
-                                 G_CALLBACK (menu_item_deselect_cb),
-                                 ev_window);
-       }
-}
+       GtkWidget *popup;
+       gboolean   show_external = FALSE;
+       gboolean   show_internal = FALSE;
+       GtkAction *action;
 
-static void
-disconnect_proxy_cb (GtkUIManager *ui_manager, GtkAction *action,
-                    GtkWidget *proxy, EvWindow *ev_window)
-{
-       if (GTK_IS_MENU_ITEM (proxy)) {
-               g_signal_handlers_disconnect_by_func
-                       (proxy, G_CALLBACK (menu_item_select_cb), ev_window);
-               g_signal_handlers_disconnect_by_func
-                       (proxy, G_CALLBACK (menu_item_deselect_cb), ev_window);
-       }
-}
+       if (ev_view_get_presentation (EV_VIEW (ev_window->priv->view)))
+               return FALSE;
+       
+       if (ev_window->priv->link)
+               g_object_unref (ev_window->priv->link);
+       if (link)
+               ev_window->priv->link = g_object_ref (link);
+       else    
+               ev_window->priv->link = NULL;
+
+       popup = ev_window->priv->popup;
+
+       if (ev_window->priv->link) 
+               switch (ev_link_get_link_type (ev_window->priv->link)) {
+                       case EV_LINK_TYPE_PAGE:
+                       case EV_LINK_TYPE_PAGE_FIT:
+                       case EV_LINK_TYPE_PAGE_FITH:
+                       case EV_LINK_TYPE_PAGE_FITV:
+                       case EV_LINK_TYPE_PAGE_FITR:
+                       case EV_LINK_TYPE_PAGE_XYZ:
+                               show_internal = TRUE;
+                               break;
+                       case EV_LINK_TYPE_EXTERNAL_URI:
+                       case EV_LINK_TYPE_LAUNCH:       
+                               show_external = TRUE;
+                               break;
+                       default:
+                               break;
+               }
+       
+       action = gtk_action_group_get_action (ev_window->priv->popups_action_group,
+                                             "OpenLink");
+       gtk_action_set_visible (action, show_external);
 
-static void
-view_status_changed_cb (EvView     *view,
-                       GParamSpec *pspec,
-                       EvWindow   *ev_window)
-{
-       const char *message;
+       action = gtk_action_group_get_action (ev_window->priv->popups_action_group,
+                                             "CopyLinkAddress");
+       gtk_action_set_visible (action, show_external);
 
-       gtk_statusbar_pop (GTK_STATUSBAR (ev_window->priv->statusbar),
-                          ev_window->priv->view_message_cid);
+       action = gtk_action_group_get_action (ev_window->priv->popups_action_group,
+                                             "GoLink");
+       gtk_action_set_visible (action, show_internal);
 
-       message = ev_view_get_status (view);
-       if (message) {
-               gtk_statusbar_push (GTK_STATUSBAR (ev_window->priv->statusbar),
-                                   ev_window->priv->view_message_cid, message);
-       }
+       gtk_menu_popup (GTK_MENU (popup), NULL, NULL,
+                       NULL, NULL,
+                       3, gtk_get_current_event_time ());
+       return FALSE;
 }
 
 static void
@@ -1964,22 +2594,7 @@ static void
 find_bar_close_cb (EggFindBar *find_bar,
                   EvWindow   *ev_window)
 {
-       update_chrome_flag (ev_window, EV_CHROME_FINDBAR, NULL, FALSE);
-}
-
-static void
-ev_window_page_mode_cb (GtkRadioAction *action,
-                       GtkRadioAction *activated_action,
-                       EvWindow       *window)
-{
-       int mode;
-
-       mode = gtk_radio_action_get_current_value (action);
-
-       g_assert (mode == PAGE_MODE_CONTINUOUS_PAGE ||
-                 mode == PAGE_MODE_SINGLE_PAGE);
-
-       ev_window_set_page_mode (window, (EvWindowPageMode) mode);
+       update_chrome_flag (ev_window, EV_CHROME_FINDBAR, FALSE);
 }
 
 static void
@@ -2010,17 +2625,18 @@ find_bar_search_changed_cb (EggFindBar *find_bar,
        if (ev_window->priv->document &&
            EV_IS_DOCUMENT_FIND (ev_window->priv->document)) {
                if (visible && search_string && search_string[0]) {
-                       g_mutex_lock (EV_DOC_MUTEX);
+                       ev_document_doc_mutex_lock ();
                        ev_document_find_begin (EV_DOCUMENT_FIND (ev_window->priv->document), 
-                                               ev_view_get_page (EV_VIEW (ev_window->priv->view)),
+                                               ev_page_cache_get_current_page (ev_window->priv->page_cache),
                                                search_string,
                                                case_sensitive);
-                       g_mutex_unlock (EV_DOC_MUTEX);
+                       ev_document_doc_mutex_unlock ();
                } else {
-                       g_mutex_lock (EV_DOC_MUTEX);
+                       ev_document_doc_mutex_lock ();
                        ev_document_find_cancel (EV_DOCUMENT_FIND (ev_window->priv->document));
-                       g_mutex_unlock (EV_DOC_MUTEX);
+                       ev_document_doc_mutex_unlock ();
 
+                       update_action_sensitivity (ev_window);
                        egg_find_bar_set_status_text (EGG_FIND_BAR (ev_window->priv->find_bar),
                                                      NULL);
                        gtk_widget_queue_draw (GTK_WIDGET (ev_window->priv->view));
@@ -2028,12 +2644,66 @@ find_bar_search_changed_cb (EggFindBar *find_bar,
        }
 }
 
+static void
+find_bar_scroll(EggFindBar *find_bar, GtkScrollType scroll, EvWindow* ev_window)
+{
+       ev_view_scroll(EV_VIEW(ev_window->priv->view), scroll, FALSE);
+}
+
+static void
+zoom_control_changed_cb (EphyZoomAction *action,
+                        float           zoom,
+                        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;
+       } else if (zoom == EPHY_ZOOM_FIT_WIDTH) {
+               mode = EV_SIZING_FIT_WIDTH;
+       } else {
+               mode = EV_SIZING_FREE;
+       }
+       
+       ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), mode);
+       
+       if (mode == EV_SIZING_FREE) {
+               ev_view_set_zoom (EV_VIEW (ev_window->priv->view), zoom, FALSE);
+       }
+}
+
+static void
+ev_window_finalize (GObject *object)
+{
+       GList *windows = ev_application_get_windows (EV_APP);
+
+       if (windows == NULL) {
+               ev_application_shutdown (EV_APP);
+       } else {
+               g_list_free (windows);
+       }
+       
+       G_OBJECT_CLASS (ev_window_parent_class)->finalize (object);
+}
+
 static void
 ev_window_dispose (GObject *object)
 {
        EvWindow *window = EV_WINDOW (object);
        EvWindowPrivate *priv = window->priv;
 
+       if (priv->title) {
+               ev_window_title_free (priv->title);
+               priv->title = NULL;
+       }
+
+       if (priv->recent_view) {
+               g_object_unref (priv->recent_view);
+               priv->recent_view = NULL;
+       }
+
        if (priv->ui_manager) {
                g_object_unref (priv->ui_manager);
                priv->ui_manager = NULL;
@@ -2044,19 +2714,32 @@ ev_window_dispose (GObject *object)
                priv->action_group = NULL;
        }
 
+       if (priv->popups_action_group) {
+               g_object_unref (priv->popups_action_group);
+               priv->popups_action_group = NULL;
+       }
+
+       if (priv->page_cache) {
+               g_signal_handlers_disconnect_by_func (priv->page_cache, page_changed_cb, window);
+               priv->page_cache = NULL;
+       }
+
        if (priv->document) {
                g_object_unref (priv->document);
                priv->document = NULL;
        }
-
+       
        if (priv->view) {
                g_object_unref (priv->view);
                priv->view = NULL;
        }
 
-       if (priv->page_view) {
-               g_object_unref (priv->page_view);
-               priv->page_view = NULL;
+       if (priv->load_job || priv->xfer_job) {
+               ev_window_clear_jobs (window);
+       }
+       
+       if (priv->local_uri) {
+               ev_window_clear_local_uri (window);
        }
 
        if (priv->password_document) {
@@ -2064,9 +2747,11 @@ ev_window_dispose (GObject *object)
                priv->password_document = NULL;
        }
        
-       if (priv->password_uri) {
-               g_free (priv->password_uri);
-               priv->password_uri = NULL;
+       ev_window_close_dialogs (window);
+
+       if (priv->link) {
+               g_object_unref (priv->link);
+               priv->link = NULL;
        }
 
        if (priv->find_bar) {
@@ -2077,6 +2762,16 @@ ev_window_dispose (GObject *object)
                priv->find_bar = NULL;
        }
 
+       if (priv->uri) {
+               g_free (priv->uri);
+               priv->uri = NULL;
+       }
+
+       if (window->priv->fullscreen_timeout_source) {
+               g_source_unref (window->priv->fullscreen_timeout_source);
+               g_source_destroy (window->priv->fullscreen_timeout_source);
+               window->priv->fullscreen_timeout_source = NULL;
+       }
        destroy_fullscreen_popup (window);
 
        G_OBJECT_CLASS (ev_window_parent_class)->dispose (object);
@@ -2089,15 +2784,17 @@ ev_window_class_init (EvWindowClass *ev_window_class)
        GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (ev_window_class);
 
        g_object_class->dispose = ev_window_dispose;
+       g_object_class->finalize = ev_window_finalize;
 
        widget_class->focus_in_event = ev_window_focus_in_event;
        widget_class->focus_out_event = ev_window_focus_out_event;
+       widget_class->screen_changed = ev_window_screen_changed;
 
        g_type_class_add_private (g_object_class, sizeof (EvWindowPrivate));
 }
 
 /* Normal items */
-static GtkActionEntry entries[] = {
+static const GtkActionEntry entries[] = {
        { "File", NULL, N_("_File") },
         { "Edit", NULL, N_("_Edit") },
        { "View", NULL, N_("_View") },
@@ -2105,32 +2802,36 @@ static GtkActionEntry entries[] = {
        { "Help", NULL, N_("_Help") },
 
        /* File menu */
-       { "FileOpen", GTK_STOCK_OPEN, NULL, "<control>O",
+       { "FileOpen", GTK_STOCK_OPEN, N_("_Open..."), "<control>O",
          N_("Open an existing document"),
          G_CALLBACK (ev_window_cmd_file_open) },
-               { "FileSaveAs", GTK_STOCK_SAVE_AS, N_("_Save a Copy..."), NULL,
-         N_("Save the current document with a new filename"),
+               { "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) },
-       { "FilePrint", GTK_STOCK_PRINT, N_("Print..."), "<control>P",
+       { "FilePrint", GTK_STOCK_PRINT, N_("_Print..."), "<control>P",
          N_("Print this document"),
          G_CALLBACK (ev_window_cmd_file_print) },
-       { "FileCloseWindow", GTK_STOCK_CLOSE, NULL, "<control>W",
-         N_("Close this window"),
+       { "FileProperties", GTK_STOCK_PROPERTIES, N_("P_roperties"), "<alt>Return", NULL,
+         G_CALLBACK (ev_window_cmd_file_properties) },                       
+       { "FileCloseWindow", GTK_STOCK_CLOSE, NULL, "<control>W", NULL,
          G_CALLBACK (ev_window_cmd_file_close_window) },
 
         /* Edit menu */
-        { "EditCopy", GTK_STOCK_COPY, NULL, "<control>C",
-          N_("Copy text from the document"),
+        { "EditCopy", GTK_STOCK_COPY, NULL, "<control>C", NULL,
           G_CALLBACK (ev_window_cmd_edit_copy) },
-       { "EditSelectAll", NULL, N_("Select _All"), "<control>A",
-         N_("Select the entire page"),
+       { "EditSelectAll", NULL, N_("Select _All"), "<control>A", NULL,
          G_CALLBACK (ev_window_cmd_edit_select_all) },
         { "EditFind", GTK_STOCK_FIND, NULL, "<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",
-         N_("Find next occurrence of the word or phrase"),
+       { "EditFindNext", NULL, N_("Find Ne_xt"), "<control>G", NULL,
          G_CALLBACK (ev_window_cmd_edit_find_next) },
+        { "EditToolbar", NULL, N_("T_oolbar"), NULL, NULL,
+          G_CALLBACK (ev_window_cmd_edit_toolbar) },
+       { "EditRotateLeft", NULL, N_("Rotate _Left"), NULL, NULL,
+         G_CALLBACK (ev_window_cmd_edit_rotate_left) },
+       { "EditRotateRight", NULL, N_("Rotate _Right"), NULL, NULL,
+         G_CALLBACK (ev_window_cmd_edit_rotate_right) },
 
         /* View menu */
         { "ViewZoomIn", GTK_STOCK_ZOOM_IN, NULL, "<control>plus",
@@ -2139,18 +2840,15 @@ static GtkActionEntry entries[] = {
         { "ViewZoomOut", GTK_STOCK_ZOOM_OUT, NULL, "<control>minus",
           N_("Shrink the document"),
           G_CALLBACK (ev_window_cmd_view_zoom_out) },
-        { "ViewNormalSize", GTK_STOCK_ZOOM_100, NULL, "<control>0",
-          N_("Reset the zoom level to the default value"),
-          G_CALLBACK (ev_window_cmd_view_normal_size) },
         { "ViewReload", GTK_STOCK_REFRESH, N_("_Reload"), "<control>R",
           N_("Reload the document"),
           G_CALLBACK (ev_window_cmd_view_reload) },
 
         /* Go menu */
-        { "GoPreviousPage", GTK_STOCK_GO_BACK, N_("_Previous Page"), "Page_Up",
+        { "GoPreviousPage", GTK_STOCK_GO_BACK, N_("_Previous Page"), "<control>Page_Up",
           N_("Go to the previous page"),
           G_CALLBACK (ev_window_cmd_go_previous_page) },
-        { "GoNextPage", GTK_STOCK_GO_FORWARD, N_("_Next Page"), "Page_Down",
+        { "GoNextPage", GTK_STOCK_GO_FORWARD, N_("_Next Page"), "<control>Page_Down",
           N_("Go to the next page"),
           G_CALLBACK (ev_window_cmd_go_next_page) },
         { "GoFirstPage", GTK_STOCK_GOTO_FIRST, N_("_First Page"), "<control>Home",
@@ -2161,12 +2859,10 @@ static GtkActionEntry entries[] = {
           G_CALLBACK (ev_window_cmd_go_last_page) },
 
        /* Help menu */
-       { "HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1",
-         N_("Display help for the viewer application"),
+       { "HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1", NULL,
          G_CALLBACK (ev_window_cmd_help_contents) },
 
-       { "HelpAbout", GTK_STOCK_ABOUT, N_("_About"), NULL,
-         N_("Display credits for the document viewer creators"),
+       { "HelpAbout", GTK_STOCK_ABOUT, N_("_About"), NULL, NULL,
          G_CALLBACK (ev_window_cmd_help_about) },
 
        /* Toolbar-only */
@@ -2174,25 +2870,72 @@ static GtkActionEntry entries[] = {
          N_("Leave fullscreen mode"),
          G_CALLBACK (ev_window_cmd_leave_fullscreen) },
 
-       { "Escape", NULL, N_("Selection Caret"), "Escape", "",
-         G_CALLBACK (ev_window_cmd_escape) }
+       /* Accellerators */
+       { "Escape", NULL, "", "Escape", "",
+         G_CALLBACK (ev_window_cmd_escape) },
+        { "Slash", GTK_STOCK_FIND, NULL, "slash", NULL,
+          G_CALLBACK (ev_window_cmd_edit_find) },
+        { "PageDown", NULL, "", "Page_Down", NULL,
+          G_CALLBACK (ev_window_cmd_scroll_forward) },
+        { "PageUp", NULL, "", "Page_Up", NULL,
+          G_CALLBACK (ev_window_cmd_scroll_backward) },
+        { "Space", NULL, "", "space", NULL,
+          G_CALLBACK (ev_window_cmd_scroll_forward) },
+        { "ShiftSpace", NULL, "", "<shift>space", NULL,
+          G_CALLBACK (ev_window_cmd_scroll_backward) },
+        { "BackSpace", NULL, "", "BackSpace", NULL,
+          G_CALLBACK (ev_window_cmd_scroll_backward) },
+        { "ShiftBackSpace", NULL, "", "<shift>BackSpace", NULL,
+          G_CALLBACK (ev_window_cmd_scroll_forward) },
+        { "Return", NULL, "", "Return", NULL,
+          G_CALLBACK (ev_window_cmd_scroll_forward) },
+        { "ShiftReturn", NULL, "", "<shift>Return", NULL,
+          G_CALLBACK (ev_window_cmd_scroll_backward) },
+        { "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,
+          G_CALLBACK (ev_window_cmd_view_zoom_in) },
+        { "Equal", GTK_STOCK_ZOOM_IN, NULL, "equal", NULL,
+          G_CALLBACK (ev_window_cmd_view_zoom_in) },
+        { "Minus", GTK_STOCK_ZOOM_OUT, NULL, "minus", NULL,
+          G_CALLBACK (ev_window_cmd_view_zoom_out) },
+        { "FocusPageSelector", NULL, "", "<control>l", NULL,
+          G_CALLBACK (ev_window_cmd_focus_page_selector) },
+        { "GoBackwardFast", NULL, "", "<shift>Page_Up", NULL,
+          G_CALLBACK (ev_window_cmd_go_backward) },
+        { "GoForwardFast", NULL, "", "<shift>Page_Down", NULL,
+          G_CALLBACK (ev_window_cmd_go_forward) },
+        { "KpPlus", GTK_STOCK_ZOOM_IN, NULL, "KP_Add", NULL,
+          G_CALLBACK (ev_window_cmd_view_zoom_in) },
+        { "KpMinus", GTK_STOCK_ZOOM_OUT, NULL, "KP_Subtract", NULL,
+          G_CALLBACK (ev_window_cmd_view_zoom_out) },
+        { "CtrlKpPlus", GTK_STOCK_ZOOM_IN, NULL, "<control>KP_Add", NULL,
+          G_CALLBACK (ev_window_cmd_view_zoom_in) },
+        { "CtrlKpMinus", GTK_STOCK_ZOOM_OUT, NULL, "<control>KP_Subtract", NULL,
+          G_CALLBACK (ev_window_cmd_view_zoom_out) },
 };
 
 /* Toggle items */
-static GtkToggleActionEntry toggle_entries[] = {
+static const GtkToggleActionEntry toggle_entries[] = {
        /* View Menu */
        { "ViewToolbar", NULL, N_("_Toolbar"), "<shift><control>T",
          N_("Show or hide the toolbar"),
          G_CALLBACK (ev_window_view_toolbar_cb), TRUE },
-       { "ViewStatusbar", NULL, N_("_Statusbar"), NULL,
-         N_("Show or hide the statusbar"),
-         G_CALLBACK (ev_window_view_statusbar_cb), TRUE },
-        { "ViewSidebar", NULL, N_("Side _pane"), "F9",
+        { "ViewSidebar", GTK_STOCK_INDEX, N_("Side _Pane"), "F9",
          N_("Show or hide the side pane"),
          G_CALLBACK (ev_window_view_sidebar_cb), TRUE },
+        { "ViewContinuous", EV_STOCK_VIEW_CONTINUOUS, N_("_Continuous"), NULL,
+         N_("Show the entire document"),
+         G_CALLBACK (ev_window_cmd_continuous), TRUE },
+        { "ViewDual", EV_STOCK_VIEW_DUAL, N_("_Dual"), NULL,
+         N_("Show two pages at once"),
+         G_CALLBACK (ev_window_cmd_dual), FALSE },
         { "ViewFullscreen", NULL, N_("_Fullscreen"), "F11",
           N_("Expand the window to fill the screen"),
           G_CALLBACK (ev_window_cmd_view_fullscreen) },
+        { "ViewPresentation", NULL, N_("_Presentation"), "F5",
+          N_("Run document as a presentation"),
+          G_CALLBACK (ev_window_cmd_view_presentation) },
         { "ViewBestFit", EV_STOCK_ZOOM_PAGE, N_("_Best Fit"), NULL,
           N_("Make the current document fill the window"),
           G_CALLBACK (ev_window_cmd_view_best_fit) },
@@ -2201,13 +2944,16 @@ static GtkToggleActionEntry toggle_entries[] = {
           G_CALLBACK (ev_window_cmd_view_page_width) },
 };
 
-static GtkRadioActionEntry page_view_entries[] = {
-       { "SinglePage", GTK_STOCK_DND, N_("Single"), NULL,
-         N_("Show the document one page at a time"),
-         PAGE_MODE_SINGLE_PAGE },
-       { "ContinuousPage", GTK_STOCK_DND_MULTIPLE, N_("Multi"), NULL,
-         N_("Show the full document at once"),
-         PAGE_MODE_CONTINUOUS_PAGE }
+/* Popups specific items */
+static const GtkActionEntry popups_entries [] = {
+       /* Links */
+       { "OpenLink", GTK_STOCK_OPEN, N_("_Open Link"), NULL,
+         NULL, G_CALLBACK (ev_popup_cmd_open_link) },
+       { "GoLink", GTK_STOCK_GO_FORWARD, N_("_Go To"), NULL,
+         NULL, G_CALLBACK (ev_popup_cmd_open_link) },
+       { "CopyLinkAddress", NULL, N_("_Copy Link Address"), NULL,
+         NULL,
+         G_CALLBACK (ev_popup_cmd_copy_link_address) },
 };
 
 static void
@@ -2215,19 +2961,49 @@ drag_data_received_cb (GtkWidget *widget, GdkDragContext *context,
                       gint x, gint y, GtkSelectionData *selection_data,
                       guint info, guint time, gpointer gdata)
 {
-       GList    *uri_list = NULL;
+       GList  *uri_list = NULL;
+       GSList *uris = NULL;
+       gchar  *uri;
 
        uri_list = gnome_vfs_uri_list_parse ((gchar *) selection_data->data);
 
        if (uri_list) {
-               ev_window_open_uri_list (EV_WINDOW (widget), uri_list);
-               
+               while (uri_list) {
+                       uri = gnome_vfs_uri_to_string (uri_list->data, GNOME_VFS_URI_HIDE_NONE);
+                       uris = g_slist_append (uris, (gpointer) uri);
+                       
+                       uri_list = g_list_next (uri_list);
+               }
+
                gnome_vfs_uri_list_free (uri_list);
+               
+               ev_application_open_uri_list (EV_APP, uris, 0);
+               
+               g_slist_free (uris);
 
                gtk_drag_finish (context, TRUE, FALSE, time);
        }
 }
 
+static void
+activate_link_cb (EvPageAction *page_action, EvLink *link, EvWindow *window)
+{
+       g_return_if_fail (EV_IS_WINDOW (window));
+
+       ev_view_goto_link (EV_VIEW (window->priv->view), link);
+       gtk_widget_grab_focus (window->priv->view);
+}
+
+static gboolean
+activate_label_cb (EvPageAction *page_action, char *label, EvWindow *window)
+{
+       g_return_val_if_fail (EV_IS_WINDOW (window), FALSE);
+
+       gtk_widget_grab_focus (window->priv->view);
+
+       return ev_page_cache_set_page_label (window->priv->page_cache, label);
+}
+
 static void
 register_custom_actions (EvWindow *window, GtkActionGroup *group)
 {
@@ -2237,7 +3013,24 @@ register_custom_actions (EvWindow *window, GtkActionGroup *group)
                               "name", PAGE_SELECTOR_ACTION,
                               "label", _("Page"),
                               "tooltip", _("Select Page"),
+                              "visible_overflown", FALSE,
                               NULL);
+       g_signal_connect (action, "activate_link",
+                         G_CALLBACK (activate_link_cb), window);
+       g_signal_connect (action, "activate_label",
+                         G_CALLBACK (activate_label_cb), window);
+       gtk_action_group_add_action (group, action);
+       g_object_unref (action);
+
+       action = g_object_new (EPHY_TYPE_ZOOM_ACTION,
+                              "name", ZOOM_CONTROL_ACTION,
+                              "label", _("Zoom"),
+                              "stock_id", GTK_STOCK_ZOOM_IN,
+                              "tooltip", _("Adjust the zoom level"),
+                              "zoom", 1.0,
+                              NULL);
+       g_signal_connect (action, "zoom_to_level",
+                         G_CALLBACK (zoom_control_changed_cb), window);
        gtk_action_group_add_action (group, action);
        g_object_unref (action);
 }
@@ -2295,76 +3088,209 @@ set_chrome_actions (EvWindow *window)
                                      (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, "ViewSidebar");
-       g_signal_handlers_block_by_func
-               (action, G_CALLBACK (ev_window_view_sidebar_cb), window);
-       gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
-                                     (priv->chrome & EV_CHROME_SIDEBAR) != 0);
-       g_signal_handlers_unblock_by_func
-               (action, G_CALLBACK (ev_window_view_sidebar_cb), window);
+static void
+sidebar_widget_model_set (EvSidebarLinks *ev_sidebar_links,
+                         GParamSpec     *pspec,
+                         EvWindow       *ev_window)
+{
+       GtkTreeModel *model;
+       GtkAction *action;
 
-       action= gtk_action_group_get_action (action_group, "ViewStatusbar");
-       g_signal_handlers_block_by_func
-               (action, G_CALLBACK (ev_window_view_statusbar_cb), window);
-       gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
-                                     (priv->chrome & EV_CHROME_STATUSBAR) != 0);
-       g_signal_handlers_unblock_by_func
-               (action, G_CALLBACK (ev_window_view_statusbar_cb), window);
+       g_object_get (G_OBJECT (ev_sidebar_links),
+                     "model", &model,
+                     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);
+       g_object_unref (model);
 }
 
-static EvChrome
-load_chrome (void)
+
+static void
+ev_window_set_view_accels_sensitivity (EvWindow *window, gboolean sensitive)
 {
-       EvChrome chrome = EV_CHROME_NORMAL;
-       GConfClient *client;
-       GConfValue *value;
+       if (window->priv->action_group) {
+               set_action_sensitive (window, "PageDown", sensitive);
+               set_action_sensitive (window, "PageUp", sensitive);
+               set_action_sensitive (window, "Space", sensitive);
+               set_action_sensitive (window, "ShiftSpace", sensitive);
+               set_action_sensitive (window, "BackSpace", sensitive);
+               set_action_sensitive (window, "ShiftBackSpace", sensitive);
+               set_action_sensitive (window, "Return", sensitive);
+               set_action_sensitive (window, "ShiftReturn", sensitive);
+               set_action_sensitive (window, "Slash", sensitive);
+               set_action_sensitive (window, "Plus", sensitive);
+               set_action_sensitive (window, "Minus", sensitive);
+               set_action_sensitive (window, "KpPlus", sensitive);
+               set_action_sensitive (window, "KpMinus", sensitive);
+               set_action_sensitive (window, "Equal", sensitive);
+       }
+}
 
-       client = gconf_client_get_default ();
+static gboolean
+view_actions_focus_in_cb (GtkWidget *widget, GdkEventFocus *event, EvWindow *window)
+{
+       update_chrome_flag (window, EV_CHROME_RAISE_TOOLBAR, FALSE);
+       set_action_sensitive (window, "ViewToolbar", TRUE);
 
-       value = gconf_client_get (client, GCONF_CHROME_TOOLBAR, NULL);
-       if (value != NULL) {
-               if (value->type == GCONF_VALUE_BOOL && !gconf_value_get_bool (value)) {
-                       chrome &= ~EV_CHROME_TOOLBAR;
-               }
-               gconf_value_free (value);
+       ev_window_set_view_accels_sensitivity (window, TRUE);
+
+       return FALSE;
+}
+
+static gboolean
+view_actions_focus_out_cb (GtkWidget *widget, GdkEventFocus *event, EvWindow *window)
+{
+       ev_window_set_view_accels_sensitivity (window, FALSE);
+
+       return FALSE;
+}
+
+static void
+sidebar_page_main_widget_update_cb (GObject *ev_sidebar_page,
+                                   GParamSpec         *pspec,
+                                   EvWindow           *ev_window)
+{
+       GtkWidget *widget;
+       
+       g_object_get (ev_sidebar_page, "main_widget", &widget, NULL);
+
+       if (widget != NULL) {           
+               g_signal_connect_object (widget, "focus_in_event",
+                                        G_CALLBACK (view_actions_focus_in_cb),
+                                        ev_window, 0);
+               g_signal_connect_object (widget, "focus_out_event",
+                                        G_CALLBACK (view_actions_focus_out_cb),
+                                        ev_window, 0);
+               g_object_unref (widget);
+       }
+}
+
+static gboolean
+window_state_event_cb (EvWindow *window, GdkEventWindowState *event, gpointer dummy)
+{
+       if (!(event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN)) {
+               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);
        }
 
-       value = gconf_client_get (client, GCONF_CHROME_SIDEBAR, NULL);
-       if (value != NULL) {
-               if (value->type == GCONF_VALUE_BOOL && !gconf_value_get_bool (value)) {
-                       chrome &= ~EV_CHROME_SIDEBAR;
+       return FALSE;
+}
+
+static gboolean
+window_configure_event_cb (EvWindow *window, GdkEventConfigure *event, gpointer dummy)
+{
+       char *uri = window->priv->uri;
+       GdkWindowState state;
+       int x, y, width, height;
+
+       state = gdk_window_get_state (GTK_WIDGET (window)->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)) {
+                       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);
                }
-               gconf_value_free (value);
        }
 
-       value = gconf_client_get (client, GCONF_CHROME_STATUSBAR, NULL);
-       if (value != NULL) {
-               if (value->type == GCONF_VALUE_BOOL && !gconf_value_get_bool (value)) {
-                       chrome &= ~EV_CHROME_STATUSBAR;
+       return FALSE;
+}
+
+static void
+sidebar_links_link_activated_cb (EvSidebarLinks *sidebar_links, EvLink *link, EvWindow *window)
+{
+       ev_view_goto_link (EV_VIEW (window->priv->view), link);
+}
+
+static void
+launch_link (EvWindow *window, EvLink *link)
+{
+       const char *filename = ev_link_get_filename (link);
+       char *uri = NULL;
+
+       if (filename  && g_path_is_absolute (filename)) {
+               uri = gnome_vfs_get_uri_from_local_path (filename);
+       } else {
+               GnomeVFSURI *base_uri, *resolved_uri;
+
+               base_uri = gnome_vfs_uri_new (window->priv->uri);
+               if (base_uri && filename) {
+                       resolved_uri = gnome_vfs_uri_resolve_relative (base_uri, filename);     
+                       if (resolved_uri) {
+                               uri = gnome_vfs_uri_to_string (resolved_uri, GNOME_VFS_URI_HIDE_NONE);
+                               gnome_vfs_uri_unref (resolved_uri);
+                       }
+                       gnome_vfs_uri_unref (base_uri);
                }
-               gconf_value_free (value);
        }
 
-       g_object_unref (client);
+       if (uri) {
+               gnome_vfs_url_show (uri);
+       } else {
+               gnome_vfs_url_show (filename);
+       }
+
+       g_free (uri);
 
-       return chrome;
+       /* According to the PDF spec filename can be an executable. I'm not sure
+          allowing to launch executables is a good idea though. -- marco */
 }
 
 static void
-sidebar_widget_model_set (EvSidebarLinks *ev_sidebar_links,
-                         GParamSpec     *pspec,
-                         EvWindow       *ev_window)
+launch_external_uri (EvWindow *window, EvLink *link)
 {
-       GtkTreeModel *model;
-       GtkAction *action;
+       const char *uri;
+       char *escaped;
 
-       g_object_get (G_OBJECT (ev_sidebar_links),
-                     "model", &model,
-                     NULL);
+       uri = ev_link_get_uri (link);
+       escaped = gnome_vfs_escape_host_and_path_string (uri);
 
-       action = gtk_action_group_get_action (ev_window->priv->action_group, PAGE_SELECTOR_ACTION);
-       ev_page_action_set_model (EV_PAGE_ACTION (action), model);
+       gnome_vfs_url_show (escaped);
+       g_free (escaped);
+}
+
+static void
+view_external_link_cb (EvView *view, EvLink *link, EvWindow *window)
+{
+       switch (ev_link_get_link_type (link)) {
+       case EV_LINK_TYPE_EXTERNAL_URI:
+               launch_external_uri (window, link);
+               break;
+       case EV_LINK_TYPE_LAUNCH:
+               launch_link (window, link);
+               break;
+       default:
+               g_assert_not_reached ();
+       }
+}
+
+static void
+ev_popup_cmd_open_link (GtkAction *action, EvWindow *window)
+{
+       ev_view_goto_link (EV_VIEW (window->priv->view), window->priv->link);
+}
+
+static void
+ev_popup_cmd_copy_link_address (GtkAction *action, EvWindow *window)
+{
+       GtkClipboard *clipboard;
+       const gchar *uri;
+
+       uri = ev_link_get_uri (window->priv->link);
+
+       clipboard = gtk_widget_get_clipboard (GTK_WIDGET (window),
+                                             GDK_SELECTION_CLIPBOARD);
+       gtk_clipboard_set_text (clipboard, uri, -1);
 }
 
 static void
@@ -2374,14 +3300,16 @@ ev_window_init (EvWindow *ev_window)
        GtkAccelGroup *accel_group;
        GError *error = NULL;
        GtkWidget *sidebar_widget, *toolbar_dock;
-       GConfValue *value;
-       GConfClient *client;
-       int sidebar_size;
+
+       g_signal_connect (ev_window, "configure_event",
+                         G_CALLBACK (window_configure_event_cb), NULL);
+       g_signal_connect (ev_window, "window_state_event",
+                         G_CALLBACK (window_state_event_cb), NULL);
 
        ev_window->priv = EV_WINDOW_GET_PRIVATE (ev_window);
 
-       ev_window->priv->page_mode = PAGE_MODE_SINGLE_PAGE;
-       update_window_title (NULL, NULL, ev_window);
+       ev_window->priv->page_mode = PAGE_MODE_DOCUMENT;
+       ev_window->priv->title = ev_window_title_new (ev_window);
 
        ev_window->priv->main_box = gtk_vbox_new (FALSE, 0);
        gtk_container_add (GTK_CONTAINER (ev_window), ev_window->priv->main_box);
@@ -2395,11 +3323,6 @@ ev_window_init (EvWindow *ev_window)
        gtk_action_group_add_toggle_actions (action_group, toggle_entries,
                                             G_N_ELEMENTS (toggle_entries),
                                             ev_window);
-       gtk_action_group_add_radio_actions (action_group, page_view_entries,
-                                           G_N_ELEMENTS (page_view_entries),
-                                           ev_window->priv->page_mode,
-                                           G_CALLBACK (ev_window_page_mode_cb),
-                                           ev_window);
        set_action_properties (action_group);
        register_custom_actions (ev_window, action_group);
 
@@ -2411,15 +3334,20 @@ ev_window_init (EvWindow *ev_window)
                gtk_ui_manager_get_accel_group (ev_window->priv->ui_manager);
        gtk_window_add_accel_group (GTK_WINDOW (ev_window), accel_group);
 
-       g_signal_connect (ev_window->priv->ui_manager, "connect_proxy",
-                         G_CALLBACK (connect_proxy_cb), ev_window);
-       g_signal_connect (ev_window->priv->ui_manager, "disconnect_proxy",
-                         G_CALLBACK (disconnect_proxy_cb), ev_window);
+       ev_window_set_view_accels_sensitivity (ev_window, FALSE);
+
+       action_group = gtk_action_group_new ("PopupsActions");
+       ev_window->priv->popups_action_group = action_group;
+       gtk_action_group_set_translation_domain (action_group, NULL);
+       gtk_action_group_add_actions (action_group, popups_entries,
+                                     G_N_ELEMENTS (popups_entries), ev_window);
+       gtk_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)) {
-               g_message ("building menus failed: %s", error->message);
+               g_warning ("building menus failed: %s", error->message);
                g_error_free (error);
        }
 
@@ -2439,18 +3367,14 @@ ev_window_init (EvWindow *ev_window)
                            FALSE, FALSE, 0);
        gtk_widget_show (toolbar_dock);
 
-       ev_window->priv->toolbar =
-               gtk_ui_manager_get_widget (ev_window->priv->ui_manager,
-                                          "/ToolBar");
+       ev_window->priv->toolbar = egg_editable_toolbar_new_with_model
+                               (ev_window->priv->ui_manager, ev_application_get_toolbars_model (EV_APP));
+       egg_editable_toolbar_show (EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar),
+                                  "DefaultToolBar");
        gtk_box_pack_start (GTK_BOX (toolbar_dock), ev_window->priv->toolbar,
                            TRUE, TRUE, 0);
        gtk_widget_show (ev_window->priv->toolbar);
 
-       ev_window->priv->fullscreen_toolbar =
-               gtk_ui_manager_get_widget (ev_window->priv->ui_manager, "/LeaveFullscreenToolbar");
-       gtk_toolbar_set_show_arrow (GTK_TOOLBAR (ev_window->priv->fullscreen_toolbar), TRUE);
-       gtk_toolbar_set_style (GTK_TOOLBAR (ev_window->priv->fullscreen_toolbar), GTK_TOOLBAR_BOTH_HORIZ);
-
        /* Add the main area */
        ev_window->priv->hpaned = gtk_hpaned_new ();
        g_signal_connect (ev_window->priv->hpaned,
@@ -2458,17 +3382,7 @@ ev_window_init (EvWindow *ev_window)
                          G_CALLBACK (ev_window_sidebar_position_change_cb),
                          ev_window);
        
-       sidebar_size = SIDEBAR_DEFAULT_SIZE;
-       client = gconf_client_get_default ();
-       value = gconf_client_get (client, GCONF_SIDEBAR_SIZE, NULL);
-       if (value != NULL) {
-               if (value->type == GCONF_VALUE_INT) {
-                       sidebar_size = gconf_value_get_int (value);
-               }
-               gconf_value_free (value);
-       }
-       g_object_unref (client);
-       gtk_paned_set_position (GTK_PANED (ev_window->priv->hpaned), sidebar_size);
+       gtk_paned_set_position (GTK_PANED (ev_window->priv->hpaned), SIDEBAR_DEFAULT_SIZE);
        gtk_box_pack_start (GTK_BOX (ev_window->priv->main_box), ev_window->priv->hpaned,
                            TRUE, TRUE, 0);
        gtk_widget_show (ev_window->priv->hpaned);
@@ -2480,22 +3394,31 @@ ev_window_init (EvWindow *ev_window)
 
        /* Stub sidebar, for now */
        sidebar_widget = ev_sidebar_links_new ();
+       ev_window->priv->sidebar_links = sidebar_widget;
        g_signal_connect (sidebar_widget,
                          "notify::model",
                          G_CALLBACK (sidebar_widget_model_set),
                          ev_window);
+       g_signal_connect (sidebar_widget,
+                         "link_activated",
+                         G_CALLBACK (sidebar_links_link_activated_cb),
+                         ev_window);
+       sidebar_page_main_widget_update_cb (G_OBJECT (sidebar_widget), NULL, ev_window);
        gtk_widget_show (sidebar_widget);
        ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar),
-                            "index",
-                            _("Index"),
                             sidebar_widget);
 
-       ev_window->priv->thumbs_sidebar = ev_sidebar_thumbnails_new ();
-       gtk_widget_show (ev_window->priv->thumbs_sidebar);
+       sidebar_widget = ev_sidebar_thumbnails_new ();
+       ev_window->priv->sidebar_thumbs = sidebar_widget;
+       g_signal_connect (sidebar_widget,
+                         "notify::main-widget",
+                         G_CALLBACK (sidebar_page_main_widget_update_cb),
+                         ev_window);
+       sidebar_page_main_widget_update_cb (G_OBJECT (sidebar_widget), NULL, ev_window);
+       gtk_widget_show (sidebar_widget);
        ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar),
-                            "thumbnails",
-                            _("Thumbnails"),
-                            ev_window->priv->thumbs_sidebar);
+                            sidebar_widget);
+
 
        ev_window->priv->scrolled_window =
                GTK_WIDGET (g_object_new (GTK_TYPE_SCROLLED_WINDOW,
@@ -2507,57 +3430,78 @@ ev_window_init (EvWindow *ev_window)
                        ev_window->priv->scrolled_window);
 
        ev_window->priv->view = ev_view_new ();
-       ev_view_set_spacing (EV_VIEW (ev_window->priv->view), VIEW_SPACING);    
        ev_window->priv->password_view = ev_password_view_new ();
        g_signal_connect_swapped (ev_window->priv->password_view,
                                  "unlock",
                                  G_CALLBACK (ev_window_popup_password_dialog),
                                  ev_window);
+       g_signal_connect_object (ev_window->priv->view, "focus_in_event",
+                                G_CALLBACK (view_actions_focus_in_cb),
+                                ev_window, 0);
+       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_object (ev_window->priv->view,
+                                "popup",
+                                G_CALLBACK (view_menu_popup_cb),
+                                ev_window, 0);
        gtk_widget_show (ev_window->priv->view);
-       //gtk_widget_show (ev_window->priv->page_view);
        gtk_widget_show (ev_window->priv->password_view);
 
+       ev_window->priv->find_bar = egg_find_bar_new ();
+       gtk_box_pack_end (GTK_BOX (ev_window->priv->main_box),
+                         ev_window->priv->find_bar,
+                         FALSE, TRUE, 0);
+
        /* We own a ref on these widgets, as we can swap them in and out */
        g_object_ref (ev_window->priv->view);
-       //g_object_ref (ev_window->priv->page_view);
        g_object_ref (ev_window->priv->password_view);
 
        gtk_container_add (GTK_CONTAINER (ev_window->priv->scrolled_window),
                           ev_window->priv->view);
+
        g_signal_connect (ev_window->priv->view,
                          "notify::find-status",
                          G_CALLBACK (view_find_status_changed_cb),
                          ev_window);
        g_signal_connect (ev_window->priv->view,
-                         "notify::status",
-                         G_CALLBACK (view_status_changed_cb),
+                         "notify::sizing-mode",
+                         G_CALLBACK (ev_window_sizing_mode_changed_cb),
+                         ev_window);
+       g_signal_connect (ev_window->priv->view,
+                         "notify::zoom",
+                         G_CALLBACK (ev_window_zoom_changed_cb),
+                         ev_window);
+       g_signal_connect (ev_window->priv->view,
+                         "notify::dual-page",
+                         G_CALLBACK (ev_window_dual_mode_changed_cb),
+                         ev_window);
+       g_signal_connect (ev_window->priv->view,
+                         "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),
+                         ev_window);
+       g_signal_connect (ev_window->priv->view,
+                         "notify::has-selection",
+                         G_CALLBACK (ev_window_has_selection_changed_cb),
                          ev_window);
 
-       ev_window->priv->statusbar = gtk_statusbar_new ();
-       gtk_box_pack_end (GTK_BOX (ev_window->priv->main_box),
-                         ev_window->priv->statusbar,
-                         FALSE, TRUE, 0);
-       ev_window->priv->help_message_cid = gtk_statusbar_get_context_id
-               (GTK_STATUSBAR (ev_window->priv->statusbar), "help_message");
-       ev_window->priv->view_message_cid = gtk_statusbar_get_context_id
-               (GTK_STATUSBAR (ev_window->priv->statusbar), "view_message");
-
-       ev_window->priv->find_bar = egg_find_bar_new ();
-       gtk_box_pack_end (GTK_BOX (ev_window->priv->main_box),
-                         ev_window->priv->find_bar,
-                         FALSE, TRUE, 0);
-
-       ev_window_setup_recent (ev_window);
-       ev_window->priv->chrome = load_chrome ();
-       set_chrome_actions (ev_window);
-       update_chrome_visibility (ev_window);
-
-       /* Connect sidebar signals */
+       /* Connect sidebar signals */
        g_signal_connect (ev_window->priv->sidebar,
                          "notify::visible",
                          G_CALLBACK (ev_window_sidebar_visibility_changed_cb),
                          ev_window);
-       
+       g_signal_connect (ev_window->priv->sidebar,
+                         "notify::current-page",
+                         G_CALLBACK (ev_window_sidebar_current_page_changed_cb),
+                         ev_window);
+
        /* Connect to find bar signals */
        g_signal_connect (ev_window->priv->find_bar,
                          "previous",
@@ -2583,13 +3527,18 @@ ev_window_init (EvWindow *ev_window)
                          "notify::visible",
                          G_CALLBACK (find_bar_search_changed_cb),
                          ev_window);
-
-       g_signal_connect (ev_window, "window-state-event",
-                         G_CALLBACK (ev_window_state_event_cb),
+       g_signal_connect (ev_window->priv->find_bar,
+                         "scroll",
+                         G_CALLBACK (find_bar_scroll),
                          ev_window);
 
-       /* Give focus to the scrolled window */
-       gtk_widget_grab_focus (ev_window->priv->scrolled_window);
+       /* Popups */
+       ev_window->priv->popup = gtk_ui_manager_get_widget (ev_window->priv->ui_manager,
+                                                          "/DocumentPopup");
+       ev_window->priv->link = NULL;
+
+       /* Give focus to the document view */
+       gtk_widget_grab_focus (ev_window->priv->view);
 
        /* Drag and Drop */
        gtk_drag_dest_unset (GTK_WIDGET (ev_window));
@@ -2599,8 +3548,30 @@ ev_window_init (EvWindow *ev_window)
        g_signal_connect (G_OBJECT (ev_window), "drag_data_received",
                          G_CALLBACK (drag_data_received_cb), NULL);
 
-       /* Set it to something random to force a change */
-       ev_window->priv->sizing_mode = EV_SIZING_FREE;
-       ev_window_set_sizing_mode (ev_window,  EV_SIZING_FIT_WIDTH);
+       /* Set it user interface params */
+
+       ev_window_setup_recent (ev_window);
+       setup_chrome_from_metadata (ev_window);
+       set_chrome_actions (ev_window);
+       update_chrome_visibility (ev_window);
+       update_sidebar_visibility (ev_window);
+
+       gtk_window_set_default_size (GTK_WINDOW (ev_window),
+                                    600, 600);
+       setup_view_from_metadata (ev_window);
+
+        ev_window_sizing_mode_changed_cb (EV_VIEW (ev_window->priv->view), NULL, ev_window);
        update_action_sensitivity (ev_window);
 }
+
+GtkWidget *
+ev_window_new (void)
+{
+       GtkWidget *ev_window;
+
+       ev_window = GTK_WIDGET (g_object_new (EV_TYPE_WINDOW,
+                                             "type", GTK_WINDOW_TOPLEVEL,
+                                             NULL));
+
+       return ev_window;
+}