X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=shell%2Fev-window.c;h=854079b573e0888cfbb9a4c2929daeafce1adf06;hb=bbc6a0f5736ed843754902eb9a829dd5e173e1ac;hp=12fa3d86d68888cf522a6dfa33236638b63eeef6;hpb=79986dda7231d1ef1c530909bde8e18a507a2a2a;p=evince.git

diff --git a/shell/ev-window.c b/shell/ev-window.c
index 12fa3d86..854079b5 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -37,17 +37,20 @@
 #include "ev-password.h"
 #include "ev-password-view.h"
 #include "ev-print-job.h"
-#include "ev-properties.h"
+#include "ev-properties-dialog.h"
+#include "ev-ps-exporter.h"
 #include "ev-document-thumbnails.h"
 #include "ev-document-links.h"
 #include "ev-document-fonts.h"
 #include "ev-document-find.h"
 #include "ev-document-security.h"
+#include "ev-document-types.h"
 #include "ev-job-queue.h"
 #include "ev-jobs.h"
 #include "ev-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"
@@ -58,6 +61,8 @@
 #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>
@@ -80,6 +85,7 @@ 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;
 
@@ -99,6 +105,10 @@ struct _EvWindowPrivate {
 	GtkWidget *page_view;
 	GtkWidget *password_view;
 	GtkWidget *statusbar;
+	GtkWidget *sidebar_thumbs;
+
+	/* Dialogs */
+	GtkWidget *properties;
 
 	/* UI Builders */
 	GtkActionGroup *action_group;
@@ -131,7 +141,7 @@ struct _EvWindowPrivate {
 
 	/* recent file stuff */
 	EggRecentModel *recent_model;
-	EggRecentViewGtk *recent_view;
+	EggRecentViewUIManager *recent_view;
 };
 
 static const GtkTargetEntry ev_drop_types[] = {
@@ -171,8 +181,8 @@ static void     ev_window_zoom_changed_cb 	        (EvView           *view,
 							 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);
@@ -205,13 +215,18 @@ update_action_sensitivity (EvWindow *ev_window)
 	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);
@@ -223,11 +238,18 @@ update_action_sensitivity (EvWindow *ev_window)
 		ok_to_copy = (info->permissions & EV_DOCUMENT_PERMISSIONS_OK_TO_COPY);
 	}
 
+	if (has_document && !EV_IS_PS_EXPORTER(document))
+		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 && ok_to_copy);
 	set_action_sensitive (ev_window, "FilePrint", has_pages && ok_to_print);
-	set_action_sensitive (ev_window, "FileProperties", has_document);
+	set_action_sensitive (ev_window, "FileProperties", has_document && has_properties);
 	/* "FileCloseWindow": always sensitive */
 
         /* Edit menu */
@@ -240,6 +262,8 @@ update_action_sensitivity (EvWindow *ev_window)
 			      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);
@@ -307,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;
 
@@ -358,6 +384,9 @@ 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));
@@ -594,11 +623,12 @@ page_changed_cb (EvPageCache *page_cache,
 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);
+	}
 }
 
 static void
@@ -640,6 +670,11 @@ ev_window_setup_document (EvWindow *ev_window)
 
 	info = ev_page_cache_get_info (ev_window->priv->page_cache);
 	update_document_mode (ev_window, info->mode);
+
+	if (ev_window->priv->properties) {
+		ev_properties_dialog_set_document (EV_PROPERTIES_DIALOG (ev_window->priv->properties),
+					           ev_window->priv->document);
+	}
 }
 
 static void
@@ -872,9 +907,27 @@ ev_window_xfer_job_cb  (EvJobXfer *job,
 				  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);
 	}		
 }
 
