X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=shell%2Fev-window.c;h=d860d74589186daff904a6cb20c4dae0bd6eeadd;hb=b0083a8f9bb4ef2d2fd9bed4106ce61e042f7c5c;hp=88392d96b9a8444e77da73f8c92b31071609a466;hpb=938636d838432d71cd8ed1c2aa1604faa6f8d083;p=evince.git

diff --git a/shell/ev-window.c b/shell/ev-window.c
index 88392d96..d860d745 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -52,16 +52,17 @@
 #include "eggfindbar.h"
 #include "egg-recent-view-uimanager.h"
 #include "egg-recent-view.h"
-#include "egg-recent-model.h"
 #include "egg-toolbar-editor.h"
-#include "egg-toolbars-model.h"
 #include "egg-editable-toolbar.h"
+#include "egg-recent-model.h"
+#include "egg-toolbars-model.h"
 #include "ephy-zoom.h"
 #include "ephy-zoom-action.h"
 #include "ev-application.h"
 #include "ev-stock-icons.h"
-#include "ev-file-helpers.h"
 #include "ev-metadata-manager.h"
+#include "ev-file-helpers.h"
+#include "ev-utils.h"
 
 #include <poppler.h>
 
@@ -114,13 +115,10 @@ struct _EvWindowPrivate {
 	GtkActionGroup *action_group;
 	GtkUIManager *ui_manager;
 
-	gchar *toolbar_file;
-	EggToolbarsModel *toolbar_model;
-	
 	/* Fullscreen mode */
 	GtkWidget *fullscreen_toolbar;
 	GtkWidget *fullscreen_popup;
-	GSource *fullscreen_timeout_source;
+	GSource   *fullscreen_timeout_source;
 
 	/* Document */
 	char *uri;
@@ -139,8 +137,6 @@ struct _EvWindowPrivate {
 	EvJob *xfer_job;
 	EvJob *load_job;
 
-	/* recent file stuff */
-	EggRecentModel *recent_model;
 	EggRecentViewUIManager *recent_view;
 };
 
@@ -158,11 +154,14 @@ static const GtkTargetEntry ev_drop_types[] = {
 #define GCONF_CHROME_TOOLBAR	"/apps/evince/show_toolbar"
 #define GCONF_CHROME_SIDEBAR	"/apps/evince/show_sidebar"
 #define GCONF_CHROME_STATUSBAR	"/apps/evince/show_statusbar"
-
+#define GCONF_LOCKDOWN_SAVE     "/desktop/gnome/lockdown/disable_save_to_disk"
+#define GCONF_LOCKDOWN_PRINT    "/desktop/gnome/lockdown/disable_printing"
 #define GCONF_SIDEBAR_SIZE      "/apps/evince/sidebar_size"
 
 #define SIDEBAR_DEFAULT_SIZE    132
 
+#define PRINT_CONFIG_FILENAME	"ev-print-config.xml"
+
 static void     ev_window_update_fullscreen_popup       (EvWindow         *window);
 static void     ev_window_sidebar_visibility_changed_cb (EvSidebar        *ev_sidebar,
 							 GParamSpec       *pspec,
@@ -216,6 +215,7 @@ update_action_sensitivity (EvWindow *ev_window)
 	gboolean ok_to_print = TRUE;
 	gboolean ok_to_copy = TRUE;
 	gboolean has_properties = TRUE;
+	GConfClient *client;
 
 	view = EV_VIEW (ev_window->priv->view);
 
@@ -244,6 +244,16 @@ update_action_sensitivity (EvWindow *ev_window)
 	if (!info || info->fields_mask == 0) {
 		has_properties = FALSE;
 	}
+	
+	client = gconf_client_get_default ();
+
+	if (gconf_client_get_bool (client, GCONF_LOCKDOWN_SAVE, NULL)) {
+		ok_to_copy = FALSE;
+	}
+
+	if (gconf_client_get_bool (client, GCONF_LOCKDOWN_PRINT, NULL)) {
+		ok_to_print = FALSE;
+	}
 
 	/* File menu */
 	/* "FileOpen": always sensitive */
@@ -262,8 +272,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);
+	set_action_sensitive (ev_window, "EditRotateLeft", has_pages);
+	set_action_sensitive (ev_window, "EditRotateRight", has_pages);
 
         /* View menu */
 	set_action_sensitive (ev_window, "ViewContinuous", has_pages);
@@ -347,13 +357,14 @@ update_chrome_visibility (EvWindow *window)
 	set_widget_visibility (priv->sidebar, sidebar);
 	set_widget_visibility (priv->find_bar, findbar);
 	set_widget_visibility (priv->statusbar, statusbar);
-	set_widget_visibility (priv->fullscreen_toolbar, fullscreen_toolbar);
 
 	if (priv->fullscreen_popup != NULL) {
 		if (fullscreen)
 			show_fullscreen_popup (window);
 		else
 			set_widget_visibility (priv->fullscreen_popup, FALSE);
+
+		set_widget_visibility (priv->fullscreen_toolbar, fullscreen_toolbar);
 	}
 }
 
@@ -579,11 +590,11 @@ update_window_title (EvDocument *document, GParamSpec *pspec, EvWindow *ev_windo
 	}
 
 	if (doc_title == NULL && ev_window->priv->uri) {
-		char *basename;
+		char *display_name;
 
-		basename = g_path_get_basename (ev_window->priv->uri);
-		doc_title = gnome_vfs_unescape_string_for_display (basename);
-		g_free (basename);
+		display_name = gnome_vfs_format_uri_for_display (ev_window->priv->uri);
+		doc_title = g_path_get_basename (display_name);
+		g_free (display_name);
 	}
 
 	if (password_needed) {
@@ -633,7 +644,6 @@ update_document_mode (EvWindow *window, EvDocumentMode mode)
 	}
 }
 
