X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-window.c;h=a487c88b7fd63d7bf8c03bc7022e88cd3a6329a5;hb=79a78d0249676255e902c9207a0eec4aba179de6;hp=2db012df0006f153d79a61ec20eb203922764576;hpb=11368f9b50db86ce4f2ae0b549fb575a19af2a74;p=evince.git

diff --git a/shell/ev-window.c b/shell/ev-window.c
index 2db012df..a487c88b 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -37,14 +37,20 @@
 #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-types.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-statusbar.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-recent-model.h"
 #include "egg-toolbar-editor.h"
@@ -55,24 +61,22 @@
 #include "ev-application.h"
 #include "ev-stock-icons.h"
 #include "ev-file-helpers.h"
+#include "ev-metadata-manager.h"
+
+#include <poppler.h>
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gnome.h>
-
-#include <libgnomevfs/gnome-vfs-uri.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
-#include <libgnomevfs/gnome-vfs-ops.h>
 #include <libgnomeprintui/gnome-print-dialog.h>
-
+#include <libgnomevfs/gnome-vfs-utils.h>
 #include <gconf/gconf-client.h>
 
 #include <string.h>
 
 typedef enum {
-	PAGE_MODE_SINGLE_PAGE,
-	PAGE_MODE_CONTINUOUS_PAGE,
-	PAGE_MODE_PASSWORD,
+	PAGE_MODE_DOCUMENT,
+	PAGE_MODE_PASSWORD
 } EvWindowPageMode;
 
 typedef enum {
@@ -81,10 +85,14 @@ typedef enum {
 	EV_CHROME_SIDEBAR	= 1 << 2,
 	EV_CHROME_FINDBAR	= 1 << 3,
 	EV_CHROME_STATUSBAR	= 1 << 4,
+	EV_CHROME_RAISE_TOOLBAR	= 1 << 5,
 	EV_CHROME_NORMAL	= EV_CHROME_MENUBAR | EV_CHROME_TOOLBAR | EV_CHROME_SIDEBAR | EV_CHROME_STATUSBAR
 } EvChrome;
 
 struct _EvWindowPrivate {
+	/* UI */
+	EvChrome chrome;
+
 	GtkWidget *main_box;
 	GtkWidget *menubar;
 	GtkWidget *toolbar_dock;
@@ -96,35 +104,44 @@ struct _EvWindowPrivate {
 	GtkWidget *view;
 	GtkWidget *page_view;
 	GtkWidget *password_view;
+	GtkWidget *statusbar;
+	GtkWidget *sidebar_thumbs;
+
+	/* Dialogs */
+	GtkWidget *properties;
 
+	/* UI Builders */
 	GtkActionGroup *action_group;
 	GtkUIManager *ui_manager;
 
 	gchar *toolbar_file;
 	EggToolbarsModel *toolbar_model;
-
-	GtkWidget *statusbar;
-	guint help_message_cid;
-	guint view_message_cid;
+	
+	/* Fullscreen mode */
 	GtkWidget *fullscreen_toolbar;
 	GtkWidget *fullscreen_popup;
-	char *uri;
+	GSource *fullscreen_timeout_source;
 
+	/* Document */
+	char *uri;
+	char *local_uri;
 	EvDocument *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;
-	GSource *fullscreen_timeout_source;
+	/* Job used to load document */
+	EvJob *xfer_job;
+	EvJob *load_job;
 
 	/* recent file stuff */
 	EggRecentModel *recent_model;
-	EggRecentViewGtk *recent_view;
+	EggRecentViewUIManager *recent_view;
 };
 
 static const GtkTargetEntry ev_drop_types[] = {
@@ -152,22 +169,27 @@ static void     ev_window_sidebar_visibility_changed_cb (EvSidebar        *ev_si
 							 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_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_fullscreen                    (EvWindow         *window);
-static void     ev_window_unfullscreen                  (EvWindow         *window);
+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);
 
 
 G_DEFINE_TYPE (EvWindow, ev_window, GTK_TYPE_WINDOW)
@@ -187,37 +209,61 @@ 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;
 
 	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;
 	}
 
+	if (info && info->fields_mask & EV_DOCUMENT_INFO_PERMISSIONS) {
+		ok_to_print = (info->permissions & EV_DOCUMENT_PERMISSIONS_OK_TO_PRINT);
+		ok_to_copy = (info->permissions & EV_DOCUMENT_PERMISSIONS_OK_TO_COPY);
+	}
+
+	if (has_document && !EV_IS_PS_EXPORTER(document))
+		ok_to_print = FALSE;
+
+	if (!info || info->fields_mask == 0) {
+		has_properties = FALSE;
+	}
+
 	/* 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);
+	set_action_sensitive (ev_window, "EditSelectAll", sensitive && ok_to_copy);
 	set_action_sensitive (ev_window, "EditFind",
 			      has_pages && EV_IS_DOCUMENT_FIND (document));
 	set_action_sensitive (ev_window, "Slash",
 			      has_pages && EV_IS_DOCUMENT_FIND (document));
 	set_action_sensitive (ev_window, "EditFindNext",
 			      ev_view_can_find_next (view));
+	set_action_sensitive (ev_window, "EditRotateLeft", has_document);
+	set_action_sensitive (ev_window, "EditRotateRight", has_document);
 
         /* View menu */
 	set_action_sensitive (ev_window, "ViewContinuous", has_pages);
@@ -226,7 +272,6 @@ update_action_sensitivity (EvWindow *ev_window)
 			      has_pages && ev_view_can_zoom_in (view));
 	set_action_sensitive (ev_window, "ViewZoomOut",
 			      has_pages && ev_view_can_zoom_out (view));
-	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);
@@ -244,15 +289,6 @@ 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);
-	}
-
 	/* Toolbar-specific actions: */
 	set_action_sensitive (ev_window, PAGE_SELECTOR_ACTION, has_pages);
 	set_action_sensitive (ev_window, ZOOM_CONTROL_ACTION,  has_pages);
@@ -295,9 +331,11 @@ update_chrome_visibility (EvWindow *window)
 	fullscreen_mode = fullscreen || presentation;
 
 	menubar = (priv->chrome & EV_CHROME_MENUBAR) != 0 && !fullscreen_mode;
-	toolbar = (priv->chrome & EV_CHROME_TOOLBAR) != 0 && !fullscreen_mode;
+	toolbar = ((priv->chrome & EV_CHROME_TOOLBAR) != 0  || 
+		   (priv->chrome & EV_CHROME_RAISE_TOOLBAR) != 0) && !fullscreen_mode;
 	sidebar = (priv->chrome & EV_CHROME_SIDEBAR) != 0 && !fullscreen_mode;
-	fullscreen_toolbar = (priv->chrome & EV_CHROME_TOOLBAR) != 0;
+	fullscreen_toolbar = ((priv->chrome & EV_CHROME_TOOLBAR) != 0 ||
+			      (priv->chrome & EV_CHROME_RAISE_TOOLBAR) != 0);
 	statusbar = (priv->chrome & EV_CHROME_STATUSBAR) != 0 && !fullscreen_mode;
 	findbar = (priv->chrome & EV_CHROME_FINDBAR) != 0;
 
