]> www.fi.muni.cz Git - evince.git/blobdiff - shell/ev-window.c
Slash -> Find
[evince.git] / shell / ev-window.c
index a3bd2d9fb64120a7dff77ef6f50f47112bd6bcca..652d435552020d6f4f1d25758cb61a9e1995c502 100644 (file)
 #include "ev-sidebar-links.h"
 #include "ev-sidebar-thumbnails.h"
 #include "ev-view.h"
-#include "ev-page-view.h"
 #include "ev-password.h"
 #include "ev-password-view.h"
 #include "ev-print-job.h"
+#include "ev-document-thumbnails.h"
+#include "ev-document-links.h"
+#include "ev-document-types.h"
 #include "ev-document-find.h"
 #include "ev-document-security.h"
+#include "ev-job-queue.h"
 #include "eggfindbar.h"
-
-#include "pdf-document.h"
-#include "pixbuf-document.h"
-#include "ps-document.h"
+#include "egg-recent-view-gtk.h"
+#include "egg-recent-view.h"
+#include "egg-recent-model.h"
+#include "ephy-zoom.h"
+#include "ephy-zoom-action.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>
@@ -82,7 +87,6 @@ struct _EvWindowPrivate {
        GtkWidget *toolbar;
        GtkWidget *hpaned;
        GtkWidget *sidebar;
-       GtkWidget *thumbs_sidebar;
        GtkWidget *find_bar;
        GtkWidget *scrolled_window;
        GtkWidget *view;
@@ -98,6 +102,7 @@ struct _EvWindowPrivate {
        char *uri;
 
        EvDocument *document;
+       EvPageCache *page_cache;
 
        EvWindowPageMode page_mode;
        /* These members are used temporarily when in PAGE_MODE_PASSWORD */
@@ -106,12 +111,14 @@ struct _EvWindowPrivate {
        char *password_uri;
 
        EvChrome chrome;
-       gboolean fullscreen_mode;
-       EvSizingMode sizing_mode;
        GSource *fullscreen_timeout_source;
+
+       /* recent file stuff */
+       EggRecentModel *recent_model;
+       EggRecentViewGtk *recent_view;
 };
 
-static GtkTargetEntry ev_drop_types[] = {
+static const GtkTargetEntry ev_drop_types[] = {
        { "text/uri-list", 0, 0 }
 };
 
@@ -120,19 +127,39 @@ 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"
 
-static void     ev_window_update_fullscreen_popup (EvWindow         *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);
+#define GCONF_SIDEBAR_SIZE      "/apps/evince/sidebar_size"
+
+#define SIDEBAR_DEFAULT_SIZE    132
+
+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_sizing_mode_changed_cb        (EvView           *view,
+                                                        GParamSpec       *pspec,
+                                                        EvWindow         *ev_window);
+static void     ev_window_add_recent                    (EvWindow         *window,
+                                                        const char       *filename);
+static void     ev_window_fullscreen                    (EvWindow         *window);
+static void     ev_window_unfullscreen                  (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);
+
 
 G_DEFINE_TYPE (EvWindow, ev_window, GTK_TYPE_WINDOW)
 
@@ -149,49 +176,56 @@ set_action_sensitive (EvWindow   *ev_window,
 static void
 update_action_sensitivity (EvWindow *ev_window)
 {
+       EvView *view;
        EvDocument *document;
        EvWindowPageMode page_mode;
-       EvView *view;
+       gboolean sensitive, has_pages = FALSE, has_document;
+       int n_pages = 0, page = -1;
 
+       view = EV_VIEW (ev_window->priv->view);
        document = ev_window->priv->document;
        page_mode = ev_window->priv->page_mode;
-
-       view = EV_VIEW (ev_window->priv->view);
+       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;
+       }
 
        /* File menu */
        /* "FileOpen": always sensitive */
-       set_action_sensitive (ev_window, "FileSaveAs", document!=NULL);
-       set_action_sensitive (ev_window, "FilePrint", document!=NULL);
+       set_action_sensitive (ev_window, "FileSaveAs", has_document);
+       set_action_sensitive (ev_window, "FilePrint", has_pages);
        /* "FileCloseWindow": always sensitive */
 
         /* Edit menu */
-       set_action_sensitive (ev_window, "EditCopy", document!=NULL);
-       set_action_sensitive (ev_window, "EditSelectAll", document!=NULL);
 
-       if (document)
-               set_action_sensitive (ev_window, "EditFind", EV_IS_DOCUMENT_FIND (document));
-       else
-               set_action_sensitive (ev_window, "EditFind", FALSE);
+       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, "EditFind",
+                             has_pages && EV_IS_DOCUMENT_FIND (document));
+       set_action_sensitive (ev_window, "EditFindNext",
+                             ev_view_can_find_next (view));
 
         /* View menu */
-       set_action_sensitive (ev_window, "ViewZoomIn", document!=NULL);
-       set_action_sensitive (ev_window, "ViewZoomOut", document!=NULL);
-       set_action_sensitive (ev_window, "ViewNormalSize", document!=NULL);
-       set_action_sensitive (ev_window, "ViewBestFit", document!=NULL);
-       set_action_sensitive (ev_window, "ViewPageWidth", document!=NULL);
+       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, "ViewNormalSize", has_pages);
+       set_action_sensitive (ev_window, "ViewBestFit", has_pages);
+       set_action_sensitive (ev_window, "ViewPageWidth", has_pages);
+       set_action_sensitive (ev_window, "ViewReload", has_pages);
 
         /* Go menu */
        if (document) {
-               int n_pages;
-               int page;
-
-               page = ev_view_get_page (EV_VIEW (ev_window->priv->view));
-               n_pages = ev_document_get_n_pages (document);
-
-               set_action_sensitive (ev_window, "GoPreviousPage", page > 1);
-               set_action_sensitive (ev_window, "GoNextPage", page < n_pages);
-               set_action_sensitive (ev_window, "GoFirstPage", page > 1);
-               set_action_sensitive (ev_window, "GoLastPage", page < n_pages);
+               set_action_sensitive (ev_window, "GoPreviousPage", page > 0);
+               set_action_sensitive (ev_window, "GoNextPage", page < n_pages - 1);
+               set_action_sensitive (ev_window, "GoFirstPage", page > 0);
+               set_action_sensitive (ev_window, "GoLastPage", page < n_pages - 1);
        } else {
                set_action_sensitive (ev_window, "GoFirstPage", FALSE);
                set_action_sensitive (ev_window, "GoPreviousPage", FALSE);
@@ -212,12 +246,29 @@ update_action_sensitivity (EvWindow *ev_window)
        /* "HelpAbout": always sensitive */
 
        /* Toolbar-specific actions: */
-       set_action_sensitive (ev_window, PAGE_SELECTOR_ACTION, document!=NULL);
+       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_FREE) {
+               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
 set_widget_visibility (GtkWidget *widget, gboolean visible)
 {
+       g_return_if_fail (GTK_IS_WIDGET (widget));
+       
        if (visible)
                gtk_widget_show (widget);
        else
@@ -229,12 +280,17 @@ update_chrome_visibility (EvWindow *window)
 {
        EvWindowPrivate *priv = window->priv;
        gboolean menubar, toolbar, sidebar, findbar, statusbar, 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 && !priv->fullscreen_mode;
-       toolbar = (priv->chrome & EV_CHROME_TOOLBAR) != 0 && !priv->fullscreen_mode;
-       sidebar = (priv->chrome & EV_CHROME_SIDEBAR) != 0 && !priv->fullscreen_mode;
+       menubar = (priv->chrome & EV_CHROME_MENUBAR) != 0 && !fullscreen_mode;
+       toolbar = (priv->chrome & EV_CHROME_TOOLBAR) != 0 && !fullscreen_mode;
+       sidebar = (priv->chrome & EV_CHROME_SIDEBAR) != 0 && !fullscreen_mode;
        fullscreen_toolbar = (priv->chrome & EV_CHROME_TOOLBAR) != 0;
-       statusbar = (priv->chrome & EV_CHROME_STATUSBAR) != 0 && !priv->fullscreen_mode;
+       statusbar = (priv->chrome & EV_CHROME_STATUSBAR) != 0 && !fullscreen_mode;
        findbar = (priv->chrome & EV_CHROME_FINDBAR) != 0;
 
        set_widget_visibility (priv->menubar, menubar);
@@ -245,7 +301,7 @@ update_chrome_visibility (EvWindow *window)
        set_widget_visibility (priv->fullscreen_toolbar, fullscreen_toolbar);
 
        if (priv->fullscreen_popup != NULL) {
-               set_widget_visibility (priv->fullscreen_popup, priv->fullscreen_mode);
+               set_widget_visibility (priv->fullscreen_popup, fullscreen);
        }
 }
 
@@ -272,42 +328,119 @@ update_chrome_flag (EvWindow *window, EvChrome flag, const char *pref, gboolean
 }
 
 static void
-update_sizing_buttons (EvWindow *ev_window)
+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)
 {
-       GtkWidget *best_fit;
-       GtkWidget *fit_width;
+       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);
+}
+
+static void
+update_sizing_buttons (EvWindow *window)
+{
+       GtkActionGroup *action_group = window->priv->action_group;
+       GtkAction *action;
+       gboolean best_fit, page_width;
+       EvSizingMode sizing_mode;
 
-       best_fit = gtk_ui_manager_get_widget (ev_window->priv->ui_manager,
-                                             "/ToolBar/ViewBestFit");
-       fit_width = gtk_ui_manager_get_widget (ev_window->priv->ui_manager,
-                                             "/ToolBar/ViewPageWidth");
+       if (window->priv->view == NULL)
+               return;
+
+       g_object_get (window->priv->view,
+                     "sizing_mode", &sizing_mode,
+                     NULL);
 
-       switch (ev_window->priv->sizing_mode) {
+       switch (sizing_mode) {
        case EV_SIZING_BEST_FIT:
-               gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (best_fit), TRUE);
-               gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (fit_width), FALSE);
+               best_fit = TRUE;
+               page_width = FALSE;
                break;
        case EV_SIZING_FIT_WIDTH:
-               gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (best_fit), FALSE);
-               gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (fit_width), TRUE);
+               best_fit = FALSE;
+               page_width = TRUE;
                break;
-       case EV_SIZING_FREE:
-               gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (best_fit), FALSE);
-               gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (fit_width), FALSE);
+
+       default:
+               best_fit = page_width = FALSE;
                break;
        }