-#ifdef ENABLE_METADATA
 static void
 setup_document_from_metadata (EvWindow *window)
 {
@@ -647,7 +657,6 @@ setup_document_from_metadata (EvWindow *window)
 	}
 
 }
-#endif
 
 static void
 ev_window_setup_document (EvWindow *ev_window)
@@ -694,9 +703,7 @@ ev_window_setup_document (EvWindow *ev_window)
 					           ev_window->priv->document);
 	}
 
-#ifdef ENABLE_METADATA
 	setup_document_from_metadata (ev_window);
-#endif
 }
 
 static void
@@ -760,20 +767,21 @@ ev_window_popup_password_dialog (EvWindow *ev_window)
 
 	update_window_title (ev_window->priv->password_document, NULL, ev_window);
 	if (ev_window->priv->password_dialog == NULL) {
-		gchar *basename, *file_name;
+		gchar *base_name, *file_name;
 
-		basename = g_path_get_basename (ev_window->priv->password_uri);
-		file_name = gnome_vfs_unescape_string_for_display (basename);
+		file_name = gnome_vfs_format_uri_for_display (ev_window->priv->password_uri);
+		base_name = g_path_get_basename (file_name);
 		ev_window->priv->password_dialog =
-			ev_password_dialog_new (GTK_WIDGET (ev_window), file_name);
+			ev_password_dialog_new (GTK_WIDGET (ev_window), base_name);
+		g_free (base_name);
+		g_free (file_name);
+
 		g_object_add_weak_pointer (G_OBJECT (ev_window->priv->password_dialog),
 					   (gpointer *) &(ev_window->priv->password_dialog));
 		g_signal_connect (ev_window->priv->password_dialog,
 				  "response",
 				  G_CALLBACK (password_dialog_response),
 				  ev_window);
-		g_free (basename);
-		g_free (file_name);
 		gtk_widget_show (ev_window->priv->password_dialog);
 	} else {
 		ev_password_dialog_set_bad_pass (ev_window->priv->password_dialog);
@@ -875,11 +883,10 @@ ev_window_load_job_cb  (EvJobLoad *job,
 		ev_window->priv->password_document = g_object_ref (document);
 		ev_window->priv->password_uri = g_strdup (job->uri);
 
-		base_name = g_path_get_basename (job->uri);
-		file_name = gnome_vfs_unescape_string_for_display (base_name);
-
+		file_name = gnome_vfs_format_uri_for_display (job->uri);
+		base_name = g_path_get_basename (file_name);
 		ev_password_view_set_file_name (EV_PASSWORD_VIEW (ev_window->priv->password_view),
-						file_name);
+						base_name);
 		g_free (file_name);
 		g_free (base_name);
 		ev_window_set_page_mode (ev_window, PAGE_MODE_PASSWORD);
@@ -933,7 +940,6 @@ ev_window_xfer_job_cb  (EvJobXfer *job,
 	}		
 }
 
