]> www.fi.muni.cz Git - evince.git/blobdiff - shell/ev-window.c
Separate page/scale notifications
[evince.git] / shell / ev-window.c
index 01c4f8a3ea9557876816afc0a6d0c6b9fe6a34ba..dc88f7096c159906f4a3d6d79dcc04ad334be53e 100644 (file)
@@ -4,7 +4,7 @@
  *  Copyright (C) 2004 Martin Kretzschmar
  *  Copyright (C) 2004 Red Hat, Inc.
  *  Copyright (C) 2000, 2001, 2002, 2003, 2004 Marco Pesenti Gritti
- *  Copyright (C) 2003, 2004 Christian Persch
+ *  Copyright (C) 2003, 2004, 2005 Christian Persch
  *
  *  Author:
  *    Martin Kretzschmar <martink@gnome.org>
 #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>
+
 #include <string.h>
 
 #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,
        PAGE_MODE_PASSWORD,
 } EvWindowPageMode;
 
+typedef enum {
+       EV_CHROME_MENUBAR       = 1 << 0,
+       EV_CHROME_TOOLBAR       = 1 << 1,
+       EV_CHROME_SIDEBAR       = 1 << 2,
+       EV_CHROME_FINDBAR       = 1 << 3,
+       EV_CHROME_STATUSBAR     = 1 << 4,
+       EV_CHROME_NORMAL        = EV_CHROME_MENUBAR | EV_CHROME_TOOLBAR | EV_CHROME_SIDEBAR | EV_CHROME_STATUSBAR
+} EvChrome;
+
 struct _EvWindowPrivate {
        GtkWidget *main_box;
+       GtkWidget *menubar;
+       GtkWidget *toolbar_dock;
+       GtkWidget *toolbar;
        GtkWidget *hpaned;
        GtkWidget *sidebar;
        GtkWidget *thumbs_sidebar;
@@ -78,7 +99,8 @@ struct _EvWindowPrivate {
        GtkWidget *statusbar;
        guint help_message_cid;
        guint view_message_cid;
-       GtkWidget *exit_fullscreen_popup;
+       GtkWidget *fullscreen_toolbar;
+       GtkWidget *fullscreen_popup;
        char *uri;
 
        EvDocument *document;
@@ -89,14 +111,25 @@ struct _EvWindowPrivate {
        GtkWidget *password_dialog;
        char *password_uri;
 
+       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))
 
+#define PAGE_SELECTOR_ACTION   "PageSelector"
 
-#define PAGE_SELECTOR_ACTION "PageSelector"
-
+#define GCONF_CHROME_TOOLBAR   "/apps/evince/show_toolbar"
+#define GCONF_CHROME_SIDEBAR   "/apps/evince/show_sidebar"
+#define GCONF_CHROME_STATUSBAR "/apps/evince/show_statusbar"
 
 static void     ev_window_update_fullscreen_popup (EvWindow         *window);
 static void     ev_window_set_page_mode           (EvWindow         *window,
@@ -104,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)
 
@@ -160,14 +194,14 @@ update_action_sensitivity (EvWindow *ev_window)
                page = ev_view_get_page (EV_VIEW (ev_window->priv->view));
                n_pages = ev_document_get_n_pages (document);
 
-               set_action_sensitive (ev_window, "GoPageUp", page > 1);
-               set_action_sensitive (ev_window, "GoPageDown", page < n_pages);
+               set_action_sensitive (ev_window, "GoPreviousPage", page > 1);
+               set_action_sensitive (ev_window, "GoNextPage", page < n_pages);
                set_action_sensitive (ev_window, "GoFirstPage", page > 1);
                set_action_sensitive (ev_window, "GoLastPage", page < n_pages);
        } else {
                set_action_sensitive (ev_window, "GoFirstPage", FALSE);
-               set_action_sensitive (ev_window, "GoPageUp", FALSE);
-               set_action_sensitive (ev_window, "GoPageDown", FALSE);
+               set_action_sensitive (ev_window, "GoPreviousPage", FALSE);
+               set_action_sensitive (ev_window, "GoNextPage", FALSE);
                set_action_sensitive (ev_window, "GoLastPage", FALSE);
        }
 
