]> www.fi.muni.cz Git - evince.git/blobdiff - shell/ev-window.c
*** empty log message ***
[evince.git] / shell / ev-window.c
index fac6047d77ac868369087cbf0c4818979df05085..a3a4457d8e8ed7b0488b19aa93fcb3e68f56c469 100644 (file)
@@ -29,6 +29,7 @@
 #endif
 
 #include "ev-window.h"
+#include "ev-window-title.h"
 #include "ev-page-action.h"
 #include "ev-sidebar.h"
 #include "ev-sidebar-links.h"
@@ -47,7 +48,6 @@
 #include "ev-document-types.h"
 #include "ev-job-queue.h"
 #include "ev-jobs.h"
-#include "ev-statusbar.h"
 #include "ev-sidebar-page.h"
 #include "eggfindbar.h"
 #include "egg-recent-view-uimanager.h"
@@ -62,6 +62,8 @@
 #include "ev-stock-icons.h"
 #include "ev-metadata-manager.h"
 #include "ev-file-helpers.h"
+#include "ev-utils.h"
+#include "ev-debug.h"
 
 #include <poppler.h>
 
@@ -82,11 +84,9 @@ typedef enum {
 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_RAISE_TOOLBAR = 1 << 5,
-       EV_CHROME_NORMAL        = EV_CHROME_MENUBAR | EV_CHROME_TOOLBAR | EV_CHROME_SIDEBAR | EV_CHROME_STATUSBAR
+       EV_CHROME_FINDBAR       = 1 << 2,
+       EV_CHROME_RAISE_TOOLBAR = 1 << 3,
+       EV_CHROME_NORMAL        = EV_CHROME_MENUBAR | EV_CHROME_TOOLBAR
 } EvChrome;
 
 struct _EvWindowPrivate {
@@ -104,39 +104,43 @@ struct _EvWindowPrivate {
        GtkWidget *view;
        GtkWidget *page_view;
        GtkWidget *password_view;
-       GtkWidget *statusbar;
        GtkWidget *sidebar_thumbs;
+       GtkWidget *sidebar_links;
 
        /* Dialogs */
        GtkWidget *properties;
+       GtkWidget *print_dialog;
+       GtkWidget *password_dialog;
 
        /* UI Builders */
        GtkActionGroup *action_group;
-       GtkUIManager *ui_manager;
+       GtkActionGroup *popups_action_group;
+       GtkUIManager   *ui_manager;
 
        /* Fullscreen mode */
        GtkWidget *fullscreen_toolbar;
        GtkWidget *fullscreen_popup;
        GSource   *fullscreen_timeout_source;
+       
+       /* Popup link */
+       GtkWidget *popup;
+       EvLink    *link;
 
        /* Document */
        char *uri;
        char *local_uri;
+       
        EvDocument *document;
+       EvDocument *password_document;
        EvPageCache *page_cache;
-
        EvWindowPageMode page_mode;
-
-       /* These members are used temporarily when in PAGE_MODE_PASSWORD */
-       EvDocument *password_document;
-       GtkWidget *password_dialog;
-       char *password_uri;
+       EvWindowTitle *title;
+       EggRecentViewUIManager *recent_view;
 
        /* Job used to load document */
        EvJob *xfer_job;
        EvJob *load_job;
-
-       EggRecentViewUIManager *recent_view;
+       GnomePrintJob *print_job;
 };
 
 static const GtkTargetEntry ev_drop_types[] = {
@@ -150,16 +154,15 @@ static const GtkTargetEntry ev_drop_types[] = {
 #define PAGE_SELECTOR_ACTION   "PageSelector"
 #define ZOOM_CONTROL_ACTION    "ViewZoom"
 
-#define GCONF_CHROME_TOOLBAR   "/apps/evince/show_toolbar"
-#define GCONF_CHROME_SIDEBAR   "/apps/evince/show_sidebar"
-#define GCONF_CHROME_STATUSBAR "/apps/evince/show_statusbar"
-#define GCONF_LOCKDOWN_SAVE     "/desktop/gnome/lockdown/disable_save_to_disk"
-#define GCONF_LOCKDOWN_PRINT    "/desktop/gnome/lockdown/disable_printing"
-#define GCONF_SIDEBAR_SIZE      "/apps/evince/sidebar_size"
+#define GCONF_OVERRIDE_RESTRICTIONS "/apps/evince/override_restrictions"
+#define GCONF_LOCKDOWN_SAVE         "/desktop/gnome/lockdown/disable_save_to_disk"
+#define GCONF_LOCKDOWN_PRINT        "/desktop/gnome/lockdown/disable_printing"
 
-#define SIDEBAR_DEFAULT_SIZE    132
+#define FULLSCREEN_TIMEOUT 5 * 1000
 
-#define PRINT_CONFIG_FILENAME  "ev-print-config.xml"
+#define SIDEBAR_DEFAULT_SIZE    132
+#define LINKS_SIDEBAR_ID "links"
+#define THUMBNAILS_SIDEBAR_ID "thumbnails"
 
 static void     ev_window_update_fullscreen_popup       (EvWindow         *window);
 static void     ev_window_sidebar_visibility_changed_cb (EvSidebar        *ev_sidebar,
@@ -188,7 +191,14 @@ static void     ev_window_stop_presentation             (EvWindow         *windo
 static void     ev_window_cmd_view_presentation         (GtkAction        *action,
                                                         EvWindow         *window);
 static void     show_fullscreen_popup                   (EvWindow         *window);
-
+static void     ev_popup_cmd_open_link                  (GtkAction        *action,
+                                                        EvWindow         *window);
+static void     ev_popup_cmd_copy_link_address          (GtkAction        *action,
+                                                        EvWindow         *window);
+static void    ev_window_cmd_view_best_fit             (GtkAction        *action, 
+                                                        EvWindow         *ev_window);
+static void    ev_window_cmd_view_page_width           (GtkAction        *action, 
+                                                        EvWindow         *ev_window);
 
 G_DEFINE_TYPE (EvWindow, ev_window, GTK_TYPE_WINDOW)
 
@@ -214,6 +224,9 @@ update_action_sensitivity (EvWindow *ev_window)
        gboolean ok_to_print = TRUE;
        gboolean ok_to_copy = TRUE;
        gboolean has_properties = TRUE;
+       gboolean override_restrictions = FALSE;
+       gboolean can_get_text = FALSE;
+       gboolean ok_to_copy_text = FALSE;
        GConfClient *client;
 
        view = EV_VIEW (ev_window->priv->view);
@@ -232,7 +245,11 @@ update_action_sensitivity (EvWindow *ev_window)
                has_pages = has_document && n_pages > 0;
        }
 
-       if (info && info->fields_mask & EV_DOCUMENT_INFO_PERMISSIONS) {
+       client = gconf_client_get_default ();
+       override_restrictions = gconf_client_get_bool (client, 
+                                                      GCONF_OVERRIDE_RESTRICTIONS, 
+                                                      NULL);
+       if (!override_restrictions && info && info->fields_mask & EV_DOCUMENT_INFO_PERMISSIONS) {
                ok_to_print = (info->permissions & EV_DOCUMENT_PERMISSIONS_OK_TO_PRINT);
                ok_to_copy = (info->permissions & EV_DOCUMENT_PERMISSIONS_OK_TO_COPY);
        }
@@ -244,8 +261,6 @@ update_action_sensitivity (EvWindow *ev_window)
                has_properties = FALSE;
        }
        
-       client = gconf_client_get_default ();
-
        if (gconf_client_get_bool (client, GCONF_LOCKDOWN_SAVE, NULL)) {
                ok_to_copy = FALSE;
        }
@@ -253,7 +268,14 @@ update_action_sensitivity (EvWindow *ev_window)
        if (gconf_client_get_bool (client, GCONF_LOCKDOWN_PRINT, NULL)) {
                ok_to_print = FALSE;
        }
+       
+       g_object_unref (client);
 
+       if (has_document && ev_document_can_get_text (document)) {
+               can_get_text = TRUE;
+               ok_to_copy_text = ev_view_get_has_selection (view);
+       }
+       
        /* File menu */
        /* "FileOpen": always sensitive */
        set_action_sensitive (ev_window, "FileSaveAs", has_document && ok_to_copy);
@@ -263,8 +285,8 @@ update_action_sensitivity (EvWindow *ev_window)
 
         /* Edit menu */
        sensitive = has_pages && ev_document_can_get_text (document);
-       set_action_sensitive (ev_window, "EditCopy", sensitive && ok_to_copy);
-       set_action_sensitive (ev_window, "EditSelectAll", sensitive && ok_to_copy);
+       set_action_sensitive (ev_window, "EditCopy", sensitive && ok_to_copy_text);
+       set_action_sensitive (ev_window, "EditSelectAll", sensitive && can_get_text);
        set_action_sensitive (ev_window, "EditFind",
                              has_pages && EV_IS_DOCUMENT_FIND (document));
        set_action_sensitive (ev_window, "Slash",
@@ -302,7 +324,9 @@ update_action_sensitivity (EvWindow *ev_window)
        set_action_sensitive (ev_window, PAGE_SELECTOR_ACTION, has_pages);
        set_action_sensitive (ev_window, ZOOM_CONTROL_ACTION,  has_pages);
 
-       if (has_pages && ev_view_get_sizing_mode (view) == EV_SIZING_FREE) {
+       if (has_pages &&
+           ev_view_get_sizing_mode (view) != EV_SIZING_FIT_WIDTH &&
+           ev_view_get_sizing_mode (view) != EV_SIZING_BEST_FIT) {
                GtkAction *action;
                float      zoom;
                float      real_zoom;
@@ -332,7 +356,7 @@ static void
 update_chrome_visibility (EvWindow *window)
 {
        EvWindowPrivate *priv = window->priv;
-       gboolean menubar, toolbar, sidebar, findbar, statusbar, fullscreen_toolbar;
+       gboolean menubar, toolbar, findbar, fullscreen_toolbar;
        gboolean fullscreen_mode, presentation, fullscreen;
 
        presentation = ev_view_get_presentation (EV_VIEW (priv->view));
@@ -342,10 +366,8 @@ update_chrome_visibility (EvWindow *window)
        menubar = (priv->chrome & EV_CHROME_MENUBAR) != 0 && !fullscreen_mode;
        toolbar = ((priv->chrome & EV_CHROME_TOOLBAR) != 0  || 
                   (priv->chrome & EV_CHROME_RAISE_TOOLBAR) != 0) && !fullscreen_mode;
-       sidebar = (priv->chrome & EV_CHROME_SIDEBAR) != 0 && !fullscreen_mode;
        fullscreen_toolbar = ((priv->chrome & EV_CHROME_TOOLBAR) != 0 ||
                              (priv->chrome & EV_CHROME_RAISE_TOOLBAR) != 0);
-       statusbar = (priv->chrome & EV_CHROME_STATUSBAR) != 0 && !fullscreen_mode;
        findbar = (priv->chrome & EV_CHROME_FINDBAR) != 0;
 
        set_widget_visibility (priv->menubar, menubar);
@@ -353,9 +375,7 @@ update_chrome_visibility (EvWindow *window)
        set_widget_visibility (priv->toolbar_dock, toolbar);
        set_action_sensitive (window, "EditToolbar", toolbar);
 
-       set_widget_visibility (priv->sidebar, sidebar);
        set_widget_visibility (priv->find_bar, findbar);
-       set_widget_visibility (priv->statusbar, statusbar);
 
        if (priv->fullscreen_popup != NULL) {
                if (fullscreen)
@@ -368,25 +388,72 @@ update_chrome_visibility (EvWindow *window)
 }
 
 static void
-update_chrome_flag (EvWindow *window, EvChrome flag, const char *pref, gboolean active)
+update_chrome_flag (EvWindow *window, EvChrome flag, gboolean active)
 {
        EvWindowPrivate *priv = window->priv;
-       GConfClient *client;
        
        if (active) {
                priv->chrome |= flag;
-       }
-       else {
+       } 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 *window)
+{
+       GtkActionGroup *action_group = window->priv->action_group;
+       GtkAction *action;
+       gboolean best_fit, page_width;
+       EvSizingMode sizing_mode;
+
+       if (window->priv->view == NULL)
+               return;
+
+       g_object_get (window->priv->view,
+                     "sizing_mode", &sizing_mode,
+                     NULL);
+
+       switch (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;
        }
 
-       update_chrome_visibility (window);
+       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);
+
+       action = gtk_action_group_get_action (window->priv->action_group, 
+                                             ZOOM_CONTROL_ACTION);     
+       if (best_fit) {
+               ephy_zoom_action_set_zoom_level (EPHY_ZOOM_ACTION (action), 
+                                                EPHY_ZOOM_BEST_FIT);
+       } else if (page_width) {
+               ephy_zoom_action_set_zoom_level (EPHY_ZOOM_ACTION (action), 
+                                                EPHY_ZOOM_FIT_WIDTH);
+       }
 }
 
 static void
@@ -394,7 +461,7 @@ ev_window_cmd_focus_page_selector (GtkAction *act, EvWindow *window)
 {
        GtkAction *action;
        
-       update_chrome_flag (window, EV_CHROME_RAISE_TOOLBAR, NULL, TRUE);
+       update_chrome_flag (window, EV_CHROME_RAISE_TOOLBAR, TRUE);
        set_action_sensitive (window, "ViewToolbar", FALSE);
        
        action = gtk_action_group_get_action (window->priv->action_group,
@@ -466,60 +533,6 @@ ev_window_cmd_view_page_width (GtkAction *action, EvWindow *ev_window)
        update_action_sensitivity (ev_window);
 }
 
-static void
-update_sizing_buttons (EvWindow *window)
-{
-       GtkActionGroup *action_group = window->priv->action_group;
-       GtkAction *action;
-       gboolean best_fit, page_width;
-       EvSizingMode sizing_mode;
-
-       if (window->priv->view == NULL)
-               return;
-
-       g_object_get (window->priv->view,
-                     "sizing_mode", &sizing_mode,
-                     NULL);
-
-       switch (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);
-
-       action = gtk_action_group_get_action (window->priv->action_group, 
-                                             ZOOM_CONTROL_ACTION);     
-       if (best_fit) {
-               ephy_zoom_action_set_zoom_level (EPHY_ZOOM_ACTION (action), 
-                                                EPHY_ZOOM_BEST_FIT);
-       } else if (page_width) {
-               ephy_zoom_action_set_zoom_level (EPHY_ZOOM_ACTION (action), 
-                                                EPHY_ZOOM_FIT_WIDTH);
-       }
-}
 
 void
 ev_window_open_page_label (EvWindow   *ev_window, 
@@ -541,6 +554,14 @@ ev_window_is_empty (const EvWindow *ev_window)
                (ev_window->priv->xfer_job == NULL);
 }
 
+static void
+unable_to_load_dialog_response_cb (GtkWidget *dialog,
+                                  gint       response_id,
+                                  EvWindow  *ev_window)
+{
+       gtk_widget_destroy (dialog);
+}
+
 static void
 unable_to_load (EvWindow   *ev_window,
                const char *error_message)
@@ -554,66 +575,10 @@ unable_to_load (EvWindow   *ev_window,
                                         _("Unable to open document"));
        gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
                                                  "%s", error_message);
-       gtk_dialog_run (GTK_DIALOG (dialog));
-       gtk_widget_destroy (dialog);
-}
-
-static void
-update_window_title (EvDocument *document, GParamSpec *pspec, EvWindow *ev_window)
-{
-       char *title = NULL;
-       char *doc_title = NULL;
-       gboolean password_needed;
-
-       password_needed = (ev_window->priv->password_document != NULL);
-       if (document && ev_window->priv->page_cache) {
-               doc_title = g_strdup (ev_page_cache_get_title (ev_window->priv->page_cache));
-
-               /* Make sure we get a valid title back */
-               if (doc_title) {
-                       if (doc_title[0] == '\000' ||
-                           !g_utf8_validate (doc_title, -1, NULL)) {
-                               doc_title = NULL;
-                       }
-               }
-       }
-
-       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) {
-               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) {
-               if (doc_title == NULL) {
-                       title = g_strdup (_("Document Viewer - Password Required"));
-               } else {
-                       title = g_strdup_printf (_("%s - Password Required"), doc_title);
-               }
-       } else {
-               if (doc_title == NULL) {
-                       title = g_strdup (_("Document Viewer"));
-               } else {
-                       title = g_strdup (doc_title);
-               }
-       }
-
-       gtk_window_set_title (GTK_WINDOW (ev_window), title);
-
-       g_free (doc_title);
-       g_free (title);
+       g_signal_connect (dialog, "response",
+                         G_CALLBACK (unable_to_load_dialog_response_cb),
+                         ev_window);
+       gtk_widget_show (dialog);
 }
 
 static void
@@ -628,8 +593,8 @@ page_changed_cb (EvPageCache *page_cache,
                 EvWindow    *ev_window)
 {
        update_action_sensitivity (ev_window);
-
-       ev_metadata_manager_set_int (ev_window->priv->uri, "page", page);
+       if (!ev_window_is_empty (ev_window))
+               ev_metadata_manager_set_int (ev_window->priv->uri, "page", page);
 }
 
 static void
@@ -643,18 +608,179 @@ update_document_mode (EvWindow *window, EvDocumentMode mode)
        }
 }
 
+static void
+update_sidebar_visibility (EvWindow *window)
+{
+       char *uri = window->priv->uri;
+       GValue sidebar_visibility = { 0, };
+
+       if (ev_metadata_manager_get (uri, "sidebar_visibility", &sidebar_visibility, FALSE)) {
+               set_widget_visibility (window->priv->sidebar,
+                                      g_value_get_boolean (&sidebar_visibility));
+       }
+}
+
 static void
 setup_document_from_metadata (EvWindow *window)
 {
        char *uri = window->priv->uri;
        GValue page = { 0, };
+       gint new_page;
 
-       /* Page */
-       if (ev_metadata_manager_get (uri, "page", &page)) {
+       if (uri && ev_metadata_manager_get (uri, "page", &page, TRUE)) {
+               new_page = CLAMP (g_value_get_int (&page), 0, ev_page_cache_get_n_pages (window->priv->page_cache) - 1);
                ev_page_cache_set_current_page (window->priv->page_cache,
-                                               g_value_get_int (&page));
+                                               new_page);
        }
+}
+
+static void
+setup_chrome_from_metadata (EvWindow *window)
+{
+       EvChrome chrome = EV_CHROME_NORMAL;
+       GValue show_toolbar = { 0, };
 
+       if (ev_metadata_manager_get (NULL, "show_toolbar", &show_toolbar, FALSE)) {
+               if (!g_value_get_boolean (&show_toolbar))
+                       chrome &= ~EV_CHROME_TOOLBAR;
+       }
+       window->priv->chrome = chrome;
+}
+
+
+static void
+setup_sidebar_from_metadata (EvWindow *window, EvDocument *document)
+{
+       char *uri = window->priv->uri;
+       GtkWidget *sidebar = window->priv->sidebar;
+       GtkWidget *links = window->priv->sidebar_links;
+       GtkWidget *thumbs = window->priv->sidebar_thumbs;
+       GValue sidebar_size = { 0, };
+       GValue sidebar_page = { 0, };
+
+       if (ev_metadata_manager_get (uri, "sidebar_size", &sidebar_size, FALSE)) {
+               gtk_paned_set_position (GTK_PANED (window->priv->hpaned),
+                                       g_value_get_int (&sidebar_size));
+       }
+
+       if (ev_metadata_manager_get (uri, "sidebar_page", &sidebar_page, FALSE)) {
+               const char *page_id = g_value_get_string (&sidebar_page);
+
+               if (strcmp (page_id, "links") == 0 && ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (links), document)) {
+                       ev_sidebar_set_page (EV_SIDEBAR (sidebar), links);
+               } else if (strcmp (page_id, "thumbnails") && ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (thumbs), document)) {
+                       ev_sidebar_set_page (EV_SIDEBAR (sidebar), thumbs);
+               }
+       } else {
+               if (ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (links), document)) {
+                       ev_sidebar_set_page (EV_SIDEBAR (sidebar), links);
+               }
+       }
+
+       update_sidebar_visibility (window);
+}
+
+static void
+setup_view_from_metadata (EvWindow *window)
+{
+       EvView *view = EV_VIEW (window->priv->view);
+       char *uri = window->priv->uri;
+       GEnumValue *enum_value;
+       GValue width = { 0, };
+       GValue height = { 0, };
+       GValue maximized = { 0, };
+       GValue x = { 0, };
+       GValue y = { 0, };
+       GValue sizing_mode = { 0, };
+       GValue zoom = { 0, };
+       GValue continuous = { 0, };
+       GValue dual_page = { 0, };
+       GValue presentation = { 0, };
+       GValue fullscreen = { 0, };
+       GValue rotation = { 0, };
+       gboolean restore_size = TRUE;
+
+       /* Window size */
+
+       if (ev_metadata_manager_get (uri, "window_maximized", &maximized, FALSE)) {
+               if (g_value_get_boolean (&maximized)) {
+                       gtk_window_maximize (GTK_WINDOW (window));
+                       restore_size = FALSE;
+               } else {
+                       gtk_window_unmaximize (GTK_WINDOW (window));
+               }
+       }
+
+       if (restore_size &&
+           ev_metadata_manager_get (uri, "window_width", &width, TRUE) &&
+            ev_metadata_manager_get (uri, "window_height", &height, TRUE)) {
+               gtk_window_resize (GTK_WINDOW (window),
+                                  g_value_get_int (&width),
+                                  g_value_get_int (&height));
+       }
+       if (restore_size &&
+           ev_metadata_manager_get (uri, "window_x", &x, TRUE) &&
+           ev_metadata_manager_get (uri, "window_y", &y, TRUE)) {
+               gtk_window_move (GTK_WINDOW (window), g_value_get_int (&x),
+                                g_value_get_int (&y));
+       }
+
+       /* Sizing mode */
+       if (ev_metadata_manager_get (uri, "sizing_mode", &sizing_mode, FALSE)) {
+               enum_value = g_enum_get_value_by_nick
+                       (EV_SIZING_MODE_CLASS, g_value_get_string (&sizing_mode));
+               g_value_unset (&sizing_mode);
+               ev_view_set_sizing_mode (view, enum_value->value);
+       }
+
+       /* Zoom */
+       if (ev_metadata_manager_get (uri, "zoom", &zoom, FALSE) &&
+           ev_view_get_sizing_mode (view) == EV_SIZING_FREE) {
+               ev_view_set_zoom (view, g_value_get_double (&zoom), FALSE);
+       }
+
+       /* Continuous */
+       if (ev_metadata_manager_get (uri, "continuous", &continuous, FALSE)) {
+               ev_view_set_continuous (view, g_value_get_boolean (&continuous));
+       }
+
+       /* Dual page */
+       if (ev_metadata_manager_get (uri, "dual-page", &dual_page, FALSE)) {
+               ev_view_set_dual_page (view, g_value_get_boolean (&dual_page));
+       }
+
+       /* Presentation */
+       if (ev_metadata_manager_get (uri, "presentation", &presentation, FALSE)) {
+               if (g_value_get_boolean (&presentation) && uri) {
+                       ev_window_run_presentation (window);
+               }
+       }
+
+       /* Fullscreen */
+       if (ev_metadata_manager_get (uri, "fullscreen", &fullscreen, FALSE)) {
+               if (g_value_get_boolean (&fullscreen) && uri) {
+                       ev_window_run_fullscreen (window);
+               }
+       }
+
+       /* Rotation */
+       if (ev_metadata_manager_get (uri, "rotation", &rotation, TRUE)) {
+               if (g_value_get_int (&rotation)) {
+                       switch (g_value_get_int (&rotation)) {
+                       case 90:
+                               ev_view_set_rotation (view, 90);
+                               break;
+                       case 180:
+                               ev_view_set_rotation (view, 180);
+                               break;
+                       case 270:
+                               ev_view_set_rotation (view, 270);
+                               break;
+                       default:
+                               break;
+                       }
+               }
+       }
 }
 
 static void