-#ifdef ENABLE_METADATA
 static void
 setup_view_from_metadata (EvWindow *window)
 {
@@ -942,19 +948,39 @@ setup_view_from_metadata (EvWindow *window)
 	GEnumValue *enum_value;
 	GValue width = { 0, };
 	GValue height = { 0, };
+	GValue maximized = { 0, };
+	GValue x = { 0, };
+	GValue y = { 0, };
 	GValue sizing_mode = { 0, };
 	GValue zoom = { 0, };
 	GValue continuous = { 0, };
 	GValue dual_page = { 0, };
 	GValue presentation = { 0, };
 	GValue fullscreen = { 0, };
+	GValue rotation = { 0, };
 
 	/* Window size */
-	if (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));
+	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 (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));
+		}
 	}
 
 	/* Sizing mode */
@@ -994,8 +1020,26 @@ setup_view_from_metadata (EvWindow *window)
 			ev_window_run_fullscreen (window);
 		}
 	}
+
+	/* Rotation */
+	if (ev_metadata_manager_get (uri, "rotation", &rotation)) {
+		if (g_value_get_int (&rotation)) {
+			switch (g_value_get_int (&rotation)) {
+			case 90:
+				ev_view_set_rotation (view, 90);
+				break;
+			case 180:
+				ev_view_set_rotation (view, 180);
+				break;
+			case 270:
+				ev_view_set_rotation (view, 270);
+				break;
+			default:
+				break;
+			}
+		}
+	}
 }
-#endif
 
 void
 ev_window_open_uri (EvWindow *ev_window, const char *uri)
@@ -1006,9 +1050,7 @@ 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
 	setup_view_from_metadata (ev_window);
-#endif
 	
 	ev_window_clear_jobs (ev_window);
 	ev_window_clear_local_uri (ev_window);
@@ -1033,7 +1075,7 @@ ev_window_cmd_file_open (GtkAction *action, EvWindow *window)
 	GtkWidget *chooser;
 	static char *folder = NULL;
 
-	chooser = gtk_file_chooser_dialog_new (_("Open document"),
+	chooser = gtk_file_chooser_dialog_new (_("Open Document"),
 					       GTK_WINDOW (window),
 					       GTK_FILE_CHOOSER_ACTION_OPEN,
 					       GTK_STOCK_CANCEL,
@@ -1096,33 +1138,22 @@ ev_window_add_recent (EvWindow *window, const char *filename)
 
 	item = egg_recent_item_new_from_uri (filename);
 	egg_recent_item_add_group (item, "Evince");
-	egg_recent_model_add_full (window->priv->recent_model, item);
+	egg_recent_model_add_full (ev_application_get_recent_model (EV_APP), item);
 }
 
 static void
 ev_window_setup_recent (EvWindow *ev_window)
 {
 
-
-
-	/* it would be better if we just filtered by mime-type, but there
-	 * doesn't seem to be an easy way to figure out which mime-types we
-	 * can handle */
-	ev_window->priv->recent_model = egg_recent_model_new (EGG_RECENT_MODEL_SORT_MRU);
-
 	ev_window->priv->recent_view = egg_recent_view_uimanager_new (ev_window->priv->ui_manager,
 								      "/MainMenu/FileMenu/RecentFilesMenu",
 								      G_CALLBACK (ev_window_cmd_recent_file_activate), 
 								      ev_window);	
 
         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),
-				   ev_window->priv->recent_model);
-
-	egg_recent_model_set_filter_groups (ev_window->priv->recent_model,
-    	    	    			    "Evince", NULL);
+				   ev_application_get_recent_model (EV_APP));
 
 	egg_recent_view_uimanager_set_trailing_sep (ev_window->priv->recent_view, TRUE);
 	
@@ -1202,7 +1233,8 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
 	GtkWidget *fc;
 
 	gchar *uri;
