X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-window.c;h=f1c41bb793700b018b79386e7772519b39fc2578;hb=77d8e048e17095228d5eca1edb00405978c5c9bc;hp=fdcb26478bd7d6d0223acac8778bc2d8e0d762e4;hpb=b03508d5c56a66284012bf5d1fc2f0a08347143f;p=evince.git

diff --git a/shell/ev-window.c b/shell/ev-window.c
index fdcb2647..f1c41bb7 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -34,10 +34,11 @@
 #include "ev-sidebar-links.h"
 #include "ev-sidebar-thumbnails.h"
 #include "ev-view.h"
-#include "ev-page-view.h"
 #include "ev-password.h"
 #include "ev-password-view.h"
 #include "ev-print-job.h"
+#include "ev-document-thumbnails.h"
+#include "ev-document-links.h"
 #include "ev-document-find.h"
 #include "ev-document-security.h"
 #include "eggfindbar.h"
@@ -51,6 +52,7 @@
 
 #include <libgnomevfs/gnome-vfs-mime-utils.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
+#include <libgnomevfs/gnome-vfs-utils.h>
 #include <libgnomeprintui/gnome-print-dialog.h>
 
 #include <gconf/gconf-client.h>
@@ -60,6 +62,12 @@
 #include "ev-application.h"
 #include "ev-stock-icons.h"
 