@@ -670,10 +796,6 @@ ev_window_setup_document (EvWindow *ev_window)
        ev_window->priv->page_cache = ev_page_cache_get (ev_window->priv->document);
        g_signal_connect (ev_window->priv->page_cache, "page-changed", G_CALLBACK (page_changed_cb), ev_window);
 
-       g_signal_connect_object (G_OBJECT (document),
-                                "notify::title",
-                                G_CALLBACK (update_window_title),
-                                ev_window, 0);
        if (EV_IS_DOCUMENT_FIND (document)) {
                g_signal_connect_object (G_OBJECT (document),
                                         "find_changed",
@@ -681,28 +803,30 @@ ev_window_setup_document (EvWindow *ev_window)
                                         ev_window, 0);
        }
 
-       ev_window_set_page_mode (ev_window, PAGE_MODE_DOCUMENT);
-
        ev_sidebar_set_document (sidebar, document);
 
        if (ev_page_cache_get_n_pages (ev_window->priv->page_cache) > 0) {
                ev_view_set_document (view, document);
        }
+       ev_window_set_page_mode (ev_window, PAGE_MODE_DOCUMENT);
+
+       ev_window_title_set_document (ev_window->priv->title, document);
+       ev_window_title_set_uri (ev_window->priv->title, ev_window->priv->uri);
 
-       update_window_title (document, NULL, ev_window);
        action = gtk_action_group_get_action (ev_window->priv->action_group, PAGE_SELECTOR_ACTION);
        ev_page_action_set_document (EV_PAGE_ACTION (action), document);
        update_action_sensitivity (ev_window);
 
-       info = ev_page_cache_get_info (ev_window->priv->page_cache);
-       update_document_mode (ev_window, info->mode);
-
        if (ev_window->priv->properties) {
                ev_properties_dialog_set_document (EV_PROPERTIES_DIALOG (ev_window->priv->properties),
                                                   ev_window->priv->document);
        }
-
+       
        setup_document_from_metadata (ev_window);
+       setup_sidebar_from_metadata (ev_window, document);
+
+       info = ev_page_cache_get_info (ev_window->priv->page_cache);
+       update_document_mode (ev_window, info->mode);
 }
 
 static void