-	gchar *basename;
+	gchar *base_name;
+	gchar *file_name;
 	static char* folder = NULL;
 
 	gboolean success;
@@ -1223,9 +1255,11 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
 							folder);
     	}
 	
-	basename = g_path_get_basename (ev_window->priv->uri);
-	gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (fc), basename);
-	g_free (basename);
+	file_name = gnome_vfs_format_uri_for_display (ev_window->priv->uri);
+	base_name = g_path_get_basename (file_name);
+	gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (fc), base_name);
+	g_free (file_name);
+	g_free (base_name);
 
 	gtk_widget_show (fc);
 
@@ -1256,6 +1290,24 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
 	gtk_widget_destroy (fc);
 }
 
+static gboolean
+using_pdf_printer (GnomePrintConfig *config)
+{
+	const guchar *driver;
+
+	driver = gnome_print_config_get (
+		config, (const guchar *)"Settings.Engine.Backend.Driver");
+
+	if (driver) {
+		if (!strcmp ((const gchar *)driver, "gnome-print-pdf"))
+			return TRUE;
+		else
+			return FALSE;
+	}
+
+	return FALSE;
+}
+
 static gboolean
 using_postscript_printer (GnomePrintConfig *config)
 {
@@ -1273,7 +1325,7 @@ using_postscript_printer (GnomePrintConfig *config)
 			return TRUE;
 		else
 			return FALSE;
-	} else 	if (transport) {
+	} else 	if (transport) { /* these transports default to PostScript */
 		if (!strcmp ((const gchar *)transport, "CUPS"))
 			return TRUE;
 		else if (!strcmp ((const gchar *)transport, "LPD"))
@@ -1283,6 +1335,53 @@ using_postscript_printer (GnomePrintConfig *config)
 	return FALSE;
 }
 
+static GnomePrintConfig *
+load_print_config_from_file (void)
+{
+	GnomePrintConfig *print_config = NULL;
+	char *file_name, *contents = NULL;
+
+	file_name = g_build_filename (ev_dot_dir (), PRINT_CONFIG_FILENAME,
+				      NULL);
+
+	if (g_file_get_contents (file_name, &contents, NULL, NULL)) {
+		print_config = gnome_print_config_from_string (contents, 0);
+		g_free (contents);
+	}
+
+	if (print_config == NULL) {
+		print_config = gnome_print_config_default ();
+	}
+
+	g_free (file_name);
+
+	return print_config;
+}
+
+static void
+save_print_config_to_file (GnomePrintConfig *config)
+{
+	char *file_name, *str;
+
+	g_return_if_fail (config != NULL);
+
+	str = gnome_print_config_to_string (config, 0);
+	if (str == NULL) return;
+
+	file_name = g_build_filename (ev_dot_dir (),
+				      PRINT_CONFIG_FILENAME,
+				      NULL);
+
+#ifdef HAVE_G_FILE_SET_CONTENTS
+	g_file_set_contents (file_name, str, -1, NULL);
+#else
+	ev_file_set_contents (file_name, str, -1, NULL);
+#endif
+
+	g_free (file_name);
+	g_free (str);
+}
+
 static void
 ev_window_print (EvWindow *window)
 {
@@ -1319,7 +1418,7 @@ ev_window_print_range (EvWindow *ev_window, int first_page, int last_page)
 		last_page = ev_page_cache_get_n_pages (page_cache);
 	}
 