@@ -312,7 +350,10 @@ update_chrome_visibility (EvWindow *window)
 	set_widget_visibility (priv->fullscreen_toolbar, fullscreen_toolbar);
 
 	if (priv->fullscreen_popup != NULL) {
-		set_widget_visibility (priv->fullscreen_popup, fullscreen);
+		if (fullscreen)
+			show_fullscreen_popup (window);
+		else
+			set_widget_visibility (priv->fullscreen_popup, FALSE);
 	}
 }
 
@@ -338,6 +379,19 @@ update_chrome_flag (EvWindow *window, EvChrome flag, const char *pref, gboolean
 	update_chrome_visibility (window);
 }
 
+static void
+ev_window_cmd_focus_page_selector (GtkAction *act, EvWindow *window)
+{
+	GtkAction *action;
+	
+	update_chrome_flag (window, EV_CHROME_RAISE_TOOLBAR, NULL, 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)
 {
@@ -458,11 +512,12 @@ update_sizing_buttons (EvWindow *window)
 }
 
 void
-ev_window_open_page (EvWindow *ev_window, int page)
+ev_window_open_page_label (EvWindow   *ev_window, 
+			   const char *label)
 {
 	if (ev_window->priv->page_cache) {
-	    page = CLAMP (page, 0, ev_page_cache_get_n_pages (ev_window->priv->page_cache));
-	    ev_page_cache_set_current_page (ev_window->priv->page_cache, page);
+		ev_page_cache_set_page_label (ev_window->priv->page_cache, 
+					      label);
 	}
 }
 
@@ -471,7 +526,9 @@ 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
@@ -500,13 +557,12 @@ update_window_title (EvDocument *document, GParamSpec *pspec, EvWindow *ev_windo
 
 	password_needed = (ev_window->priv->password_document != NULL);
 	if (document && ev_window->priv->page_cache) {
-		doc_title = ev_page_cache_get_title (ev_window->priv->page_cache);
+		doc_title = g_strdup (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;
 			}
 		}
@@ -562,29 +618,50 @@ page_changed_cb (EvPageCache *page_cache,
 		 EvWindow    *ev_window)
 {
 	update_action_sensitivity (ev_window);
+
+#ifdef ENABLE_METADATA
+	ev_metadata_manager_set_int (ev_window->priv->uri, "page", page);
+#endif
 }
 
 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) {
+	if (mode == EV_DOCUMENT_MODE_PRESENTATION) {
 		ev_window_run_presentation (window);
 	}
+	else if (mode == EV_DOCUMENT_MODE_FULL_SCREEN) {
+		ev_window_run_fullscreen (window);
+	}
+}
+
+#ifdef ENABLE_METADATA
+static void
+setup_document_from_metadata (EvWindow *window)
+{
+	char *uri = window->priv->uri;
+	GValue page = { 0, };
+
+	/* Page */
+	if (ev_metadata_manager_get (uri, "page", &page)) {
+		ev_page_cache_set_current_page (window->priv->page_cache,
+						g_value_get_int (&page));
+	}
+
 }
+#endif
 
 static void
 ev_window_setup_document (EvWindow *ev_window)
 {
-	EvDocumentInfo *info;
+	const EvDocumentInfo *info;
 	EvDocument *document;
 	EvView *view = EV_VIEW (ev_window->priv->view);
 	EvSidebar *sidebar = EV_SIDEBAR (ev_window->priv->sidebar);
 	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),
@@ -598,7 +675,7 @@ ev_window_setup_document (EvWindow *ev_window)
 				         ev_window, 0);
 	}
 
-	ev_window_set_page_mode (ev_window, PAGE_MODE_SINGLE_PAGE);
+	ev_window_set_page_mode (ev_window, PAGE_MODE_DOCUMENT);
 
 	ev_sidebar_set_document (sidebar, document);
 
@@ -611,9 +688,17 @@ ev_window_setup_document (EvWindow *ev_window)
 	ev_page_action_set_document (EV_PAGE_ACTION (action), document);
 	update_action_sensitivity (ev_window);
 
-	info = ev_document_get_info (document);
+	info = ev_page_cache_get_info (ev_window->priv->page_cache);
 	update_document_mode (ev_window, info->mode);
-	g_free (info);
+
+	if (ev_window->priv->properties) {
+		ev_properties_dialog_set_document (EV_PROPERTIES_DIALOG (ev_window->priv->properties),
+					           ev_window->priv->document);
+	}
+
+#ifdef ENABLE_METADATA
+	setup_document_from_metadata (ev_window);
+#endif
 }
 
 static void
@@ -641,11 +726,18 @@ password_dialog_response (GtkWidget *password_dialog,
 
 		ev_window->priv->password_document = NULL;
 		ev_window->priv->password_uri = NULL;
+		
+		ev_job_queue_add_job (ev_window->priv->load_job, EV_JOB_PRIORITY_HIGH);
+		
+		ev_statusbar_push (EV_STATUSBAR (ev_window->priv->statusbar),
+				   EV_CONTEXT_PROGRESS,
+				   _("Loading document. Please wait"));
 
-		if (start_loading_document (ev_window, document, uri)) {
-			gtk_widget_destroy (password_dialog);
-		}
-
+	        ev_statusbar_set_progress  (EV_STATUSBAR (ev_window->priv->statusbar), 
+	    			            TRUE);
+	
+    		gtk_widget_destroy (password_dialog);
+			
 		g_object_unref (document);
 		g_free (uri);
 
@@ -656,7 +748,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() */
 
@@ -690,8 +782,48 @@ ev_window_popup_password_dialog (EvWindow *ev_window)
 	}
 }
 
-/* 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
@@ -699,17 +831,23 @@ 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_statusbar_pop (EV_STATUSBAR (ev_window->priv->statusbar),
+			  EV_CONTEXT_PROGRESS);
+
+        ev_statusbar_set_progress  (EV_STATUSBAR (ev_window->priv->statusbar), 
+    			            FALSE);
+
 	if (ev_window->priv->password_document) {
 		g_object_unref (ev_window->priv->password_document);
 		ev_window->priv->password_document = NULL;
@@ -719,31 +857,27 @@ start_loading_document (EvWindow   *ev_window,
 		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, uri);
-
-		return TRUE;
+		ev_window_add_recent (ev_window, ev_window->priv->uri);
+		ev_window_clear_jobs (ev_window);
+		
+		return;
 	}
 
-	/* unable to load the document */
-	g_assert (error != NULL);
-
-	if (error->domain == EV_DOCUMENT_ERROR &&
-	    error->code == EV_DOCUMENT_ERROR_ENCRYPTED) {
+	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);
+		ev_window->priv->password_uri = g_strdup (job->uri);
 