-}
 
-void
-ev_window_open_page (EvWindow *ev_window, int page)
-{
-       ev_view_set_page (EV_VIEW (ev_window->priv->view), page);
+       action = gtk_action_group_get_action (action_group, "ViewBestFit");
+       g_signal_handlers_block_by_func
+               (action, G_CALLBACK (ev_window_cmd_view_best_fit), window);
+       gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), best_fit);
+       g_signal_handlers_unblock_by_func
+               (action, G_CALLBACK (ev_window_cmd_view_best_fit), window);
+
+       action = gtk_action_group_get_action (action_group, "ViewPageWidth");   
+       g_signal_handlers_block_by_func
+               (action, G_CALLBACK (ev_window_cmd_view_page_width), 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_link (EvWindow *ev_window, EvLink *link)
+ev_window_open_page (EvWindow *ev_window, int page)
 {
-       ev_view_go_to_link (EV_VIEW (ev_window->priv->view), link);
+       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);
+       }
 }
 
 gboolean
@@ -335,44 +468,6 @@ unable_to_load (EvWindow   *ev_window,
        gtk_widget_destroy (dialog);
 }
 
-/* Would be nice to have this in gdk-pixbuf */
-static gboolean
-mime_type_supported_by_gdk_pixbuf (const gchar *mime_type)
-{
-       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;
-                       }
-               }
-
-               if (retval)
-                       break;
-
-               list = list->next;
-       }
-
-       g_slist_free (formats);
-
-       return retval;
-}
-
 static void
 update_window_title (EvDocument *document, GParamSpec *pspec, EvWindow *ev_window)
 {
@@ -381,9 +476,8 @@ update_window_title (EvDocument *document, GParamSpec *pspec, EvWindow *ev_windo
        gboolean password_needed;
 
        password_needed = (ev_window->priv->password_document != NULL);
-
-       if (document) {
-               doc_title = ev_document_get_title (document);
+       if (document && ev_window->priv->page_cache) {
+               doc_title = ev_page_cache_get_title (ev_window->priv->page_cache);
 
                /* Make sure we get a valid title back */
                if (doc_title) {
@@ -406,7 +500,11 @@ update_window_title (EvDocument *document, GParamSpec *pspec, EvWindow *ev_windo
        }
 
        if (doc_title == NULL && ev_window->priv->uri) {
-               doc_title = g_path_get_basename (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);
        }
 
        if (password_needed) {
@@ -430,41 +528,69 @@ update_window_title (EvDocument *document, GParamSpec *pspec, EvWindow *ev_windo
 }
 
 static void
-update_total_pages (EvWindow *ev_window)
+find_changed_cb (EvDocument *document, int page, EvWindow *ev_window)
 {
-       GtkAction *action;
-       int pages;
+       update_action_sensitivity (ev_window);
+}
 
-       pages = ev_document_get_n_pages (ev_window->priv->document);
-       action = gtk_action_group_get_action
-               (ev_window->priv->action_group, PAGE_SELECTOR_ACTION);
-       ev_page_action_set_total_pages (EV_PAGE_ACTION (action), pages);
+static void
+page_changed_cb (EvPageCache *page_cache,
+                gint         page,
+                EvWindow    *ev_window)
+{
+       update_action_sensitivity (ev_window);
+}
+
+static void
+update_document_mode (EvWindow *window, EvDocumentMode mode)
+{
+       if (mode == EV_DOCUMENT_MODE_FULL_SCREEN) {
+               ev_window_fullscreen (window);
+       } else if (mode == EV_DOCUMENT_MODE_PRESENTATION) {
+               ev_window_run_presentation (window);
+       }
 }
 
-/* This function assumes that ev_window just had ev_window->document set.
- */
 static void
 ev_window_setup_document (EvWindow *ev_window)
 {
+       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);
+       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",
+                                        G_CALLBACK (find_changed_cb),  
+                                        ev_window, 0);
+       }
 
        ev_window_set_page_mode (ev_window, PAGE_MODE_SINGLE_PAGE);
 
        ev_sidebar_set_document (sidebar, document);
-       ev_view_set_document (view, document);
+
+       if (ev_page_cache_get_n_pages (ev_window->priv->page_cache) > 0) {
+               ev_view_set_document (view, document);
+       }
 
        update_window_title (document, NULL, ev_window);
-       update_total_pages (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);
+
+       info = ev_document_get_info (document);
+       update_document_mode (ev_window, info->mode);
+       g_free (info);
 }
 
 static void
@@ -479,9 +605,12 @@ password_dialog_response (GtkWidget *password_dialog,
                gchar *uri;
 
                password = ev_password_dialog_get_password (password_dialog);
-               if (password)
+               if (password) {
+                       ev_document_doc_mutex_lock ();
                        ev_document_security_set_password (EV_DOCUMENT_SECURITY (ev_window->priv->password_document),
                                                           password);
+                       ev_document_doc_mutex_unlock ();
+               }
                g_free (password);
 
                document = ev_window->priv->password_document;
@@ -518,9 +647,10 @@ ev_window_popup_password_dialog (EvWindow *ev_window)
 
        update_window_title (ev_window->priv->password_document, NULL, ev_window);
        if (ev_window->priv->password_dialog == NULL) {
-               gchar *file_name;
+               gchar *basename, *file_name;
 
-               file_name = g_path_get_basename (ev_window->priv->password_uri);
+               basename = g_path_get_basename (ev_window->priv->password_uri);
+               file_name = gnome_vfs_unescape_string_for_display (basename);
                ev_window->priv->password_dialog =
                        ev_password_dialog_new (GTK_WIDGET (ev_window), file_name);
                g_object_add_weak_pointer (G_OBJECT (ev_window->priv->password_dialog),
@@ -529,6 +659,7 @@ ev_window_popup_password_dialog (EvWindow *ev_window)
                                  "response",
                                  G_CALLBACK (password_dialog_response),
                                  ev_window);
+               g_free (basename);
                g_free (file_name);
                gtk_widget_show (ev_window->priv->password_dialog);
        } else {
@@ -573,6 +704,8 @@ start_loading_document (EvWindow   *ev_window,
                        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, uri);
 
                return TRUE;
        }
@@ -582,15 +715,18 @@ start_loading_document (EvWindow   *ev_window,
 
        if (error->domain == EV_DOCUMENT_ERROR &&
            error->code == EV_DOCUMENT_ERROR_ENCRYPTED) {
-               char *file_name;
+               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);
+               base_name = g_path_get_basename (uri);
+               file_name = gnome_vfs_unescape_string_for_display (base_name);
+
                ev_password_view_set_file_name (EV_PASSWORD_VIEW (ev_window->priv->password_view),
                                                file_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);
@@ -602,52 +738,20 @@ start_loading_document (EvWindow   *ev_window,
        return FALSE;
 }
 
-static gboolean
-is_file_supported (const gchar *mime_type)
-{
-       static char *supported_types [] = {
-               "application/pdf",
-               "application/postscript",
-               "application/x-gzpostscript",
-               "image/x-eps",
-               NULL
-       };
-       gint   i;
-       
-       g_return_val_if_fail (mime_type != NULL, FALSE);
-
-       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;
-}
-
 void
 ev_window_open (EvWindow *ev_window, const char *uri)
 {
        EvDocument *document = NULL;
-       char *mime_type;
+       GType document_type;
+       char *mime_type = NULL;
 
        g_free (ev_window->priv->uri);
        ev_window->priv->uri = g_strdup (uri);
 
-       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);
-       else if (mime_type_supported_by_gdk_pixbuf (mime_type))
-               document = g_object_new (PIXBUF_TYPE_DOCUMENT, NULL);
+       document_type = ev_document_type_lookup (uri, &mime_type);
+       if (document_type != G_TYPE_INVALID) {
+               document = g_object_new (document_type, NULL);
+       }
 
        if (document) {
                start_loading_document (ev_window, document, uri);
@@ -671,16 +775,15 @@ static void
 ev_window_open_uri_list (EvWindow *ev_window, GList *uri_list)
 {
        GList *list;
-       gchar *uri, *mime_type;
+       gchar *uri;
        
        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_document_type_lookup (uri, NULL) != G_TYPE_INVALID) {
                        if (ev_window_is_empty (EV_WINDOW (ev_window))) {
                                ev_window_open (ev_window, uri);
                                
@@ -695,7 +798,6 @@ ev_window_open_uri_list (EvWindow *ev_window, GList *uri_list)
                        }
                }
 
-               g_free (mime_type);
                g_free (uri);
 
                list = g_list_next (list);
@@ -708,6 +810,69 @@ ev_window_cmd_file_open (GtkAction *action, EvWindow *ev_window)
        ev_application_open (EV_APP, NULL);
 }
 
+static void
+ev_window_cmd_recent_file_activate (EggRecentViewGtk *view, EggRecentItem *item,
+                                   EvWindow *ev_window)
+{
+       char *uri;
+       GtkWidget *window;
+
+       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);
+       
+       g_free (uri);
+}
+
+static void
+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);
+}
+
+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_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_set_model (EGG_RECENT_VIEW (ev_window->priv->recent_view),
+                                  ev_window->priv->recent_model);
+
+       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);
+       
+       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)
@@ -780,6 +945,7 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
        GtkWidget *fc;
        GtkFileFilter *pdf_filter, *all_filter;
        gchar *uri = NULL;