+typedef enum {
+	EV_SIZING_BEST_FIT,
+	EV_SIZING_FIT_WIDTH,
+	EV_SIZING_FREE,
+} EvSizingMode;
+
 typedef enum {
 	PAGE_MODE_SINGLE_PAGE,
 	PAGE_MODE_CONTINUOUS_PAGE,
@@ -93,8 +101,8 @@ struct _EvWindowPrivate {
 	GtkWidget *statusbar;
 	guint help_message_cid;
 	guint view_message_cid;
-	GtkWidget *exit_fullscreen_popup;
-	GtkWidget *exit_fullscreen_toolbar;
+	GtkWidget *fullscreen_toolbar;
+	GtkWidget *fullscreen_popup;
 	char *uri;
 
 	EvDocument *document;
@@ -107,6 +115,8 @@ struct _EvWindowPrivate {
 
 	EvChrome chrome;
 	gboolean fullscreen_mode;
+	EvSizingMode sizing_mode;
+	GSource *fullscreen_timeout_source;
 };
 
 static GtkTargetEntry ev_drop_types[] = {
@@ -123,13 +133,19 @@ static GtkTargetEntry ev_drop_types[] = {
 #define GCONF_CHROME_SIDEBAR	"/apps/evince/show_sidebar"
 #define GCONF_CHROME_STATUSBAR	"/apps/evince/show_statusbar"
 
+#define GCONF_SIDEBAR_SIZE      "/apps/evince/sidebar_size"
+#define SIDEBAR_DEFAULT_SIZE    132
+
 static void     ev_window_update_fullscreen_popup (EvWindow         *window);
+static void     ev_window_sidebar_visibility_changed_cb (EvSidebar *ev_sidebar, GParamSpec *pspec,
+							 EvWindow   *ev_window);
 static void     ev_window_set_page_mode           (EvWindow         *window,
 						   EvWindowPageMode  page_mode);
 static gboolean start_loading_document            (EvWindow         *ev_window,
 						   EvDocument       *document,
 						   const char       *uri);
-
+static void     ev_window_set_sizing_mode         (EvWindow         *ev_window,
+						   EvSizingMode      sizing_mode);
 
 G_DEFINE_TYPE (EvWindow, ev_window, GTK_TYPE_WINDOW)
 
@@ -176,6 +192,7 @@ update_action_sensitivity (EvWindow *ev_window)
 	set_action_sensitive (ev_window, "ViewNormalSize", document!=NULL);
 	set_action_sensitive (ev_window, "ViewBestFit", document!=NULL);
 	set_action_sensitive (ev_window, "ViewPageWidth", document!=NULL);
+	set_action_sensitive (ev_window, "ViewReload", document!=NULL);
 
         /* Go menu */
 	if (document) {
@@ -212,27 +229,39 @@ update_action_sensitivity (EvWindow *ev_window)
 	set_action_sensitive (ev_window, PAGE_SELECTOR_ACTION, document!=NULL);
 }
 
+static void
+set_widget_visibility (GtkWidget *widget, gboolean visible)
+{
+	g_return_if_fail (GTK_IS_WIDGET (widget));
+	
+	if (visible)
+		gtk_widget_show (widget);
+	else
+		gtk_widget_hide (widget);
+}
+
 static void
 update_chrome_visibility (EvWindow *window)
 {
 	EvWindowPrivate *priv = window->priv;
-	gboolean menubar, toolbar, sidebar, findbar, statusbar;
+	gboolean menubar, toolbar, sidebar, findbar, statusbar, fullscreen_toolbar;
 
 	menubar = (priv->chrome & EV_CHROME_MENUBAR) != 0 && !priv->fullscreen_mode;
-	toolbar = (priv->chrome & EV_CHROME_TOOLBAR) != 0;
-	sidebar = (priv->chrome & EV_CHROME_SIDEBAR) != 0;
-	findbar = (priv->chrome & EV_CHROME_FINDBAR) != 0;
+	toolbar = (priv->chrome & EV_CHROME_TOOLBAR) != 0 && !priv->fullscreen_mode;
+	sidebar = (priv->chrome & EV_CHROME_SIDEBAR) != 0 && !priv->fullscreen_mode;
+	fullscreen_toolbar = (priv->chrome & EV_CHROME_TOOLBAR) != 0;
 	statusbar = (priv->chrome & EV_CHROME_STATUSBAR) != 0 && !priv->fullscreen_mode;
+	findbar = (priv->chrome & EV_CHROME_FINDBAR) != 0;
 
-	g_object_set (priv->menubar, "visible", menubar, NULL);
-	g_object_set (priv->toolbar_dock, "visible", toolbar, NULL);
-	g_object_set (priv->sidebar, "visible", sidebar, NULL);
-	g_object_set (priv->find_bar, "visible", findbar, NULL);
-	g_object_set (priv->statusbar, "visible", statusbar, NULL);
+	set_widget_visibility (priv->menubar, menubar);
+	set_widget_visibility (priv->toolbar_dock, toolbar);
+	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);
 
-	g_object_set (priv->exit_fullscreen_toolbar, "visible", priv->fullscreen_mode, NULL);
-	if (priv->exit_fullscreen_popup != NULL) {
-		g_object_set (priv->exit_fullscreen_popup, "visible", !toolbar, NULL);
+	if (priv->fullscreen_popup != NULL) {
+		set_widget_visibility (priv->fullscreen_popup, priv->fullscreen_mode);
 	}
 }
 
@@ -258,6 +287,63 @@ update_chrome_flag (EvWindow *window, EvChrome flag, const char *pref, gboolean
 	update_chrome_visibility (window);
 }
 
+static void
+ev_window_cmd_view_best_fit (GtkAction *action, EvWindow *ev_window)
+{
+	if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) {
+		ev_window_set_sizing_mode (ev_window, EV_SIZING_BEST_FIT);
+	} else {
+		ev_window_set_sizing_mode (ev_window, EV_SIZING_FREE);
+	}
+}
+
+static void
+ev_window_cmd_view_page_width (GtkAction *action, EvWindow *ev_window)
+{
+	if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) {
+		ev_window_set_sizing_mode (ev_window, EV_SIZING_FIT_WIDTH);
+	} else {
+		ev_window_set_sizing_mode (ev_window, EV_SIZING_FREE);
+	}
+}
+
+static void
+update_sizing_buttons (EvWindow *window)
+{
+	GtkActionGroup *action_group = window->priv->action_group;
+	GtkAction *action;
+	gboolean best_fit, page_width;
+
+	switch (window->priv->sizing_mode) {
+	case EV_SIZING_BEST_FIT:
+		best_fit = TRUE;
+		page_width = FALSE;
+		break;
+	case EV_SIZING_FIT_WIDTH:
+		best_fit = FALSE;
+		page_width = TRUE;
+		break;
+
+	default:
+		best_fit = page_width = FALSE;
+		break;
+	}
+
+	action = gtk_action_group_get_action (action_group, "ViewBestFit");
+	g_signal_handlers_block_by_func
+		(action, G_CALLBACK (ev_window_cmd_view_best_fit), window);
+	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), best_fit);
+	g_signal_handlers_unblock_by_func
+		(action, G_CALLBACK (ev_window_cmd_view_best_fit), window);
+
+	action = gtk_action_group_get_action (action_group, "ViewPageWidth");	
+	g_signal_handlers_block_by_func
+		(action, G_CALLBACK (ev_window_cmd_view_page_width), window);
+	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), page_width);
+	g_signal_handlers_unblock_by_func
+		(action, G_CALLBACK (ev_window_cmd_view_page_width), window);
+}
+
 void
 ev_window_open_page (EvWindow *ev_window, int page)
 {
@@ -354,8 +440,23 @@ update_window_title (EvDocument *document, GParamSpec *pspec, EvWindow *ev_windo
 			}
 		}
 	}