-		base_name = g_path_get_basename (uri);
+		base_name = g_path_get_basename (job->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),
@@ -754,124 +888,224 @@ start_loading_document (EvWindow   *ev_window,
 
 		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
-sanity_check_uri (EvWindow *window, const char *uri)
+static void
+ev_window_xfer_job_cb  (EvJobXfer *job,
+			gpointer data)
 {
-	gboolean result = FALSE;
-	GnomeVFSURI *vfs_uri;
-	char *err;
-
-	vfs_uri = gnome_vfs_uri_new (uri);
-	if (vfs_uri) {
-		if (gnome_vfs_uri_exists (vfs_uri)) {
-			result = TRUE;
-		}
-	}
+	EvWindow *ev_window = EV_WINDOW (data);
 
-	if (!result) {
-		err = g_strdup_printf (_("The file %s does not exist."), uri);
-		unable_to_load (window, err);
-		g_free (err);
-	}
 
-	return result;
+	
+	if (job->error != NULL) {
+		ev_statusbar_pop (EV_STATUSBAR (ev_window->priv->statusbar),
+				  EV_CONTEXT_PROGRESS);
+	        ev_statusbar_set_progress  (EV_STATUSBAR (ev_window->priv->statusbar), 
+    				            FALSE);
+
+		unable_to_load (ev_window, job->error->message);
+		ev_window_clear_jobs (ev_window);
+	} else {
+		char *uri;
+		
+		EvDocument *document = g_object_ref (EV_JOB (job)->document);
+		
+		if (job->local_uri) {
+			ev_window->priv->local_uri = g_strdup (job->local_uri);
+			uri = ev_window->priv->local_uri;
+		} else {
+			ev_window->priv->local_uri = NULL;
+			uri = ev_window->priv->uri;
+		}
+		
+		ev_window_clear_jobs (ev_window);
+		
+		ev_window->priv->load_job = ev_job_load_new (document, uri);
+		g_signal_connect (ev_window->priv->load_job,
+				  "finished",
+				  G_CALLBACK (ev_window_load_job_cb),
+				  ev_window);
+		ev_job_queue_add_job (ev_window->priv->load_job, EV_JOB_PRIORITY_HIGH);
+		g_object_unref (document);
+	}		
 }
 
-void
-ev_window_open (EvWindow *ev_window, const char *uri)
+#ifdef ENABLE_METADATA
+static void
+setup_view_from_metadata (EvWindow *window)
 {
-	EvDocument *document = NULL;
-	GType document_type;
-	char *mime_type = NULL;
+	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, };
+
+	/* Window size */
+	if (!GTK_WIDGET_VISIBLE (window)) {
+		gboolean restore_size = TRUE;
+
+		if (ev_metadata_manager_get (uri, "window_maximized", &maximized)) {
+			if (g_value_get_boolean (&maximized)) {
+				gtk_window_maximize (GTK_WINDOW (window));
+				restore_size = FALSE;
+			}
+		}
 
-	if (!sanity_check_uri (ev_window, uri)) {
-		return;
+		if (restore_size &&
+		    ev_metadata_manager_get (uri, "window_x", &x) &&
+		    ev_metadata_manager_get (uri, "window_y", &y) &&
+		    ev_metadata_manager_get (uri, "window_width", &width) &&
+	            ev_metadata_manager_get (uri, "window_height", &height)) {
+			gtk_window_set_default_size (GTK_WINDOW (window),
+						     g_value_get_int (&width),
+						     g_value_get_int (&height));
+			gtk_window_move (GTK_WINDOW (window), g_value_get_int (&x),
+					 g_value_get_int (&y));
+		}
 	}
 
-	g_free (ev_window->priv->uri);
-	ev_window->priv->uri = g_strdup (uri);
+	/* Sizing mode */
+	if (ev_metadata_manager_get (uri, "sizing_mode", &sizing_mode)) {
+		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);
+	}
 
-	document_type = ev_document_type_lookup (uri, &mime_type);
-	if (document_type != G_TYPE_INVALID) {
-		document = g_object_new (document_type, NULL);
+	/* Zoom */
+	if (ev_metadata_manager_get (uri, "zoom", &zoom) &&
+	    ev_view_get_sizing_mode (view) == EV_SIZING_FREE) {
+		ev_view_set_zoom (view, g_value_get_double (&zoom), FALSE);
 	}
 
-	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;
+	/* Continuous */
+	if (ev_metadata_manager_get (uri, "continuous", &continuous)) {
+		ev_view_set_continuous (view, g_value_get_boolean (&continuous));
+	}
+
+	/* Dual page */
+	if (ev_metadata_manager_get (uri, "dual-page", &dual_page)) {
+		ev_view_set_dual_page (view, g_value_get_boolean (&dual_page));
+	}
 
-		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);
+	/* Presentation */
+	if (ev_metadata_manager_get (uri, "presentation", &presentation)) {
+		if (g_value_get_boolean (&presentation)) {
+			ev_window_run_presentation (window);
+		}
 	}
 
-	g_free (mime_type);
+	/* Fullscreen */
+	if (ev_metadata_manager_get (uri, "fullscreen", &fullscreen)) {
+		if (g_value_get_boolean (&fullscreen)) {
+			ev_window_run_fullscreen (window);
+		}
+	}
 }
+#endif
 
-static void
-ev_window_open_uri_list (EvWindow *ev_window, GList *uri_list)
+void
+ev_window_open_uri (EvWindow *ev_window, const char *uri)
 {
-	GList *list;
-	gchar *uri;
+	if (ev_window->priv->password_dialog)
+		gtk_widget_destroy (ev_window->priv->password_dialog);
+
+	g_free (ev_window->priv->uri);
+	ev_window->priv->uri = g_strdup (uri);
+
+#ifdef ENABLE_METADATA
+	setup_view_from_metadata (ev_window);
+#endif
 	
-	g_return_if_fail (uri_list != NULL);
+	ev_window_clear_jobs (ev_window);
+	ev_window_clear_local_uri (ev_window);
 	
-	list = uri_list;
-	while (list) {
-		uri = gnome_vfs_uri_to_string (list->data, GNOME_VFS_URI_HIDE_NONE);
-		
-		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);
-				
-				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));
-			}
-		}
-
-		g_free (uri);
+	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);
 
-		list = g_list_next (list);
-	}
+	ev_statusbar_push (EV_STATUSBAR (ev_window->priv->statusbar),
+			   EV_CONTEXT_PROGRESS,
+			   _("Loading document. Please wait"));
+        ev_statusbar_set_progress  (EV_STATUSBAR (ev_window->priv->statusbar), 
+    			            TRUE);
 }
 
 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;
+	static char *folder = NULL;
+
+	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);
+
+	if (folder) {
+		gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (chooser),
+						         folder);
+    	}
+
+	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 (gtk_dialog_run (GTK_DIALOG (chooser)) == GTK_RESPONSE_OK) {
+		GSList *uris;
+
+		uris = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (chooser));
+
+		if (folder != NULL)
+			g_free (folder);
+				
+		folder = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (chooser));
+
+		ev_application_open_uri_list (EV_APP, uris);
+	
+		g_slist_foreach (uris, (GFunc)g_free, NULL);	
+		g_slist_free (uris);
+	} else {
+		if (!GTK_WIDGET_VISIBLE (window))
+			gtk_widget_destroy (GTK_WIDGET (window));
+	}
+
+	gtk_widget_destroy (GTK_WIDGET (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, NULL);	
 	
 	g_free (uri);
 }