@@ -187,6 +221,89 @@ 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, fullscreen_toolbar;
+
+       menubar = (priv->chrome & EV_CHROME_MENUBAR) != 0 && !priv->fullscreen_mode;
+       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;
+
+       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);
+
+       if (priv->fullscreen_popup != NULL) {
+               set_widget_visibility (priv->fullscreen_popup, priv->fullscreen_mode);
+       }
+}
+
+static void
+update_chrome_flag (EvWindow *window, EvChrome flag, const char *pref, gboolean active)
+{
+       EvWindowPrivate *priv = window->priv;
+       GConfClient *client;
+       
+       if (active) {
+               priv->chrome |= flag;
+       }
+       else {
+               priv->chrome &= ~flag;
+       }
+
+       if (pref != NULL) {
+               client = gconf_client_get_default ();
+               gconf_client_set_bool (client, pref, active, NULL);
+               g_object_unref (client);
+       }
+
+       update_chrome_visibility (window);
+}
+
+static void
+update_sizing_buttons (EvWindow *ev_window)
+{
+       GtkWidget *best_fit;
+       GtkWidget *fit_width;
+
+       best_fit = gtk_ui_manager_get_widget (ev_window->priv->ui_manager,
+                                             "/ToolBar/ViewBestFit");
+       fit_width = gtk_ui_manager_get_widget (ev_window->priv->ui_manager,
+                                             "/ToolBar/ViewPageWidth");
+
+       switch (ev_window->priv->sizing_mode) {
+       case EV_SIZING_BEST_FIT:
+               gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (best_fit), TRUE);
+               gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (fit_width), FALSE);
+               break;
+       case EV_SIZING_FIT_WIDTH:
+               gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (best_fit), FALSE);
+               gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (fit_width), TRUE);
+               break;
+       case EV_SIZING_FREE:
+               gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (best_fit), FALSE);
+               gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (fit_width), FALSE);
+               break;
+       }
+}
+
 void
 ev_window_open_page (EvWindow *ev_window, int page)
 {
@@ -283,6 +400,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);
        }
@@ -326,7 +454,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;
@@ -340,7 +467,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);
@@ -482,6 +608,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)
 {
@@ -498,6 +649,7 @@ ev_window_open (EvWindow *ev_window, const char *uri)
        else if (!strcmp (mime_type, "application/pdf"))
                document = g_object_new (PDF_TYPE_DOCUMENT, NULL);
        else if (!strcmp (mime_type, "application/postscript") ||
+                !strcmp (mime_type, "application/x-gzpostscript") ||
                 !strcmp (mime_type, "image/x-eps"))
                document = g_object_new (PS_TYPE_DOCUMENT, NULL);
        else if (mime_type_supported_by_gdk_pixbuf (mime_type))
@@ -521,6 +673,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)
 {
@@ -782,10 +969,7 @@ ev_window_cmd_edit_find (GtkAction *action, EvWindow *ev_window)
        } else if (!EV_IS_DOCUMENT_FIND (ev_window->priv->document)) {
                find_not_supported_dialog (ev_window);
        } else {
-               gtk_widget_show (ev_window->priv->find_bar);
-
-               if (ev_window->priv->exit_fullscreen_popup)
-                       ev_window_update_fullscreen_popup (ev_window);
+               update_chrome_flag (ev_window, EV_CHROME_FINDBAR, NULL, TRUE);
 
                egg_find_bar_grab_focus (EGG_FIND_BAR (ev_window->priv->find_bar));
        }
@@ -802,15 +986,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);
 
-       if (!popup)
-               return;
-
+       toolbar = (window->priv->chrome & EV_CHROME_TOOLBAR) != 0;
        popup_width = popup->requisition.width;
        popup_height = popup->requisition.height;
 
@@ -820,25 +1003,25 @@ ev_window_update_fullscreen_popup (EvWindow *window)
                         (gdk_screen_get_default (),
                          GTK_WIDGET (window)->window),
                          &screen_rect);
-
-       if (GTK_WIDGET_VISIBLE (window->priv->find_bar)) {
-               GtkRequisition req;
-
-               gtk_widget_size_request (window->priv->find_bar, &req);
-
-               screen_rect.height -= req.height;
-       }
-
-       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.width - popup_width,
-                                screen_rect.height - popup_height);
-       }
-       else
-       {
-               gtk_window_move (GTK_WINDOW (popup),
-                               screen_rect.x, screen_rect.height - popup_height);
+                                screen_rect.x,
+                                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);
+               }
        }
 }
 
@@ -850,17 +1033,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;
        }
 }
 
@@ -881,35 +1064,116 @@ 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, *main_menu;
+       GSource *source;
 
-       window->priv->fullscreen_mode = TRUE;
+       if (window->priv->fullscreen_timeout_source != NULL)
+               g_source_destroy (window->priv->fullscreen_timeout_source);
 