+       gboolean success;
 
        fc = gtk_file_chooser_dialog_new (
                _("Save a Copy"),
@@ -812,8 +978,12 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
                    !overwrite_existing_file (GTK_WINDOW (fc), uri))
                                continue;
 */
+               
+               ev_document_doc_mutex_lock ();
+               success = ev_document_save (ev_window->priv->document, uri, NULL);
+               ev_document_doc_mutex_unlock ();
 
-               if (ev_document_save (ev_window->priv->document, uri, NULL))
+               if (success)
                        break;
                else
                        save_error_dialog (GTK_WINDOW (fc), uri);
@@ -860,7 +1030,7 @@ ev_window_print (EvWindow *ev_window)
        config = gnome_print_config_default ();
        job = gnome_print_job_new (config);
 
-       print_dialog = gnome_print_dialog_new (job, _("Print"),
+       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),
@@ -888,7 +1058,7 @@ ev_window_print (EvWindow *ev_window)
                                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, "Settings.Engine.Backend.Driver"));
+                                       config, (guchar *)"Settings.Engine.Backend.Driver"));
                        gtk_dialog_run (GTK_DIALOG (dialog));
                        gtk_widget_destroy (dialog);
 
@@ -965,10 +1135,18 @@ ev_window_cmd_edit_find (GtkAction *action, EvWindow *ev_window)
        } else {
                update_chrome_flag (ev_window, EV_CHROME_FINDBAR, NULL, TRUE);
 
-               egg_find_bar_grab_focus (EGG_FIND_BAR (ev_window->priv->find_bar));
+               gtk_widget_grab_focus (ev_window->priv->find_bar);
        }
 }
 