@@ -881,9 +1115,6 @@ 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);
@@ -892,23 +1123,20 @@ ev_window_add_recent (EvWindow *window, const char *filename)
 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);
+	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);	
+
+        egg_recent_view_uimanager_show_icons (EGG_RECENT_VIEW_UIMANAGER (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),
@@ -917,7 +1145,7 @@ ev_window_setup_recent (EvWindow *ev_window)
 	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);
@@ -993,8 +1221,11 @@ static void
 ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
 {
 	GtkWidget *fc;
-	GtkFileFilter *pdf_filter, *all_filter;
-	gchar *uri = NULL;
+
+	gchar *uri;
+	gchar *basename;
+	static char* folder = NULL;
+
 	gboolean success;
 
 	fc = gtk_file_chooser_dialog_new (
@@ -1005,18 +1236,17 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
 		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);
+	
+	if (folder) {
+		gtk_file_chooser_set_current_folder_uri(GTK_FILE_CHOOSER (fc), 
+							folder);
+    	}
+	
+	basename = g_path_get_basename (ev_window->priv->uri);
+	gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (fc), basename);
+	g_free (basename);
 
 	gtk_widget_show (fc);
 
@@ -1038,6 +1268,12 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
 		else
 			save_error_dialog (GTK_WINDOW (fc), uri);
 	}
+
+	if (folder != NULL)
+		g_free (folder);
+				
+	folder = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (fc));
+
 	gtk_widget_destroy (fc);
 }
 
@@ -1069,23 +1305,44 @@ using_postscript_printer (GnomePrintConfig *config)
 }
 
 static void
-ev_window_print (EvWindow *ev_window)
+ev_window_print (EvWindow *window)
+{
+	EvPageCache *page_cache;
+	int last_page;
+
+	page_cache = ev_page_cache_get (window->priv->document);
+	last_page = ev_page_cache_get_n_pages (page_cache);
+
+	ev_window_print_range (window, 1, -1);
+}
+
+const char *
+ev_window_get_uri (EvWindow *ev_window)
+{
+	return ev_window->priv->uri;
+}
+
+void
+ev_window_print_range (EvWindow *ev_window, int first_page, int last_page)
 {
 	GnomePrintConfig *config;
 	GnomePrintJob *job;
 	GtkWidget *print_dialog;
-	EvPageCache *page_cache;
 	gchar *pages_label;
 	EvPrintJob *print_job = NULL;
+	EvPageCache *page_cache;
 
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 	g_return_if_fail (ev_window->priv->document != NULL);
 
+	page_cache = ev_page_cache_get (ev_window->priv->document);
+	if (last_page == -1) {
+		last_page = ev_page_cache_get_n_pages (page_cache);
+	}
+
 	config = gnome_print_config_default ();
 	job = gnome_print_job_new (config);
 
-	page_cache = ev_document_get_page_cache (ev_window->priv->document);
-
 	print_dialog = gnome_print_dialog_new (job, (guchar *) _("Print"),
 					       (GNOME_PRINT_DIALOG_RANGE |
 						GNOME_PRINT_DIALOG_COPIES));
@@ -1094,8 +1351,7 @@ ev_window_print (EvWindow *ev_window)
 	gnome_print_dialog_construct_range_page (GNOME_PRINT_DIALOG (print_dialog),
 						 GNOME_PRINT_RANGE_ALL |
 						 GNOME_PRINT_RANGE_RANGE,
-						 1,
-						 ev_page_cache_get_n_pages (page_cache),
+						 first_page, last_page,
 						 NULL, (const guchar *)pages_label);
 	g_free (pages_label);
 						 
@@ -1153,6 +1409,22 @@ 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)
 {
@@ -1231,7 +1503,8 @@ ev_window_update_fullscreen_popup (EvWindow *window)
 
 	g_return_if_fail (popup != NULL);
 
-	toolbar = (window->priv->chrome & EV_CHROME_TOOLBAR) != 0;
+	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;
 
@@ -1347,6 +1620,18 @@ fullscreen_clear_timeout (EvWindow *window)
 	ev_view_show_cursor (EV_VIEW (window->priv->view));
 }
 
+
+static void
+show_fullscreen_popup (EvWindow *window)
+{
+	if (!GTK_WIDGET_VISIBLE (window->priv->fullscreen_popup)) {
+		g_object_set (window->priv->fullscreen_popup, "visible", TRUE, NULL);
+		ev_view_show_cursor (EV_VIEW (window->priv->view));
+	}
+
+	fullscreen_set_timeout (window);	
+}
+
 static gboolean
 fullscreen_motion_notify_cb (GtkWidget *widget,
 			     GdkEventMotion *event,
@@ -1354,12 +1639,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;
 }
@@ -1450,7 +1730,7 @@ ev_window_update_fullscreen_action (EvWindow *window)
 }
 
 static void
-ev_window_fullscreen (EvWindow *window)
+ev_window_run_fullscreen (EvWindow *window)
 {
 	ev_view_set_fullscreen (EV_VIEW (window->priv->view), TRUE);
 	if (window->priv->fullscreen_popup == NULL)
@@ -1461,7 +1741,7 @@ ev_window_fullscreen (EvWindow *window)
 	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),
@@ -1476,13 +1756,20 @@ ev_window_fullscreen (EvWindow *window)
 	ev_window_update_fullscreen_action (window);
 	gtk_window_fullscreen (GTK_WINDOW (window));
 	ev_window_update_fullscreen_popup (window);
+
+#ifdef ENABLE_METADATA
+	ev_metadata_manager_set_boolean (window->priv->uri, "fullscreen", TRUE);
+#endif
 }
 
 static void
-ev_window_unfullscreen (EvWindow *window)
+ev_window_stop_fullscreen (EvWindow *window)
 {
 	EvView *view = EV_VIEW (window->priv->view);
 
+	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,
@@ -1499,6 +1786,10 @@ ev_window_unfullscreen (EvWindow *window)
 	ev_window_update_fullscreen_action (window);
 	gtk_window_unfullscreen (GTK_WINDOW (window));
 	update_chrome_visibility (window);
+
+#ifdef ENABLE_METADATA
+	ev_metadata_manager_set_boolean (window->priv->uri, "fullscreen", FALSE);
+#endif
 }
 
 static void
@@ -1511,9 +1802,9 @@ ev_window_cmd_view_fullscreen (GtkAction *action, EvWindow *window)
 
 	fullscreen = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
 	if (fullscreen) {
-		ev_window_fullscreen (window);
+		ev_window_run_fullscreen (window);
 	} else {
-		ev_window_unfullscreen (window);
+		ev_window_stop_fullscreen (window);
 	}
 }
 