-       popup = gtk_window_new (GTK_WINDOW_POPUP);
-       window->priv->exit_fullscreen_popup = popup;
+       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;
+}
+
+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);
        gtk_container_add (GTK_CONTAINER (button), hbox);
 
-       icon = gtk_image_new_from_stock (GTK_STOCK_QUIT, GTK_ICON_SIZE_BUTTON);
+       icon = gtk_image_new_from_stock (EV_STOCK_LEAVE_FULLSCREEN, GTK_ICON_SIZE_BUTTON);
        gtk_widget_show (icon);
        gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0);
 
-       label = gtk_label_new (_("Exit Fullscreen"));
+       label = gtk_label_new (_("Leave Fullscreen"));
        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 */
@@ -918,27 +1182,56 @@ ev_window_fullscreen (EvWindow *window)
        g_signal_connect (popup, "size_request",
                          G_CALLBACK (fullscreen_popup_size_request_cb), window);
 
-       main_menu = gtk_ui_manager_get_widget (window->priv->ui_manager, "/MainMenu");
-       gtk_widget_hide (main_menu);
-       gtk_widget_hide (window->priv->statusbar);
+       return popup;
+}
 
-       ev_window_update_fullscreen_popup (window);
+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_show (popup);
+       gtk_widget_grab_focus (window->priv->view);
+
+       ev_window_update_fullscreen_popup (window);
 }
 
 static void
 ev_window_unfullscreen (EvWindow *window)
 {
-       GtkWidget *main_menu;
-
        window->priv->fullscreen_mode = FALSE;
 
-       main_menu = gtk_ui_manager_get_widget (window->priv->ui_manager, "/MainMenu");
-       gtk_widget_show (main_menu);
-       gtk_widget_show (window->priv->statusbar);
+       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_exit_fullscreen_popup (window);
+//     destroy_fullscreen_popup (window);
+
+       update_chrome_visibility (window);
 }
 
 static void
@@ -992,11 +1285,31 @@ ev_window_state_event_cb (GtkWidget *widget, GdkEventWindowState *event, EvWindo
 }
 
 static gboolean
-ev_window_focus_out_cb (GtkWidget *widget, GdkEventFocus *event, EvWindow *ev_window)
+ev_window_focus_in_event (GtkWidget *widget, GdkEventFocus *event)
 {
-       gtk_window_unfullscreen (GTK_WINDOW (ev_window));
+       EvWindow *window = EV_WINDOW (widget);
+       EvWindowPrivate *priv = window->priv;
 
-       return FALSE;
+       if (priv->fullscreen_mode)
+       {
+               gtk_widget_show (priv->fullscreen_popup);
+       }
+
+       return GTK_WIDGET_CLASS (ev_window_parent_class)->focus_in_event (widget, event);
+}
+
+static gboolean
+ev_window_focus_out_event (GtkWidget *widget, GdkEventFocus *event)
+{
+       EvWindow *window = EV_WINDOW (widget);
+       EvWindowPrivate *priv = window->priv;
+
+       if (priv->fullscreen_mode)
+       {
+               gtk_widget_hide (priv->fullscreen_popup);
+       }
+
+       return GTK_WIDGET_CLASS (ev_window_parent_class)->focus_out_event (widget, event);
 }
 
 static void
@@ -1040,6 +1353,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));
 }
 
@@ -1048,6 +1363,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));
 }
 