+static void
+ev_window_cmd_edit_find_next (GtkAction *action, EvWindow *ev_window)
+{
+        g_return_if_fail (EV_IS_WINDOW (ev_window));
+
+       ev_view_find_next (EV_VIEW (ev_window->priv->view));
+}
+
 static void
 ev_window_cmd_edit_copy (GtkAction *action, EvWindow *ev_window)
 {
@@ -1026,16 +1204,25 @@ screen_size_changed_cb (GdkScreen *screen,
        ev_window_update_fullscreen_popup (window);
 }
 
+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);
+}
+
 static void
 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;
        }
@@ -1171,19 +1358,35 @@ 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);
+       g_signal_connect_object (gdk_screen_get_default (), "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);
 
        return popup;
 }
 
+
+static void
+ev_window_update_fullscreen_action (EvWindow *window)
+{
+       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_fullscreen (EvWindow *window)
 {
-       window->priv->fullscreen_mode = TRUE;
-
+       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);
@@ -1204,75 +1407,120 @@ 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);
 }
 
 static void
 ev_window_unfullscreen (EvWindow *window)
 {
-       window->priv->fullscreen_mode = FALSE;
+       EvView *view = EV_VIEW (window->priv->view);
 
+       ev_view_set_fullscreen (view, FALSE);
        g_object_set (G_OBJECT (window->priv->scrolled_window),
                      "shadow-type", GTK_SHADOW_IN,
                      NULL);
 
        fullscreen_clear_timeout (window);
 
-       g_signal_handlers_disconnect_by_func (window->priv->view,
+       g_signal_handlers_disconnect_by_func (view,
                                              (gpointer) fullscreen_motion_notify_cb,
                                              window);
-
-//     destroy_fullscreen_popup (window);
-
+       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);
 }
 
 static void
-ev_window_cmd_view_fullscreen (GtkAction *action, EvWindow *ev_window)
+ev_window_cmd_view_fullscreen (GtkAction *action, EvWindow *window)
 {
        gboolean fullscreen;
 
-        g_return_if_fail (EV_IS_WINDOW (ev_window));
+        g_return_if_fail (EV_IS_WINDOW (window));
+       ev_window_stop_presentation (window);
 
        fullscreen = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
-
        if (fullscreen) {
-               gtk_window_fullscreen (GTK_WINDOW (ev_window));
+               ev_window_fullscreen (window);
        } else {
-               gtk_window_unfullscreen (GTK_WINDOW (ev_window));
+               ev_window_unfullscreen (window);
        }
 }
 
-static gboolean
-ev_window_state_event_cb (GtkWidget *widget, GdkEventWindowState *event, EvWindow *window)
+static void
+ev_window_update_presentation_action (EvWindow *window)
 {
-       if (event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN)
-       {
-               GtkActionGroup *action_group;
-               GtkAction *action;
-               gboolean fullscreen;
+       GtkAction *action;
 
-               fullscreen = event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN;
+       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);
+}
 
-               if (fullscreen)
-               {
-                       ev_window_fullscreen (window);
-               }
-               else
-               {
-                       ev_window_unfullscreen (window);
-               }
+static void
+ev_window_run_presentation (EvWindow *window)
+{
+       g_object_set (G_OBJECT (window->priv->scrolled_window),
+                     "shadow-type", GTK_SHADOW_NONE,
+                     NULL);
 
-               action_group = window->priv->action_group;
+       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);
+}
+
+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);
+}
+
+static void
+ev_window_cmd_view_presentation (GtkAction *action, EvWindow *window)
+{
+       gboolean presentation;
+
+        g_return_if_fail (EV_IS_WINDOW (window));
+
+       presentation = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
+       if (presentation) {
+               ev_window_run_presentation (window);
+       } else {
+               ev_window_stop_presentation (window);
+       }
+}
 