@@ -1543,12 +1834,16 @@ ev_window_run_presentation (EvWindow *window)
 	gtk_window_fullscreen (GTK_WINDOW (window));
 	ev_window_update_presentation_action (window);
 	update_chrome_visibility (window);
+
+#ifdef ENABLE_METADATA
+	ev_metadata_manager_set_boolean (window->priv->uri, "presentation", TRUE);
+#endif
 }
 
 static void
 ev_window_stop_presentation (EvWindow *window)
 {
-	if (! ev_view_get_presentation (EV_VIEW (window->priv->view)))
+	if (!ev_view_get_presentation (EV_VIEW (window->priv->view)))
 		return;
 
 	g_object_set (G_OBJECT (window->priv->scrolled_window),
@@ -1558,6 +1853,10 @@ ev_window_stop_presentation (EvWindow *window)
 	gtk_window_unfullscreen (GTK_WINDOW (window));
 	ev_window_update_presentation_action (window);
 	update_chrome_visibility (window);
+
+#ifdef ENABLE_METADATA
+	ev_metadata_manager_set_boolean (window->priv->uri, "presentation", FALSE);
+#endif
 }
 
 static void
@@ -1566,6 +1865,7 @@ ev_window_cmd_view_presentation (GtkAction *action, EvWindow *window)
 	gboolean presentation;
 
         g_return_if_fail (EV_IS_WINDOW (window));
+	ev_window_stop_fullscreen (window);
 
 	presentation = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
 	if (presentation) {
@@ -1581,12 +1881,12 @@ ev_window_state_event (GtkWidget *widget, GdkEventWindowState *event)
 	EvWindow *window = EV_WINDOW (widget);
 
 	if (event->changed_mask & GDK_WINDOW_STATE_MAXIMIZED) {
-		gboolean show;
+		gboolean maximized;
 
-		show = (event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED) == 0;
+		maximized = (event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED) == 0;
 
-		gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR (window->priv->statusbar),
-						   show);
+		ev_statusbar_set_maximized (EV_STATUSBAR (window->priv->statusbar),
+					    maximized);
 	}
 
 	return FALSE;
@@ -1604,7 +1904,7 @@ ev_window_focus_in_event (GtkWidget *widget, GdkEventFocus *event)
 		      NULL);
 
 	if (fullscreen)
-		gtk_widget_show (priv->fullscreen_popup);
+		show_fullscreen_popup (window);
 
 	return GTK_WIDGET_CLASS (ev_window_parent_class)->focus_in_event (widget, event);
 }
@@ -1639,15 +1939,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 ();
 	}
@@ -1673,6 +1970,20 @@ ev_window_cmd_edit_toolbar_cb (GtkDialog *dialog, gint response, gpointer data)
         gtk_widget_destroy (GTK_WIDGET (dialog));
 }
 
+static void
+ev_window_cmd_edit_rotate_left (GtkAction *action, EvWindow *ev_window)
+{
+	ev_view_rotate_left (EV_VIEW (ev_window->priv->view));
+	ev_sidebar_thumbnails_refresh (EV_SIDEBAR_THUMBNAILS (ev_window->priv->sidebar_thumbs));
+}
+
+static void
+ev_window_cmd_edit_rotate_right (GtkAction *action, EvWindow *ev_window)
+{
+	ev_view_rotate_right (EV_VIEW (ev_window->priv->view));
+	ev_sidebar_thumbnails_refresh (EV_SIDEBAR_THUMBNAILS (ev_window->priv->sidebar_thumbs));
+}
+
 static void
 ev_window_cmd_edit_toolbar (GtkAction *action, EvWindow *ev_window)
 {
@@ -1714,7 +2025,6 @@ ev_window_cmd_view_zoom_in (GtkAction *action, EvWindow *ev_window)
 
 	ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_FREE);
 	ev_view_zoom_in (EV_VIEW (ev_window->priv->view));
-	update_action_sensitivity (ev_window);
 }
 
 static void
@@ -1724,16 +2034,6 @@ ev_window_cmd_view_zoom_out (GtkAction *action, EvWindow *ev_window)
 
 	ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_FREE);
 	ev_view_zoom_out (EV_VIEW (ev_window->priv->view));
-	update_action_sensitivity (ev_window);
-}
-
-static void
-ev_window_cmd_view_normal_size (GtkAction *action, EvWindow *ev_window)
-{
-        g_return_if_fail (EV_IS_WINDOW (ev_window));
-
-	ev_view_zoom_normal (EV_VIEW (ev_window->priv->view));
-	update_action_sensitivity (ev_window);
 }
 
 static void
@@ -1771,6 +2071,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)
 {
@@ -1782,8 +2109,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));
+
+	ev_page_cache_set_current_page (ev_window->priv->page_cache, page);
 
 	g_free (uri);
 }
@@ -1827,7 +2158,7 @@ ev_window_cmd_escape (GtkAction *action, EvWindow *window)
 			      NULL);
 
 		if (fullscreen)
-			ev_window_unfullscreen (window);
+			ev_window_stop_fullscreen (window);
 		if (presentation)
 			ev_window_stop_presentation (window);
 
@@ -1837,7 +2168,7 @@ ev_window_cmd_escape (GtkAction *action, EvWindow *window)
 }
 
 static void
-update_view_size (EvWindow *window)
+update_view_size (EvView *view, EvWindow *window)
 {
 	int width, height;
 	GtkRequisition vsb_requisition;
@@ -1869,11 +2200,20 @@ update_view_size (EvWindow *window)
 }
 
 static void
-size_allocate_cb (GtkWidget     *scrolled_window,
-		  GtkAllocation *allocation,
-		  EvWindow      *window)
+save_sizing_mode (EvWindow *window)
 {
-	update_view_size (window);
+#ifdef ENABLE_METADATA
+	EvSizingMode mode;
+	GEnumValue *enum_value;
+
+	if (window->priv->uri) {
+		mode = ev_view_get_sizing_mode (EV_VIEW (window->priv->view));
+		enum_value = g_enum_get_value (EV_SIZING_MODE_CLASS, mode);
+
+		ev_metadata_manager_set_string (window->priv->uri, "sizing_mode",
+						enum_value->value_nick);
+	}
+#endif
 }
 
 static void     