@@ -1056,27 +1373,61 @@ 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));
+       ev_view_set_size (EV_VIEW (ev_window->priv->view), -1, -1);
 }
 
 static void
 ev_window_cmd_view_best_fit (GtkAction *action, EvWindow *ev_window)
 {
+       EvWindowPrivate *priv = ev_window->priv;
+       GtkWidget *button;
+
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
-       ev_view_best_fit (EV_VIEW (ev_window->priv->view));
+       button = gtk_ui_manager_get_widget (priv->ui_manager, "/ToolBar/ViewBestFit");
+       if (! gtk_toggle_tool_button_get_active (GTK_TOGGLE_TOOL_BUTTON (button)))
+               return;
+
+       ev_window_set_sizing_mode (ev_window, EV_SIZING_BEST_FIT);
 }
 
 static void
 ev_window_cmd_view_page_width (GtkAction *action, EvWindow *ev_window)
 {
+       EvWindowPrivate *priv = ev_window->priv;
+       GtkWidget *button;
+       int width, height;
+       GtkRequisition vsb_requisition;
+       int scrollbar_spacing;
+
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
-       ev_view_fit_width (EV_VIEW (ev_window->priv->view));
+       button = gtk_ui_manager_get_widget (priv->ui_manager, "/ToolBar/ViewPageWidth");
+       if (! gtk_toggle_tool_button_get_active (GTK_TOGGLE_TOOL_BUTTON (button)))
+               return;
+
+
+       width = priv->scrolled_window->allocation.width;
+       height = priv->scrolled_window->allocation.height;
+
+       /* the scrolled window has a GTK_SHADOW_IN */
+       width -= 2 * priv->view->style->xthickness;
+       height -= 2 * priv->view->style->ythickness;
+
+       gtk_widget_size_request (
+               GTK_SCROLLED_WINDOW (priv->scrolled_window)->vscrollbar,
+               &vsb_requisition);
+       gtk_widget_style_get (priv->scrolled_window,
+                             "scrollbar_spacing", &scrollbar_spacing,
+                             NULL);
+
+       ev_window_set_sizing_mode (ev_window, EV_SIZING_FIT_WIDTH);
+
+       ev_view_set_size (EV_VIEW (ev_window->priv->view), width, height);
 }
 
 static void
-ev_window_cmd_go_page_up (GtkAction *action, EvWindow *ev_window)
+ev_window_cmd_go_previous_page (GtkAction *action, EvWindow *ev_window)
 {
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
@@ -1085,7 +1436,7 @@ ev_window_cmd_go_page_up (GtkAction *action, EvWindow *ev_window)
 }
 
 static void
-ev_window_cmd_go_page_down (GtkAction *action, EvWindow *ev_window)
+ev_window_cmd_go_next_page (GtkAction *action, EvWindow *ev_window)
 {
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
@@ -1117,6 +1468,86 @@ ev_window_cmd_help_contents (GtkAction *action, EvWindow *ev_window)
         /* FIXME */
 }
 
+static void
+ev_window_cmd_leave_fullscreen (GtkAction *action, EvWindow *window)
+{
+       gtk_window_unfullscreen (GTK_WINDOW (window));
+}
+
+static void
+size_allocate_cb (GtkWidget     *scrolled_window,
+                 GtkAllocation *allocation,
+                 EvWindow      *ev_window)
+{
+       int width, height;
+       GtkRequisition vsb_requisition;
+       int scrollbar_spacing;
+
+       width = ev_window->priv->scrolled_window->allocation.width;
+       height = ev_window->priv->scrolled_window->allocation.height;
+
+       /* the scrolled window has a GTK_SHADOW_IN */
+       width -= 2 * ev_window->priv->view->style->xthickness;
+       height -= 2 * ev_window->priv->view->style->ythickness;
+
+       if (ev_window->priv->sizing_mode == EV_SIZING_BEST_FIT) {
+               ev_view_set_size (EV_VIEW (ev_window->priv->view),
+                                 MAX (1, width), MAX (1, height));
+       } else if (ev_window->priv->sizing_mode == EV_SIZING_FIT_WIDTH) {
+               gtk_widget_size_request (GTK_SCROLLED_WINDOW (ev_window->priv->scrolled_window)->vscrollbar,
+                                        &vsb_requisition);
+               gtk_widget_style_get (ev_window->priv->scrolled_window,
+                                     "scrollbar_spacing", &scrollbar_spacing,
+                                     NULL);
+               ev_view_set_size (EV_VIEW (ev_window->priv->view),
+                                 width - vsb_requisition.width - scrollbar_spacing, -1);
+       }
+}
+
+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);
+
+       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)
 {
@@ -1179,33 +1610,52 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window)
 static void
 ev_window_view_toolbar_cb (GtkAction *action, EvWindow *ev_window)
 {
-       g_object_set (
-               G_OBJECT (gtk_ui_manager_get_widget (
-                                 ev_window->priv->ui_manager,
-                                 "/ToolBar")),
-               "visible",
-               gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)),
-               NULL);
+       update_chrome_flag (ev_window, EV_CHROME_TOOLBAR,
+                           GCONF_CHROME_TOOLBAR,
+                           gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
 }
 
 static void
 ev_window_view_statusbar_cb (GtkAction *action, EvWindow *ev_window)
 {
-       g_object_set (
-               ev_window->priv->statusbar,
-               "visible",
-               gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)),
-               NULL);
+       update_chrome_flag (ev_window, EV_CHROME_STATUSBAR,
+                           GCONF_CHROME_STATUSBAR,
+                           gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
 }
 
 static void
 ev_window_view_sidebar_cb (GtkAction *action, EvWindow *ev_window)
 {
-       g_object_set (
-               ev_window->priv->sidebar,
-               "visible",
-               gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)),
-               NULL);
+       update_chrome_flag (ev_window, EV_CHROME_SIDEBAR,
+                           GCONF_CHROME_SIDEBAR,
+                           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
@@ -1330,10 +1780,7 @@ static void
 find_bar_close_cb (EggFindBar *find_bar,
                   EvWindow   *ev_window)
 {
-       gtk_widget_hide (ev_window->priv->find_bar);
-
-       if (ev_window->priv->exit_fullscreen_popup)
-               ev_window_update_fullscreen_popup (ev_window);
+       update_chrome_flag (ev_window, EV_CHROME_FINDBAR, NULL, FALSE);
 }
 
 static void
@@ -1384,6 +1831,7 @@ find_bar_search_changed_cb (EggFindBar *find_bar,
                        ev_document_find_cancel (EV_DOCUMENT_FIND (ev_window->priv->document));
                        egg_find_bar_set_status_text (EGG_FIND_BAR (ev_window->priv->find_bar),
                                                      NULL);
+                       gtk_widget_queue_draw (GTK_WIDGET (ev_window->priv->view));
                }
        }
 }