-               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 gboolean
+ev_window_state_event (GtkWidget *widget, GdkEventWindowState *event)
+{
+       EvWindow *window = EV_WINDOW (widget);
+
+       if (event->changed_mask & GDK_WINDOW_STATE_MAXIMIZED) {
+               gboolean show;
 
+               show = (event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED) == 0;
+
+               gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR (window->priv->statusbar),
+                                                  show);
        }
 
        return FALSE;
@@ -1283,11 +1531,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)
-       {
+       g_object_get (priv->view,
+                     "fullscreen", &fullscreen,
+                     NULL);
+
+       if (fullscreen)
                gtk_widget_show (priv->fullscreen_popup);
-       }
 
        return GTK_WIDGET_CLASS (ev_window_parent_class)->focus_in_event (widget, event);
 }
@@ -1297,11 +1548,14 @@ 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);
 }
@@ -1347,9 +1601,9 @@ ev_window_cmd_view_zoom_in (GtkAction *action, EvWindow *ev_window)
 {
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
-       ev_window_set_sizing_mode (ev_window, EV_SIZING_FREE);
-
+       ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_FREE);
        ev_view_zoom_in (EV_VIEW (ev_window->priv->view));
+       update_action_sensitivity (ev_window);
 }
 
 static void
@@ -1357,9 +1611,9 @@ ev_window_cmd_view_zoom_out (GtkAction *action, EvWindow *ev_window)
 {
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
-       ev_window_set_sizing_mode (ev_window, EV_SIZING_FREE);
-
+       ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_FREE);
        ev_view_zoom_out (EV_VIEW (ev_window->priv->view));
+       update_action_sensitivity (ev_window);
 }
 
 static void
@@ -1367,101 +1621,75 @@ ev_window_cmd_view_normal_size (GtkAction *action, EvWindow *ev_window)
 {
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
-       ev_view_normal_size (EV_VIEW (ev_window->priv->view));
+       ev_view_zoom_normal (EV_VIEW (ev_window->priv->view));
+       update_action_sensitivity (ev_window);
 }
 
 static void
-ev_window_cmd_view_best_fit (GtkAction *action, EvWindow *ev_window)
+ev_window_cmd_go_previous_page (GtkAction *action, EvWindow *ev_window)
 {
-       EvWindowPrivate *priv = ev_window->priv;
-       GtkWidget *button;
-
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
-       button = gtk_ui_manager_get_widget (priv->ui_manager, "/ToolBar/ViewBestFit");
-       if (! gtk_toggle_tool_button_get_active (GTK_TOGGLE_TOOL_BUTTON (button)))
-               return;
-
-       ev_window_set_sizing_mode (ev_window, EV_SIZING_BEST_FIT);
+       ev_page_cache_prev_page (ev_window->priv->page_cache);
 }
 
 static void
-ev_window_cmd_view_page_width (GtkAction *action, EvWindow *ev_window)
+ev_window_cmd_go_next_page (GtkAction *action, EvWindow *ev_window)
 {
-       EvWindowPrivate *priv = ev_window->priv;
-       GtkWidget *button;
-       int width, height;
-       GtkRequisition vsb_requisition;
-       int scrollbar_spacing;
-
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
-       button = gtk_ui_manager_get_widget (priv->ui_manager, "/ToolBar/ViewPageWidth");
-       if (! gtk_toggle_tool_button_get_active (GTK_TOGGLE_TOOL_BUTTON (button)))
-               return;
-
-
-       width = priv->scrolled_window->allocation.width;
-       height = priv->scrolled_window->allocation.height;
-
-       /* the scrolled window has a GTK_SHADOW_IN */
-       width -= 2 * priv->view->style->xthickness;
-       height -= 2 * priv->view->style->ythickness;
-
-       gtk_widget_size_request (
-               GTK_SCROLLED_WINDOW (priv->scrolled_window)->vscrollbar,
-               &vsb_requisition);
-       gtk_widget_style_get (priv->scrolled_window,
-                             "scrollbar_spacing", &scrollbar_spacing,
-                             NULL);
-
-       ev_window_set_sizing_mode (ev_window, EV_SIZING_FIT_WIDTH);
-
-       ev_view_fit_width (EV_VIEW (ev_window->priv->view),
-                          width, height,
-                          vsb_requisition.width + scrollbar_spacing);
+       ev_page_cache_next_page (ev_window->priv->page_cache);
 }
 
 static void
-ev_window_cmd_go_previous_page (GtkAction *action, EvWindow *ev_window)
+ev_window_cmd_go_first_page (GtkAction *action, EvWindow *ev_window)
 {
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
-       ev_view_set_page (EV_VIEW (ev_window->priv->view),
-                         ev_view_get_page (EV_VIEW (ev_window->priv->view)) - 1);
+       ev_page_cache_set_current_page (ev_window->priv->page_cache, 0);
 }
 
 static void
-ev_window_cmd_go_next_page (GtkAction *action, EvWindow *ev_window)
+ev_window_cmd_go_last_page (GtkAction *action, EvWindow *ev_window)
 {
+       int n_pages;
+
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
-       ev_view_set_page (EV_VIEW (ev_window->priv->view),
-                         ev_view_get_page (EV_VIEW (ev_window->priv->view)) + 1);
+       n_pages = ev_page_cache_get_n_pages (ev_window->priv->page_cache);
+       ev_page_cache_set_current_page (ev_window->priv->page_cache, n_pages - 1);
 }
 
 static void
-ev_window_cmd_go_first_page (GtkAction *action, EvWindow *ev_window)
+ev_window_cmd_view_reload (GtkAction *action, EvWindow *ev_window)
 {
-        g_return_if_fail (EV_IS_WINDOW (ev_window));
+       char *uri;
+       int page;
 
-       ev_view_set_page (EV_VIEW (ev_window->priv->view), 1);
-}
+       g_return_if_fail (EV_IS_WINDOW (ev_window));
 