+#ifdef ENABLE_METADATA
+static void
+ev_window_setup_from_metadata (EvWindow *window)
+{
+	char *uri = window->priv->uri;
+	GValue width = { 0, };
+	GValue height = { 0, };
+
+	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));
+}
+#endif
+
 void
 ev_window_open_uri (EvWindow *ev_window, const char *uri)
 {
@@ -883,6 +936,10 @@ ev_window_open_uri (EvWindow *ev_window, const char *uri)
 
 	g_free (ev_window->priv->uri);
 	ev_window->priv->uri = g_strdup (uri);
+
+#ifdef ENABLE_METADATA
+	ev_window_setup_from_metadata (ev_window);
+#endif
 	
 	ev_window_clear_jobs (ev_window);
 	ev_window_clear_local_uri (ev_window);
@@ -901,56 +958,64 @@ ev_window_open_uri (EvWindow *ev_window, const char *uri)
     			            TRUE);
 }
 
-void
-ev_window_open_uri_list (EvWindow *ev_window, GSList *uri_list)
+static void
+ev_window_cmd_file_open (GtkAction *action, EvWindow *window)
 {
-	GSList *list;
-	gchar  *uri;
-	
-	g_return_if_fail (uri_list != NULL);
-	
-	list = uri_list;
-	while (list) {
+	GtkWidget *chooser;
+	static char *folder = NULL;
 
-		uri = (gchar *)list->data;
-		
-			if (ev_window_is_empty (EV_WINDOW (ev_window))) {
-				ev_window_open_uri (ev_window, uri);
+	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);
 
-				gtk_widget_show (GTK_WIDGET (ev_window));
-			} else {
-				EvWindow *new_window;
+	if (folder) {
+		gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (chooser),
+						         folder);
+    	}
 
-				new_window = ev_application_new_window (EV_APP);
-				ev_window_open_uri (new_window, uri);
+	ev_document_types_add_filters (chooser);
+	gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (chooser), TRUE);
+	gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (chooser), FALSE);
 
-				gtk_widget_show (GTK_WIDGET (new_window));
-			}
+	if (gtk_dialog_run (GTK_DIALOG (chooser)) == GTK_RESPONSE_OK) {
+		GSList *uris;
 
-		g_free (uri);
+		uris = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (chooser));
 
-		list = g_slist_next (list);
+		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));
 	}
-}
 
-static void
-ev_window_cmd_file_open (GtkAction *action, EvWindow *ev_window)
-{
-	ev_application_open (EV_APP, NULL);
+	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_uri (EV_WINDOW (window), uri);
+	ev_application_open_uri (EV_APP, uri, NULL);	
 	
 	g_free (uri);
 }
@@ -968,23 +1033,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),
@@ -993,7 +1055,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);
@@ -1069,8 +1131,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 (
@@ -1081,18 +1146,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_for_type (fc, G_TYPE_FROM_INSTANCE (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);
 
@@ -1114,6 +1178,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);
 }
 
@@ -1156,6 +1226,12 @@ ev_window_print (EvWindow *window)
 	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)
 {
@@ -1246,15 +1322,17 @@ ev_window_cmd_file_print (GtkAction *action, EvWindow *ev_window)
 static void
 ev_window_cmd_file_properties (GtkAction *action, EvWindow *ev_window)
 {
-	EvDocument *document = ev_window->priv->document;
-	const EvDocumentInfo *info;
-	GtkDialog *dialog;
+	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));
+	}
 
-	info = ev_page_cache_get_info (ev_window->priv->page_cache);
-	dialog = ev_properties_new (document, info);
-	gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (ev_window));
-	gtk_dialog_run (dialog);
-	gtk_widget_destroy (GTK_WIDGET (dialog));
+	gtk_widget_show (ev_window->priv->properties);
 }
 					
 static void
@@ -1335,7 +1413,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;
 
@@ -1561,7 +1640,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)
@@ -1590,10 +1669,13 @@ ev_window_fullscreen (EvWindow *window)
 }
 
 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,
@@ -1622,9 +1704,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);
 	}
 }
 
@@ -1659,7 +1741,7 @@ ev_window_run_presentation (EvWindow *window)
 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),
@@ -1677,6 +1759,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) {
@@ -1782,24 +1865,17 @@ ev_window_cmd_edit_toolbar_cb (GtkDialog *dialog, gint response, gpointer data)
 }
 
 static void