-	config = gnome_print_config_default ();
+	config = load_print_config_from_file ();
 	job = gnome_print_job_new (config);
 
 	print_dialog = gnome_print_dialog_new (job, (guchar *) _("Print"),
@@ -1348,7 +1447,18 @@ ev_window_print_range (EvWindow *ev_window, int first_page, int last_page)
 		/* FIXME: Change this when we have the first backend
 		 * that can print more than postscript
 		 */
-		if (!using_postscript_printer (config)) {
+		if (using_pdf_printer (config)) {
+			GtkWidget *dialog;
+
+			dialog = gtk_message_dialog_new (
+				GTK_WINDOW (print_dialog), GTK_DIALOG_MODAL,
+				GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
+				_("Generating PDF is not supported"));
+			gtk_dialog_run (GTK_DIALOG (dialog));
+			gtk_widget_destroy (dialog);
+			
+			continue;
+		} else if (!using_postscript_printer (config)) {
 			GtkWidget *dialog;
 
 			dialog = gtk_message_dialog_new (
@@ -1366,6 +1476,8 @@ ev_window_print_range (EvWindow *ev_window, int first_page, int last_page)
 			continue;
 		}
 
+		save_print_config_to_file (config);
+
 		print_job = g_object_new (EV_TYPE_PRINT_JOB,
 					  "gnome_print_job", job,
 					  "document", ev_window->priv->document,
@@ -1380,6 +1492,8 @@ ev_window_print_range (EvWindow *ev_window, int first_page, int last_page)
 		ev_print_job_print (print_job, GTK_WINDOW (ev_window));
 		g_object_unref (print_job);
 	}
+
+	g_object_unref (config);
 }
 
 static void
@@ -1482,6 +1596,9 @@ ev_window_update_fullscreen_popup (EvWindow *window)
 
 	g_return_if_fail (popup != NULL);
 
+	if (GTK_WIDGET (window)->window == NULL)
+		return;
+
 	toolbar = (window->priv->chrome & EV_CHROME_TOOLBAR) != 0 || 
 		  (window->priv->chrome & EV_CHROME_RAISE_TOOLBAR) != 0;
 	popup_width = popup->requisition.width;
@@ -1668,6 +1785,9 @@ ev_window_create_fullscreen_popup (EvWindow *window)
 	GtkWidget *hbox;
 	GtkWidget *button;
 
+	window->priv->fullscreen_toolbar = egg_editable_toolbar_new_with_model
+			(window->priv->ui_manager, ev_application_get_toolbars_model (EV_APP));
+
 	popup = gtk_window_new (GTK_WINDOW_POPUP);
 	hbox = gtk_hbox_new (FALSE, 0);
 	button = ev_window_get_exit_fullscreen_button (window);
@@ -1936,16 +2056,31 @@ ev_window_cmd_edit_toolbar_cb (GtkDialog *dialog, gint response, gpointer data)
 	EvWindow *ev_window = EV_WINDOW (data);
         egg_editable_toolbar_set_edit_mode
 			(EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar), FALSE);
-        egg_toolbars_model_save (ev_window->priv->toolbar_model,
-				 ev_window->priv->toolbar_file, "1.0");
+	ev_application_save_toolbars_model (EV_APP);
         gtk_widget_destroy (GTK_WIDGET (dialog));
 }
 
+/* should these be hooked up to properties?? */
+static void
+save_rotation_to_file (EvWindow *window)
+{
+	int rotation;
+
+	if (window->priv->uri) {
+		rotation = ev_view_get_rotation (EV_VIEW (window->priv->view));
+		ev_metadata_manager_set_int (window->priv->uri, "rotation",
+					     rotation);
+	}
+
+
+}
+
 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));
+	save_rotation_to_file (ev_window);
 }
 
 static void
@@ -1953,6 +2088,7 @@ 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));
+	save_rotation_to_file (ev_window);
 }
 
 static void
@@ -1960,33 +2096,34 @@ ev_window_cmd_edit_toolbar (GtkAction *action, EvWindow *ev_window)
 {
 	GtkWidget *dialog;
 	GtkWidget *editor;
-	g_return_if_fail (EV_IS_WINDOW (ev_window));
-    
-	dialog = gtk_dialog_new_with_buttons (_("Toolbar editor"), GTK_WINDOW (ev_window), 
+
+	dialog = gtk_dialog_new_with_buttons (_("Toolbar editor"),
+					      GTK_WINDOW (ev_window), 
 				              GTK_DIALOG_DESTROY_WITH_PARENT, 
 					      GTK_STOCK_CLOSE,
-					      GTK_RESPONSE_CANCEL, 
+					      GTK_RESPONSE_CLOSE, 
 					      NULL);
+	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)), 5);
+	gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 18);
 	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
 	gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 400);
 	  
 	editor = egg_toolbar_editor_new (ev_window->priv->ui_manager,
-					 ev_window->priv->toolbar_model);
+					 ev_application_get_toolbars_model (EV_APP));
 	gtk_container_set_border_width (GTK_CONTAINER (editor), 5);
 	gtk_box_set_spacing (GTK_BOX (EGG_TOOLBAR_EDITOR (editor)), 5);