@@ -713,10 +837,8 @@ password_dialog_response (GtkWidget *password_dialog,
        char *password;
        
        if (response_id == GTK_RESPONSE_OK) {
-               EvDocument *document;
-               gchar *uri;
 
-               password = ev_password_dialog_get_password (password_dialog);
+               password = ev_password_dialog_get_password (EV_PASSWORD_DIALOG (password_dialog));
                if (password) {
                        ev_document_doc_mutex_lock ();
                        ev_document_security_set_password (EV_DOCUMENT_SECURITY (ev_window->priv->password_document),
@@ -725,26 +847,16 @@ password_dialog_response (GtkWidget *password_dialog,
                }
                g_free (password);
 
-               document = ev_window->priv->password_document;
-               uri = ev_window->priv->password_uri;
+               ev_password_dialog_save_password (EV_PASSWORD_DIALOG (password_dialog));
 
+               g_object_unref (ev_window->priv->password_document);
                ev_window->priv->password_document = NULL;
-               ev_window->priv->password_uri = NULL;
-               
+
+               ev_window_title_set_type (ev_window->priv->title, EV_WINDOW_TITLE_DOCUMENT);
                ev_job_queue_add_job (ev_window->priv->load_job, EV_JOB_PRIORITY_HIGH);
                
-               ev_statusbar_push (EV_STATUSBAR (ev_window->priv->statusbar),
-                                  EV_CONTEXT_PROGRESS,
-                                  _("Loading document. Please wait"));
-
-               ev_statusbar_set_progress  (EV_STATUSBAR (ev_window->priv->statusbar), 
-                                           TRUE);
-       
                gtk_widget_destroy (password_dialog);
                        
-               g_object_unref (document);
-               g_free (uri);
-
                return;
        }
 
@@ -760,29 +872,26 @@ static void
 ev_window_popup_password_dialog (EvWindow *ev_window)
 {
        g_assert (ev_window->priv->password_document);
-       g_assert (ev_window->priv->password_uri);
 
        gtk_widget_set_sensitive (ev_window->priv->password_view, FALSE);
 
-       update_window_title (ev_window->priv->password_document, NULL, ev_window);
-       if (ev_window->priv->password_dialog == NULL) {
-               gchar *basename, *file_name;
+       ev_window_title_set_uri (ev_window->priv->title, ev_window->priv->uri);
+       ev_window_title_set_type (ev_window->priv->title, EV_WINDOW_TITLE_PASSWORD);
 
-               basename = g_path_get_basename (ev_window->priv->password_uri);
-               file_name = gnome_vfs_unescape_string_for_display (basename);
+       if (ev_window->priv->password_dialog == NULL) {
                ev_window->priv->password_dialog =
-                       ev_password_dialog_new (GTK_WIDGET (ev_window), file_name);
+                       g_object_new (EV_TYPE_PASSWORD_DIALOG, "uri", ev_window->priv->uri, NULL);
+               gtk_window_set_transient_for (GTK_WINDOW (ev_window->priv->password_dialog), GTK_WINDOW (ev_window));
+
                g_object_add_weak_pointer (G_OBJECT (ev_window->priv->password_dialog),
                                           (gpointer *) &(ev_window->priv->password_dialog));
                g_signal_connect (ev_window->priv->password_dialog,
                                  "response",
                                  G_CALLBACK (password_dialog_response),
                                  ev_window);
-               g_free (basename);
-               g_free (file_name);
                gtk_widget_show (ev_window->priv->password_dialog);
        } else {
-               ev_password_dialog_set_bad_pass (ev_window->priv->password_dialog);
+               ev_password_dialog_set_bad_pass (EV_PASSWORD_DIALOG (ev_window->priv->password_dialog));
        }
 }
 
@@ -846,29 +955,20 @@ ev_window_load_job_cb  (EvJobLoad *job,
        g_assert (document != ev_window->priv->document);
        g_assert (job->uri);
 
-       ev_statusbar_pop (EV_STATUSBAR (ev_window->priv->statusbar),
-                         EV_CONTEXT_PROGRESS);
-
-        ev_statusbar_set_progress  (EV_STATUSBAR (ev_window->priv->statusbar), 
-                                   FALSE);
-
        if (ev_window->priv->password_document) {
                g_object_unref (ev_window->priv->password_document);
                ev_window->priv->password_document = NULL;
        }
-       if (ev_window->priv->password_uri) {
-               g_free (ev_window->priv->password_uri);
-               ev_window->priv->password_uri = NULL;
-       }
 
        /* Success! */
        if (job->error == NULL) {
+               
                if (ev_window->priv->document)
                        g_object_unref (ev_window->priv->document);
                ev_window->priv->document = g_object_ref (document);
-               ev_window_setup_document (ev_window);
                
-               ev_window_add_recent (ev_window, ev_window->priv->uri);
+               ev_window_setup_document (ev_window);
+               ev_window_add_recent (ev_window, ev_window->priv->uri);         
                ev_window_clear_jobs (ev_window);
                
                return;
@@ -879,13 +979,11 @@ ev_window_load_job_cb  (EvJobLoad *job,
                gchar *base_name, *file_name;
 
                ev_window->priv->password_document = g_object_ref (document);
-               ev_window->priv->password_uri = g_strdup (job->uri);
-
-               base_name = g_path_get_basename (job->uri);
-               file_name = gnome_vfs_unescape_string_for_display (base_name);
 
+               file_name = gnome_vfs_format_uri_for_display (job->uri);
+               base_name = g_path_get_basename (file_name);
                ev_password_view_set_file_name (EV_PASSWORD_VIEW (ev_window->priv->password_view),
-                                               file_name);
+                                               base_name);
                g_free (file_name);
                g_free (base_name);
                ev_window_set_page_mode (ev_window, PAGE_MODE_PASSWORD);
@@ -907,11 +1005,6 @@ ev_window_xfer_job_cb  (EvJobXfer *job,
 
        
        if (job->error != NULL) {
-               ev_statusbar_pop (EV_STATUSBAR (ev_window->priv->statusbar),
-                                 EV_CONTEXT_PROGRESS);
-               ev_statusbar_set_progress  (EV_STATUSBAR (ev_window->priv->statusbar), 
-                                           FALSE);
-
                unable_to_load (ev_window, job->error->message);
                ev_window_clear_jobs (ev_window);
        } else {
@@ -939,98 +1032,41 @@ ev_window_xfer_job_cb  (EvJobXfer *job,
        }               
 }
 
-static void
-setup_view_from_metadata (EvWindow *window)
+const char *
+ev_window_get_uri (EvWindow *ev_window)
 {
-       EvView *view = EV_VIEW (window->priv->view);
-       char *uri = window->priv->uri;
-       GEnumValue *enum_value;
-       GValue width = { 0, };
-       GValue height = { 0, };
-       GValue maximized = { 0, };
-       GValue x = { 0, };
-       GValue y = { 0, };
-       GValue sizing_mode = { 0, };
-       GValue zoom = { 0, };
-       GValue continuous = { 0, };
-       GValue dual_page = { 0, };
-       GValue presentation = { 0, };
-       GValue fullscreen = { 0, };
-
-       /* Window size */
-       if (!GTK_WIDGET_VISIBLE (window)) {
-               gboolean restore_size = TRUE;
-
-               if (ev_metadata_manager_get (uri, "window_maximized", &maximized)) {
-                       if (g_value_get_boolean (&maximized)) {
-                               gtk_window_maximize (GTK_WINDOW (window));
-                               restore_size = FALSE;
-                       }
-               }
-
-               if (restore_size &&
-                   ev_metadata_manager_get (uri, "window_x", &x) &&
-                   ev_metadata_manager_get (uri, "window_y", &y) &&
-                   ev_metadata_manager_get (uri, "window_width", &width) &&
-                   ev_metadata_manager_get (uri, "window_height", &height)) {
-                       gtk_window_set_default_size (GTK_WINDOW (window),
-                                                    g_value_get_int (&width),
-                                                    g_value_get_int (&height));
-                       gtk_window_move (GTK_WINDOW (window), g_value_get_int (&x),
-                                        g_value_get_int (&y));
-               }
-       }
-
-       /* Sizing mode */
-       if (ev_metadata_manager_get (uri, "sizing_mode", &sizing_mode)) {
-               enum_value = g_enum_get_value_by_nick
-                       (EV_SIZING_MODE_CLASS, g_value_get_string (&sizing_mode));
-               g_value_unset (&sizing_mode);
-               ev_view_set_sizing_mode (view, enum_value->value);
-       }
-
-       /* Zoom */
-       if (ev_metadata_manager_get (uri, "zoom", &zoom) &&
-           ev_view_get_sizing_mode (view) == EV_SIZING_FREE) {
-               ev_view_set_zoom (view, g_value_get_double (&zoom), FALSE);
-       }
-
-       /* Continuous */
-       if (ev_metadata_manager_get (uri, "continuous", &continuous)) {
-               ev_view_set_continuous (view, g_value_get_boolean (&continuous));
-       }
+       return ev_window->priv->uri;
+}
 
-       /* Dual page */
-       if (ev_metadata_manager_get (uri, "dual-page", &dual_page)) {
-               ev_view_set_dual_page (view, g_value_get_boolean (&dual_page));
-       }
+static void
+ev_window_close_dialogs (EvWindow *ev_window)
+{
+       if (ev_window->priv->password_dialog)
+               gtk_widget_destroy (ev_window->priv->password_dialog);
+       ev_window->priv->password_dialog = NULL;
 
-       /* Presentation */
-       if (ev_metadata_manager_get (uri, "presentation", &presentation)) {
-               if (g_value_get_boolean (&presentation)) {
-                       ev_window_run_presentation (window);
-               }
+       if (ev_window->priv->print_dialog) {
+               gtk_widget_destroy (ev_window->priv->print_dialog);
+               g_object_unref (ev_window->priv->print_job);
        }
+       ev_window->priv->print_dialog = NULL;
+       ev_window->priv->print_job = NULL;
 
-       /* Fullscreen */
-       if (ev_metadata_manager_get (uri, "fullscreen", &fullscreen)) {
-               if (g_value_get_boolean (&fullscreen)) {
-                       ev_window_run_fullscreen (window);
-               }
-       }
+       if (ev_window->priv->properties)
+               gtk_widget_destroy (ev_window->priv->properties);
+       ev_window->priv->properties = NULL;
 }
 
 void
 ev_window_open_uri (EvWindow *ev_window, const char *uri)
 {
-       if (ev_window->priv->password_dialog)
-               gtk_widget_destroy (ev_window->priv->password_dialog);
 
        g_free (ev_window->priv->uri);
        ev_window->priv->uri = g_strdup (uri);
 
        setup_view_from_metadata (ev_window);
        
+       ev_window_close_dialogs (ev_window);
        ev_window_clear_jobs (ev_window);
        ev_window_clear_local_uri (ev_window);
        
@@ -1040,21 +1076,35 @@ ev_window_open_uri (EvWindow *ev_window, const char *uri)
                          G_CALLBACK (ev_window_xfer_job_cb),
                          ev_window);
        ev_job_queue_add_job (ev_window->priv->xfer_job, EV_JOB_PRIORITY_HIGH);
+}
+
+static void
+file_open_dialog_response_cb (GtkWidget *chooser,
+                             gint       response_id,
+                             EvWindow  *ev_window)
+{
+       if (response_id == GTK_RESPONSE_OK) {
+               GSList *uris;
+
+               uris = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (chooser));
 
-       ev_statusbar_push (EV_STATUSBAR (ev_window->priv->statusbar),
-                          EV_CONTEXT_PROGRESS,
-                          _("Loading document. Please wait"));
-        ev_statusbar_set_progress  (EV_STATUSBAR (ev_window->priv->statusbar), 
-                                   TRUE);
+               ev_application_open_uri_list (EV_APP, uris, GDK_CURRENT_TIME);
+       
+               g_slist_foreach (uris, (GFunc)g_free, NULL);    
+               g_slist_free (uris);
+       }
+       ev_application_set_chooser_uri (EV_APP, 
+                                       gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (chooser)));
+
+       gtk_widget_destroy (chooser);
 }
 
 static void
 ev_window_cmd_file_open (GtkAction *action, EvWindow *window)
 {
        GtkWidget *chooser;
-       static char *folder = NULL;
 
-       chooser = gtk_file_chooser_dialog_new (_("Open document"),
+       chooser = gtk_file_chooser_dialog_new (_("Open Document"),
                                               GTK_WINDOW (window),
                                               GTK_FILE_CHOOSER_ACTION_OPEN,
                                               GTK_STOCK_CANCEL,
@@ -1062,35 +1112,18 @@ ev_window_cmd_file_open (GtkAction *action, EvWindow *window)
                                               GTK_STOCK_OPEN, GTK_RESPONSE_OK,
                                               NULL);
 
-       if (folder) {
-               gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (chooser),
-                                                        folder);
-       }
-
        ev_document_types_add_filters (chooser, NULL);
        gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (chooser), TRUE);
        gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (chooser), FALSE);
-
-       if (gtk_dialog_run (GTK_DIALOG (chooser)) == GTK_RESPONSE_OK) {
-               GSList *uris;
-
-               uris = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (chooser));
-
-               if (folder != NULL)
-                       g_free (folder);
-                               
-               folder = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (chooser));
-
-               ev_application_open_uri_list (EV_APP, uris);
+       if (ev_application_get_chooser_uri (EV_APP) != NULL)
+               gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (chooser),
+                                         ev_application_get_chooser_uri (EV_APP));
        
-               g_slist_foreach (uris, (GFunc)g_free, NULL);    
-               g_slist_free (uris);
-       } else {
-               if (!GTK_WIDGET_VISIBLE (window))
-                       gtk_widget_destroy (GTK_WIDGET (window));
-       }
+       g_signal_connect (chooser, "response",
+                         G_CALLBACK (file_open_dialog_response_cb),
+                         window);
 
-       gtk_widget_destroy (GTK_WIDGET (chooser));
+       gtk_widget_show (chooser);
 }
 
 static void
@@ -1105,7 +1138,7 @@ ev_window_cmd_recent_file_activate (GtkAction *action,
 
        uri = egg_recent_item_get_uri (item);
 
-       ev_application_open_uri (EV_APP, uri, NULL, NULL);      
+       ev_application_open_uri (EV_APP, uri, NULL, GDK_CURRENT_TIME, NULL);
        
        g_free (uri);
 }
@@ -1140,50 +1173,6 @@ ev_window_setup_recent (EvWindow *ev_window)
                        G_CALLBACK (ev_window_cmd_recent_file_activate), ev_window);
 }
 