-static void
-ev_window_cmd_go_last_page (GtkAction *action, EvWindow *ev_window)
-{
-        g_return_if_fail (EV_IS_WINDOW (ev_window));
+       page = ev_page_cache_get_current_page (ev_window->priv->page_cache);
+       uri = g_strdup (ev_window->priv->uri);
 
-       ev_view_set_page (EV_VIEW (ev_window->priv->view), G_MAXINT);
+       ev_window_open (ev_window, uri);
+       ev_window_open_page (ev_window, page);
+
+       g_free (uri);
 }
 
 static void
 ev_window_cmd_help_contents (GtkAction *action, EvWindow *ev_window)
 {
+       GError *error = NULL;
+
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
-        /* FIXME */
+       gnome_help_display ("evince.xml", NULL, &error);
+
+       if(error != NULL) {
+               g_warning (error->message);
+               g_error_free (error);
+       }
 }
 
 static void
@@ -1471,55 +1699,95 @@ ev_window_cmd_leave_fullscreen (GtkAction *action, EvWindow *window)
 }
 
 static void
-size_allocate_cb (GtkWidget     *scrolled_window,
-                 GtkAllocation *allocation,
-                 EvWindow      *ev_window)
+ev_window_cmd_escape (GtkAction *action, EvWindow *window)
+{
+       GtkWidget *widget;
+
+       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);
+       } else {
+               gboolean fullscreen;
+               gboolean presentation;
+
+               g_object_get (window->priv->view,
+                             "fullscreen", &fullscreen,
+                             "presentation", &presentation,
+                             NULL);
+
+               if (fullscreen)
+                       ev_window_unfullscreen (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)
 {
        int width, height;
        GtkRequisition vsb_requisition;
+       GtkRequisition hsb_requisition;
        int scrollbar_spacing;
 
-       width = ev_window->priv->scrolled_window->allocation.width;
-       height = ev_window->priv->scrolled_window->allocation.height;
-
-       /* the scrolled window has a GTK_SHADOW_IN */
-       width -= 2 * ev_window->priv->view->style->xthickness;
-       height -= 2 * ev_window->priv->view->style->ythickness;
+       /* Calculate the width available for the */
+       width = window->priv->scrolled_window->allocation.width;
+       height = window->priv->scrolled_window->allocation.height;
 
-       if (ev_window->priv->sizing_mode == EV_SIZING_BEST_FIT) {
-               ev_view_best_fit (EV_VIEW (ev_window->priv->view),
-                                 MAX (1, width), MAX (1, height));
-       } else if (ev_window->priv->sizing_mode == EV_SIZING_FIT_WIDTH) {
-               gtk_widget_size_request (GTK_SCROLLED_WINDOW (ev_window->priv->scrolled_window)->vscrollbar,
-                                        &vsb_requisition);
-               gtk_widget_style_get (ev_window->priv->scrolled_window,
-                                     "scrollbar_spacing", &scrollbar_spacing,
-                                     NULL);
-               ev_view_fit_width (EV_VIEW (ev_window->priv->view),
-                                  width, height,
-                                  vsb_requisition.width + scrollbar_spacing);
+       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;
        }
+
+       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
-ev_window_set_sizing_mode (EvWindow     *ev_window,
-                          EvSizingMode  sizing_mode)
+size_allocate_cb (GtkWidget     *scrolled_window,
+                 GtkAllocation *allocation,
+                 EvWindow      *window)
+{
+       update_view_size (window);
+}
+
+static void     
+ev_window_sizing_mode_changed_cb (EvView *view, GParamSpec *pspec,
+                                 EvWindow   *ev_window)
 {
        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);
 
+       if (sizing_mode != EV_SIZING_FREE)
+               update_view_size (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),
@@ -1542,7 +1810,6 @@ ev_window_set_sizing_mode (EvWindow     *ev_window,
                break;
        }
 
-       ev_view_set_mode (EV_VIEW (ev_window->priv->view), sizing_mode);
        update_sizing_buttons (ev_window);
 }
 
@@ -1634,14 +1901,17 @@ ev_window_sidebar_visibility_changed_cb (EvSidebar *ev_sidebar, GParamSpec *pspe
                                         EvWindow   *ev_window)
 {
        GtkAction *action;
-       gboolean visible;
+       gboolean visible, fullscreen;
 
+       g_object_get (ev_window->priv->view,
+                     "fullscreen", &fullscreen,
+                     NULL);
        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)
+       if (fullscreen)
                return;
        
        action = gtk_action_group_get_action (ev_window->priv->action_group, "ViewSidebar");
@@ -1705,32 +1975,6 @@ disconnect_proxy_cb (GtkUIManager *ui_manager, GtkAction *action,
        }
 }
 
-static void
-update_current_page (EvWindow *ev_window,
-                    EvView   *view)
-{
-       int page;
-       GtkAction *action;
-       EvSidebarThumbnails *thumbs;
-
-       thumbs = EV_SIDEBAR_THUMBNAILS (ev_window->priv->thumbs_sidebar);
-       ev_sidebar_thumbnails_select_page (thumbs, ev_view_get_page (view));
-
-       action = gtk_action_group_get_action
-               (ev_window->priv->action_group, PAGE_SELECTOR_ACTION);
-
-       page = ev_view_get_page (EV_VIEW (ev_window->priv->view));
-       ev_page_action_set_current_page (EV_PAGE_ACTION (action), page);
-}
-
-static void
-view_page_changed_cb (EvView   *view,
-                     EvWindow *ev_window)
-{
-       update_current_page (ev_window, view);
-       update_action_sensitivity (ev_window);
-}
-
 static void
 view_status_changed_cb (EvView     *view,
                        GParamSpec *pspec,
@@ -1823,10 +2067,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) {
-                       ev_document_find_begin (EV_DOCUMENT_FIND (ev_window->priv->document), search_string, case_sensitive);
+               if (visible && search_string && search_string[0]) {
+                       ev_document_doc_mutex_lock ();
+                       ev_document_find_begin (EV_DOCUMENT_FIND (ev_window->priv->document), 
+                                               ev_page_cache_get_current_page (ev_window->priv->page_cache),
+                                               search_string,
+                                               case_sensitive);
+                       ev_document_doc_mutex_unlock ();
                } else {
+                       ev_document_doc_mutex_lock ();
                        ev_document_find_cancel (EV_DOCUMENT_FIND (ev_window->priv->document));
+                       ev_document_doc_mutex_unlock ();
+
                        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));