+
+	if (doc_title) {
+		char *p;
+
+		for (p = doc_title; *p; ++p) {
+			/* an '\n' byte is always ASCII, no need for UTF-8 special casing */
+			if (*p == '\n')
+				*p = ' ';
+		}
+	}
+
 	if (doc_title == NULL && ev_window->priv->uri) {
-		doc_title = g_path_get_basename (ev_window->priv->uri);
+		char *basename;
+
+		basename = g_path_get_basename (ev_window->priv->uri);
+		doc_title = gnome_vfs_unescape_string_for_display (basename);
+		g_free (basename);
 	}
 
 	if (password_needed) {
@@ -392,12 +493,32 @@ update_total_pages (EvWindow *ev_window)
 
 /* This function assumes that ev_window just had ev_window->document set.
  */
+static gboolean
+document_supports_sidebar (EvDocument *document)
+{
+	return (EV_IS_DOCUMENT_THUMBNAILS (document) && EV_IS_DOCUMENT_LINKS (document));
+}
+
+static void
+hide_sidebar_and_actions (EvWindow *ev_window)
+{
+	GtkAction *action;
+	/* Alsthough we update the hiddenness of the sidebar, we don't want to
+	 * store the value */
+	g_signal_handlers_disconnect_by_func (ev_window->priv->sidebar,
+					      ev_window_sidebar_visibility_changed_cb,
+					      ev_window);
+	gtk_widget_hide (ev_window->priv->sidebar);
+	action = gtk_action_group_get_action (ev_window->priv->action_group, "ViewSidebar");
+	gtk_action_set_sensitive (action, FALSE);
+
+}
+
 static void
 ev_window_setup_document (EvWindow *ev_window)
 {
 	EvDocument *document;
 	EvView *view = EV_VIEW (ev_window->priv->view);
-	//EvPageView *page_view = EV_PAGE_VIEW (ev_window->priv->page_view);
 	EvSidebar *sidebar = EV_SIDEBAR (ev_window->priv->sidebar);
 
 	document = ev_window->priv->document;
@@ -409,9 +530,11 @@ ev_window_setup_document (EvWindow *ev_window)
 
 	ev_window_set_page_mode (ev_window, PAGE_MODE_SINGLE_PAGE);
 
-	ev_sidebar_set_document (sidebar, document);
+	if (document_supports_sidebar (document)) 
+		ev_sidebar_set_document (sidebar, document);
+	else
+		hide_sidebar_and_actions (ev_window);
 	ev_view_set_document (view, document);
-	//ev_page_view_set_document (page_view, document);
 
 	update_window_title (document, NULL, ev_window);
 	update_total_pages (ev_window);
@@ -469,9 +592,10 @@ ev_window_popup_password_dialog (EvWindow *ev_window)
 
 	update_window_title (ev_window->priv->password_document, NULL, ev_window);
 	if (ev_window->priv->password_dialog == NULL) {
-		gchar *file_name;
+		gchar *basename, *file_name;
 
-		file_name = g_path_get_basename (ev_window->priv->password_uri);
+		basename = g_path_get_basename (ev_window->priv->password_uri);
+		file_name = gnome_vfs_unescape_string_for_display (basename);
 		ev_window->priv->password_dialog =
 			ev_password_dialog_new (GTK_WIDGET (ev_window), file_name);
 		g_object_add_weak_pointer (G_OBJECT (ev_window->priv->password_dialog),
@@ -480,6 +604,7 @@ ev_window_popup_password_dialog (EvWindow *ev_window)
 				  "response",
 				  G_CALLBACK (password_dialog_response),
 				  ev_window);
+		g_free (basename);
 		g_free (file_name);
 		gtk_widget_show (ev_window->priv->password_dialog);
 	} else {
@@ -931,12 +1056,14 @@ ev_window_cmd_edit_copy (GtkAction *action, EvWindow *ev_window)
 static void
 ev_window_update_fullscreen_popup (EvWindow *window)
 {
-	GtkWidget *popup = window->priv->exit_fullscreen_popup;
+	GtkWidget *popup = window->priv->fullscreen_popup;
 	int popup_width, popup_height;
 	GdkRectangle screen_rect;
+	gboolean toolbar;
 
 	g_return_if_fail (popup != NULL);
 
+	toolbar = (window->priv->chrome & EV_CHROME_TOOLBAR) != 0;
 	popup_width = popup->requisition.width;
 	popup_height = popup->requisition.height;
 
@@ -946,18 +1073,25 @@ ev_window_update_fullscreen_popup (EvWindow *window)
                         (gdk_screen_get_default (),
                          GTK_WIDGET (window)->window),
                          &screen_rect);
-
-	if (gtk_widget_get_direction (popup) == GTK_TEXT_DIR_RTL)
-	{
+	if (toolbar) {
+		gtk_widget_set_size_request (popup,
+					     screen_rect.width,
+					     -1);
 		gtk_window_move (GTK_WINDOW (popup),
 				 screen_rect.x,
 				 screen_rect.y);
-	}
-	else
-	{
-		gtk_window_move (GTK_WINDOW (popup),
-				 screen_rect.x + screen_rect.width - popup_width,
-				 screen_rect.y);
+
+	} else {
+		if (gtk_widget_get_direction (popup) == GTK_TEXT_DIR_RTL)
+		{
+			gtk_window_move (GTK_WINDOW (popup),
+					 screen_rect.x,
+					 screen_rect.y);
+		} else {
+			gtk_window_move (GTK_WINDOW (popup),
+					 screen_rect.x + screen_rect.width - popup_width,
+					 screen_rect.y);
+		}
 	}
 }
 
@@ -969,17 +1103,31 @@ screen_size_changed_cb (GdkScreen *screen,
 }
 
 static void
-destroy_exit_fullscreen_popup (EvWindow *window)
+ev_window_sidebar_position_change_cb (GObject *object, GParamSpec *pspec,
+				      EvWindow *ev_window)
 {
-	if (window->priv->exit_fullscreen_popup != NULL)
+	GConfClient *client;
+	int sidebar_size;
+
+	sidebar_size = gtk_paned_get_position (GTK_PANED (object));
+
+	client = gconf_client_get_default ();
+	gconf_client_set_int (client, GCONF_SIDEBAR_SIZE, sidebar_size, NULL);
+	g_object_unref (client);
+}
+
+static void
+destroy_fullscreen_popup (EvWindow *window)
+{
+	if (window->priv->fullscreen_popup != NULL)
 	{
 		/* FIXME multihead */
 		g_signal_handlers_disconnect_by_func
 			(gdk_screen_get_default (),
 			 G_CALLBACK (screen_size_changed_cb), window);
 
-		gtk_widget_destroy (window->priv->exit_fullscreen_popup);
-		window->priv->exit_fullscreen_popup = NULL;
+		gtk_widget_destroy (window->priv->fullscreen_popup);
+		window->priv->fullscreen_popup = NULL;
 	}
 }
 
@@ -1000,24 +1148,81 @@ fullscreen_popup_size_request_cb (GtkWidget *popup, GtkRequisition *req, EvWindo
 	ev_window_update_fullscreen_popup (window);
 }
 
+static gboolean
+fullscreen_timeout_cb (gpointer data)
+{
+	EvWindow *window = EV_WINDOW (data);
+
+	g_object_set (window->priv->fullscreen_popup, "visible", FALSE, NULL);
+	ev_view_hide_cursor (EV_VIEW (window->priv->view));
+	window->priv->fullscreen_timeout_source = NULL;
+
+	return FALSE;
+}
+
 static void
-ev_window_fullscreen (EvWindow *window)
+fullscreen_set_timeout (EvWindow *window)
 {
-	GtkWidget *popup, *button, *icon, *label, *hbox;
+	GSource *source;
 
-	window->priv->fullscreen_mode = TRUE;
+	if (window->priv->fullscreen_timeout_source != NULL)
+		g_source_destroy (window->priv->fullscreen_timeout_source);
 
-	g_return_if_fail (window->priv->exit_fullscreen_popup == NULL);
+	source = g_timeout_source_new (1000);
+	g_source_set_callback (source, fullscreen_timeout_cb, window, NULL);
+	g_source_attach (source, NULL);
+	window->priv->fullscreen_timeout_source = source;
+}
 
-	popup = gtk_window_new (GTK_WINDOW_POPUP);
-	window->priv->exit_fullscreen_popup = popup;
+static void
+fullscreen_clear_timeout (EvWindow *window)
+{
+	if (window->priv->fullscreen_timeout_source != NULL)
+		g_source_destroy (window->priv->fullscreen_timeout_source);
+
+	window->priv->fullscreen_timeout_source = NULL;
+	ev_view_show_cursor (EV_VIEW (window->priv->view));
+}
+
+static gboolean
+fullscreen_motion_notify_cb (GtkWidget *widget,
+			     GdkEventMotion *event,
+			     gpointer user_data)
+{
+	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);
+
+	return FALSE;
+}
+
+static gboolean
+fullscreen_leave_notify_cb (GtkWidget *widget,
+			    GdkEventCrossing *event,
+			    gpointer user_data)
+{
+	EvWindow *window = EV_WINDOW (user_data);
+
+	fullscreen_clear_timeout (window);
+
+	return FALSE;
+}
+
+static GtkWidget *
+ev_window_get_exit_fullscreen_button (EvWindow *window)
+{
+	GtkWidget *button, *icon, *label, *hbox;
 
 	button = gtk_button_new ();
 	g_signal_connect (button, "clicked",
 			  G_CALLBACK (exit_fullscreen_button_clicked_cb),
 			  window);
 	gtk_widget_show (button);
-	gtk_container_add (GTK_CONTAINER (popup), button);
 
 	hbox = gtk_hbox_new (FALSE, 2);
 	gtk_widget_show (hbox);
@@ -1031,6 +1236,28 @@ ev_window_fullscreen (EvWindow *window)
 	gtk_widget_show (label);
 	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
 
+	return button;
+}
+
+static GtkWidget *
+ev_window_create_fullscreen_popup (EvWindow *window)
+{
+	GtkWidget *popup;
+	GtkWidget *hbox;
+	GtkWidget *button;
+
+	popup = gtk_window_new (GTK_WINDOW_POPUP);
+	hbox = gtk_hbox_new (FALSE, 0);
+	button = ev_window_get_exit_fullscreen_button (window);
+
+	gtk_container_add (GTK_CONTAINER (popup), hbox);
+	gtk_box_pack_start (GTK_BOX (hbox), window->priv->fullscreen_toolbar,
+			    TRUE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+
+	gtk_widget_show (button);
+	gtk_widget_show (hbox);
+
 	gtk_window_set_resizable (GTK_WINDOW (popup), FALSE);
 
 	/* FIXME multihead */
@@ -1039,8 +1266,35 @@ ev_window_fullscreen (EvWindow *window)
 	g_signal_connect (popup, "size_request",
 			  G_CALLBACK (fullscreen_popup_size_request_cb), window);
 
+	return popup;
+}
+
+static void
+ev_window_fullscreen (EvWindow *window)
+{
+	window->priv->fullscreen_mode = TRUE;
+
+	if (window->priv->fullscreen_popup == NULL)
+		window->priv->fullscreen_popup
+			= ev_window_create_fullscreen_popup (window);
 	update_chrome_visibility (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),
+			  window);
+	g_signal_connect (window->priv->view,
+			  "leave-notify-event",
+			  G_CALLBACK (fullscreen_leave_notify_cb),
+			  window);
+	fullscreen_set_timeout (window);
+
+	gtk_widget_grab_focus (window->priv->view);
+
 	ev_window_update_fullscreen_popup (window);
 }
 
@@ -1049,7 +1303,17 @@ ev_window_unfullscreen (EvWindow *window)
 {
 	window->priv->fullscreen_mode = FALSE;
 
-	destroy_exit_fullscreen_popup (window);
+	g_object_set (G_OBJECT (window->priv->scrolled_window),
+		      "shadow-type", GTK_SHADOW_IN,
+		      NULL);
+
+	fullscreen_clear_timeout (window);
+
+	g_signal_handlers_disconnect_by_func (window->priv->view,
+					      (gpointer) fullscreen_motion_notify_cb,
+					      window);
+
+//	destroy_fullscreen_popup (window);
 
 	update_chrome_visibility (window);
 }
@@ -1110,10 +1374,9 @@ ev_window_focus_in_event (GtkWidget *widget, GdkEventFocus *event)
 	EvWindow *window = EV_WINDOW (widget);
 	EvWindowPrivate *priv = window->priv;
 
-	if (priv->exit_fullscreen_popup != NULL &&
-	    (priv->chrome & EV_CHROME_TOOLBAR) == 0)
+	if (priv->fullscreen_mode)
 	{
-		gtk_widget_show (priv->exit_fullscreen_popup);
+		gtk_widget_show (priv->fullscreen_popup);
 	}
 
 	return GTK_WIDGET_CLASS (ev_window_parent_class)->focus_in_event (widget, event);
@@ -1125,10 +1388,9 @@ ev_window_focus_out_event (GtkWidget *widget, GdkEventFocus *event)
 	EvWindow *window = EV_WINDOW (widget);
 	EvWindowPrivate *priv = window->priv;
 
-	if (priv->exit_fullscreen_popup != NULL &&
-	    (priv->chrome & EV_CHROME_TOOLBAR) == 0)
+	if (priv->fullscreen_mode)
 	{
-		gtk_widget_hide (priv->exit_fullscreen_popup);
+		gtk_widget_hide (priv->fullscreen_popup);
 	}
 
 	return GTK_WIDGET_CLASS (ev_window_parent_class)->focus_out_event (widget, event);
@@ -1175,6 +1437,8 @@ ev_window_cmd_view_zoom_in (GtkAction *action, EvWindow *ev_window)
 {
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
+	ev_window_set_sizing_mode (ev_window, EV_SIZING_FREE);
+
 	ev_view_zoom_in (EV_VIEW (ev_window->priv->view));
 }
 
@@ -1183,6 +1447,8 @@ ev_window_cmd_view_zoom_out (GtkAction *action, EvWindow *ev_window)
 {
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
+	ev_window_set_sizing_mode (ev_window, EV_SIZING_FREE);
+
 	ev_view_zoom_out (EV_VIEW (ev_window->priv->view));
 }
 
@@ -1191,23 +1457,7 @@ ev_window_cmd_view_normal_size (GtkAction *action, EvWindow *ev_window)
 {
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
-	ev_view_normal_size (EV_VIEW (ev_window->priv->view));
-}
-
-static void
-ev_window_cmd_view_best_fit (GtkAction *action, EvWindow *ev_window)
-{
-        g_return_if_fail (EV_IS_WINDOW (ev_window));
-
-	ev_view_best_fit (EV_VIEW (ev_window->priv->view));
-}
-
-static void
-ev_window_cmd_view_page_width (GtkAction *action, EvWindow *ev_window)
-{
-        g_return_if_fail (EV_IS_WINDOW (ev_window));
-
-	ev_view_fit_width (EV_VIEW (ev_window->priv->view));
+	ev_view_set_size (EV_VIEW (ev_window->priv->view), -1, -1);
 }
 
 static void
@@ -1244,6 +1494,23 @@ ev_window_cmd_go_last_page (GtkAction *action, EvWindow *ev_window)
 	ev_view_set_page (EV_VIEW (ev_window->priv->view), G_MAXINT);
 }
 
+static void
+ev_window_cmd_view_reload (GtkAction *action, EvWindow *ev_window)
+{
+	char *uri;
+	int page;
+
+	g_return_if_fail (EV_IS_WINDOW (ev_window));
+
+	page = ev_document_get_page (ev_window->priv->document);
+	uri = g_strdup (ev_window->priv->uri);
+
+	ev_window_open (ev_window, uri);
+	ev_window_open_page (ev_window, page);
+
+	g_free (uri);
+}
+
 static void
 ev_window_cmd_help_contents (GtkAction *action, EvWindow *ev_window)
 {
@@ -1258,6 +1525,88 @@ ev_window_cmd_leave_fullscreen (GtkAction *action, EvWindow *window)
 	gtk_window_unfullscreen (GTK_WINDOW (window));
 }
 
+static void
+update_view_size (EvWindow *window)
+{
+	int width, height;
+	GtkRequisition vsb_requisition;
+	int scrollbar_spacing;
+
+	width = window->priv->scrolled_window->allocation.width;
+	height = window->priv->scrolled_window->allocation.height;
+
+	/* the scrolled window has a GTK_SHADOW_IN */
+	width -= 2 * window->priv->view->style->xthickness;
+	height -= 2 * window->priv->view->style->ythickness;
+
+	if (window->priv->sizing_mode == EV_SIZING_BEST_FIT) {
+		ev_view_set_size (EV_VIEW (window->priv->view),
+				  MAX (1, width), MAX (1, height));
+	} else if (window->priv->sizing_mode == EV_SIZING_FIT_WIDTH) {
+		gtk_widget_size_request (GTK_SCROLLED_WINDOW (window->priv->scrolled_window)->vscrollbar,
+					 &vsb_requisition);
+		gtk_widget_style_get (window->priv->scrolled_window,
+				      "scrollbar_spacing", &scrollbar_spacing,
+				      NULL);
+		ev_view_set_size (EV_VIEW (window->priv->view),
+				  width - vsb_requisition.width - scrollbar_spacing, -1);
+	}
+}
+
+static void
+size_allocate_cb (GtkWidget     *scrolled_window,
+		  GtkAllocation *allocation,
+		  EvWindow      *window)
+{
+	update_view_size (window);
+}
+
+static void
+ev_window_set_sizing_mode (EvWindow     *ev_window,
+			   EvSizingMode  sizing_mode)
+{
+	GtkWidget *scrolled_window;
+
+	if (ev_window->priv->sizing_mode == sizing_mode)
+		return;
+
+	scrolled_window = ev_window->priv->scrolled_window;
+	ev_window->priv->sizing_mode = sizing_mode;
+
+	g_signal_handlers_disconnect_by_func (scrolled_window, size_allocate_cb, ev_window);
+
+	update_view_size (ev_window);
+
+	switch (sizing_mode) {
+	case EV_SIZING_BEST_FIT:
+		g_object_set (G_OBJECT (scrolled_window),
+			      "hscrollbar-policy", GTK_POLICY_NEVER,
+			      "vscrollbar-policy", GTK_POLICY_NEVER,
+			      NULL);
+		g_signal_connect (scrolled_window, "size-allocate",
+				  G_CALLBACK (size_allocate_cb),
+				  ev_window);
+		break;
+	case EV_SIZING_FIT_WIDTH:
+		g_object_set (G_OBJECT (scrolled_window),
+			      "hscrollbar-policy", GTK_POLICY_NEVER,
+			      "vscrollbar-policy", GTK_POLICY_AUTOMATIC,
+			      NULL);
+		g_signal_connect (scrolled_window, "size-allocate",
+				  G_CALLBACK (size_allocate_cb),
+				  ev_window);
+		break;
+	case EV_SIZING_FREE:
+		g_object_set (G_OBJECT (scrolled_window),
+			      "hscrollbar-policy", GTK_POLICY_AUTOMATIC,
+			      "vscrollbar-policy", GTK_POLICY_AUTOMATIC,
+			      NULL);
+		break;
+	}
+
+	update_sizing_buttons (ev_window);
+}
+
 static void
 ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window)
 {
@@ -1341,6 +1690,33 @@ ev_window_view_sidebar_cb (GtkAction *action, EvWindow *ev_window)
 			    gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
 }
 