-/* FIXME
-static gboolean
-overwrite_existing_file (GtkWindow *window, const gchar *file_name)
-{
-       GtkWidget *msgbox;
-       gchar *utf8_file_name;
-       AtkObject *obj;
-       gint ret;
-
-       utf8_file_name = g_filename_to_utf8 (file_name, -1, NULL, NULL, NULL);
-       msgbox = gtk_message_dialog_new (
-               window,
-               (GtkDialogFlags)GTK_DIALOG_DESTROY_WITH_PARENT,
-               GTK_MESSAGE_QUESTION,
-               GTK_BUTTONS_NONE,
-               _("A file named \"%s\" already exists."),
-               utf8_file_name);
-       g_free (utf8_file_name);
-
-       gtk_message_dialog_format_secondary_text (
-               GTK_MESSAGE_DIALOG (msgbox),
-               _("Do you want to replace it with the one you are saving?"));
-
-       gtk_dialog_add_button (GTK_DIALOG (msgbox),
-                              GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
-
-       gtk_dialog_add_button (GTK_DIALOG (msgbox),
-                              _("_Replace"), GTK_RESPONSE_YES);
-
-       gtk_dialog_set_default_response (GTK_DIALOG (msgbox),
-                                        GTK_RESPONSE_CANCEL);
-
-       obj = gtk_widget_get_accessible (msgbox);
-
-       if (GTK_IS_ACCESSIBLE (obj))
-               atk_object_set_name (obj, _("Question"));
-
-       ret = gtk_dialog_run (GTK_DIALOG (msgbox));
-       gtk_widget_destroy (msgbox);
-
-       return (ret == GTK_RESPONSE_YES);
-}
-*/
-
 static void
 save_error_dialog (GtkWindow *window, const gchar *file_name)
 {
@@ -1207,155 +1196,57 @@ save_error_dialog (GtkWindow *window, const gchar *file_name)
 }
 
 static void
-ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
+file_save_dialog_response_cb (GtkWidget *fc,
+                             gint       response_id,
+                             EvWindow  *ev_window)
 {
-       GtkWidget *fc;
-
-       gchar *uri;
-       gchar *basename;
-       static char* folder = NULL;
-
        gboolean success;
 
-       fc = gtk_file_chooser_dialog_new (
-               _("Save a Copy"),
-               NULL, GTK_FILE_CHOOSER_ACTION_SAVE,
-               GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-               GTK_STOCK_SAVE, GTK_RESPONSE_OK,
-               NULL);
-       gtk_window_set_modal (GTK_WINDOW (fc), TRUE);
-
-       ev_document_types_add_filters (fc, ev_window->priv->document);
-       gtk_dialog_set_default_response (GTK_DIALOG (fc), GTK_RESPONSE_OK);
-       
-       if (folder) {
-               gtk_file_chooser_set_current_folder_uri(GTK_FILE_CHOOSER (fc), 
-                                                       folder);
-       }
-       
-       basename = g_path_get_basename (ev_window->priv->uri);
-       gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (fc), basename);
-       g_free (basename);
-
-       gtk_widget_show (fc);
+       if (response_id == GTK_RESPONSE_OK) {
+               const char *uri;
 
-       while (gtk_dialog_run (GTK_DIALOG (fc)) == GTK_RESPONSE_OK) {
                uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (fc));
 
-/* FIXME
-               if (g_file_test (uri, G_FILE_TEST_EXISTS) &&
-                   !overwrite_existing_file (GTK_WINDOW (fc), uri))
-                               continue;
-*/
-               
                ev_document_doc_mutex_lock ();
                success = ev_document_save (ev_window->priv->document, uri, NULL);
                ev_document_doc_mutex_unlock ();
 
-               if (success)
-                       break;
-               else
+               if (!success) {
                        save_error_dialog (GTK_WINDOW (fc), uri);
+               }
        }
 
-       if (folder != NULL)
-               g_free (folder);
-                               
-       folder = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (fc));
-
        gtk_widget_destroy (fc);
 }
 
-static gboolean
-using_pdf_printer (GnomePrintConfig *config)
-{
-       const guchar *driver;
-
-       driver = gnome_print_config_get (
-               config, (const guchar *)"Settings.Engine.Backend.Driver");
-
-       if (driver) {
-               if (!strcmp ((const gchar *)driver, "gnome-print-pdf"))
-                       return TRUE;
-               else
-                       return FALSE;
-       }
-
-       return FALSE;
-}
-
-static gboolean
-using_postscript_printer (GnomePrintConfig *config)
-{
-       const guchar *driver;
-       const guchar *transport;
-
-       driver = gnome_print_config_get (
-               config, (const guchar *)"Settings.Engine.Backend.Driver");
-
-       transport = gnome_print_config_get (
-               config, (const guchar *)"Settings.Transport.Backend");
-
-       if (driver) {
-               if (!strcmp ((const gchar *)driver, "gnome-print-ps"))
-                       return TRUE;
-               else
-                       return FALSE;
-       } else  if (transport) { /* these transports default to PostScript */
-               if (!strcmp ((const gchar *)transport, "CUPS"))
-                       return TRUE;
-               else if (!strcmp ((const gchar *)transport, "LPD"))
-                       return TRUE;
-       }
-
-       return FALSE;
-}
-
-static GnomePrintConfig *
-load_print_config_from_file (void)
-{
-       GnomePrintConfig *print_config = NULL;
-       char *file_name, *contents = NULL;
-
-       file_name = g_build_filename (ev_dot_dir (), PRINT_CONFIG_FILENAME,
-                                     NULL);
-
-       if (g_file_get_contents (file_name, &contents, NULL, NULL)) {
-               print_config = gnome_print_config_from_string (contents, 0);
-               g_free (contents);
-       }
-
-       if (print_config == NULL) {
-               print_config = gnome_print_config_default ();
-       }
-
-       g_free (file_name);
-
-       return print_config;
-}
-
 static void
-save_print_config_to_file (GnomePrintConfig *config)
+ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
 {
-       char *file_name, *str;
-
-       g_return_if_fail (config != NULL);
+       GtkWidget *fc;
+       gchar *base_name;
+       gchar *file_name;
 
-       str = gnome_print_config_to_string (config, 0);
-       if (str == NULL) return;
+       fc = gtk_file_chooser_dialog_new (
+               _("Save a Copy"),
+               GTK_WINDOW (ev_window), GTK_FILE_CHOOSER_ACTION_SAVE,
+               GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+               GTK_STOCK_SAVE, GTK_RESPONSE_OK,
+               NULL);
 
-       file_name = g_build_filename (ev_dot_dir (),
-                                     PRINT_CONFIG_FILENAME,
-                                     NULL);
+       ev_document_types_add_filters (fc, ev_window->priv->document);
+       gtk_dialog_set_default_response (GTK_DIALOG (fc), GTK_RESPONSE_OK);
+       
+       file_name = gnome_vfs_format_uri_for_display (ev_window->priv->uri);
+       base_name = g_path_get_basename (file_name);
+       gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (fc), base_name);
+       g_free (file_name);
+       g_free (base_name);
 
-#ifdef HAVE_G_FILE_SET_CONTENTS
-       g_file_set_contents (file_name, str, -1, NULL);
-#else
-       ev_file_set_contents (file_name, str, -1, NULL);
-#endif
+       g_signal_connect (fc, "response",
+                         G_CALLBACK (file_save_dialog_response_cb),
+                         ev_window);
 
-       g_free (file_name);
-       g_free (str);
+       gtk_widget_show (fc);
 }
 
 static void
@@ -1367,111 +1258,114 @@ ev_window_print (EvWindow *window)
        page_cache = ev_page_cache_get (window->priv->document);
        last_page = ev_page_cache_get_n_pages (page_cache);
 
-       ev_window_print_range (window, 1, -1);
+       ev_window_print_range (window, 1, last_page);
 }
 
-const char *
-ev_window_get_uri (EvWindow *ev_window)
+
+static gboolean
+ev_window_print_dialog_response_cb (GtkDialog *print_dialog, gint response, gpointer data)
 {
-       return ev_window->priv->uri;
+    EvWindow *ev_window = EV_WINDOW (data);
+    EvPrintJob *print_job;
+    GnomePrintConfig *config;
+    
+    if (response != GNOME_PRINT_DIALOG_RESPONSE_PRINT) {
+           gtk_widget_destroy (GTK_WIDGET (print_dialog));
+           ev_window->priv->print_dialog = NULL;
+           g_object_unref (ev_window->priv->print_job);
+           ev_window->priv->print_job = NULL;
+           return FALSE;
+    }
+
+    config = gnome_print_dialog_get_config (GNOME_PRINT_DIALOG (print_dialog));
+
+    /* FIXME: Change this when we have the first backend
+     * that can print more than postscript
+     */
+    if (using_pdf_printer (config)) {
+           GtkWidget *dialog;
+           dialog = gtk_message_dialog_new (GTK_WINDOW (print_dialog), GTK_DIALOG_MODAL,
+                                            GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
+                                           _("Generating PDF is not supported"));
+           gtk_dialog_run (GTK_DIALOG (dialog));
+           gtk_widget_destroy (dialog);
+           return FALSE;
+    } else if (!using_postscript_printer (config)) {
+           GtkWidget *dialog;
+
+           dialog = gtk_message_dialog_new (GTK_WINDOW (print_dialog), GTK_DIALOG_MODAL,
+                                            GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
+                                            _("Printing is not supported on this printer."));
+                                            gtk_message_dialog_format_secondary_text (
+                                                       GTK_MESSAGE_DIALOG (dialog),
+                                                       _("You were trying to print to a printer using the \"%s\" driver. This program requires a PostScript printer driver."),
+                                                       gnome_print_config_get (config, (guchar *)"Settings.Engine.Backend.Driver"));
+           gtk_dialog_run (GTK_DIALOG (dialog));
+           gtk_widget_destroy (dialog);
+           return FALSE;
+    }
+
+    save_print_config_to_file (config);
+    
+    print_job = g_object_new (EV_TYPE_PRINT_JOB,
+                             "gnome_print_job", ev_window->priv->print_job,
+                             "document", ev_window->priv->document,
+                             "print_dialog", print_dialog,
+                              NULL);
+
+    if (print_job != NULL) {
+       ev_print_job_print (print_job, GTK_WINDOW (ev_window));
+       g_object_unref (print_job);
+    }
+
+    g_object_unref (config);
+
+    gtk_widget_destroy (GTK_WIDGET (print_dialog));
+    ev_window->priv->print_dialog = NULL;
+    g_object_unref (ev_window->priv->print_job);
+    ev_window->priv->print_job = NULL;
+
+    return FALSE;
 }
 
 void
 ev_window_print_range (EvWindow *ev_window, int first_page, int last_page)
 {
        GnomePrintConfig *config;
-       GnomePrintJob *job;
-       GtkWidget *print_dialog;
        gchar *pages_label;
-       EvPrintJob *print_job = NULL;
-       EvPageCache *page_cache;
 
         g_return_if_fail (EV_IS_WINDOW (ev_window));
        g_return_if_fail (ev_window->priv->document != NULL);
 
-       page_cache = ev_page_cache_get (ev_window->priv->document);
-       if (last_page == -1) {
-               last_page = ev_page_cache_get_n_pages (page_cache);
-       }
-
-       config = load_print_config_from_file ();
-       job = gnome_print_job_new (config);
-
-       print_dialog = gnome_print_dialog_new (job, (guchar *) _("Print"),
-                                              (GNOME_PRINT_DIALOG_RANGE |
-                                               GNOME_PRINT_DIALOG_COPIES));
-
-       pages_label = g_strconcat (_("Pages"), " ", NULL);
-       gnome_print_dialog_construct_range_page (GNOME_PRINT_DIALOG (print_dialog),
-                                                GNOME_PRINT_RANGE_ALL |
-                                                GNOME_PRINT_RANGE_RANGE,
-                                                first_page, last_page,
-                                                NULL, (const guchar *)pages_label);
-       g_free (pages_label);
-                                                
-       gtk_dialog_set_response_sensitive (GTK_DIALOG (print_dialog),
-                                          GNOME_PRINT_DIALOG_RESPONSE_PREVIEW,
-                                          FALSE);
-
-       while (TRUE) {
-               int response;
-               response = gtk_dialog_run (GTK_DIALOG (print_dialog));
-
-               if (response != GNOME_PRINT_DIALOG_RESPONSE_PRINT)
-                       break;
-
-               /* FIXME: Change this when we have the first backend
-                * that can print more than postscript
-                */
-               if (using_pdf_printer (config)) {
-                       GtkWidget *dialog;
-
-                       dialog = gtk_message_dialog_new (
-                               GTK_WINDOW (print_dialog), GTK_DIALOG_MODAL,
-                               GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
-                               _("Generating PDF is not supported"));
-                       gtk_dialog_run (GTK_DIALOG (dialog));
-                       gtk_widget_destroy (dialog);
-                       
-                       continue;
-               } else if (!using_postscript_printer (config)) {
-                       GtkWidget *dialog;
-
-                       dialog = gtk_message_dialog_new (
-                               GTK_WINDOW (print_dialog), GTK_DIALOG_MODAL,
-                               GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
-                               _("Printing is not supported on this printer."));
-                       gtk_message_dialog_format_secondary_text (
-                               GTK_MESSAGE_DIALOG (dialog),
-                               _("You were trying to print to a printer using the \"%s\" driver. This program requires a PostScript printer driver."),
-                               gnome_print_config_get (
-                                       config, (guchar *)"Settings.Engine.Backend.Driver"));
-                       gtk_dialog_run (GTK_DIALOG (dialog));
-                       gtk_widget_destroy (dialog);
-
-                       continue;
-               }
-
-               save_print_config_to_file (config);
-
-               print_job = g_object_new (EV_TYPE_PRINT_JOB,
-                                         "gnome_print_job", job,
-                                         "document", ev_window->priv->document,
-                                         "print_dialog", print_dialog,
-                                         NULL);
-               break;
-       }
+       config = load_print_config_from_file ();
 
-       gtk_widget_destroy (print_dialog);
+       if (ev_window->priv->print_job == NULL)
+               ev_window->priv->print_job = gnome_print_job_new (config);
+       
+       if (ev_window->priv->print_dialog == NULL)
+               ev_window->priv->print_dialog = gnome_print_dialog_new (ev_window->priv->print_job, (guchar *) _("Print"),
+                                                                      (GNOME_PRINT_DIALOG_RANGE |
+                                                                       GNOME_PRINT_DIALOG_COPIES));
+       gtk_window_set_transient_for (GTK_WINDOW (ev_window->priv->print_dialog), GTK_WINDOW (ev_window));                                                              
+       g_object_unref (config);                                                                
 
-       if (print_job != NULL) {
-               ev_print_job_print (print_job, GTK_WINDOW (ev_window));
-               g_object_unref (print_job);
-       }
+       pages_label = g_strconcat (_("Pages"), " ", NULL);
+       gnome_print_dialog_construct_range_page (GNOME_PRINT_DIALOG (ev_window->priv->print_dialog),
+                                                GNOME_PRINT_RANGE_ALL |
+                                                GNOME_PRINT_RANGE_RANGE,
+                                                first_page, last_page,
+                                                NULL, (const guchar *)pages_label);
+       g_free (pages_label);
+                                                
+       gtk_dialog_set_response_sensitive (GTK_DIALOG (ev_window->priv->print_dialog),
+                                          GNOME_PRINT_DIALOG_RESPONSE_PREVIEW,
+                                          FALSE);
 
-       g_object_unref (config);
+       g_signal_connect (G_OBJECT (ev_window->priv->print_dialog), "response", G_CALLBACK (ev_window_print_dialog_response_cb), ev_window);
+       gtk_widget_show (ev_window->priv->print_dialog);
+       return;
 }
