X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-window.c;h=250c119a20ded79f40f6bf6ec776e128f1ce4ab5;hb=6f7b6348dbaac85f6694242a08dd1374e16d317f;hp=23798bf9730da7605c5995b29966a017e915db35;hpb=792e15101fa0a75343b241a692beff93f189cbd8;p=evince.git

diff --git a/shell/ev-window.c b/shell/ev-window.c
index 23798bf9..250c119a 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -50,6 +50,7 @@
 #include <gtk/gtk.h>
 
 #include <libgnomevfs/gnome-vfs-mime-utils.h>
+#include <libgnomevfs/gnome-vfs-uri.h>
 #include <libgnomeprintui/gnome-print-dialog.h>
 
 #include <gconf/gconf-client.h>
@@ -59,6 +60,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,
@@ -92,8 +99,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;
@@ -106,7 +113,15 @@ struct _EvWindowPrivate {
 
 	EvChrome chrome;
 	gboolean fullscreen_mode;
+	EvSizingMode sizing_mode;
+	GSource *fullscreen_timeout_source;
+};
+
+static GtkTargetEntry ev_drop_types[] = {
+	{ "text/uri-list", 0, 0 }
 };
+
+
 #define EV_WINDOW_GET_PRIVATE(object) \
 	(G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_WINDOW, EvWindowPrivate))
 
@@ -122,7 +137,8 @@ static void     ev_window_set_page_mode           (EvWindow         *window,
 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)
 
@@ -205,27 +221,37 @@ 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)
+{
+	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);
 	}
 }
 
@@ -251,6 +277,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)
 {
@@ -347,6 +430,17 @@ 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);
 	}
@@ -390,7 +484,6 @@ 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;
@@ -404,7 +497,6 @@ ev_window_setup_document (EvWindow *ev_window)
 
 	ev_sidebar_set_document (sidebar, document);
 	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);
@@ -546,6 +638,31 @@ start_loading_document (EvWindow   *ev_window,
 	return FALSE;
 }
 
+static gboolean
+is_file_supported (const gchar *mime_type)
+{
+	static char *supported_types [] = {
+		"application/pdf",
+		"application/postscript",
+		"application/x-gzpostscript",
+		"image/x-eps",
+		NULL
+	};
+	gint   i;
+	
+	g_return_val_if_fail (mime_type != NULL, FALSE);
+
+	if (mime_type_supported_by_gdk_pixbuf (mime_type))
+		return TRUE;
+	
+	for (i = 0; supported_types[i] != NULL; i++) {
+		if (g_ascii_strcasecmp (mime_type, supported_types[i]) == 0)
+			return TRUE;
+	}
+	
+	return FALSE;
+}
+
 void
 ev_window_open (EvWindow *ev_window, const char *uri)
 {
@@ -586,6 +703,41 @@ ev_window_open (EvWindow *ev_window, const char *uri)
 	g_free (mime_type);
 }
 
+static void
+ev_window_open_uri_list (EvWindow *ev_window, GList *uri_list)
+{
+	GList *list;
+	gchar *uri, *mime_type;
+	
+	g_return_if_fail (uri_list != NULL);
+	
+	list = uri_list;
+	while (list) {
+		uri = gnome_vfs_uri_to_string (list->data, GNOME_VFS_URI_HIDE_NONE);
+		mime_type = gnome_vfs_get_mime_type (uri);
+		
+		if (is_file_supported (mime_type)) {
+			if (ev_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 (mime_type);
+		g_free (uri);
+
+		list = g_list_next (list);
+	}
+}
+
 static void
 ev_window_cmd_file_open (GtkAction *action, EvWindow *ev_window)
 {
@@ -864,12 +1016,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;
 
@@ -879,18 +1033,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);
+		}
 	}
 }
 
@@ -902,17 +1063,17 @@ screen_size_changed_cb (GdkScreen *screen,
 }
 
 static void
-destroy_exit_fullscreen_popup (EvWindow *window)
+destroy_fullscreen_popup (EvWindow *window)
 {
-	if (window->priv->exit_fullscreen_popup != NULL)
+	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;
 	}
 }
 
@@ -933,24 +1094,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);
@@ -964,6 +1182,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 */
@@ -972,8 +1212,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);
 }
 
@@ -982,7 +1249,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);
 }
@@ -1043,10 +1320,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);
@@ -1058,10 +1334,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);
@@ -1108,6 +1383,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));
 }
 
@@ -1116,6 +1393,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));
 }
 
@@ -1124,23 +1403,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
@@ -1191,6 +1454,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)
 {
@@ -1274,6 +1619,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)
 {
@@ -1493,7 +1865,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);
 }
@@ -1527,7 +1899,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",
@@ -1553,14 +1925,8 @@ 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) },
 
         /* Go menu */
         { "GoPreviousPage", GTK_STOCK_GO_BACK, N_("_Previous Page"), "Page_Up",
@@ -1606,6 +1972,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[] = {
@@ -1627,6 +1999,24 @@ goto_page_cb (GtkAction *action, int page_number, EvWindow *ev_window)
 	}
 }
 
+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;
+
+	uri_list = gnome_vfs_uri_list_parse ((gchar *) selection_data->data);
+
+	if (uri_list) {
+		ev_window_open_uri_list (EV_WINDOW (widget), uri_list);
+		
+		gnome_vfs_uri_list_free (uri_list);
+
+		gtk_drag_finish (context, TRUE, FALSE, time);
+	}
+}
+
 static void
 register_custom_actions (EvWindow *window, GtkActionGroup *group)
 {
@@ -1700,9 +2090,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 ();
 
@@ -1811,26 +2201,23 @@ 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);
 	gtk_box_pack_start (GTK_BOX (ev_window->priv->main_box), ev_window->priv->hpaned,
-			    TRUE, TRUE, 0);
-
+			    TRUE, TRUE, 0);	
 	ev_window->priv->sidebar = ev_sidebar_new ();
-	gtk_paned_add1 (GTK_PANED (ev_window->priv->hpaned),
-			ev_window->priv->sidebar);
+	g_signal_connect (ev_window->priv->sidebar,
+			  "notify::visible",
+			  G_CALLBACK (ev_window_sidebar_visibility_changed_cb),
+			  ev_window);
+	gtk_paned_pack1 (GTK_PANED (ev_window->priv->hpaned),
+			 ev_window->priv->sidebar, FALSE, FALSE);
+	gtk_widget_show (ev_window->priv->hpaned);
 
 	/* Stub sidebar, for now */
 	sidebar_widget = ev_sidebar_links_new ();
@@ -1849,8 +2236,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);
@@ -1940,5 +2325,16 @@ ev_window_init (EvWindow *ev_window)
 	/* Give focus to the scrolled window */
 	gtk_widget_grab_focus (ev_window->priv->scrolled_window);
 
+	/* Drag and Drop */
+	gtk_drag_dest_unset (GTK_WIDGET (ev_window));
+	gtk_drag_dest_set (GTK_WIDGET (ev_window), GTK_DEST_DEFAULT_ALL, ev_drop_types,
+			   sizeof (ev_drop_types) / sizeof (ev_drop_types[0]),
+			   GDK_ACTION_COPY);
+	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_BEST_FIT);
 	update_action_sensitivity (ev_window);
 }