-	             
+             
 	gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), editor);
 	egg_toolbar_editor_load_actions (EGG_TOOLBAR_EDITOR (editor),
-				      DATADIR"/evince-toolbar.xml");
+				         DATADIR "/evince-toolbar.xml");
 
 	egg_editable_toolbar_set_edit_mode
 		(EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar), TRUE);
 
-	gtk_widget_show_all (dialog);
-      
-	g_signal_connect (G_OBJECT (dialog), "response",
+	g_signal_connect (dialog, "response",
 			  G_CALLBACK (ev_window_cmd_edit_toolbar_cb),
 			  ev_window);
+	gtk_widget_show_all (dialog);
 }
 
 static void
@@ -2119,6 +2256,7 @@ ev_window_cmd_escape (GtkAction *action, EvWindow *window)
 	widget = gtk_window_get_focus (GTK_WINDOW (window));
 	if (widget && gtk_widget_get_ancestor (widget, EGG_TYPE_FIND_BAR)) {
 		update_chrome_flag (window, EV_CHROME_FINDBAR, NULL, FALSE);
+		gtk_widget_grab_focus (window->priv->view);
 	} else {
 		gboolean fullscreen;
 		gboolean presentation;
@@ -2173,7 +2311,6 @@ update_view_size (EvView *view, EvWindow *window)
 static void
 save_sizing_mode (EvWindow *window)
 {
-#ifdef ENABLE_METADATA
 	EvSizingMode mode;
 	GEnumValue *enum_value;
 
@@ -2184,7 +2321,6 @@ save_sizing_mode (EvWindow *window)
 		ev_metadata_manager_set_string (window->priv->uri, "sizing_mode",
 						enum_value->value_nick);
 	}
-#endif
 }
 
 static void     
@@ -2241,8 +2377,10 @@ ev_window_zoom_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_window)
 {
         update_action_sensitivity (ev_window);
 
-	ev_metadata_manager_set_double (ev_window->priv->uri, "zoom",
-				        ev_view_get_zoom (EV_VIEW (ev_window->priv->view)));
+	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));
+	}
 }
 
 static void
@@ -2277,6 +2415,7 @@ static void
 ev_window_continuous_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_window)
 {
 	ev_window_update_continuous_action (ev_window);
+
 	ev_metadata_manager_set_boolean (ev_window->priv->uri, "continuous",
 				         ev_view_get_continuous (EV_VIEW (ev_window->priv->view)));
 }
@@ -2285,6 +2424,7 @@ static void
 ev_window_dual_mode_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_window)
 {
 	ev_window_update_dual_page_action (ev_window);
+
 	ev_metadata_manager_set_boolean (ev_window->priv->uri, "dual-page",
 				         ev_view_get_dual_page (EV_VIEW (ev_window->priv->view)));
 }
@@ -2625,18 +2765,6 @@ ev_window_dispose (GObject *object)
 	EvWindow *window = EV_WINDOW (object);
 	EvWindowPrivate *priv = window->priv;
 