-ev_window_cmd_edit_landscape (GtkAction *action, EvWindow *ev_window)
-{
-	ev_view_set_orientation (EV_VIEW (ev_window->priv->view),
-				 EV_ORIENTATION_LANDSCAPE);
-}
-
-static void
-ev_window_cmd_edit_portrait (GtkAction *action, EvWindow *ev_window)
+ev_window_cmd_edit_rotate_left (GtkAction *action, EvWindow *ev_window)
 {
-	ev_view_set_orientation (EV_VIEW (ev_window->priv->view),
-				 EV_ORIENTATION_PORTRAIT);
+	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_flip (GtkAction *action, EvWindow *ev_window)
+ev_window_cmd_edit_rotate_right (GtkAction *action, EvWindow *ev_window)
 {
-	ev_view_set_orientation (EV_VIEW (ev_window->priv->view),
-				 EV_ORIENTATION_SEASCAPE);
+	ev_view_rotate_right (EV_VIEW (ev_window->priv->view));
+	ev_sidebar_thumbnails_refresh (EV_SIDEBAR_THUMBNAILS (ev_window->priv->sidebar_thumbs));
 }
 
 static void
@@ -1889,6 +1965,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)
 {
@@ -1949,7 +2052,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);
 
@@ -2124,7 +2227,7 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *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", comments,
@@ -2166,17 +2269,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");
@@ -2351,10 +2455,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);
+	
+	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
@@ -2370,6 +2491,17 @@ 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;
@@ -2446,6 +2578,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;
@@ -2495,15 +2628,12 @@ static const GtkActionEntry entries[] = {
         { "EditToolbar", NULL, N_("T_oolbar"), NULL,
           N_("Customize the toolbar"),
           G_CALLBACK (ev_window_cmd_edit_toolbar) },
-	{ "EditLandscape", NULL, N_("_Landscape"), NULL,
-	  N_("Change the document orientation to landscape"),
-	  G_CALLBACK (ev_window_cmd_edit_landscape) },
-	{ "EditPortrait", NULL, N_("_Portrait"), NULL,
-	  N_("Change the document orientation to portrait"),
-	  G_CALLBACK (ev_window_cmd_edit_portrait) },
-	{ "EditFlip", NULL, N_("_Flip"), NULL,
-	  N_("Flip the document"),
-	  G_CALLBACK (ev_window_cmd_edit_flip) },
+	{ "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",
@@ -2571,12 +2701,21 @@ static const GtkActionEntry entries[] = {
         { "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) }
+          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 */
@@ -2632,7 +2771,7 @@ drag_data_received_cb (GtkWidget *widget, GdkDragContext *context,
 
 		gnome_vfs_uri_list_free (uri_list);
 		
-		ev_window_open_uri_list (EV_WINDOW (widget), uris);
+		ev_application_open_uri_list (EV_APP, uris);
 		
 		g_slist_free (uris);
 
@@ -2813,6 +2952,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);
 }
 
 
@@ -2835,6 +2975,9 @@ set_view_actions_sensitivity (EvWindow *window, gboolean 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);
 }
 
@@ -2845,14 +2988,42 @@ 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_configure_event_cb (EvWindow *window, gpointer dummy)
+{
+#ifdef ENABLE_METADATA
+	int width, height;
+
+	if (window->priv->uri == NULL) {
+		return FALSE;
+	}
+
+	gtk_window_get_size (GTK_WINDOW (window), &width, &height);
+
+	ev_metadata_manager_set_int (window->priv->uri, "window_width", width);
+	ev_metadata_manager_set_int (window->priv->uri, "window_height", height);
+#endif
+
+	return FALSE;
 }
 
 static void
@@ -2861,11 +3032,14 @@ 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);
+
 	ev_window->priv = EV_WINDOW_GET_PRIVATE (ev_window);
 
 	ev_window->priv->page_mode = PAGE_MODE_DOCUMENT;
@@ -2987,21 +3161,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,
@@ -3017,10 +3193,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);
@@ -3110,3 +3292,18 @@ ev_window_init (EvWindow *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;
+}
+
+