-
+       
 static void
 ev_window_cmd_file_print (GtkAction *action, EvWindow *ev_window)
 {
@@ -1540,7 +1434,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 {
-               update_chrome_flag (ev_window, EV_CHROME_FINDBAR, NULL, TRUE);
+               update_chrome_flag (ev_window, EV_CHROME_FINDBAR, TRUE);
 
                gtk_widget_grab_focus (ev_window->priv->find_bar);
        }
@@ -1567,20 +1461,24 @@ ev_window_update_fullscreen_popup (EvWindow *window)
 {
        GtkWidget *popup = window->priv->fullscreen_popup;
        int popup_width, popup_height;
+       GdkScreen *screen;
        GdkRectangle screen_rect;
        gboolean toolbar;
 
        g_return_if_fail (popup != NULL);
 
+       if (GTK_WIDGET (window)->window == NULL)
+               return;
+
        toolbar = (window->priv->chrome & EV_CHROME_TOOLBAR) != 0 || 
                  (window->priv->chrome & EV_CHROME_RAISE_TOOLBAR) != 0;
        popup_width = popup->requisition.width;
        popup_height = popup->requisition.height;
 
-       /* FIXME multihead */
-       gdk_screen_get_monitor_geometry (gdk_screen_get_default (),
+       screen = gtk_widget_get_screen (GTK_WIDGET (window));
+       gdk_screen_get_monitor_geometry (screen,
                        gdk_screen_get_monitor_at_window
-                        (gdk_screen_get_default (),
+                        (screen,
                          GTK_WIDGET (window)->window),
                          &screen_rect);
        if (toolbar) {
@@ -1616,14 +1514,9 @@ static void
 ev_window_sidebar_position_change_cb (GObject *object, GParamSpec *pspec,
                                      EvWindow *ev_window)
 {
-       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);
+       if (!ev_window_is_empty (ev_window))
+               ev_metadata_manager_set_int (ev_window->priv->uri, "sidebar_size",
+                                            gtk_paned_get_position (GTK_PANED (object)));
 }
 
 static void
@@ -1660,6 +1553,7 @@ fullscreen_timeout_cb (gpointer data)
 
        g_object_set (window->priv->fullscreen_popup, "visible", FALSE, NULL);
        ev_view_hide_cursor (EV_VIEW (window->priv->view));
+       g_source_unref (window->priv->fullscreen_timeout_source);
        window->priv->fullscreen_timeout_source = NULL;
 
        return FALSE;
@@ -1670,10 +1564,12 @@ fullscreen_set_timeout (EvWindow *window)
 {
        GSource *source;
 
-       if (window->priv->fullscreen_timeout_source != NULL)
+       if (window->priv->fullscreen_timeout_source != NULL) {
+               g_source_unref (window->priv->fullscreen_timeout_source);
                g_source_destroy (window->priv->fullscreen_timeout_source);
+       }
 
-       source = g_timeout_source_new (1000);
+       source = g_timeout_source_new (FULLSCREEN_TIMEOUT);
        g_source_set_callback (source, fullscreen_timeout_cb, window, NULL);
        g_source_attach (source, NULL);
        window->priv->fullscreen_timeout_source = source;
@@ -1682,8 +1578,10 @@ fullscreen_set_timeout (EvWindow *window)
 static void
 fullscreen_clear_timeout (EvWindow *window)
 {
-       if (window->priv->fullscreen_timeout_source != NULL)
+       if (window->priv->fullscreen_timeout_source != NULL) {
+               g_source_unref (window->priv->fullscreen_timeout_source);
                g_source_destroy (window->priv->fullscreen_timeout_source);
+       }
 
        window->priv->fullscreen_timeout_source = NULL;
        ev_view_show_cursor (EV_VIEW (window->priv->view));
@@ -1757,6 +1655,7 @@ ev_window_create_fullscreen_popup (EvWindow *window)
        GtkWidget *popup;
        GtkWidget *hbox;
        GtkWidget *button;
+       GdkScreen *screen;
 
        window->priv->fullscreen_toolbar = egg_editable_toolbar_new_with_model
                        (window->priv->ui_manager, ev_application_get_toolbars_model (EV_APP));
@@ -1775,14 +1674,17 @@ ev_window_create_fullscreen_popup (EvWindow *window)
 
        gtk_window_set_resizable (GTK_WINDOW (popup), FALSE);
 
-       /* FIXME multihead */
-       g_signal_connect_object (gdk_screen_get_default (), "size-changed",
+       screen = gtk_widget_get_screen (GTK_WIDGET (window));
+       g_signal_connect_object (screen, "size-changed",
                                 G_CALLBACK (screen_size_changed_cb),
                                 window, 0);
        g_signal_connect_object (popup, "size_request",
                                 G_CALLBACK (fullscreen_popup_size_request_cb),
                                 window, 0);
 
+       gtk_window_set_screen (GTK_WINDOW (popup),
+                              gtk_widget_get_screen (GTK_WIDGET (window)));
+
        return popup;
 }
 
@@ -1808,7 +1710,9 @@ ev_window_run_fullscreen (EvWindow *window)
        if (window->priv->fullscreen_popup == NULL)
                window->priv->fullscreen_popup
                        = ev_window_create_fullscreen_popup (window);
+
        update_chrome_visibility (window);
+       gtk_widget_hide (window->priv->sidebar);
 
        g_object_set (G_OBJECT (window->priv->scrolled_window),
                      "shadow-type", GTK_SHADOW_NONE,
@@ -1829,7 +1733,8 @@ ev_window_run_fullscreen (EvWindow *window)
        gtk_window_fullscreen (GTK_WINDOW (window));
        ev_window_update_fullscreen_popup (window);
 
-       ev_metadata_manager_set_boolean (window->priv->uri, "fullscreen", TRUE);
+       if (!ev_window_is_empty (window))
+               ev_metadata_manager_set_boolean (window->priv->uri, "fullscreen", TRUE);
 }
 
 static void
@@ -1856,8 +1761,10 @@ ev_window_stop_fullscreen (EvWindow *window)
        ev_window_update_fullscreen_action (window);
        gtk_window_unfullscreen (GTK_WINDOW (window));
        update_chrome_visibility (window);
+       update_sidebar_visibility (window);
 
-       ev_metadata_manager_set_boolean (window->priv->uri, "fullscreen", FALSE);
+       if (!ev_window_is_empty (window))
+               ev_metadata_manager_set_boolean (window->priv->uri, "fullscreen", FALSE);
 }
 
 static void
@@ -1902,8 +1809,10 @@ ev_window_run_presentation (EvWindow *window)
        gtk_window_fullscreen (GTK_WINDOW (window));
        ev_window_update_presentation_action (window);
        update_chrome_visibility (window);
+       gtk_widget_hide (window->priv->sidebar);
 
-       ev_metadata_manager_set_boolean (window->priv->uri, "presentation", TRUE);
+       if (!ev_window_is_empty (window))
+               ev_metadata_manager_set_boolean (window->priv->uri, "presentation", TRUE);
 }
 
 static void
@@ -1919,8 +1828,10 @@ ev_window_stop_presentation (EvWindow *window)
        gtk_window_unfullscreen (GTK_WINDOW (window));
        ev_window_update_presentation_action (window);
        update_chrome_visibility (window);
+       update_sidebar_visibility (window);
 
-       ev_metadata_manager_set_boolean (window->priv->uri, "presentation", FALSE);
+       if (!ev_window_is_empty (window))
+               ev_metadata_manager_set_boolean (window->priv->uri, "presentation", FALSE);
 }
 
 static void
@@ -1939,23 +1850,6 @@ ev_window_cmd_view_presentation (GtkAction *action, EvWindow *window)
        }
 }
 
-static gboolean
-ev_window_state_event (GtkWidget *widget, GdkEventWindowState *event)
-{
-       EvWindow *window = EV_WINDOW (widget);
-
-       if (event->changed_mask & GDK_WINDOW_STATE_MAXIMIZED) {
-               gboolean maximized;
-
-               maximized = (event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED) == 0;
-
-               ev_statusbar_set_maximized (EV_STATUSBAR (window->priv->statusbar),
-                                           maximized);
-       }
-
-       return FALSE;
-}
-
 static gboolean
 ev_window_focus_in_event (GtkWidget *widget, GdkEventFocus *event)
 {
@@ -1990,6 +1884,32 @@ ev_window_focus_out_event (GtkWidget *widget, GdkEventFocus *event)
        return GTK_WIDGET_CLASS (ev_window_parent_class)->focus_out_event (widget, event);
 }
 
+static void
+ev_window_screen_changed (GtkWidget *widget,
+                         GdkScreen *old_screen)
+{
+       EvWindow *window = EV_WINDOW (widget);
+       EvWindowPrivate *priv = window->priv;
+       GdkScreen *screen;
+
+       if (GTK_WIDGET_CLASS (ev_window_parent_class)->screen_changed) {
+               GTK_WIDGET_CLASS (ev_window_parent_class)->screen_changed (widget, old_screen);
+       }
+
+       if (priv->fullscreen_popup != NULL) {
+               g_signal_handlers_disconnect_by_func
+                       (old_screen, G_CALLBACK (screen_size_changed_cb), window);
+
+               screen = gtk_widget_get_screen (widget);
+               g_signal_connect_object (screen, "size-changed",
+                                        G_CALLBACK (screen_size_changed_cb),
+                                        window, 0);
+               gtk_window_set_screen (GTK_WINDOW (priv->fullscreen_popup), screen);
+
+               ev_window_update_fullscreen_popup (window);
+       }
+}
+
 static void
 ev_window_set_page_mode (EvWindow         *window,
                         EvWindowPageMode  page_mode)
@@ -2037,14 +1957,12 @@ static void
 ev_window_cmd_edit_rotate_left (GtkAction *action, EvWindow *ev_window)
 {
        ev_view_rotate_left (EV_VIEW (ev_window->priv->view));
-       ev_sidebar_thumbnails_refresh (EV_SIDEBAR_THUMBNAILS (ev_window->priv->sidebar_thumbs));
 }
 
 static void
 ev_window_cmd_edit_rotate_right (GtkAction *action, EvWindow *ev_window)
 {
        ev_view_rotate_right (EV_VIEW (ev_window->priv->view));
-       ev_sidebar_thumbnails_refresh (EV_SIDEBAR_THUMBNAILS (ev_window->priv->sidebar_thumbs));
 }
 
 static void
@@ -2053,14 +1971,15 @@ ev_window_cmd_edit_toolbar (GtkAction *action, EvWindow *ev_window)
        GtkWidget *dialog;
        GtkWidget *editor;
 
-       dialog = gtk_dialog_new_with_buttons (_("Toolbar editor"),
+       dialog = gtk_dialog_new_with_buttons (_("Toolbar Editor"),
                                              GTK_WINDOW (ev_window), 
                                              GTK_DIALOG_DESTROY_WITH_PARENT, 
                                              GTK_STOCK_CLOSE,
                                              GTK_RESPONSE_CLOSE, 
                                              NULL);
+       gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
        gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)), 5);
-       gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 18);
+       gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 2);
        gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
        gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 400);
          
@@ -2105,7 +2024,7 @@ ev_window_cmd_go_previous_page (GtkAction *action, EvWindow *ev_window)
 {
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
-       ev_page_cache_prev_page (ev_window->priv->page_cache);
+       ev_view_previous_page (EV_VIEW (ev_window->priv->view));
 }
 
 static void
@@ -2113,7 +2032,7 @@ ev_window_cmd_go_next_page (GtkAction *action, EvWindow *ev_window)
 {
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
-       ev_page_cache_next_page (ev_window->priv->page_cache);
+       ev_view_next_page (EV_VIEW (ev_window->priv->view));
 }
 
 static void
@@ -2176,7 +2095,7 @@ ev_window_cmd_view_reload (GtkAction *action, EvWindow *ev_window)
        ev_window_open_uri (ev_window, uri);
 
        /* In case the number of pages in the document has changed. */