@@ -1834,6 +2086,28 @@ find_bar_search_changed_cb (EggFindBar *find_bar,
        }
 }
 
+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_zoom (EV_VIEW (ev_window->priv->view), zoom, FALSE);
+       }
+       
+       ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), mode);
+       update_action_sensitivity (ev_window);
+}
+
 static void
 ev_window_dispose (GObject *object)
 {
@@ -1850,11 +2124,16 @@ ev_window_dispose (GObject *object)
                priv->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;
@@ -1875,6 +2154,14 @@ ev_window_dispose (GObject *object)
                priv->password_uri = NULL;
        }
 
+       if (priv->find_bar) {
+               g_signal_handlers_disconnect_by_func
+                       (window->priv->find_bar,
+                        G_CALLBACK (find_bar_close_cb),
+                        window);
+               priv->find_bar = NULL;
+       }
+
        destroy_fullscreen_popup (window);
 
        G_OBJECT_CLASS (ev_window_parent_class)->dispose (object);
@@ -1888,6 +2175,7 @@ ev_window_class_init (EvWindowClass *ev_window_class)
 
        g_object_class->dispose = ev_window_dispose;
 
+       widget_class->window_state_event = ev_window_state_event;
        widget_class->focus_in_event = ev_window_focus_in_event;
        widget_class->focus_out_event = ev_window_focus_out_event;
 
@@ -1895,7 +2183,7 @@ ev_window_class_init (EvWindowClass *ev_window_class)
 }
 
 /* Normal items */