@@ -1391,11 +1839,8 @@ find_bar_search_changed_cb (EggFindBar *find_bar,
 static void
 ev_window_dispose (GObject *object)
 {
-       EvWindowPrivate *priv;
-
-       g_return_if_fail (object != NULL && EV_IS_WINDOW (object));
-
-       priv = EV_WINDOW (object)->priv;
+       EvWindow *window = EV_WINDOW (object);
+       EvWindowPrivate *priv = window->priv;
 
        if (priv->ui_manager) {
                g_object_unref (priv->ui_manager);
@@ -1411,7 +1856,17 @@ ev_window_dispose (GObject *object)
                g_object_unref (priv->document);
                priv->document = NULL;
        }
-       
+
+       if (priv->view) {
+               g_object_unref (priv->view);
+               priv->view = NULL;
+       }
+
+       if (priv->page_view) {
+               g_object_unref (priv->page_view);
+               priv->page_view = NULL;
+       }
+
        if (priv->password_document) {
                g_object_unref (priv->password_document);
                priv->password_document = NULL;
@@ -1421,20 +1876,24 @@ ev_window_dispose (GObject *object)
                g_free (priv->password_uri);
                priv->password_uri = NULL;
        }
-       
+
+       destroy_fullscreen_popup (window);
+
        G_OBJECT_CLASS (ev_window_parent_class)->dispose (object);
 }
 
 static void
 ev_window_class_init (EvWindowClass *ev_window_class)
 {
-       GObjectClass *g_object_class;
+       GObjectClass *g_object_class = G_OBJECT_CLASS (ev_window_class);
+       GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (ev_window_class);
 
-       g_object_class = G_OBJECT_CLASS (ev_window_class);
        g_object_class->dispose = ev_window_dispose;
 
-       g_type_class_add_private (g_object_class, sizeof (EvWindowPrivate));
+       widget_class->focus_in_event = ev_window_focus_in_event;
+       widget_class->focus_out_event = ev_window_focus_out_event;
 
+       g_type_class_add_private (g_object_class, sizeof (EvWindowPrivate));
 }
 
 /* Normal items */
@@ -1446,54 +1905,48 @@ static GtkActionEntry entries[] = {
        { "Help", NULL, N_("_Help") },
 
        /* File menu */
-       { "FileOpen", GTK_STOCK_OPEN, N_("_Open"), "<control>O",
-         N_("Open a file"),
+       { "FileOpen", GTK_STOCK_OPEN, NULL, "<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) },
-       { "FileCloseWindow", GTK_STOCK_CLOSE, N_("_Close"), "<control>W",
+       { "FileCloseWindow", GTK_STOCK_CLOSE, NULL, "<control>W",
          N_("Close this window"),
          G_CALLBACK (ev_window_cmd_file_close_window) },
 
         /* Edit menu */
-        { "EditCopy", GTK_STOCK_COPY, N_("_Copy"), "<control>C",
+        { "EditCopy", GTK_STOCK_COPY, NULL, "<control>C",
           N_("Copy text from the document"),
           G_CALLBACK (ev_window_cmd_edit_copy) },
        { "EditSelectAll", NULL, N_("Select _All"), "<control>A",
          N_("Select the entire page"),
          G_CALLBACK (ev_window_cmd_edit_select_all) },
-        { "EditFind", GTK_STOCK_FIND, N_("_Find"), "<control>F",
+        { "EditFind", GTK_STOCK_FIND, NULL, "<control>F",
           N_("Find a word or phrase in the document"),
           G_CALLBACK (ev_window_cmd_edit_find) },
 
         /* View menu */
-        { "ViewZoomIn", GTK_STOCK_ZOOM_IN, N_("Zoom _In"), "<control>plus",
+        { "ViewZoomIn", GTK_STOCK_ZOOM_IN, NULL, "<control>plus",
           N_("Enlarge the document"),
           G_CALLBACK (ev_window_cmd_view_zoom_in) },
-        { "ViewZoomOut", GTK_STOCK_ZOOM_OUT, N_("Zoom _Out"), "<control>minus",
+        { "ViewZoomOut", GTK_STOCK_ZOOM_OUT, NULL, "<control>minus",
           N_("Shrink the document"),
           G_CALLBACK (ev_window_cmd_view_zoom_out) },
-        { "ViewNormalSize", GTK_STOCK_ZOOM_100, N_("_Normal Size"), "<control>0",
-          N_("Zoom to the normal size"),
+        { "ViewNormalSize", GTK_STOCK_ZOOM_100, NULL, "<control>0",
+          N_("Reset the zoom level to the default value"),
           G_CALLBACK (ev_window_cmd_view_normal_size) },
-        { "ViewBestFit", GTK_STOCK_ZOOM_FIT, N_("_Best Fit"), NULL,
-          N_("Zoom to fit the document to the current window"),
-          G_CALLBACK (ev_window_cmd_view_best_fit) },
-        { "ViewPageWidth", EV_STOCK_ZOOM_FIT_WIDTH, N_("Fit Page _Width"), NULL,
-          N_("Zoom to fit the width of the current window "),
-          G_CALLBACK (ev_window_cmd_view_page_width) },
 
         /* Go menu */
-        { "GoPageUp", GTK_STOCK_GO_UP, N_("_Page Up"), "<control>Page_Up",
+        { "GoPreviousPage", GTK_STOCK_GO_BACK, N_("_Previous Page"), "Page_Up",
           N_("Go to the previous page"),
-          G_CALLBACK (ev_window_cmd_go_page_up) },
-        { "GoPageDown", GTK_STOCK_GO_DOWN, N_("_Page Down"), "<control>Page_Down",
+          G_CALLBACK (ev_window_cmd_go_previous_page) },
+        { "GoNextPage", GTK_STOCK_GO_FORWARD, N_("_Next Page"), "Page_Down",
           N_("Go to the next page"),
-          G_CALLBACK (ev_window_cmd_go_page_down) },
+          G_CALLBACK (ev_window_cmd_go_next_page) },
         { "GoFirstPage", GTK_STOCK_GOTO_FIRST, N_("_First Page"), "<control>Home",
           N_("Go to the first page"),
           G_CALLBACK (ev_window_cmd_go_first_page) },
@@ -1509,23 +1962,34 @@ static GtkActionEntry entries[] = {
        { "HelpAbout", GTK_STOCK_ABOUT, N_("_About"), NULL,
          N_("Display credits for the document viewer creators"),
          G_CALLBACK (ev_window_cmd_help_about) },
+
+       /* Toolbar-only */
+       { "LeaveFullscreen", EV_STOCK_LEAVE_FULLSCREEN, N_("Leave Fullscreen"), "Escape",
+         N_("Leave fullscreen mode"),
+         G_CALLBACK (ev_window_cmd_leave_fullscreen) }
 };
 
 /* Toggle items */
 static GtkToggleActionEntry toggle_entries[] = {
        /* View Menu */
        { "ViewToolbar", NULL, N_("_Toolbar"), "<shift><control>T",
-         N_("Show or hide toolbar"),
+         N_("Show or hide the toolbar"),
          G_CALLBACK (ev_window_view_toolbar_cb), TRUE },
        { "ViewStatusbar", NULL, N_("_Statusbar"), NULL,
-         N_("Show or hide statusbar"),
+         N_("Show or hide the statusbar"),
          G_CALLBACK (ev_window_view_statusbar_cb), TRUE },
-        { "ViewSidebar", NULL, N_("Side_bar"), "F9",
-         N_("Show or hide sidebar"),
+        { "ViewSidebar", NULL, N_("Side _pane"), "F9",
+         N_("Show or hide the side pane"),
          G_CALLBACK (ev_window_view_sidebar_cb), TRUE },
         { "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[] = {
@@ -1547,6 +2011,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)
 {
@@ -1564,16 +2046,95 @@ register_custom_actions (EvWindow *window, GtkActionGroup *group)
 }
 
 static void
-set_short_labels (GtkActionGroup *action_group)
+set_action_properties (GtkActionGroup *action_group)
 {
        GtkAction *action;
 
-       action = gtk_action_group_get_action (action_group, "GoPageUp");
-       g_object_set (action, "short_label", _("Up"), NULL);
-       action = gtk_action_group_get_action (action_group, "GoPageDown");
-       g_object_set (action, "short_label", _("Down"), NULL);
+       action = gtk_action_group_get_action (action_group, "GoPreviousPage");
+       /*translators: this is the label for toolbar button*/
+       g_object_set (action, "short_label", _("Previous"), NULL);
+       g_object_set (action, "is-important", TRUE, NULL);
+       action = gtk_action_group_get_action (action_group, "GoNextPage");
+       /*translators: this is the label for toolbar button*/
+       g_object_set (action, "is-important", TRUE, NULL);
+       g_object_set (action, "short_label", _("Next"), NULL);
        action = gtk_action_group_get_action (action_group, "ViewPageWidth");
+       /*translators: this is the label for toolbar button*/
        g_object_set (action, "short_label", _("Fit Width"), NULL);
+       action = gtk_action_group_get_action (action_group, "ViewZoomIn");
+
+       action = gtk_action_group_get_action (action_group, "LeaveFullscreen");
+       g_object_set (action, "is-important", TRUE, NULL);
+}
+
+static void
+set_chrome_actions (EvWindow *window)
+{
+       EvWindowPrivate *priv = window->priv;
+       GtkActionGroup *action_group = priv->action_group;
+       GtkAction *action;
+
+       action= gtk_action_group_get_action (action_group, "ViewToolbar");
+       g_signal_handlers_block_by_func
+               (action, G_CALLBACK (ev_window_view_toolbar_cb), window);
+       gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
+                                     (priv->chrome & EV_CHROME_TOOLBAR) != 0);
+       g_signal_handlers_unblock_by_func
+               (action, G_CALLBACK (ev_window_view_toolbar_cb), window);
+
+       action= gtk_action_group_get_action (action_group, "ViewSidebar");
+       g_signal_handlers_block_by_func
+               (action, G_CALLBACK (ev_window_view_sidebar_cb), window);
+       gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
+                                     (priv->chrome & EV_CHROME_SIDEBAR) != 0);
+       g_signal_handlers_unblock_by_func
+               (action, G_CALLBACK (ev_window_view_sidebar_cb), window);
+
+       action= gtk_action_group_get_action (action_group, "ViewStatusbar");
+       g_signal_handlers_block_by_func
+               (action, G_CALLBACK (ev_window_view_statusbar_cb), window);
+       gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
+                                     (priv->chrome & EV_CHROME_STATUSBAR) != 0);
+       g_signal_handlers_unblock_by_func
+               (action, G_CALLBACK (ev_window_view_statusbar_cb), window);
+}
+
+static EvChrome
+load_chrome (void)
+{
+       EvChrome chrome = EV_CHROME_NORMAL;
+       GConfClient *client;
+       GConfValue *value;
+
+       client = gconf_client_get_default ();
+
+       value = gconf_client_get (client, GCONF_CHROME_TOOLBAR, NULL);
+       if (value != NULL) {
+               if (value->type == GCONF_VALUE_BOOL && !gconf_value_get_bool (value)) {
+                       chrome &= ~EV_CHROME_TOOLBAR;
+               }
+               gconf_value_free (value);
+       }
+
+       value = gconf_client_get (client, GCONF_CHROME_SIDEBAR, NULL);
+       if (value != NULL) {
+               if (value->type == GCONF_VALUE_BOOL && !gconf_value_get_bool (value)) {
+                       chrome &= ~EV_CHROME_SIDEBAR;
+               }
+               gconf_value_free (value);
+       }
+
+       value = gconf_client_get (client, GCONF_CHROME_STATUSBAR, NULL);
+       if (value != NULL) {
+               if (value->type == GCONF_VALUE_BOOL && !gconf_value_get_bool (value)) {
+                       chrome &= ~EV_CHROME_STATUSBAR;
+               }
+               gconf_value_free (value);
+       }
+
+       g_object_unref (client);
+
+       return chrome;
 }
 
 static void
@@ -1582,9 +2143,7 @@ ev_window_init (EvWindow *ev_window)
        GtkActionGroup *action_group;
        GtkAccelGroup *accel_group;
        GError *error = NULL;
-       GtkWidget *menubar;
-       GtkWidget *toolbar;
-       GtkWidget *sidebar_widget;
+       GtkWidget *sidebar_widget, *toolbar_dock;
 
        ev_window->priv = EV_WINDOW_GET_PRIVATE (ev_window);
 
@@ -1608,7 +2167,7 @@ ev_window_init (EvWindow *ev_window)
                                            ev_window->priv->page_mode,
                                            G_CALLBACK (ev_window_page_mode_cb),
                                            ev_window);
-       set_short_labels (action_group);
+       set_action_properties (action_group);
        register_custom_actions (ev_window, action_group);
 
        ev_window->priv->ui_manager = gtk_ui_manager_new ();
@@ -1631,26 +2190,46 @@ ev_window_init (EvWindow *ev_window)
                g_error_free (error);
        }
 
-       menubar = gtk_ui_manager_get_widget (ev_window->priv->ui_manager,
-                                            "/MainMenu");
-       gtk_box_pack_start (GTK_BOX (ev_window->priv->main_box), menubar,
+       ev_window->priv->menubar =
+                gtk_ui_manager_get_widget (ev_window->priv->ui_manager,
+                                           "/MainMenu");
+       gtk_box_pack_start (GTK_BOX (ev_window->priv->main_box),
+                           ev_window->priv->menubar,
                            FALSE, FALSE, 0);
 
-       toolbar = gtk_ui_manager_get_widget (ev_window->priv->ui_manager,
-                                            "/ToolBar");
-       gtk_box_pack_start (GTK_BOX (ev_window->priv->main_box), toolbar,
+       /* 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.
+        */
+       toolbar_dock = ev_window->priv->toolbar_dock = gtk_hbox_new (FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (ev_window->priv->main_box), toolbar_dock,
                            FALSE, FALSE, 0);
+       gtk_widget_show (toolbar_dock);
+
+       ev_window->priv->toolbar =
+               gtk_ui_manager_get_widget (ev_window->priv->ui_manager,
+                                          "/ToolBar");
+       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);
+       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_widget_show (ev_window->priv->sidebar);
-       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 ();
@@ -1669,8 +2248,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);
@@ -1679,19 +2256,19 @@ ev_window_init (EvWindow *ev_window)
                        ev_window->priv->scrolled_window);
 
        ev_window->priv->view = ev_view_new ();
-       ev_window->priv->page_view = ev_page_view_new ();
+       //ev_window->priv->page_view = ev_page_view_new ();
        ev_window->priv->password_view = ev_password_view_new ();
        g_signal_connect_swapped (ev_window->priv->password_view,
                                  "unlock",
                                  G_CALLBACK (ev_window_popup_password_dialog),
                                  ev_window);
        gtk_widget_show (ev_window->priv->view);
-       gtk_widget_show (ev_window->priv->page_view);
+       //gtk_widget_show (ev_window->priv->page_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);
+       //g_object_ref (ev_window->priv->page_view);
        g_object_ref (ev_window->priv->password_view);
 
        gtk_container_add (GTK_CONTAINER (ev_window->priv->scrolled_window),
@@ -1710,7 +2287,6 @@ ev_window_init (EvWindow *ev_window)
                          ev_window);
 
        ev_window->priv->statusbar = gtk_statusbar_new ();
-       gtk_widget_show (ev_window->priv->statusbar);
        gtk_box_pack_end (GTK_BOX (ev_window->priv->main_box),
                          ev_window->priv->statusbar,
                          FALSE, TRUE, 0);
@@ -1724,6 +2300,10 @@ ev_window_init (EvWindow *ev_window)
                          ev_window->priv->find_bar,
                          FALSE, TRUE, 0);
 
+       ev_window->priv->chrome = load_chrome ();
+       set_chrome_actions (ev_window);
+       update_chrome_visibility (ev_window);
+
        /* Connect to find bar signals */
        g_signal_connect (ev_window->priv->find_bar,
                          "previous",
@@ -1753,12 +2333,20 @@ ev_window_init (EvWindow *ev_window)
        g_signal_connect (ev_window, "window-state-event",
                          G_CALLBACK (ev_window_state_event_cb),
                          ev_window);
-       g_signal_connect (ev_window, "focus_out_event",
-                         G_CALLBACK (ev_window_focus_out_cb),
-                         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);
 }