@@ -1889,10 +2229,10 @@ ev_window_sizing_mode_changed_cb (EvView *view, GParamSpec *pspec,
 
 	scrolled_window = ev_window->priv->scrolled_window;
 
-	g_signal_handlers_disconnect_by_func (scrolled_window, size_allocate_cb, ev_window);
+	g_signal_handlers_disconnect_by_func (ev_window->priv->view, update_view_size, ev_window);
 
 	if (sizing_mode != EV_SIZING_FREE)
-	    	update_view_size (ev_window);
+	    	update_view_size (NULL, ev_window);
 
 	switch (sizing_mode) {
 	case EV_SIZING_BEST_FIT:
@@ -1900,8 +2240,8 @@ ev_window_sizing_mode_changed_cb (EvView *view, GParamSpec *pspec,
 			      "hscrollbar-policy", GTK_POLICY_NEVER,
 			      "vscrollbar-policy", GTK_POLICY_AUTOMATIC,
 			      NULL);
-		g_signal_connect (scrolled_window, "size-allocate",
-				  G_CALLBACK (size_allocate_cb),
+		g_signal_connect (ev_window->priv->view, "zoom_invalid",
+				  G_CALLBACK (update_view_size),
 				  ev_window);
 		break;
 	case EV_SIZING_FIT_WIDTH:
@@ -1909,8 +2249,8 @@ ev_window_sizing_mode_changed_cb (EvView *view, GParamSpec *pspec,
 			      "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:
@@ -1922,18 +2262,112 @@ ev_window_sizing_mode_changed_cb (EvView *view, GParamSpec *pspec,
 	}
 
 	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);
+
+#ifdef ENABLE_METADATA
+	if (ev_view_get_sizing_mode (view) == EV_SIZING_FREE) {
+		ev_metadata_manager_set_double (ev_window->priv->uri, "zoom",
+					        ev_view_get_zoom (view));
+	}
+#endif
+}
+
+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);
+
+#ifdef ENABLE_METADATA
+	ev_metadata_manager_set_boolean (ev_window->priv->uri, "continuous",
+				         ev_view_get_continuous (EV_VIEW (ev_window->priv->view)));
+#endif
+}
+
+static void     
+ev_window_dual_mode_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_window)
+{
+	ev_window_update_dual_page_action (ev_window);
+
+#ifdef ENABLE_METADATA
+	ev_metadata_manager_set_boolean (ev_window->priv->uri, "dual-page",
+				         ev_view_get_dual_page (EV_VIEW (ev_window->priv->view)));
+#endif
+}
+
+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
 	};
 
@@ -1952,6 +2386,7 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window)
 	};
 
 	char *license_trans;
+	char *comments;
 
 #ifdef ENABLE_NLS
 	const char **p;
@@ -1965,21 +2400,23 @@ 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);
 }
 
@@ -2012,17 +2449,18 @@ ev_window_sidebar_visibility_changed_cb (EvSidebar *ev_sidebar, GParamSpec *pspe
 					 EvWindow   *ev_window)
 {
 	GtkAction *action;
-	gboolean visible, fullscreen;
+	gboolean visible, fullscreen_mode;
+
+
+	fullscreen_mode = ev_view_get_presentation (EV_VIEW (ev_window->priv->view)) ||
+			       ev_view_get_fullscreen (EV_VIEW (ev_window->priv->view));
 
-	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 (fullscreen)
+	if (fullscreen_mode)
 		return;
 	
 	action = gtk_action_group_get_action (ev_window->priv->action_group, "ViewSidebar");
@@ -2048,8 +2486,8 @@ menu_item_select_cb (GtkMenuItem *proxy, EvWindow *ev_window)
 
 	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);
+		ev_statusbar_push (EV_STATUSBAR (ev_window->priv->statusbar),
+				   EV_CONTEXT_VIEW, message);
 		g_free (message);
 	}
 }
@@ -2057,8 +2495,8 @@ menu_item_select_cb (GtkMenuItem *proxy, EvWindow *ev_window)
 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);
+	ev_statusbar_pop (EV_STATUSBAR (ev_window->priv->statusbar),
+			  EV_CONTEXT_VIEW);
 }
 
 static void
@@ -2093,13 +2531,13 @@ view_status_changed_cb (EvView     *view,
 {
 	const char *message;
 
-	gtk_statusbar_pop (GTK_STATUSBAR (ev_window->priv->statusbar),
-			   ev_window->priv->view_message_cid);
+	ev_statusbar_pop (EV_STATUSBAR (ev_window->priv->statusbar),
+			  EV_CONTEXT_HELP);
 
 	message = ev_view_get_status (view);
 	if (message) {
-		gtk_statusbar_push (GTK_STATUSBAR (ev_window->priv->statusbar),
-				    ev_window->priv->view_message_cid, message);
+		ev_statusbar_push (EV_STATUSBAR (ev_window->priv->statusbar),
+				   EV_CONTEXT_HELP, message);
 	}
 }
 
@@ -2136,21 +2574,6 @@ find_bar_close_cb (EggFindBar *find_bar,
 	update_chrome_flag (ev_window, EV_CHROME_FINDBAR, NULL, FALSE);
 }
 
-static void
-ev_window_page_mode_cb (GtkRadioAction *action,
-			GtkRadioAction *activated_action,
-			EvWindow       *window)
-{
-	int mode;
-
-	mode = gtk_radio_action_get_current_value (action);
-
-	g_assert (mode == PAGE_MODE_CONTINUOUS_PAGE ||
-		  mode == PAGE_MODE_SINGLE_PAGE);
-
-	ev_window_set_page_mode (window, (EvWindowPageMode) mode);
-}
-
 static void
 find_bar_search_changed_cb (EggFindBar *find_bar,
 			    GParamSpec *param,
@@ -2212,11 +2635,27 @@ zoom_control_changed_cb (EphyZoomAction *action,
 		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);
+	
+	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 = gtk_window_list_toplevels ();
+
+	if (windows == NULL) {
+		ev_application_shutdown (EV_APP);
+	} else {
+		g_list_free (windows);
+	}
+
+	G_OBJECT_CLASS (ev_window_parent_class)->finalize (object);
 }
 
 static void
@@ -2232,6 +2671,16 @@ ev_window_dispose (GObject *object)
 		priv->toolbar_file = NULL;
 	}
 
+	if (priv->recent_model) {
+		g_object_unref (priv->recent_model);
+		priv->recent_model = 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;
@@ -2262,6 +2711,14 @@ ev_window_dispose (GObject *object)
 		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) {
 		g_object_unref (priv->password_document);
 		priv->password_document = NULL;
@@ -2272,6 +2729,10 @@ ev_window_dispose (GObject *object)
 		priv->password_uri = NULL;
 	}
 