-       page = CLAMP (page, 0, ev_page_cache_get_n_pages (ev_window->priv->page_cache));
+       page = CLAMP (page, 0, ev_page_cache_get_n_pages (ev_window->priv->page_cache) - 1);
 
        ev_page_cache_set_current_page (ev_window->priv->page_cache, page);
 
@@ -2211,7 +2130,8 @@ ev_window_cmd_escape (GtkAction *action, EvWindow *window)
 
        widget = gtk_window_get_focus (GTK_WINDOW (window));
        if (widget && gtk_widget_get_ancestor (widget, EGG_TYPE_FIND_BAR)) {
-               update_chrome_flag (window, EV_CHROME_FINDBAR, NULL, FALSE);
+               update_chrome_flag (window, EV_CHROME_FINDBAR, FALSE);
+               gtk_widget_grab_focus (window->priv->view);
        } else {
                gboolean fullscreen;
                gboolean presentation;
@@ -2269,13 +2189,12 @@ save_sizing_mode (EvWindow *window)
        EvSizingMode mode;
        GEnumValue *enum_value;
 
-       if (window->priv->uri) {
-               mode = ev_view_get_sizing_mode (EV_VIEW (window->priv->view));
-               enum_value = g_enum_get_value (EV_SIZING_MODE_CLASS, mode);
+       mode = ev_view_get_sizing_mode (EV_VIEW (window->priv->view));
+       enum_value = g_enum_get_value (EV_SIZING_MODE_CLASS, mode);
 
+       if (!ev_window_is_empty (window))
                ev_metadata_manager_set_string (window->priv->uri, "sizing_mode",
                                                enum_value->value_nick);
-       }
 }
 
 static void     
@@ -2332,7 +2251,7 @@ ev_window_zoom_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_window)
 {
         update_action_sensitivity (ev_window);
 
-       if (ev_view_get_sizing_mode (view) == EV_SIZING_FREE) {
+       if (ev_view_get_sizing_mode (view) == EV_SIZING_FREE && !ev_window_is_empty (ev_window)) {
                ev_metadata_manager_set_double (ev_window->priv->uri, "zoom",
                                                ev_view_get_zoom (view));
        }
@@ -2371,8 +2290,30 @@ ev_window_continuous_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_w
 {
        ev_window_update_continuous_action (ev_window);
 
-       ev_metadata_manager_set_boolean (ev_window->priv->uri, "continuous",
-                                        ev_view_get_continuous (EV_VIEW (ev_window->priv->view)));
+       if (!ev_window_is_empty (ev_window))
+               ev_metadata_manager_set_boolean (ev_window->priv->uri, "continuous",
+                                                ev_view_get_continuous (EV_VIEW (ev_window->priv->view)));
+}
+
+static void     
+ev_window_rotation_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *window)
+{
+       int rotation;
+
+       rotation = ev_view_get_rotation (EV_VIEW (window->priv->view));
+
+       if (!ev_window_is_empty (window))
+               ev_metadata_manager_set_int (window->priv->uri, "rotation",
+                                            rotation);
+
+       ev_sidebar_thumbnails_refresh (EV_SIDEBAR_THUMBNAILS (window->priv->sidebar_thumbs),
+                                      rotation);
+}
+
+static void
+ev_window_has_selection_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *window)
+{
+       update_action_sensitivity (window);
 }
 
 static void     
@@ -2380,8 +2321,9 @@ ev_window_dual_mode_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_wi
 {
        ev_window_update_dual_page_action (ev_window);
 
-       ev_metadata_manager_set_boolean (ev_window->priv->uri, "dual-page",
-                                        ev_view_get_dual_page (EV_VIEW (ev_window->priv->view)));
+       if (!ev_window_is_empty (ev_window))
+               ev_metadata_manager_set_boolean (ev_window->priv->uri, "dual-page",
+                                                ev_view_get_dual_page (EV_VIEW (ev_window->priv->view)));
 }
 
 static char *