-	if (priv->toolbar_model) {
-		g_object_unref (priv->toolbar_model);
-		g_free (priv->toolbar_file);
-		priv->toolbar_model = NULL;
-		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;
@@ -2736,16 +2864,16 @@ static const GtkActionEntry entries[] = {
 	{ "Help", NULL, N_("_Help") },
 
 	/* File menu */
-	{ "FileOpen", GTK_STOCK_OPEN, NULL, "<control>O",
+	{ "FileOpen", GTK_STOCK_OPEN, N_("_Open..."), "<control>O",
 	  N_("Open an existing document"),
 	  G_CALLBACK (ev_window_cmd_file_open) },
        	{ "FileSaveAs", GTK_STOCK_SAVE_AS, N_("_Save a Copy..."), NULL,
 	  N_("Save the current document with a new filename"),
 	  G_CALLBACK (ev_window_cmd_save_as) },
-	{ "FilePrint", GTK_STOCK_PRINT, N_("Print..."), "<control>P",
+	{ "FilePrint", GTK_STOCK_PRINT, N_("_Print..."), "<control>P",
 	  N_("Print this document"),
 	  G_CALLBACK (ev_window_cmd_file_print) },
-	{ "FileProperties", GTK_STOCK_PROPERTIES, N_("Properties"), "<alt>Return",
+	{ "FileProperties", GTK_STOCK_PROPERTIES, N_("P_roperties"), "<alt>Return",
 	  N_("View the properties of this document"),
 	  G_CALLBACK (ev_window_cmd_file_properties) },			      
 	{ "FileCloseWindow", GTK_STOCK_CLOSE, NULL, "<control>W",
@@ -2856,6 +2984,12 @@ static const GtkActionEntry entries[] = {
         { "GoForwardFast", NULL, "", "<shift>Page_Down",
           N_("Go ten pages forward"),
           G_CALLBACK (ev_window_cmd_go_forward) },
+        { "KpPlus", GTK_STOCK_ZOOM_IN, NULL, "KP_Add",
+          N_("Enlarge the document"),
+          G_CALLBACK (ev_window_cmd_view_zoom_in) },
+        { "KpMinus", GTK_STOCK_ZOOM_OUT, NULL, "KP_Subtract",
+          N_("Shrink the document"),
+          G_CALLBACK (ev_window_cmd_view_zoom_out) },
 };
 
 /* Toggle items */
@@ -2867,7 +3001,7 @@ static const GtkToggleActionEntry toggle_entries[] = {
 	{ "ViewStatusbar", NULL, N_("_Statusbar"), NULL,
 	  N_("Show or hide the statusbar"),
 	  G_CALLBACK (ev_window_view_statusbar_cb), TRUE },
-        { "ViewSidebar", NULL, N_("Side _pane"), "F9",
+        { "ViewSidebar", NULL, N_("Side _Pane"), "F9",
 	  N_("Show or hide the side pane"),
 	  G_CALLBACK (ev_window_view_sidebar_cb), TRUE },
         { "ViewContinuous", EV_STOCK_VIEW_CONTINUOUS, N_("_Continuous"), NULL,
@@ -2879,7 +3013,7 @@ static const GtkToggleActionEntry toggle_entries[] = {
         { "ViewFullscreen", NULL, N_("_Fullscreen"), "F11",
           N_("Expand the window to fill the screen"),
           G_CALLBACK (ev_window_cmd_view_fullscreen) },
-        { "ViewPresentation", NULL, N_("_Presentation"), "F12",
+        { "ViewPresentation", NULL, N_("_Presentation"), "F5",
           N_("Run document as a presentation"),
           G_CALLBACK (ev_window_cmd_view_presentation) },
         { "ViewBestFit", EV_STOCK_ZOOM_PAGE, N_("_Best Fit"), NULL,
@@ -3097,7 +3231,7 @@ sidebar_widget_model_set (EvSidebarLinks *ev_sidebar_links,
 
 
 static void
-set_view_actions_sensitivity (EvWindow *window, gboolean sensitive)
+ev_window_set_view_accels_sensitivity (EvWindow *window, gboolean sensitive)
 {
 	if (window->priv->action_group) {
 		set_action_sensitive (window, "PageDown", sensitive);
@@ -3109,22 +3243,28 @@ set_view_actions_sensitivity (EvWindow *window, gboolean sensitive)
 		set_action_sensitive (window, "Slash", sensitive);
 		set_action_sensitive (window, "Plus", sensitive);
 		set_action_sensitive (window, "Minus", sensitive);
+		set_action_sensitive (window, "KpPlus", sensitive);
+		set_action_sensitive (window, "KpMinus", sensitive);
 	}
 }
 
-static void
+static gboolean
 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);
+	ev_window_set_view_accels_sensitivity (window, TRUE);
+
+	return FALSE;
 }
 
-static void
+static gboolean
 view_actions_focus_out_cb (GtkWidget *widget, GdkEventFocus *event, EvWindow *window)
 {
-	set_view_actions_sensitivity (window, FALSE);
+	ev_window_set_view_accels_sensitivity (window, FALSE);
+
+	return FALSE;
 }
 
 static void
@@ -3148,20 +3288,38 @@ sidebar_page_main_widget_update_cb (GObject *ev_sidebar_page,
 }
 
 static gboolean
-window_configure_event_cb (EvWindow *window, gpointer dummy)
+window_state_event_cb (EvWindow *window, GdkEventWindowState *event, gpointer dummy)
 {
-#ifdef ENABLE_METADATA
-	int width, height;
+	char *uri = window->priv->uri;
 
-	if (window->priv->uri == NULL) {
-		return FALSE;
+	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);
 	}
 
-	gtk_window_get_size (GTK_WINDOW (window), &width, &height);
+	return FALSE;
+}
 
-	ev_metadata_manager_set_int (window->priv->uri, "window_width", width);
-	ev_metadata_manager_set_int (window->priv->uri, "window_height", height);
-#endif
+static gboolean
+window_configure_event_cb (EvWindow *window, GdkEventConfigure *event, gpointer dummy)
+{
+	char *uri = window->priv->uri;
+	GdkWindowState state;
+	int x, y, width, height;
+
+	state = gdk_window_get_state (GTK_WIDGET (window)->window);
+
+	if (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);
+	}
 
 	return FALSE;
 }
@@ -3179,6 +3337,8 @@ ev_window_init (EvWindow *ev_window)
 
 	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);
 
@@ -3208,7 +3368,7 @@ ev_window_init (EvWindow *ev_window)
 		gtk_ui_manager_get_accel_group (ev_window->priv->ui_manager);
 	gtk_window_add_accel_group (GTK_WINDOW (ev_window), accel_group);
 
-	set_view_actions_sensitivity (ev_window, FALSE);
+	ev_window_set_view_accels_sensitivity (ev_window, FALSE);
 
 	g_signal_connect (ev_window->priv->ui_manager, "connect_proxy",
 			  G_CALLBACK (connect_proxy_cb), ev_window);
@@ -3229,23 +3389,6 @@ ev_window_init (EvWindow *ev_window)
 			    ev_window->priv->menubar,
 			    FALSE, FALSE, 0);
 
-	/* Toolbar editor */
-	ev_window->priv->toolbar_model = egg_toolbars_model_new ();
-	
-	ev_window->priv->toolbar_file = g_build_filename
-			(ev_dot_dir (), "evince_toolbar.xml", NULL);
-
-	if (!g_file_test (ev_window->priv->toolbar_file, G_FILE_TEST_EXISTS)) {
-		egg_toolbars_model_load (ev_window->priv->toolbar_model,
-					 DATADIR"/evince-toolbar.xml");
-	} else {
-		egg_toolbars_model_load (ev_window->priv->toolbar_model,
-					 ev_window->priv->toolbar_file);
-	}
-
-	egg_toolbars_model_set_flags (ev_window->priv->toolbar_model, 0,
-				      EGG_TB_MODEL_NOT_REMOVABLE); 
-	
 	/* This sucks, but there is no way to have a draw=no, expand=true separator
 	 * in a GtkUIManager-built toolbar. So, just add another toolbar.
 	 * See gtk+ bug 166489.
@@ -3256,18 +3399,13 @@ ev_window_init (EvWindow *ev_window)
 	gtk_widget_show (toolbar_dock);
 
 	ev_window->priv->toolbar = egg_editable_toolbar_new_with_model
-				(ev_window->priv->ui_manager, ev_window->priv->toolbar_model);
+				(ev_window->priv->ui_manager, ev_application_get_toolbars_model (EV_APP));
 	egg_editable_toolbar_show (EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar),
 				   "DefaultToolBar");
 	gtk_box_pack_start (GTK_BOX (toolbar_dock), ev_window->priv->toolbar,
 			    TRUE, TRUE, 0);
 	gtk_widget_show (ev_window->priv->toolbar);
 
-	ev_window->priv->fullscreen_toolbar =
-		gtk_ui_manager_get_widget (ev_window->priv->ui_manager, "/LeaveFullscreenToolbar");
-	gtk_toolbar_set_show_arrow (GTK_TOOLBAR (ev_window->priv->fullscreen_toolbar), TRUE);
-	
-
 	/* Add the main area */
 	ev_window->priv->hpaned = gtk_hpaned_new ();
 	g_signal_connect (ev_window->priv->hpaned,
@@ -3453,5 +3591,3 @@ ev_window_new (void)
 
 	return ev_window;
 }
-
-