+static void
+ev_window_sidebar_visibility_changed_cb (EvSidebar *ev_sidebar, GParamSpec *pspec,
+					 EvWindow   *ev_window)
+{
+	GtkAction *action;
+	gboolean visible;
+
+	visible = GTK_WIDGET_VISIBLE (ev_sidebar);
+
+	/* In fullscreen mode the sidebar is not visible,
+	 * but we don't want to update the chrome
+	 */
+	if (ev_window->priv->fullscreen_mode)
+		return;
+	
+	action = gtk_action_group_get_action (ev_window->priv->action_group, "ViewSidebar");
+	
+	g_signal_handlers_block_by_func
+		(action, G_CALLBACK (ev_window_view_sidebar_cb), ev_window);
+	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), visible);
+	g_signal_handlers_unblock_by_func
+		(action, G_CALLBACK (ev_window_view_sidebar_cb), ev_window);
+
+	update_chrome_flag (ev_window, EV_CHROME_SIDEBAR,
+			    GCONF_CHROME_SIDEBAR, visible);
+}
+
 static void
 menu_item_select_cb (GtkMenuItem *proxy, EvWindow *ev_window)
 {
@@ -1560,7 +1936,7 @@ ev_window_dispose (GObject *object)
 		priv->password_uri = NULL;
 	}
 