@@ -2479,122 +2421,124 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window)
 static void
 ev_window_view_toolbar_cb (GtkAction *action, EvWindow *ev_window)
 {
-       update_chrome_flag (ev_window, EV_CHROME_TOOLBAR,
-                           GCONF_CHROME_TOOLBAR,
-                           gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
+       gboolean active;
+       
+       active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
+       update_chrome_flag (ev_window, EV_CHROME_TOOLBAR, active);
+       ev_metadata_manager_set_boolean (NULL, "show_toolbar", active);
 }
 
 static void
-ev_window_view_statusbar_cb (GtkAction *action, EvWindow *ev_window)
+ev_window_view_sidebar_cb (GtkAction *action, EvWindow *ev_window)
 {
-       update_chrome_flag (ev_window, EV_CHROME_STATUSBAR,
-                           GCONF_CHROME_STATUSBAR,
-                           gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
+       set_widget_visibility (ev_window->priv->sidebar,
+                              gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
 }
 
 static void
-ev_window_view_sidebar_cb (GtkAction *action, EvWindow *ev_window)
+ev_window_sidebar_current_page_changed_cb (EvSidebar  *ev_sidebar,
+                                          GParamSpec *pspec,
+                                          EvWindow   *ev_window)
 {
-       update_chrome_flag (ev_window, EV_CHROME_SIDEBAR,
-                           GCONF_CHROME_SIDEBAR,
-                           gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
+       GtkWidget *current_page;
+       const char *id;
+
+       g_object_get (G_OBJECT (ev_sidebar), "current_page", &current_page, NULL);
+
+       if (current_page == ev_window->priv->sidebar_links) {
+               id = LINKS_SIDEBAR_ID;
+       } else if (current_page == ev_window->priv->sidebar_thumbs) {
+               id = THUMBNAILS_SIDEBAR_ID;
+       } else {
+               g_assert_not_reached();
+       }
+
+       g_object_unref (current_page);
+
+       if (!ev_window_is_empty (ev_window))
+               ev_metadata_manager_set_string (ev_window->priv->uri, "sidebar_page", id);
 }
 
 static void
 ev_window_sidebar_visibility_changed_cb (EvSidebar *ev_sidebar, GParamSpec *pspec,
                                         EvWindow   *ev_window)
 {
+       EvView *view = EV_VIEW (ev_window->priv->view);
        GtkAction *action;
-       gboolean visible, fullscreen_mode;
-
 
-       fullscreen_mode = ev_view_get_presentation (EV_VIEW (ev_window->priv->view)) ||
-                              ev_view_get_fullscreen (EV_VIEW (ev_window->priv->view));
-
-       visible = GTK_WIDGET_VISIBLE (ev_sidebar);
-
-       /* In fullscreen mode the sidebar is not visible,
-        * but we don't want to update the chrome
-        */
-       if (fullscreen_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);
+       gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
+                                     GTK_WIDGET_VISIBLE (ev_sidebar));
        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)
-{
-       GtkAction *action;
-       char *message;
-
-       action = g_object_get_data (G_OBJECT (proxy), "gtk-action");
-       g_return_if_fail (action != NULL);
-
-       g_object_get (G_OBJECT (action), "tooltip", &message, NULL);
-       if (message) {
-               ev_statusbar_push (EV_STATUSBAR (ev_window->priv->statusbar),
-                                  EV_CONTEXT_VIEW, message);
-               g_free (message);
+       if (!ev_view_get_presentation (view) && 
+           !ev_view_get_fullscreen (view) &&
+           !ev_window_is_empty (ev_window)) {
+               ev_metadata_manager_set_boolean (ev_window->priv->uri, "sidebar_visibility",
+                                                GTK_WIDGET_VISIBLE (ev_sidebar));
        }
 }
 
-static void
-menu_item_deselect_cb (GtkMenuItem *proxy, EvWindow *ev_window)
-{
-       ev_statusbar_pop (EV_STATUSBAR (ev_window->priv->statusbar),
-                         EV_CONTEXT_VIEW);
-}
-
-static void
-connect_proxy_cb (GtkUIManager *ui_manager, GtkAction *action,
-                 GtkWidget *proxy, EvWindow *ev_window)
+static gboolean
+view_menu_popup_cb (EvView         *view,
+                   EvLink         *link,
+                   EvWindow       *ev_window)
 {
-       if (GTK_IS_MENU_ITEM (proxy)) {
-               g_signal_connect (proxy, "select",
-                                 G_CALLBACK (menu_item_select_cb), ev_window);
-               g_signal_connect (proxy, "deselect",
-                                 G_CALLBACK (menu_item_deselect_cb),
-                                 ev_window);
-       }
-}
+       GtkWidget *popup;
+       gboolean   show_external = FALSE;
+       gboolean   show_internal = FALSE;
+       GtkAction *action;
 
-static void
-disconnect_proxy_cb (GtkUIManager *ui_manager, GtkAction *action,
-                    GtkWidget *proxy, EvWindow *ev_window)
-{
-       if (GTK_IS_MENU_ITEM (proxy)) {
-               g_signal_handlers_disconnect_by_func
-                       (proxy, G_CALLBACK (menu_item_select_cb), ev_window);
-               g_signal_handlers_disconnect_by_func
-                       (proxy, G_CALLBACK (menu_item_deselect_cb), ev_window);
-       }
-}
+       if (ev_view_get_presentation (EV_VIEW (ev_window->priv->view)))
+               return FALSE;
+       
+       if (ev_window->priv->link)
+               g_object_unref (ev_window->priv->link);
+       if (link)
+               ev_window->priv->link = g_object_ref (link);
+       else    
+               ev_window->priv->link = NULL;
+
+       popup = ev_window->priv->popup;
+
+       if (ev_window->priv->link) 
+               switch (ev_link_get_link_type (ev_window->priv->link)) {
+                       case EV_LINK_TYPE_PAGE:
+                       case EV_LINK_TYPE_PAGE_FIT:
+                       case EV_LINK_TYPE_PAGE_FITH:
+                       case EV_LINK_TYPE_PAGE_FITV:
+                       case EV_LINK_TYPE_PAGE_FITR:
+                       case EV_LINK_TYPE_PAGE_XYZ:
+                               show_internal = TRUE;
+                               break;
+                       case EV_LINK_TYPE_EXTERNAL_URI:
+                       case EV_LINK_TYPE_LAUNCH:       
+                               show_external = TRUE;
+                               break;
+                       default:
+                               break;
+               }
+       
+       action = gtk_action_group_get_action (ev_window->priv->popups_action_group,
+                                             "OpenLink");
+       gtk_action_set_visible (action, show_external);
 
-static void
-view_status_changed_cb (EvView     *view,
-                       GParamSpec *pspec,
-                       EvWindow   *ev_window)
-{
-       const char *message;
+       action = gtk_action_group_get_action (ev_window->priv->popups_action_group,
+                                             "CopyLinkAddress");
+       gtk_action_set_visible (action, show_external);
 
-       ev_statusbar_pop (EV_STATUSBAR (ev_window->priv->statusbar),
-                         EV_CONTEXT_HELP);
+       action = gtk_action_group_get_action (ev_window->priv->popups_action_group,
+                                             "GoLink");
+       gtk_action_set_visible (action, show_internal);
 
-       message = ev_view_get_status (view);
-       if (message) {
-               ev_statusbar_push (EV_STATUSBAR (ev_window->priv->statusbar),
-                                  EV_CONTEXT_HELP, message);
-       }
+       gtk_menu_popup (GTK_MENU (popup), NULL, NULL,
+                       NULL, NULL,
+                       3, gtk_get_current_event_time ());
+       return FALSE;
 }
 
 static void
@@ -2627,7 +2571,7 @@ static void
 find_bar_close_cb (EggFindBar *find_bar,
                   EvWindow   *ev_window)
 {
-       update_chrome_flag (ev_window, EV_CHROME_FINDBAR, NULL, FALSE);
+       update_chrome_flag (ev_window, EV_CHROME_FINDBAR, FALSE);
 }
 
 static void
@@ -2669,6 +2613,7 @@ find_bar_search_changed_cb (EggFindBar *find_bar,
                        ev_document_find_cancel (EV_DOCUMENT_FIND (ev_window->priv->document));
                        ev_document_doc_mutex_unlock ();
 
+                       update_action_sensitivity (ev_window);
                        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));
@@ -2703,14 +2648,14 @@ zoom_control_changed_cb (EphyZoomAction *action,
 static void
 ev_window_finalize (GObject *object)
 {
-       GList *windows = gtk_window_list_toplevels ();
+       GList *windows = ev_application_get_windows (EV_APP);
 
        if (windows == NULL) {
                ev_application_shutdown (EV_APP);
        } else {
                g_list_free (windows);
        }
-
+       
        G_OBJECT_CLASS (ev_window_parent_class)->finalize (object);
 }
 
@@ -2720,6 +2665,11 @@ ev_window_dispose (GObject *object)
        EvWindow *window = EV_WINDOW (object);
        EvWindowPrivate *priv = window->priv;
 
+       if (priv->title) {
+               ev_window_title_free (priv->title);
+               priv->title = NULL;
+       }
+
        if (priv->recent_view) {
                g_object_unref (priv->recent_view);
                priv->recent_view = NULL;
@@ -2735,6 +2685,11 @@ ev_window_dispose (GObject *object)
                priv->action_group = NULL;
        }
 
+       if (priv->popups_action_group) {
+               g_object_unref (priv->popups_action_group);
+               priv->popups_action_group = NULL;
+       }
+
        if (priv->page_cache) {
                g_signal_handlers_disconnect_by_func (priv->page_cache, page_changed_cb, window);
                priv->page_cache = NULL;
@@ -2768,13 +2723,11 @@ ev_window_dispose (GObject *object)
                priv->password_document = NULL;
        }
        
-       if (priv->password_uri) {
-               g_free (priv->password_uri);
-               priv->password_uri = NULL;
-       }
+       ev_window_close_dialogs (window);
 
-       if (priv->password_dialog) {
-               gtk_widget_destroy (priv->password_dialog);
+       if (priv->link) {
+               g_object_unref (priv->link);
+               priv->link = NULL;
        }
 
        if (priv->find_bar) {
@@ -2785,7 +2738,13 @@ ev_window_dispose (GObject *object)
                priv->find_bar = NULL;
        }
 
+       if (priv->uri) {
+               g_free (priv->uri);
+               priv->uri = NULL;
+       }
+
        if (window->priv->fullscreen_timeout_source) {
+               g_source_unref (window->priv->fullscreen_timeout_source);
                g_source_destroy (window->priv->fullscreen_timeout_source);
                window->priv->fullscreen_timeout_source = NULL;
        }
@@ -2803,9 +2762,9 @@ ev_window_class_init (EvWindowClass *ev_window_class)
        g_object_class->dispose = ev_window_dispose;
        g_object_class->finalize = ev_window_finalize;
 
-       widget_class->window_state_event = ev_window_state_event;
        widget_class->focus_in_event = ev_window_focus_in_event;
        widget_class->focus_out_event = ev_window_focus_out_event;
+       widget_class->screen_changed = ev_window_screen_changed;
 
        g_type_class_add_private (g_object_class, sizeof (EvWindowPrivate));
 }
@@ -2819,43 +2778,35 @@ static const GtkActionEntry entries[] = {
        { "Help", NULL, N_("_Help") },
 
        /* File menu */
-       { "FileOpen", GTK_STOCK_OPEN, NULL, "<control>O",
+       { "FileOpen", GTK_STOCK_OPEN, N_("_Open..."), "<control>O",
          N_("Open an existing document"),
          G_CALLBACK (ev_window_cmd_file_open) },
-               { "FileSaveAs", GTK_STOCK_SAVE_AS, N_("_Save a Copy..."), NULL,
-         N_("Save the current document with a new filename"),
+               { "FileSaveAs", GTK_STOCK_SAVE_AS, N_("_Save a Copy..."), "<control>S",
+         N_("Save a copy of the current document"),
          G_CALLBACK (ev_window_cmd_save_as) },
-       { "FilePrint", GTK_STOCK_PRINT, N_("Print..."), "<control>P",
+       { "FilePrint", GTK_STOCK_PRINT, N_("_Print..."), "<control>P",
          N_("Print this document"),
          G_CALLBACK (ev_window_cmd_file_print) },
-       { "FileProperties", GTK_STOCK_PROPERTIES, N_("Properties"), "<alt>Return",
-         N_("View the properties of this document"),
+       { "FileProperties", GTK_STOCK_PROPERTIES, N_("P_roperties"), "<alt>Return", NULL,
          G_CALLBACK (ev_window_cmd_file_properties) },                       
-       { "FileCloseWindow", GTK_STOCK_CLOSE, NULL, "<control>W",
-         N_("Close this window"),
+       { "FileCloseWindow", GTK_STOCK_CLOSE, NULL, "<control>W", NULL,
          G_CALLBACK (ev_window_cmd_file_close_window) },
 
         /* Edit menu */
-        { "EditCopy", GTK_STOCK_COPY, NULL, "<control>C",
-          N_("Copy text from the document"),
+        { "EditCopy", GTK_STOCK_COPY, NULL, "<control>C", NULL,
           G_CALLBACK (ev_window_cmd_edit_copy) },
-       { "EditSelectAll", NULL, N_("Select _All"), "<control>A",
-         N_("Select the entire page"),
+       { "EditSelectAll", NULL, N_("Select _All"), "<control>A", NULL,
          G_CALLBACK (ev_window_cmd_edit_select_all) },
         { "EditFind", GTK_STOCK_FIND, NULL, "<control>F",
           N_("Find a word or phrase in the document"),
           G_CALLBACK (ev_window_cmd_edit_find) },
-       { "EditFindNext", NULL, N_("Find Ne_xt"), "<control>G",
-         N_("Find next occurrence of the word or phrase"),
+       { "EditFindNext", NULL, N_("Find Ne_xt"), "<control>G", NULL,
          G_CALLBACK (ev_window_cmd_edit_find_next) },
-        { "EditToolbar", NULL, N_("T_oolbar"), NULL,
-          N_("Customize the toolbar"),
+        { "EditToolbar", NULL, N_("T_oolbar"), NULL, NULL,
           G_CALLBACK (ev_window_cmd_edit_toolbar) },
-       { "EditRotateLeft", NULL, N_("Rotate _Left"), NULL,
-         N_("Rotate the document to the left"),
+       { "EditRotateLeft", NULL, N_("Rotate _Left"), NULL, NULL,
          G_CALLBACK (ev_window_cmd_edit_rotate_left) },
-       { "EditRotateRight", NULL, N_("Rotate _Right"), NULL,
-         N_("Rotate the document to the right"),
+       { "EditRotateRight", NULL, N_("Rotate _Right"), NULL, NULL,
          G_CALLBACK (ev_window_cmd_edit_rotate_right) },
 
         /* View menu */
@@ -2884,12 +2835,10 @@ static const GtkActionEntry entries[] = {
           G_CALLBACK (ev_window_cmd_go_last_page) },
 
        /* Help menu */
-       { "HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1",
-         N_("Display help for the viewer application"),
+       { "HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1", NULL,
          G_CALLBACK (ev_window_cmd_help_contents) },
 
-       { "HelpAbout", GTK_STOCK_ABOUT, N_("_About"), NULL,
-         N_("Display credits for the document viewer creators"),
+       { "HelpAbout", GTK_STOCK_ABOUT, N_("_About"), NULL, NULL,
          G_CALLBACK (ev_window_cmd_help_about) },
 
        /* Toolbar-only */
@@ -2900,50 +2849,45 @@ static const GtkActionEntry entries[] = {
        /* Accellerators */
        { "Escape", NULL, "", "Escape", "",
          G_CALLBACK (ev_window_cmd_escape) },
-        { "Slash", GTK_STOCK_FIND, NULL, "slash",
-          N_("Find a word or phrase in the document"),
+        { "Slash", GTK_STOCK_FIND, NULL, "slash", NULL,
           G_CALLBACK (ev_window_cmd_edit_find) },
-        { "PageDown", NULL, "", "Page_Down",
-          N_("Scroll one page forward"),
+        { "PageDown", NULL, "", "Page_Down", NULL,
           G_CALLBACK (ev_window_cmd_scroll_forward) },
-        { "PageUp", NULL, "", "Page_Up",
-          N_("Scroll one page backward"),
+        { "PageUp", NULL, "", "Page_Up", NULL,
           G_CALLBACK (ev_window_cmd_scroll_backward) },
-        { "Space", NULL, "", "space",
-          N_("Scroll one page forward"),
+        { "Space", NULL, "", "space", NULL,
           G_CALLBACK (ev_window_cmd_scroll_forward) },
-        { "ShiftSpace", NULL, "", "<shift>space",
-          N_("Scroll one page backward"),
+        { "ShiftSpace", NULL, "", "<shift>space", NULL,
           G_CALLBACK (ev_window_cmd_scroll_backward) },
-        { "BackSpace", NULL, "", "BackSpace",
-          N_("Scroll one page backward"),
+        { "BackSpace", NULL, "", "BackSpace", NULL,
           G_CALLBACK (ev_window_cmd_scroll_backward) },
-        { "ShiftBackSpace", NULL, "", "<shift>BackSpace",
-          N_("Scroll one page forward"),
+        { "ShiftBackSpace", NULL, "", "<shift>BackSpace", NULL,
           G_CALLBACK (ev_window_cmd_scroll_forward) },
-        { "Plus", GTK_STOCK_ZOOM_IN, NULL, "plus",
-          N_("Enlarge the document"),
+        { "Return", NULL, "", "Return", NULL,
+          G_CALLBACK (ev_window_cmd_scroll_forward) },
+        { "ShiftReturn", NULL, "", "<shift>Return", NULL,
+          G_CALLBACK (ev_window_cmd_scroll_backward) },
+        { "Plus", GTK_STOCK_ZOOM_IN, NULL, "plus", NULL,
           G_CALLBACK (ev_window_cmd_view_zoom_in) },
-        { "CtrlEqual", GTK_STOCK_ZOOM_IN, NULL, "<control>equal",
-          N_("Enlarge the document"),
+        { "CtrlEqual", GTK_STOCK_ZOOM_IN, NULL, "<control>equal", NULL,
           G_CALLBACK (ev_window_cmd_view_zoom_in) },
-        { "Minus", GTK_STOCK_ZOOM_OUT, NULL, "minus",
-          N_("Shrink the document"),
+        { "Equal", GTK_STOCK_ZOOM_IN, NULL, "equal", NULL,
+          G_CALLBACK (ev_window_cmd_view_zoom_in) },
+        { "Minus", GTK_STOCK_ZOOM_OUT, NULL, "minus", NULL,
           G_CALLBACK (ev_window_cmd_view_zoom_out) },
-        { "FocusPageSelector", NULL, "", "<control>l",
-          N_("Focus the page selector"),
+        { "FocusPageSelector", NULL, "", "<control>l", NULL,
           G_CALLBACK (ev_window_cmd_focus_page_selector) },
-        { "GoBackwardFast", NULL, "", "<shift>Page_Up",
-          N_("Go ten pages backward"),
+        { "GoBackwardFast", NULL, "", "<shift>Page_Up", NULL,
           G_CALLBACK (ev_window_cmd_go_backward) },
-        { "GoForwardFast", NULL, "", "<shift>Page_Down",
-          N_("Go ten pages forward"),
+        { "GoForwardFast", NULL, "", "<shift>Page_Down", NULL,
           G_CALLBACK (ev_window_cmd_go_forward) },
-        { "KpPlus", GTK_STOCK_ZOOM_IN, NULL, "KP_Add",
-          N_("Enlarge the document"),
+        { "KpPlus", GTK_STOCK_ZOOM_IN, NULL, "KP_Add", NULL,
           G_CALLBACK (ev_window_cmd_view_zoom_in) },
-        { "KpMinus", GTK_STOCK_ZOOM_OUT, NULL, "KP_Subtract",
-          N_("Shrink the document"),
+        { "KpMinus", GTK_STOCK_ZOOM_OUT, NULL, "KP_Subtract", NULL,
+          G_CALLBACK (ev_window_cmd_view_zoom_out) },
+        { "CtrlKpPlus", GTK_STOCK_ZOOM_IN, NULL, "<control>KP_Add", NULL,
+          G_CALLBACK (ev_window_cmd_view_zoom_in) },
+        { "CtrlKpMinus", GTK_STOCK_ZOOM_OUT, NULL, "<control>KP_Subtract", NULL,
           G_CALLBACK (ev_window_cmd_view_zoom_out) },
 };
 
@@ -2953,10 +2897,7 @@ static const GtkToggleActionEntry toggle_entries[] = {
        { "ViewToolbar", NULL, N_("_Toolbar"), "<shift><control>T",
          N_("Show or hide the toolbar"),
          G_CALLBACK (ev_window_view_toolbar_cb), TRUE },
-       { "ViewStatusbar", NULL, N_("_Statusbar"), NULL,
-         N_("Show or hide the statusbar"),
-         G_CALLBACK (ev_window_view_statusbar_cb), TRUE },
-        { "ViewSidebar", NULL, N_("Side _pane"), "F9",
+        { "ViewSidebar", NULL, N_("Side _Pane"), "F9",
          N_("Show or hide the side pane"),
          G_CALLBACK (ev_window_view_sidebar_cb), TRUE },
         { "ViewContinuous", EV_STOCK_VIEW_CONTINUOUS, N_("_Continuous"), NULL,
@@ -2979,6 +2920,18 @@ static const GtkToggleActionEntry toggle_entries[] = {
           G_CALLBACK (ev_window_cmd_view_page_width) },
 };
 
+/* Popups specific items */
+static const GtkActionEntry popups_entries [] = {
+       /* Links */
+       { "OpenLink", GTK_STOCK_OPEN, N_("_Open Link"), NULL,
+         NULL, G_CALLBACK (ev_popup_cmd_open_link) },
+       { "GoLink", GTK_STOCK_GO_FORWARD, N_("_Go To"), NULL,
+         NULL, G_CALLBACK (ev_popup_cmd_open_link) },
+       { "CopyLinkAddress", NULL, N_("_Copy Link Address"), NULL,
+         NULL,
+         G_CALLBACK (ev_popup_cmd_copy_link_address) },
+};
+
 static void
 drag_data_received_cb (GtkWidget *widget, GdkDragContext *context,
                       gint x, gint y, GtkSelectionData *selection_data,
@@ -3000,7 +2953,7 @@ drag_data_received_cb (GtkWidget *widget, GdkDragContext *context,
 
                gnome_vfs_uri_list_free (uri_list);
                
-               ev_application_open_uri_list (EV_APP, uris);
+               ev_application_open_uri_list (EV_APP, uris, 0);
                
                g_slist_free (uris);
 
@@ -3013,7 +2966,7 @@ activate_link_cb (EvPageAction *page_action, EvLink *link, EvWindow *window)
 {
        g_return_if_fail (EV_IS_WINDOW (window));
 
-       ev_page_cache_set_link (window->priv->page_cache, link);
+       ev_view_goto_link (EV_VIEW (window->priv->view), link);
        gtk_widget_grab_focus (window->priv->view);
 }
 
@@ -3111,60 +3064,6 @@ set_chrome_actions (EvWindow *window)
                                      (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
@@ -3195,18 +3094,21 @@ ev_window_set_view_accels_sensitivity (EvWindow *window, gboolean sensitive)
                set_action_sensitive (window, "ShiftSpace", sensitive);
                set_action_sensitive (window, "BackSpace", sensitive);
                set_action_sensitive (window, "ShiftBackSpace", sensitive);
+               set_action_sensitive (window, "Return", sensitive);
+               set_action_sensitive (window, "ShiftReturn", sensitive);
                set_action_sensitive (window, "Slash", sensitive);
                set_action_sensitive (window, "Plus", sensitive);
                set_action_sensitive (window, "Minus", sensitive);
                set_action_sensitive (window, "KpPlus", sensitive);
                set_action_sensitive (window, "KpMinus", sensitive);
+               set_action_sensitive (window, "Equal", sensitive);
        }
 }
 
 static gboolean
 view_actions_focus_in_cb (GtkWidget *widget, GdkEventFocus *event, EvWindow *window)
 {
-       update_chrome_flag (window, EV_CHROME_RAISE_TOOLBAR, NULL, FALSE);
+       update_chrome_flag (window, EV_CHROME_RAISE_TOOLBAR, FALSE);
        set_action_sensitive (window, "ViewToolbar", TRUE);
 
        ev_window_set_view_accels_sensitivity (window, TRUE);
@@ -3245,13 +3147,12 @@ sidebar_page_main_widget_update_cb (GObject *ev_sidebar_page,
 static gboolean
 window_state_event_cb (EvWindow *window, GdkEventWindowState *event, gpointer dummy)
 {
-       char *uri = window->priv->uri;
-
-       if (uri && !(event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN)) {
+       if (!(event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN)) {
                gboolean maximized;
 
                maximized = event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED;
-               ev_metadata_manager_set_boolean (uri, "window_maximized", maximized);
+               if (!ev_window_is_empty (window))
+                       ev_metadata_manager_set_boolean (window->priv->uri, "window_maximized", maximized);
        }
 
        return FALSE;
@@ -3266,19 +3167,108 @@ window_configure_event_cb (EvWindow *window, GdkEventConfigure *event, gpointer
 
        state = gdk_window_get_state (GTK_WIDGET (window)->window);
 
-       if (uri && !(state & GDK_WINDOW_STATE_FULLSCREEN)) {
+       if (!(state & GDK_WINDOW_STATE_FULLSCREEN)) {
                gtk_window_get_position (GTK_WINDOW (window), &x, &y);
                gtk_window_get_size (GTK_WINDOW (window), &width, &height);
 
-               ev_metadata_manager_set_int (uri, "window_x", x);
-               ev_metadata_manager_set_int (uri, "window_y", y);
-               ev_metadata_manager_set_int (uri, "window_width", width);
-               ev_metadata_manager_set_int (uri, "window_height", height);
+               if (!ev_window_is_empty (window)) {
+                       ev_metadata_manager_set_int (uri, "window_x", x);
+                       ev_metadata_manager_set_int (uri, "window_y", y);
+                       ev_metadata_manager_set_int (uri, "window_width", width);
+                       ev_metadata_manager_set_int (uri, "window_height", height);
+               }
        }
 
        return FALSE;
 }
 
+static void
+sidebar_links_link_activated_cb (EvSidebarLinks *sidebar_links, EvLink *link, EvWindow *window)
+{
+       ev_view_goto_link (EV_VIEW (window->priv->view), link);
+}
+
+static void
+launch_link (EvWindow *window, EvLink *link)
+{
+       const char *filename = ev_link_get_filename (link);
+       char *uri = NULL;
+
+       if (filename  && g_path_is_absolute (filename)) {
+               uri = gnome_vfs_get_uri_from_local_path (filename);
+       } else {
+               GnomeVFSURI *base_uri, *resolved_uri;
+
+               base_uri = gnome_vfs_uri_new (window->priv->uri);
+               if (base_uri && filename) {
+                       resolved_uri = gnome_vfs_uri_resolve_relative (base_uri, filename);     
+                       if (resolved_uri) {
+                               uri = gnome_vfs_uri_to_string (resolved_uri, GNOME_VFS_URI_HIDE_NONE);
+                               gnome_vfs_uri_unref (resolved_uri);
+                       }
+                       gnome_vfs_uri_unref (base_uri);
+               }
+       }
+
+       if (uri) {
+               gnome_vfs_url_show (uri);
+       } else {
+               gnome_vfs_url_show (filename);
+       }
+
+       g_free (uri);
+
+       /* According to the PDF spec filename can be an executable. I'm not sure
+          allowing to launch executables is a good idea though. -- marco */
+}
+
+static void
+launch_external_uri (EvWindow *window, EvLink *link)
+{
+       const char *uri;
+       char *escaped;
+
+       uri = ev_link_get_uri (link);
+       escaped = gnome_vfs_escape_host_and_path_string (uri);
+
+       gnome_vfs_url_show (escaped);
+       g_free (escaped);
+}
+
+static void
+view_external_link_cb (EvView *view, EvLink *link, EvWindow *window)
+{
+       switch (ev_link_get_link_type (link)) {
+       case EV_LINK_TYPE_EXTERNAL_URI:
+               launch_external_uri (window, link);
+               break;
+       case EV_LINK_TYPE_LAUNCH:
+               launch_link (window, link);
+               break;
+       default:
+               g_assert_not_reached ();
+       }
+}
+
+static void
+ev_popup_cmd_open_link (GtkAction *action, EvWindow *window)
+{
+       ev_view_goto_link (EV_VIEW (window->priv->view), window->priv->link);
+}
+
+static void
+ev_popup_cmd_copy_link_address (GtkAction *action, EvWindow *window)
+{
+       GtkClipboard *clipboard;
+       const gchar *uri;
+
+       uri = ev_link_get_uri (window->priv->link);
+
+       clipboard = gtk_widget_get_clipboard (GTK_WIDGET (window),
+                                             GDK_SELECTION_CLIPBOARD);
+       gtk_clipboard_set_text (clipboard, uri, -1);
+}
+
 static void
 ev_window_init (EvWindow *ev_window)
 {
@@ -3286,9 +3276,6 @@ ev_window_init (EvWindow *ev_window)
        GtkAccelGroup *accel_group;
        GError *error = NULL;
        GtkWidget *sidebar_widget, *toolbar_dock;
-       GConfValue *value;
-       GConfClient *client;
-       int sidebar_size;
 
        g_signal_connect (ev_window, "configure_event",
                          G_CALLBACK (window_configure_event_cb), NULL);
@@ -3298,7 +3285,7 @@ ev_window_init (EvWindow *ev_window)
        ev_window->priv = EV_WINDOW_GET_PRIVATE (ev_window);
 
        ev_window->priv->page_mode = PAGE_MODE_DOCUMENT;
-       update_window_title (NULL, NULL, ev_window);
+       ev_window->priv->title = ev_window_title_new (ev_window);
 
        ev_window->priv->main_box = gtk_vbox_new (FALSE, 0);
        gtk_container_add (GTK_CONTAINER (ev_window), ev_window->priv->main_box);
@@ -3325,10 +3312,13 @@ ev_window_init (EvWindow *ev_window)
 
        ev_window_set_view_accels_sensitivity (ev_window, FALSE);
 
-       g_signal_connect (ev_window->priv->ui_manager, "connect_proxy",
-                         G_CALLBACK (connect_proxy_cb), ev_window);
-       g_signal_connect (ev_window->priv->ui_manager, "disconnect_proxy",
-                         G_CALLBACK (disconnect_proxy_cb), ev_window);
+       action_group = gtk_action_group_new ("PopupsActions");
+       ev_window->priv->popups_action_group = action_group;
+       gtk_action_group_set_translation_domain (action_group, NULL);
+       gtk_action_group_add_actions (action_group, popups_entries,
+                                     G_N_ELEMENTS (popups_entries), ev_window);
+       gtk_ui_manager_insert_action_group (ev_window->priv->ui_manager,
+                                           action_group, 0);
 
        if (!gtk_ui_manager_add_ui_from_file (ev_window->priv->ui_manager,
                                              DATADIR"/evince-ui.xml",
@@ -3368,17 +3358,7 @@ ev_window_init (EvWindow *ev_window)
                          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_paned_set_position (GTK_PANED (ev_window->priv->hpaned), SIDEBAR_DEFAULT_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);
@@ -3390,10 +3370,15 @@ ev_window_init (EvWindow *ev_window)
 
        /* Stub sidebar, for now */
        sidebar_widget = ev_sidebar_links_new ();
+       ev_window->priv->sidebar_links = sidebar_widget;
        g_signal_connect (sidebar_widget,
                          "notify::model",
                          G_CALLBACK (sidebar_widget_model_set),
                          ev_window);
+       g_signal_connect (sidebar_widget,
+                         "link_activated",
+                         G_CALLBACK (sidebar_links_link_activated_cb),
+                         ev_window);
        sidebar_page_main_widget_update_cb (G_OBJECT (sidebar_widget), NULL, ev_window);
        gtk_widget_show (sidebar_widget);
        ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar),
@@ -3432,9 +3417,20 @@ ev_window_init (EvWindow *ev_window)
        g_signal_connect_object (ev_window->priv->view, "focus_out_event",
                                 G_CALLBACK (view_actions_focus_out_cb),
                                 ev_window, 0);
+       g_signal_connect_object (ev_window->priv->view, "external-link",
+                                G_CALLBACK (view_external_link_cb),
+                                ev_window, 0);
+       g_signal_connect_object (ev_window->priv->view,
+                                "popup",
+                                G_CALLBACK (view_menu_popup_cb),
+                                ev_window, 0);
        gtk_widget_show (ev_window->priv->view);
        gtk_widget_show (ev_window->priv->password_view);
 
+       ev_window->priv->find_bar = egg_find_bar_new ();
+       gtk_box_pack_end (GTK_BOX (ev_window->priv->main_box),
+                         ev_window->priv->find_bar,
+                         FALSE, TRUE, 0);
 
        /* We own a ref on these widgets, as we can swap them in and out */
        g_object_ref (ev_window->priv->view);
@@ -3448,10 +3444,6 @@ ev_window_init (EvWindow *ev_window)
                          "notify::find-status",
                          G_CALLBACK (view_find_status_changed_cb),
                          ev_window);
-       g_signal_connect (ev_window->priv->view,
-                         "notify::status",
-                         G_CALLBACK (view_status_changed_cb),
-                         ev_window);
        g_signal_connect (ev_window->priv->view,
                          "notify::sizing-mode",
                          G_CALLBACK (ev_window_sizing_mode_changed_cb),
@@ -3468,28 +3460,25 @@ ev_window_init (EvWindow *ev_window)
                          "notify::continuous",
                          G_CALLBACK (ev_window_continuous_changed_cb),
                          ev_window);
+       g_signal_connect (ev_window->priv->view,
+                         "notify::rotation",
+                         G_CALLBACK (ev_window_rotation_changed_cb),
+                         ev_window);
+       g_signal_connect (ev_window->priv->view,
+                         "notify::has-selection",
+                         G_CALLBACK (ev_window_has_selection_changed_cb),
+                         ev_window);
 
-       ev_window->priv->statusbar = ev_statusbar_new ();
-       gtk_box_pack_end (GTK_BOX (ev_window->priv->main_box),
-                         ev_window->priv->statusbar,
-                         FALSE, TRUE, 0);
-    
-       ev_window->priv->find_bar = egg_find_bar_new ();
-       gtk_box_pack_end (GTK_BOX (ev_window->priv->main_box),
-                         ev_window->priv->find_bar,
-                         FALSE, TRUE, 0);
-
-       ev_window_setup_recent (ev_window);
-       ev_window->priv->chrome = load_chrome ();
-       set_chrome_actions (ev_window);
-       update_chrome_visibility (ev_window);
-
-       /* Connect sidebar signals */
+       /* Connect sidebar signals */
        g_signal_connect (ev_window->priv->sidebar,
                          "notify::visible",
                          G_CALLBACK (ev_window_sidebar_visibility_changed_cb),
                          ev_window);
-       
+       g_signal_connect (ev_window->priv->sidebar,
+                         "notify::current-page",
+                         G_CALLBACK (ev_window_sidebar_current_page_changed_cb),
+                         ev_window);
+
        /* Connect to find bar signals */
        g_signal_connect (ev_window->priv->find_bar,
                          "previous",
@@ -3516,6 +3505,11 @@ ev_window_init (EvWindow *ev_window)
                          G_CALLBACK (find_bar_search_changed_cb),
                          ev_window);
 
+       /* Popups */
+       ev_window->priv->popup = gtk_ui_manager_get_widget (ev_window->priv->ui_manager,
+                                                          "/DocumentPopup");
+       ev_window->priv->link = NULL;
+
        /* Give focus to the document view */
        gtk_widget_grab_focus (ev_window->priv->view);
 
@@ -3527,7 +3521,17 @@ 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 */
+       /* Set it user interface params */
+
+       ev_window_setup_recent (ev_window);
+       setup_chrome_from_metadata (ev_window);
+       set_chrome_actions (ev_window);
+       update_chrome_visibility (ev_window);
+       update_sidebar_visibility (ev_window);
+
+       gtk_window_set_default_size (GTK_WINDOW (ev_window),
+                                    600, 600);
+       setup_view_from_metadata (ev_window);
 
         ev_window_sizing_mode_changed_cb (EV_VIEW (ev_window->priv->view), NULL, ev_window);
        update_action_sensitivity (ev_window);
@@ -3540,8 +3544,6 @@ ev_window_new (void)
 
        ev_window = GTK_WIDGET (g_object_new (EV_TYPE_WINDOW,
                                              "type", GTK_WINDOW_TOPLEVEL,
-                                             "default-width", 600,
-                                             "default-height", 600,
                                              NULL));
 
        return ev_window;