+	if (priv->password_dialog) {
+		gtk_widget_destroy (priv->password_dialog);
+	}
+
 	if (priv->find_bar) {
 		g_signal_handlers_disconnect_by_func
 			(window->priv->find_bar,
@@ -2280,6 +2741,10 @@ ev_window_dispose (GObject *object)
 		priv->find_bar = NULL;
 	}
 
+	if (window->priv->fullscreen_timeout_source) {
+		g_source_destroy (window->priv->fullscreen_timeout_source);
+		window->priv->fullscreen_timeout_source = NULL;
+	}
 	destroy_fullscreen_popup (window);
 
 	G_OBJECT_CLASS (ev_window_parent_class)->dispose (object);
@@ -2292,6 +2757,7 @@ 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->window_state_event = ev_window_state_event;
 	widget_class->focus_in_event = ev_window_focus_in_event;
@@ -2318,6 +2784,9 @@ static const GtkActionEntry entries[] = {
 	{ "FilePrint", GTK_STOCK_PRINT, N_("Print..."), "<control>P",
 	  N_("Print this document"),
 	  G_CALLBACK (ev_window_cmd_file_print) },
+	{ "FileProperties", GTK_STOCK_PROPERTIES, N_("Properties"), "<alt>Return",
+	  N_("View the properties of this document"),
+	  G_CALLBACK (ev_window_cmd_file_properties) },			      
 	{ "FileCloseWindow", GTK_STOCK_CLOSE, NULL, "<control>W",
 	  N_("Close this window"),
 	  G_CALLBACK (ev_window_cmd_file_close_window) },
@@ -2335,9 +2804,15 @@ static const GtkActionEntry entries[] = {
 	{ "EditFindNext", NULL, N_("Find Ne_xt"), "<control>G",
 	  N_("Find next occurrence of the word or phrase"),
 	  G_CALLBACK (ev_window_cmd_edit_find_next) },
-        { "EditToolbar", NULL, N_("Toolbar..."), NULL,
-          N_("Open Toolbar Editor Dialog"),
+        { "EditToolbar", NULL, N_("T_oolbar"), NULL,
+          N_("Customize the toolbar"),
           G_CALLBACK (ev_window_cmd_edit_toolbar) },
+	{ "EditRotateLeft", NULL, N_("Rotate _Left"), NULL,
+	  N_("Rotate the document to the left"),
+	  G_CALLBACK (ev_window_cmd_edit_rotate_left) },
+	{ "EditRotateRight", NULL, N_("Rotate _Right"), NULL,
+	  N_("Rotate the document to the right"),
+	  G_CALLBACK (ev_window_cmd_edit_rotate_right) },
 
         /* View menu */
         { "ViewZoomIn", GTK_STOCK_ZOOM_IN, NULL, "<control>plus",
@@ -2346,18 +2821,15 @@ static const GtkActionEntry entries[] = {
         { "ViewZoomOut", GTK_STOCK_ZOOM_OUT, NULL, "<control>minus",
           N_("Shrink the document"),
           G_CALLBACK (ev_window_cmd_view_zoom_out) },
-        { "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",
@@ -2382,23 +2854,47 @@ static const GtkActionEntry entries[] = {
 	  G_CALLBACK (ev_window_cmd_leave_fullscreen) },
 
 	/* Accellerators */
-	{ "Escape", NULL, N_("Selection Caret"), "Escape", "",
+	{ "Escape", NULL, "", "Escape", "",
 	  G_CALLBACK (ev_window_cmd_escape) },
         { "Slash", GTK_STOCK_FIND, NULL, "slash",
           N_("Find a word or phrase in the document"),
           G_CALLBACK (ev_window_cmd_edit_find) },
-        { "Space", GTK_STOCK_FIND, NULL, "space",
+        { "PageDown", NULL, "", "Page_Down",
+          N_("Scroll one page forward"),
+          G_CALLBACK (ev_window_cmd_scroll_forward) },
+        { "PageUp", NULL, "", "Page_Up",
+          N_("Scroll one page backward"),
+          G_CALLBACK (ev_window_cmd_scroll_backward) },
+        { "Space", NULL, "", "space",
           N_("Scroll one page forward"),
           G_CALLBACK (ev_window_cmd_scroll_forward) },
-        { "ShiftSpace", GTK_STOCK_FIND, NULL, "<shift>space",
+        { "ShiftSpace", NULL, "", "<shift>space",
           N_("Scroll one page backward"),
           G_CALLBACK (ev_window_cmd_scroll_backward) },
-        { "BackSpace", GTK_STOCK_FIND, NULL, "BackSpace",
+        { "BackSpace", NULL, "", "BackSpace",
           N_("Scroll one page backward"),
           G_CALLBACK (ev_window_cmd_scroll_backward) },
-        { "ShiftBackSpace", GTK_STOCK_FIND, NULL, "<shift>BackSpace",
+        { "ShiftBackSpace", NULL, "", "<shift>BackSpace",
           N_("Scroll one page forward"),
-          G_CALLBACK (ev_window_cmd_scroll_forward) }
+          G_CALLBACK (ev_window_cmd_scroll_forward) },
+        { "Plus", GTK_STOCK_ZOOM_IN, NULL, "plus",
+          N_("Enlarge the document"),
+          G_CALLBACK (ev_window_cmd_view_zoom_in) },
+        { "CtrlEqual", GTK_STOCK_ZOOM_IN, NULL, "<control>equal",
+          N_("Enlarge the document"),
+          G_CALLBACK (ev_window_cmd_view_zoom_in) },
+        { "Minus", GTK_STOCK_ZOOM_OUT, NULL, "minus",
+          N_("Shrink the document"),
+          G_CALLBACK (ev_window_cmd_view_zoom_out) },
+        { "FocusPageSelector", NULL, "", "<control>l",
+          N_("Focus the page selector"),
+          G_CALLBACK (ev_window_cmd_focus_page_selector) },
+        { "GoBackwardFast", NULL, "", "<shift>Page_Up",
+          N_("Go ten pages backward"),
+          G_CALLBACK (ev_window_cmd_go_backward) },
+        { "GoForwardFast", NULL, "", "<shift>Page_Down",
+          N_("Go ten pages forward"),
+          G_CALLBACK (ev_window_cmd_go_forward) },
 };
 
 /* Toggle items */
@@ -2413,10 +2909,10 @@ static const 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,
+        { "ViewContinuous", EV_STOCK_VIEW_CONTINUOUS, N_("_Continuous"), NULL,
 	  N_("Show the entire document"),
 	  G_CALLBACK (ev_window_cmd_continuous), TRUE },
-        { "ViewDual", NULL, N_("_Dual"), NULL,
+        { "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",
@@ -2433,33 +2929,54 @@ static const GtkToggleActionEntry toggle_entries[] = {
           G_CALLBACK (ev_window_cmd_view_page_width) },
 };
 
-static const GtkRadioActionEntry page_view_entries[] = {
-	{ "SinglePage", GTK_STOCK_DND, N_("Single"), NULL,
-	  N_("Show the document one page at a time"),
-	  PAGE_MODE_SINGLE_PAGE },
-	{ "ContinuousPage", GTK_STOCK_DND_MULTIPLE, N_("Multi"), NULL,
-	  N_("Show the full document at once"),
-	  PAGE_MODE_CONTINUOUS_PAGE }
-};
-
 static void
 drag_data_received_cb (GtkWidget *widget, GdkDragContext *context,
 		       gint x, gint y, GtkSelectionData *selection_data,
 		       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);
+		
+		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_page_cache_set_link (window->priv->page_cache, link);
+	gtk_widget_grab_focus (window->priv->view);
+}
+
+static gboolean
+activate_label_cb (EvPageAction *page_action, char *label, EvWindow *window)
+{
+	g_return_val_if_fail (EV_IS_WINDOW (window), FALSE);
+
+	gtk_widget_grab_focus (window->priv->view);
+
+	return ev_page_cache_set_page_label (window->priv->page_cache, label);
+}
+
 static void
 register_custom_actions (EvWindow *window, GtkActionGroup *group)
 {
@@ -2471,6 +2988,10 @@ register_custom_actions (EvWindow *window, GtkActionGroup *group)
 			       "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);
 
@@ -2610,6 +3131,7 @@ sidebar_widget_model_set (EvSidebarLinks *ev_sidebar_links,
 
 	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);
 }
 
 
@@ -2617,16 +3139,24 @@ static void
 set_view_actions_sensitivity (EvWindow *window, gboolean sensitive)
 {
 	if (window->priv->action_group) {
+		set_action_sensitive (window, "PageDown", sensitive);
+		set_action_sensitive (window, "PageUp", sensitive);
 		set_action_sensitive (window, "Space", sensitive);
 		set_action_sensitive (window, "ShiftSpace", sensitive);
 		set_action_sensitive (window, "BackSpace", sensitive);
 		set_action_sensitive (window, "ShiftBackSpace", sensitive);
+		set_action_sensitive (window, "Slash", sensitive);
+		set_action_sensitive (window, "Plus", sensitive);
+		set_action_sensitive (window, "Minus", sensitive);
 	}
 }
 
 static void
 view_actions_focus_in_cb (GtkWidget *widget, GdkEventFocus *event, EvWindow *window)
 {
+	update_chrome_flag (window, EV_CHROME_RAISE_TOOLBAR, NULL, FALSE);
+	set_action_sensitive (window, "ViewToolbar", TRUE);
+
 	set_view_actions_sensitivity (window, TRUE);
 }
 
@@ -2637,14 +3167,64 @@ view_actions_focus_out_cb (GtkWidget *widget, GdkEventFocus *event, EvWindow *wi
 }
 
 static void
-enable_view_actions_for_widget (EvWindow *window, GtkWidget *widget)
+sidebar_page_main_widget_update_cb (GObject *ev_sidebar_page,
+				    GParamSpec         *pspec,
+				    EvWindow           *ev_window)
 {
-	g_signal_connect_object (widget, "focus_in_event",
-			         G_CALLBACK (view_actions_focus_in_cb),
-				 window, 0);
-	g_signal_connect_object (widget, "focus_out_event",
-			         G_CALLBACK (view_actions_focus_out_cb),
-				 window, 0);
+	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)
+{
+#ifdef ENABLE_METADATA
+	char *uri = window->priv->uri;
+
+	if (uri && !(event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN)) {
+		gboolean maximized;
+
+		maximized = event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED;
+		ev_metadata_manager_set_boolean (uri, "window_maximized", maximized);
+	}
+#endif
+
+	return FALSE;
+}
+
+static gboolean
+window_configure_event_cb (EvWindow *window, GdkEventConfigure *event, gpointer dummy)
+{
+#ifdef ENABLE_METADATA
+	char *uri = window->priv->uri;
+	GdkWindowState state;
+	int x, y, width, height;
+
+	state = gdk_window_get_state (GTK_WIDGET (window)->window);
+
+	if (uri && !(state & GDK_WINDOW_STATE_FULLSCREEN)) {
+		gtk_window_get_position (GTK_WINDOW (window), &x, &y);
+		gtk_window_get_size (GTK_WINDOW (window), &width, &height);
+
+		ev_metadata_manager_set_int (uri, "window_x", x);
+		ev_metadata_manager_set_int (uri, "window_y", y);
+		ev_metadata_manager_set_int (uri, "window_width", width);
+		ev_metadata_manager_set_int (uri, "window_height", height);
+	}
+#endif
+
+	return FALSE;
 }
 
 static void
@@ -2653,14 +3233,19 @@ ev_window_init (EvWindow *ev_window)
 	GtkActionGroup *action_group;
 	GtkAccelGroup *accel_group;
 	GError *error = NULL;
-	GtkWidget *sidebar_widget, *toolbar_dock, *tree_view;
+	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;
+	ev_window->priv->page_mode = PAGE_MODE_DOCUMENT;
 	update_window_title (NULL, NULL, ev_window);
 
 	ev_window->priv->main_box = gtk_vbox_new (FALSE, 0);
@@ -2675,11 +3260,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);
 
@@ -2701,7 +3281,7 @@ ev_window_init (EvWindow *ev_window)
 	if (!gtk_ui_manager_add_ui_from_file (ev_window->priv->ui_manager,
 					      DATADIR"/evince-ui.xml",
 					      &error)) {
-		g_message ("building menus failed: %s", error->message);
+		g_warning ("building menus failed: %s", error->message);
 		g_error_free (error);
 	}
 
@@ -2784,21 +3364,23 @@ ev_window_init (EvWindow *ev_window)
 			  "notify::model",
 			  G_CALLBACK (sidebar_widget_model_set),
 			  ev_window);
-	tree_view = ev_sidebar_links_get_treeview
-			(EV_SIDEBAR_LINKS (sidebar_widget));
-	enable_view_actions_for_widget (ev_window, tree_view);
+	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),
 			     sidebar_widget);
 
 	sidebar_widget = ev_sidebar_thumbnails_new ();
-	tree_view = ev_sidebar_thumbnails_get_treeview
-			(EV_SIDEBAR_THUMBNAILS (sidebar_widget));
-	enable_view_actions_for_widget (ev_window, tree_view);
+	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),
 			     sidebar_widget);
 
+
 	ev_window->priv->scrolled_window =
 		GTK_WIDGET (g_object_new (GTK_TYPE_SCROLLED_WINDOW,
 					  "shadow-type", GTK_SHADOW_IN,
@@ -2814,10 +3396,16 @@ ev_window_init (EvWindow *ev_window)
 				  "unlock",
 				  G_CALLBACK (ev_window_popup_password_dialog),
 				  ev_window);
-	enable_view_actions_for_widget (ev_window, ev_window->priv->view);
+	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);
 	gtk_widget_show (ev_window->priv->view);
 	gtk_widget_show (ev_window->priv->password_view);
 
+
 	/* 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);
@@ -2838,16 +3426,24 @@ ev_window_init (EvWindow *ev_window)
 			  "notify::sizing-mode",
 			  G_CALLBACK (ev_window_sizing_mode_changed_cb),
 			  ev_window);
+	g_signal_connect (ev_window->priv->view,
+			  "notify::zoom",
+			  G_CALLBACK (ev_window_zoom_changed_cb),
+			  ev_window);
+	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);
 
-	ev_window->priv->statusbar = gtk_statusbar_new ();
+	ev_window->priv->statusbar = ev_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,
@@ -2890,8 +3486,8 @@ ev_window_init (EvWindow *ev_window)
 			  G_CALLBACK (find_bar_search_changed_cb),
 			  ev_window);
 
-	/* Give focus to the scrolled window */
-	gtk_widget_grab_focus (ev_window->priv->scrolled_window);
+	/* Give focus to the document view */
+	gtk_widget_grab_focus (ev_window->priv->view);
 
 	/* Drag and Drop */
 	gtk_drag_dest_unset (GTK_WIDGET (ev_window));
@@ -2906,3 +3502,17 @@ ev_window_init (EvWindow *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,
+					      "default-width", 600,
+					      "default-height", 600,
+					      NULL));
+
+	return ev_window;
+}