-	destroy_exit_fullscreen_popup (window);
+	destroy_fullscreen_popup (window);
 
 	G_OBJECT_CLASS (ev_window_parent_class)->dispose (object);
 }
@@ -1594,7 +1970,7 @@ static GtkActionEntry entries[] = {
        	{ "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, NULL, "<control>P",
+	{ "FilePrint", GTK_STOCK_PRINT, N_("Print..."), "<control>P",
 	  N_("Print this document"),
 	  G_CALLBACK (ev_window_cmd_file_print) },
 	{ "FileCloseWindow", GTK_STOCK_CLOSE, NULL, "<control>W",
@@ -1620,14 +1996,11 @@ static GtkActionEntry entries[] = {
           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 defaul value"),
+          N_("Reset the zoom level to the default value"),
           G_CALLBACK (ev_window_cmd_view_normal_size) },
-        { "ViewBestFit", EV_STOCK_ZOOM_PAGE, N_("_Best Fit"), NULL,
-          N_("Make the current document fill the window"),
-          G_CALLBACK (ev_window_cmd_view_best_fit) },
-        { "ViewPageWidth", EV_STOCK_ZOOM_WIDTH, N_("Fit Page _Width"), NULL,
-          N_("Make the current document fill the window width"),
-          G_CALLBACK (ev_window_cmd_view_page_width) },
+        { "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",
@@ -1673,6 +2046,12 @@ static GtkToggleActionEntry toggle_entries[] = {
         { "ViewFullscreen", NULL, N_("_Fullscreen"), "F11",
           N_("Expand the window to fill the screen"),
           G_CALLBACK (ev_window_cmd_view_fullscreen) },
+        { "ViewBestFit", EV_STOCK_ZOOM_PAGE, N_("_Best Fit"), NULL,
+          N_("Make the current document fill the window"),
+          G_CALLBACK (ev_window_cmd_view_best_fit) },
+        { "ViewPageWidth", EV_STOCK_ZOOM_WIDTH, N_("Fit Page _Width"), NULL,
+          N_("Make the current document fill the window width"),
+          G_CALLBACK (ev_window_cmd_view_page_width) },
 };
 
 static GtkRadioActionEntry page_view_entries[] = {
@@ -1785,9 +2164,9 @@ set_chrome_actions (EvWindow *window)
 static EvChrome
 load_chrome (void)
 {
-	GConfClient *client;
-	GConfValue *value;	
 	EvChrome chrome = EV_CHROME_NORMAL;
+	GConfClient *client;
+	GConfValue *value;
 
 	client = gconf_client_get_default ();
 
@@ -1827,6 +2206,9 @@ ev_window_init (EvWindow *ev_window)
 	GtkAccelGroup *accel_group;
 	GError *error = NULL;
 	GtkWidget *sidebar_widget, *toolbar_dock;
+	GConfValue *value;
+	GConfClient *client;
+	int sidebar_size;
 
 	ev_window->priv = EV_WINDOW_GET_PRIVATE (ev_window);
 
@@ -1896,26 +2278,37 @@ ev_window_init (EvWindow *ev_window)
 			    TRUE, TRUE, 0);
 	gtk_widget_show (ev_window->priv->toolbar);
 
-	ev_window->priv->exit_fullscreen_toolbar =
-		gtk_ui_manager_get_widget (ev_window->priv->ui_manager,
-					   "/LeaveFullscreenToolbar");
-	gtk_box_pack_start (GTK_BOX (toolbar_dock),
-			    ev_window->priv->exit_fullscreen_toolbar,
-			    FALSE, FALSE, 0);
-	gtk_toolbar_set_show_arrow (GTK_TOOLBAR (ev_window->priv->exit_fullscreen_toolbar),
-				    FALSE);
-	gtk_toolbar_set_style (GTK_TOOLBAR (ev_window->priv->exit_fullscreen_toolbar),
-			       GTK_TOOLBAR_BOTH_HORIZ);
+	ev_window->priv->fullscreen_toolbar =
+		gtk_ui_manager_get_widget (ev_window->priv->ui_manager, "/LeaveFullscreenToolbar");
+	gtk_toolbar_set_show_arrow (GTK_TOOLBAR (ev_window->priv->fullscreen_toolbar), TRUE);
+	gtk_toolbar_set_style (GTK_TOOLBAR (ev_window->priv->fullscreen_toolbar), GTK_TOOLBAR_BOTH_HORIZ);
 
 	/* Add the main area */
 	ev_window->priv->hpaned = gtk_hpaned_new ();
-	gtk_widget_show (ev_window->priv->hpaned);
+	g_signal_connect (ev_window->priv->hpaned,
+			  "notify::position",
+			  G_CALLBACK (ev_window_sidebar_position_change_cb),
+			  ev_window);
+	
+	sidebar_size = SIDEBAR_DEFAULT_SIZE;
+	client = gconf_client_get_default ();
+	value = gconf_client_get (client, GCONF_SIDEBAR_SIZE, NULL);
+	if (value != NULL) {
+		if (value->type == GCONF_VALUE_INT) {
+			sidebar_size = gconf_value_get_int (value);
+		}
+		gconf_value_free (value);
+	}
+	g_object_unref (client);
+	gtk_paned_set_position (GTK_PANED (ev_window->priv->hpaned), sidebar_size);
 	gtk_box_pack_start (GTK_BOX (ev_window->priv->main_box), ev_window->priv->hpaned,
 			    TRUE, TRUE, 0);
-
+	gtk_widget_show (ev_window->priv->hpaned);
+	
 	ev_window->priv->sidebar = ev_sidebar_new ();
-	gtk_paned_add1 (GTK_PANED (ev_window->priv->hpaned),
-			ev_window->priv->sidebar);
+	gtk_paned_pack1 (GTK_PANED (ev_window->priv->hpaned),
+			 ev_window->priv->sidebar, FALSE, FALSE);
+	gtk_widget_show (ev_window->priv->sidebar);
 
 	/* Stub sidebar, for now */
 	sidebar_widget = ev_sidebar_links_new ();
@@ -1934,8 +2327,6 @@ ev_window_init (EvWindow *ev_window)
 
 	ev_window->priv->scrolled_window =
 		GTK_WIDGET (g_object_new (GTK_TYPE_SCROLLED_WINDOW,
-					  "hscrollbar-policy", GTK_POLICY_AUTOMATIC,
-					  "vscrollbar-policy", GTK_POLICY_AUTOMATIC,
 					  "shadow-type", GTK_SHADOW_IN,
 					  NULL));
 	gtk_widget_show (ev_window->priv->scrolled_window);
@@ -1992,6 +2383,12 @@ ev_window_init (EvWindow *ev_window)
 	set_chrome_actions (ev_window);
 	update_chrome_visibility (ev_window);
 
+	/* Connect sidebar signals */
+	g_signal_connect (ev_window->priv->sidebar,
+			  "notify::visible",
+			  G_CALLBACK (ev_window_sidebar_visibility_changed_cb),
+			  ev_window);
+	
 	/* Connect to find bar signals */
 	g_signal_connect (ev_window->priv->find_bar,
 			  "previous",
@@ -2033,5 +2430,8 @@ ev_window_init (EvWindow *ev_window)
 	g_signal_connect (G_OBJECT (ev_window), "drag_data_received",
 			  G_CALLBACK (drag_data_received_cb), NULL);
 
+	/* Set it to something random to force a change */
+	ev_window->priv->sizing_mode = EV_SIZING_FREE;
+	ev_window_set_sizing_mode (ev_window,  EV_SIZING_FIT_WIDTH);
 	update_action_sensitivity (ev_window);
 }