-static GtkActionEntry entries[] = {
+static const GtkActionEntry entries[] = {
        { "File", NULL, N_("_File") },
         { "Edit", NULL, N_("_Edit") },
        { "View", NULL, N_("_View") },
@@ -1926,6 +2214,9 @@ static GtkActionEntry entries[] = {
         { "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"),
+         G_CALLBACK (ev_window_cmd_edit_find_next) },
 
         /* View menu */
         { "ViewZoomIn", GTK_STOCK_ZOOM_IN, NULL, "<control>plus",
@@ -1937,6 +2228,9 @@ static GtkActionEntry entries[] = {
         { "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",
@@ -1953,7 +2247,7 @@ static GtkActionEntry entries[] = {
           G_CALLBACK (ev_window_cmd_go_last_page) },
 
        /* Help menu */
-       { "HelpContents", GTK_STOCK_HELP, N_("_Contents"), NULL,
+       { "HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1",
          N_("Display help for the viewer application"),
          G_CALLBACK (ev_window_cmd_help_contents) },
 
@@ -1962,13 +2256,20 @@ static GtkActionEntry entries[] = {
          G_CALLBACK (ev_window_cmd_help_about) },
 
        /* Toolbar-only */
-       { "LeaveFullscreen", EV_STOCK_LEAVE_FULLSCREEN, N_("Leave Fullscreen"), "Escape",
+       { "LeaveFullscreen", EV_STOCK_LEAVE_FULLSCREEN, N_("Leave Fullscreen"), NULL,
          N_("Leave fullscreen mode"),
-         G_CALLBACK (ev_window_cmd_leave_fullscreen) }
+         G_CALLBACK (ev_window_cmd_leave_fullscreen) },
+
+       /* Accellerators */
+       { "Escape", NULL, N_("Selection Caret"), "Escape", "",
+         G_CALLBACK (ev_window_cmd_escape) },
+        { "Slash", GTK_STOCK_FIND, NULL, "slash",
+          N_("Find a word or phrase in the document"),
+          G_CALLBACK (ev_window_cmd_edit_find) }
 };
 
 /* 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"),
@@ -1979,9 +2280,18 @@ static GtkToggleActionEntry toggle_entries[] = {
         { "ViewSidebar", NULL, N_("Side _pane"), "F9",
          N_("Show or hide the side pane"),
          G_CALLBACK (ev_window_view_sidebar_cb), TRUE },
+        { "ViewContinuous", NULL, N_("_Continuous"), NULL,
+         N_("Show the entire document"),
+         G_CALLBACK (ev_window_cmd_continuous), TRUE },
+        { "ViewDual", NULL, 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"), "F12",
+          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) },
@@ -1990,7 +2300,7 @@ static GtkToggleActionEntry toggle_entries[] = {
           G_CALLBACK (ev_window_cmd_view_page_width) },
 };
 
-static GtkRadioActionEntry page_view_entries[] = {
+static const GtkRadioActionEntry page_view_entries[] = {
        { "SinglePage", GTK_STOCK_DND, N_("Single"), NULL,
          N_("Show the document one page at a time"),
          PAGE_MODE_SINGLE_PAGE },
@@ -1999,16 +2309,6 @@ static GtkRadioActionEntry page_view_entries[] = {
          PAGE_MODE_CONTINUOUS_PAGE }
 };
 
-static void
-goto_page_cb (GtkAction *action, int page_number, EvWindow *ev_window)
-{
-       EvView *view = EV_VIEW (ev_window->priv->view);
-
-       if (ev_view_get_page (view) != page_number) {
-               ev_view_set_page (view, page_number);
-       }
-}
-
 static void
 drag_data_received_cb (GtkWidget *widget, GdkDragContext *context,
                       gint x, gint y, GtkSelectionData *selection_data,
@@ -2037,8 +2337,18 @@ register_custom_actions (EvWindow *window, GtkActionGroup *group)
                               "label", _("Page"),
                               "tooltip", _("Select Page"),
                               NULL);
-       g_signal_connect (action, "goto_page",
-                         G_CALLBACK (goto_page_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);
 }
@@ -2052,10 +2362,27 @@ set_action_properties (GtkActionGroup *action_group)
        /*translators: this is the label for toolbar button*/
        g_object_set (action, "short_label", _("Previous"), NULL);
        g_object_set (action, "is-important", TRUE, NULL);
+
        action = gtk_action_group_get_action (action_group, "GoNextPage");
-       /*translators: this is the label for toolbar button*/
        g_object_set (action, "is-important", TRUE, NULL);
+       /*translators: this is the label for toolbar button*/
        g_object_set (action, "short_label", _("Next"), NULL);
+
+       action = gtk_action_group_get_action (action_group, "ViewZoomIn");
+       /*translators: this is the label for toolbar button*/
+       g_object_set (action, "short_label", _("Zoom In"), NULL);
+       action = gtk_action_group_get_action (action_group, "ViewZoomIn");
+
+       action = gtk_action_group_get_action (action_group, "ViewZoomOut");
+       /*translators: this is the label for toolbar button*/
+       g_object_set (action, "short_label", _("Zoom Out"), NULL);
+       action = gtk_action_group_get_action (action_group, "ViewZoomIn");
+
+       action = gtk_action_group_get_action (action_group, "ViewBestFit");
+       /*translators: this is the label for toolbar button*/
+       g_object_set (action, "short_label", _("Best Fit"), NULL);
+       action = gtk_action_group_get_action (action_group, "ViewZoomIn");
+
        action = gtk_action_group_get_action (action_group, "ViewPageWidth");
        /*translators: this is the label for toolbar button*/
        g_object_set (action, "short_label", _("Fit Width"), NULL);
@@ -2135,6 +2462,22 @@ load_chrome (void)
        return chrome;
 }
 
+static void
+sidebar_widget_model_set (EvSidebarLinks *ev_sidebar_links,
+                         GParamSpec     *pspec,
+                         EvWindow       *ev_window)
+{
+       GtkTreeModel *model;
+       GtkAction *action;
+
+       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);
+}
+
 static void
 ev_window_init (EvWindow *ev_window)
 {
@@ -2142,6 +2485,9 @@ ev_window_init (EvWindow *ev_window)
        GtkAccelGroup *accel_group;
        GError *error = NULL;
        GtkWidget *sidebar_widget, *toolbar_dock;
+       GConfValue *value;
+       GConfClient *client;
+       int sidebar_size;
 
        ev_window->priv = EV_WINDOW_GET_PRIVATE (ev_window);
 
@@ -2214,35 +2560,48 @@ ev_window_init (EvWindow *ev_window)
        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 ();
-       gtk_box_pack_start (GTK_BOX (ev_window->priv->main_box), ev_window->priv->hpaned,
-                           TRUE, TRUE, 0);     
-       ev_window->priv->sidebar = ev_sidebar_new ();
-       g_signal_connect (ev_window->priv->sidebar,
-                         "notify::visible",
-                         G_CALLBACK (ev_window_sidebar_visibility_changed_cb),
+       g_signal_connect (ev_window->priv->hpaned,
+                         "notify::position",
+                         G_CALLBACK (ev_window_sidebar_position_change_cb),
                          ev_window);
-       gtk_paned_add1 (GTK_PANED (ev_window->priv->hpaned),
-                       ev_window->priv->sidebar);
+       
+       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_box_pack_start (GTK_BOX (ev_window->priv->main_box), ev_window->priv->hpaned,
+                           TRUE, TRUE, 0);
        gtk_widget_show (ev_window->priv->hpaned);
+       
+       ev_window->priv->sidebar = ev_sidebar_new ();
+       gtk_paned_pack1 (GTK_PANED (ev_window->priv->hpaned),
+                        ev_window->priv->sidebar, FALSE, FALSE);
+       gtk_widget_show (ev_window->priv->sidebar);
 
        /* Stub sidebar, for now */
        sidebar_widget = ev_sidebar_links_new ();
+       g_signal_connect (sidebar_widget,
+                         "notify::model",
+                         G_CALLBACK (sidebar_widget_model_set),
+                         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 ();
+       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,
@@ -2254,7 +2613,6 @@ ev_window_init (EvWindow *ev_window)
                        ev_window->priv->scrolled_window);
 
        ev_window->priv->view = ev_view_new ();
-       //ev_window->priv->page_view = ev_page_view_new ();
        ev_window->priv->password_view = ev_password_view_new ();
        g_signal_connect_swapped (ev_window->priv->password_view,
                                  "unlock",
@@ -2271,10 +2629,7 @@ ev_window_init (EvWindow *ev_window)
 
        gtk_container_add (GTK_CONTAINER (ev_window->priv->scrolled_window),
                           ev_window->priv->view);
-       g_signal_connect (ev_window->priv->view,
-                         "page-changed",
-                         G_CALLBACK (view_page_changed_cb),
-                         ev_window);
+
        g_signal_connect (ev_window->priv->view,
                          "notify::find-status",
                          G_CALLBACK (view_find_status_changed_cb),
@@ -2283,6 +2638,10 @@ ev_window_init (EvWindow *ev_window)
                          "notify::status",
                          G_CALLBACK (view_status_changed_cb),
                          ev_window);
+       g_signal_connect (ev_window->priv->view,
+                         "notify::sizing-mode",
+                         G_CALLBACK (ev_window_sizing_mode_changed_cb),
+                         ev_window);
 
        ev_window->priv->statusbar = gtk_statusbar_new ();
        gtk_box_pack_end (GTK_BOX (ev_window->priv->main_box),
@@ -2298,10 +2657,17 @@ ev_window_init (EvWindow *ev_window)
                          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 */
+       g_signal_connect (ev_window->priv->sidebar,
+                         "notify::visible",
+                         G_CALLBACK (ev_window_sidebar_visibility_changed_cb),
+                         ev_window);
+       
        /* Connect to find bar signals */
        g_signal_connect (ev_window->priv->find_bar,
                          "previous",
@@ -2328,10 +2694,6 @@ ev_window_init (EvWindow *ev_window)
                          G_CALLBACK (find_bar_search_changed_cb),
                          ev_window);
 
-       g_signal_connect (ev_window, "window-state-event",
-                         G_CALLBACK (ev_window_state_event_cb),
-                         ev_window);
-
        /* Give focus to the scrolled window */
        gtk_widget_grab_focus (ev_window->priv->scrolled_window);
 
@@ -2344,7 +2706,7 @@ ev_window_init (EvWindow *ev_window)
                          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_BEST_FIT);
+
+        ev_window_sizing_mode_changed_cb (EV_VIEW (ev_window->priv->view), NULL, ev_window);
        update_action_sensitivity (ev_window);
 }