]> www.fi.muni.cz Git - evince.git/blobdiff - shell/ev-window.c
Add support for PDF attachments. Fixes bug #325143
[evince.git] / shell / ev-window.c
index d1fa8a2219e51795ff92969e5f8227fc38253670..905fd51b16ef823df449527432134b753cd9522f 100644 (file)
@@ -37,7 +37,7 @@
 #include "ev-view.h"
 #include "ev-password.h"
 #include "ev-password-view.h"
-#include "ev-print-job.h"
+#include "ev-attachment-bar.h"
 #include "ev-properties-dialog.h"
 #include "ev-ps-exporter.h"
 #include "ev-document-thumbnails.h"
@@ -45,7 +45,7 @@
 #include "ev-document-fonts.h"
 #include "ev-document-find.h"
 #include "ev-document-security.h"
-#include "ev-document-types.h"
+#include "ev-document-factory.h"
 #include "ev-job-queue.h"
 #include "ev-jobs.h"
 #include "ev-sidebar-page.h"
 #include "ev-utils.h"
 #include "ev-debug.h"
 
+#ifdef WITH_GNOME_PRINT
+#include "ev-print-job.h"
+#include <libgnomeprintui/gnome-print-dialog.h>
+#endif
+
 #include <poppler.h>
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gnome.h>
-#include <libgnomeprintui/gnome-print-dialog.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <gconf/gconf-client.h>
 
@@ -102,43 +106,52 @@ struct _EvWindowPrivate {
        GtkWidget *find_bar;
        GtkWidget *scrolled_window;
        GtkWidget *view;
-       GtkWidget *page_view;
        GtkWidget *password_view;
        GtkWidget *sidebar_thumbs;
        GtkWidget *sidebar_links;
-
-       EvWindowTitle *title;
+       GtkWidget *attachment_bar;
 
        /* Dialogs */
        GtkWidget *properties;
+#ifdef WITH_GNOME_PRINT
+       GtkWidget *print_dialog;
+#endif
+       GtkWidget *password_dialog;
 
        /* UI Builders */
        GtkActionGroup *action_group;
-       GtkUIManager *ui_manager;
+       GtkActionGroup *view_popup_action_group;
+       GtkActionGroup *attachment_popup_action_group;
+       GtkUIManager   *ui_manager;
 
        /* Fullscreen mode */
        GtkWidget *fullscreen_toolbar;
        GtkWidget *fullscreen_popup;
        GSource   *fullscreen_timeout_source;
+       
+       /* Popup link */
+       GtkWidget *view_popup;
+       EvLink    *link;
+
+       /* Popup attachment */
+       GtkWidget    *attachment_popup;
+       EvAttachment *attachment;
 
        /* Document */
        char *uri;
        char *local_uri;
+       
        EvDocument *document;
+       EvDocument *password_document;
        EvPageCache *page_cache;
-
        EvWindowPageMode page_mode;
+       EvWindowTitle *title;
+       EggRecentViewUIManager *recent_view;
 
-       /* These members are used temporarily when in PAGE_MODE_PASSWORD */
-       EvDocument *password_document;
-       GtkWidget *password_dialog;
-       char *password_uri;
-
-       /* Job used to load document */
        EvJob *xfer_job;
-       EvJob *load_job;
-
-       EggRecentViewUIManager *recent_view;
+#ifdef WITH_GNOME_PRINT
+       GnomePrintJob *print_job;
+#endif
 };
 
 static const GtkTargetEntry ev_drop_types[] = {
@@ -152,7 +165,6 @@ 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_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"
@@ -163,16 +175,13 @@ static const GtkTargetEntry ev_drop_types[] = {
 #define LINKS_SIDEBAR_ID "links"
 #define THUMBNAILS_SIDEBAR_ID "thumbnails"
 
-#define PRINT_CONFIG_FILENAME  "ev-print-config.xml"
-
+static void    ev_window_update_actions                (EvWindow *ev_window);
 static void     ev_window_update_fullscreen_popup       (EvWindow         *window);
 static void     ev_window_sidebar_visibility_changed_cb (EvSidebar        *ev_sidebar,
                                                         GParamSpec       *pspec,
                                                         EvWindow         *ev_window);
 static void     ev_window_set_page_mode                 (EvWindow         *window,
                                                         EvWindowPageMode  page_mode);
-static void    ev_window_load_job_cb                   (EvJobLoad *job,
-                                                        gpointer data);
 static void    ev_window_xfer_job_cb                   (EvJobXfer *job,
                                                         gpointer data);
 static void     ev_window_sizing_mode_changed_cb        (EvView           *view,
@@ -192,51 +201,68 @@ 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_view_popup_cmd_open_link             (GtkAction        *action,
+                                                        EvWindow         *window);
+static void     ev_view_popup_cmd_copy_link_address     (GtkAction        *action,
+                                                        EvWindow         *window);
+static void    ev_attachment_popup_cmd_open_attachment (GtkAction        *action,
+                                                        EvWindow *window);
+static void    ev_attachment_popup_cmd_save_attachment_as (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)
 
 static void
-set_action_sensitive (EvWindow   *ev_window,
-                     const char *name,
-                     gboolean    sensitive)
+ev_window_set_action_sensitive (EvWindow   *ev_window,
+                               const char *name,
+                               gboolean    sensitive)
 {
        GtkAction *action = gtk_action_group_get_action (ev_window->priv->action_group,
                                                         name);
        gtk_action_set_sensitive (action, sensitive);
 }
 
+
 static void
-update_action_sensitivity (EvWindow *ev_window)
+ev_window_setup_action_sensitivity (EvWindow *ev_window)
 {
-       EvView *view;
-       EvDocument *document;
+       EvDocument *document = ev_window->priv->document;
        const EvDocumentInfo *info = NULL;
-       EvWindowPageMode page_mode;
-       gboolean sensitive, has_pages = FALSE, has_document;
-       int n_pages = 0, page = -1;
+
+       gboolean has_document = FALSE;
        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);
+       gboolean has_pages = FALSE;
+       gboolean can_find = FALSE;
 
-       document = ev_window->priv->document;
+       GConfClient *client;
 
-       if (document)
+       if (document) {
+               has_document = TRUE;
                info = ev_page_cache_get_info (ev_window->priv->page_cache);
-
-       page_mode = ev_window->priv->page_mode;
-       has_document = document != NULL;
+       }
 
        if (has_document && ev_window->priv->page_cache) {
-               page = ev_page_cache_get_current_page (ev_window->priv->page_cache);
-               n_pages = ev_page_cache_get_n_pages (ev_window->priv->page_cache);
-               has_pages = has_document && n_pages > 0;
+               has_pages = ev_page_cache_get_n_pages (ev_window->priv->page_cache) > 0;
+       }
+
+       if (!info || info->fields_mask == 0) {
+               has_properties = FALSE;
+       }
+
+       if (has_document && ev_document_can_get_text (document)) {
+               can_get_text = TRUE;
+       }
+       
+       if (has_document && EV_IS_DOCUMENT_FIND (document)) {
+               can_find = TRUE;
        }
 
        client = gconf_client_get_default ();
@@ -251,9 +277,6 @@ update_action_sensitivity (EvWindow *ev_window)
        if (has_document && !EV_IS_PS_EXPORTER(document))
                ok_to_print = FALSE;
 
-       if (!info || info->fields_mask == 0) {
-               has_properties = FALSE;
-       }
        
        if (gconf_client_get_bool (client, GCONF_LOCKDOWN_SAVE, NULL)) {
                ok_to_copy = FALSE;
@@ -262,62 +285,75 @@ update_action_sensitivity (EvWindow *ev_window)
        if (gconf_client_get_bool (client, GCONF_LOCKDOWN_PRINT, NULL)) {
                ok_to_print = FALSE;
        }
-       
+#ifndef WITH_GNOME_PRINT
+       ok_to_print = FALSE;
+#endif
        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);
-       set_action_sensitive (ev_window, "FilePrint", has_pages && ok_to_print);
-       set_action_sensitive (ev_window, "FileProperties", has_document && has_properties);
-       /* "FileCloseWindow": always sensitive */
+       ev_window_set_action_sensitive (ev_window, "FileSaveAs", has_document && ok_to_copy);
+       ev_window_set_action_sensitive (ev_window, "FilePrint", has_pages && ok_to_print);
+       ev_window_set_action_sensitive (ev_window, "FileProperties", has_document && has_properties);
 
         /* Edit menu */
-       sensitive = has_pages && ev_document_can_get_text (document);
-       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",
+       ev_window_set_action_sensitive (ev_window, "EditSelectAll", has_pages && can_get_text);
+       ev_window_set_action_sensitive (ev_window, "EditFind",
                              has_pages && EV_IS_DOCUMENT_FIND (document));
-       set_action_sensitive (ev_window, "Slash",
+       ev_window_set_action_sensitive (ev_window, "Slash",
                              has_pages && EV_IS_DOCUMENT_FIND (document));
-       set_action_sensitive (ev_window, "EditFindNext",
-                             ev_view_can_find_next (view));
-       set_action_sensitive (ev_window, "EditRotateLeft", has_pages);
-       set_action_sensitive (ev_window, "EditRotateRight", has_pages);
+       ev_window_set_action_sensitive (ev_window, "EditRotateLeft", has_pages);
+       ev_window_set_action_sensitive (ev_window, "EditRotateRight", has_pages);
 
         /* View menu */
-       set_action_sensitive (ev_window, "ViewContinuous", has_pages);
-       set_action_sensitive (ev_window, "ViewDual", has_pages);
-       set_action_sensitive (ev_window, "ViewZoomIn",
+       ev_window_set_action_sensitive (ev_window, "ViewContinuous", has_pages);
+       ev_window_set_action_sensitive (ev_window, "ViewDual", has_pages);
+       ev_window_set_action_sensitive (ev_window, "ViewBestFit", has_pages);
+       ev_window_set_action_sensitive (ev_window, "ViewPageWidth", has_pages);
+       ev_window_set_action_sensitive (ev_window, "ViewReload", has_pages);
+
+       /* Toolbar-specific actions: */
+       ev_window_set_action_sensitive (ev_window, PAGE_SELECTOR_ACTION, has_pages);
+       ev_window_set_action_sensitive (ev_window, ZOOM_CONTROL_ACTION,  has_pages);
+
+        ev_window_update_actions (ev_window);
+}
+
+static void
+ev_window_update_actions (EvWindow *ev_window)
+{
+       EvView *view = EV_VIEW (ev_window->priv->view);
+       int n_pages = 0, page = -1;
+       gboolean has_pages = FALSE;
+
+       if (ev_window->priv->document && ev_window->priv->page_cache) {
+               page = ev_page_cache_get_current_page (ev_window->priv->page_cache);
+               n_pages = ev_page_cache_get_n_pages (ev_window->priv->page_cache);
+               has_pages = n_pages > 0;
+       }
+
+       ev_window_set_action_sensitive (ev_window, "EditCopy", has_pages && ev_view_get_has_selection (view));
+       ev_window_set_action_sensitive (ev_window, "EditFindNext",
+                             ev_view_can_find_next (view));
+
+       ev_window_set_action_sensitive (ev_window, "ViewZoomIn",
                              has_pages && ev_view_can_zoom_in (view));
-       set_action_sensitive (ev_window, "ViewZoomOut",
+       ev_window_set_action_sensitive (ev_window, "ViewZoomOut",
                              has_pages && ev_view_can_zoom_out (view));
-       set_action_sensitive (ev_window, "ViewBestFit", has_pages);
-       set_action_sensitive (ev_window, "ViewPageWidth", has_pages);
-       set_action_sensitive (ev_window, "ViewReload", has_pages);
 
         /* Go menu */
-       if (document) {
-               set_action_sensitive (ev_window, "GoPreviousPage", page > 0);
-               set_action_sensitive (ev_window, "GoNextPage", page < n_pages - 1);
-               set_action_sensitive (ev_window, "GoFirstPage", page > 0);
-               set_action_sensitive (ev_window, "GoLastPage", page < n_pages - 1);
+       if (has_pages) {
+               ev_window_set_action_sensitive (ev_window, "GoPreviousPage", page > 0);
+               ev_window_set_action_sensitive (ev_window, "GoNextPage", page < n_pages - 1);
+               ev_window_set_action_sensitive (ev_window, "GoFirstPage", page > 0);
+               ev_window_set_action_sensitive (ev_window, "GoLastPage", page < n_pages - 1);
        } else {
-               set_action_sensitive (ev_window, "GoFirstPage", FALSE);
-               set_action_sensitive (ev_window, "GoPreviousPage", FALSE);
-               set_action_sensitive (ev_window, "GoNextPage", FALSE);
-               set_action_sensitive (ev_window, "GoLastPage", FALSE);
+               ev_window_set_action_sensitive (ev_window, "GoFirstPage", FALSE);
+               ev_window_set_action_sensitive (ev_window, "GoPreviousPage", FALSE);
+               ev_window_set_action_sensitive (ev_window, "GoNextPage", FALSE);
+               ev_window_set_action_sensitive (ev_window, "GoLastPage", FALSE);
        }
 
-       /* Toolbar-specific actions: */
-       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_FIT_WIDTH &&
            ev_view_get_sizing_mode (view) != EV_SIZING_BEST_FIT) {
@@ -335,10 +371,31 @@ update_action_sensitivity (EvWindow *ev_window)
        }
 }
 
+static void
+ev_window_set_view_accels_sensitivity (EvWindow *window, gboolean sensitive)
+{
+       if (window->priv->action_group) {
+               ev_window_set_action_sensitive (window, "PageDown", sensitive);
+               ev_window_set_action_sensitive (window, "PageUp", sensitive);
+               ev_window_set_action_sensitive (window, "Space", sensitive);
+               ev_window_set_action_sensitive (window, "ShiftSpace", sensitive);
+               ev_window_set_action_sensitive (window, "BackSpace", sensitive);
+               ev_window_set_action_sensitive (window, "ShiftBackSpace", sensitive);
+               ev_window_set_action_sensitive (window, "Return", sensitive);
+               ev_window_set_action_sensitive (window, "ShiftReturn", sensitive);
+               ev_window_set_action_sensitive (window, "Slash", sensitive);
+               ev_window_set_action_sensitive (window, "Plus", sensitive);
+               ev_window_set_action_sensitive (window, "Minus", sensitive);
+               ev_window_set_action_sensitive (window, "KpPlus", sensitive);
+               ev_window_set_action_sensitive (window, "KpMinus", sensitive);
+               ev_window_set_action_sensitive (window, "Equal", sensitive);
+       }
+}
+
 static void
 set_widget_visibility (GtkWidget *widget, gboolean visible)
 {
-       g_return_if_fail (GTK_IS_WIDGET (widget));
+       g_assert (GTK_IS_WIDGET (widget));
        
        if (visible)
                gtk_widget_show (widget);
@@ -364,13 +421,13 @@ update_chrome_visibility (EvWindow *window)
                              (priv->chrome & EV_CHROME_RAISE_TOOLBAR) != 0);
        findbar = (priv->chrome & EV_CHROME_FINDBAR) != 0;
 
-       set_widget_visibility (priv->menubar, menubar);
-       
+       set_widget_visibility (priv->menubar, menubar); 
        set_widget_visibility (priv->toolbar_dock, toolbar);
-       set_action_sensitive (window, "EditToolbar", toolbar);
-
        set_widget_visibility (priv->find_bar, findbar);
 
+       ev_window_set_action_sensitive (window, "EditToolbar", toolbar);
+       gtk_widget_set_sensitive (priv->menubar, menubar);
+
        if (priv->fullscreen_popup != NULL) {
                if (fullscreen)
                        show_fullscreen_popup (window);
@@ -382,104 +439,19 @@ 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
-ev_window_cmd_focus_page_selector (GtkAction *act, EvWindow *window)
-{
-       GtkAction *action;
-       
-       update_chrome_flag (window, EV_CHROME_RAISE_TOOLBAR, NULL, TRUE);
-       set_action_sensitive (window, "ViewToolbar", FALSE);
-       
-       action = gtk_action_group_get_action (window->priv->action_group,
-                                             PAGE_SELECTOR_ACTION);
-       ev_page_action_grab_focus (EV_PAGE_ACTION (action));
-}
-
-static void
-ev_window_cmd_scroll_forward (GtkAction *action, EvWindow *window)
-{
-       ev_view_scroll (EV_VIEW (window->priv->view), EV_SCROLL_PAGE_FORWARD);
-}
-
-static void
-ev_window_cmd_scroll_backward (GtkAction *action, EvWindow *window)
-{
-       ev_view_scroll (EV_VIEW (window->priv->view), EV_SCROLL_PAGE_BACKWARD);
-}
-
-static void
-ev_window_cmd_continuous (GtkAction *action, EvWindow *ev_window)
-{
-       gboolean continuous;
-
-       ev_window_stop_presentation (ev_window);
-       continuous = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
-       g_object_set (G_OBJECT (ev_window->priv->view),
-                     "continuous", continuous,
-                     NULL);
-       update_action_sensitivity (ev_window);
-}
-
-static void
-ev_window_cmd_dual (GtkAction *action, EvWindow *ev_window)
-{
-       gboolean dual_page;
-
-       ev_window_stop_presentation (ev_window);
-       dual_page = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
-       g_object_set (G_OBJECT (ev_window->priv->view),
-                     "dual-page", dual_page,
-                     NULL);
-       update_action_sensitivity (ev_window);
-}
-
-static void
-ev_window_cmd_view_best_fit (GtkAction *action, EvWindow *ev_window)
-{
-       ev_window_stop_presentation (ev_window);
-
-       if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) {
-               ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_BEST_FIT);
-       } else {
-               ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_FREE);
-       }
-       update_action_sensitivity (ev_window);
-}
-
-static void
-ev_window_cmd_view_page_width (GtkAction *action, EvWindow *ev_window)
-{
-       ev_window_stop_presentation (ev_window);
-
-       if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) {
-               ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_FIT_WIDTH);
-       } else {
-               ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_FREE);
-       }
-       update_action_sensitivity (ev_window);
-}
-
 static void
 update_sizing_buttons (EvWindow *window)
 {
@@ -551,12 +523,11 @@ ev_window_is_empty (const EvWindow *ev_window)
        g_return_val_if_fail (EV_IS_WINDOW (ev_window), FALSE);
 
        return (ev_window->priv->document == NULL) && 
-               (ev_window->priv->load_job == NULL) &&
                (ev_window->priv->xfer_job == NULL);
 }
 
 static void
-unable_to_load_dialog_response_cb (GtkWidget *dialog,
+ev_window_error_dialog_response_cb (GtkWidget *dialog,
                                   gint       response_id,
                                   EvWindow  *ev_window)
 {
@@ -564,28 +535,27 @@ unable_to_load_dialog_response_cb (GtkWidget *dialog,
 }
 
 static void
-unable_to_load (EvWindow   *ev_window,
-               const char *error_message)
+ev_window_error_dialog (GtkWindow *window, const gchar *msg, GError *error)
 {
        GtkWidget *dialog;
 
-       dialog = gtk_message_dialog_new (GTK_WINDOW (ev_window),
+       dialog = gtk_message_dialog_new (GTK_WINDOW (window),
                                         GTK_DIALOG_DESTROY_WITH_PARENT,
                                         GTK_MESSAGE_ERROR,
                                         GTK_BUTTONS_CLOSE,
-                                        _("Unable to open document"));
+                                        msg);
        gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-                                                 "%s", error_message);
+                                                 "%s", error->message);
        g_signal_connect (dialog, "response",
-                         G_CALLBACK (unable_to_load_dialog_response_cb),
-                         ev_window);
+                         G_CALLBACK (ev_window_error_dialog_response_cb),
+                          window);
        gtk_widget_show (dialog);
 }
 
 static void
 find_changed_cb (EvDocument *document, int page, EvWindow *ev_window)
 {
-       update_action_sensitivity (ev_window);
+       ev_window_update_actions (ev_window);
 }
 
 static void
@@ -593,11 +563,10 @@ page_changed_cb (EvPageCache *page_cache,
                 gint         page,
                 EvWindow    *ev_window)
 {
-       update_action_sensitivity (ev_window);
+       ev_window_update_actions (ev_window);
 
-       if (ev_window->priv->uri) {
+       if (!ev_window_is_empty (ev_window))
                ev_metadata_manager_set_int (ev_window->priv->uri, "page", page);
-       }
 }
 
 static void
@@ -617,25 +586,48 @@ update_sidebar_visibility (EvWindow *window)
        char *uri = window->priv->uri;
        GValue sidebar_visibility = { 0, };
 
-       if (uri && ev_metadata_manager_get (uri, "sidebar_visibility", &sidebar_visibility)) {
+       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
+update_attachment_bar_visibility (EvWindow *window)
+{
+       set_widget_visibility (window->priv->attachment_bar,
+                              (window->priv->document &&
+                              ev_document_has_attachments (window->priv->document)));
+}
+
 static void
 setup_document_from_metadata (EvWindow *window)
 {
        char *uri = window->priv->uri;
        GValue page = { 0, };
+       gint new_page;
 
-       /* Page */
-       if (uri && 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)
 {
@@ -646,24 +638,22 @@ setup_sidebar_from_metadata (EvWindow *window, EvDocument *document)
        GValue sidebar_size = { 0, };
        GValue sidebar_page = { 0, };
 
-       if (ev_metadata_manager_get (uri, "sidebar_size", &sidebar_size)) {
+       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)) {
+       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) {
+               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")) {
+               } 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);
-               } else if (ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (thumbs), document)) {
-                       ev_sidebar_set_page (EV_SIDEBAR (sidebar), thumbs);
                }
        }
 
@@ -671,50 +661,157 @@ setup_sidebar_from_metadata (EvWindow *window, EvDocument *document)
 }
 
 static void
-ev_window_setup_document (EvWindow *ev_window)
+setup_view_from_metadata (EvWindow *window)
 {
-       const EvDocumentInfo *info;
-       EvDocument *document;
-       EvView *view = EV_VIEW (ev_window->priv->view);
-       EvSidebar *sidebar = EV_SIDEBAR (ev_window->priv->sidebar);
-       GtkAction *action;
+       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;
 
-       document = ev_window->priv->document;
-       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);
+       /* Window size */
 
-       if (EV_IS_DOCUMENT_FIND (document)) {
-               g_signal_connect_object (G_OBJECT (document),
-                                        "find_changed",
-                                        G_CALLBACK (find_changed_cb),  
-                                        ev_window, 0);
+       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));
+               }
        }
 
-       ev_window_set_page_mode (ev_window, PAGE_MODE_DOCUMENT);
+       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));
+       }
 
-       ev_sidebar_set_document (sidebar, document);
+       /* 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);
+       }
 
-       if (ev_page_cache_get_n_pages (ev_window->priv->page_cache) > 0) {
-               ev_view_set_document (view, document);
+       /* 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);
        }
 
-       ev_window_title_set_document (ev_window->priv->title, document);
-       ev_window_title_set_uri (ev_window->priv->title, ev_window->priv->uri);
-       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);
+       /* Continuous */
+       if (ev_metadata_manager_get (uri, "continuous", &continuous, FALSE)) {
+               ev_view_set_continuous (view, g_value_get_boolean (&continuous));
+       }
 
-       info = ev_page_cache_get_info (ev_window->priv->page_cache);
-       update_document_mode (ev_window, info->mode);
+       /* 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));
+       }
 
-       if (ev_window->priv->properties) {
-               ev_properties_dialog_set_document (EV_PROPERTIES_DIALOG (ev_window->priv->properties),
-                                                  ev_window->priv->document);
+       /* Presentation */
+       if (ev_metadata_manager_get (uri, "presentation", &presentation, FALSE)) {
+               if (g_value_get_boolean (&presentation) && uri) {
+                       ev_window_run_presentation (window);
+               }
        }
 
-       setup_document_from_metadata (ev_window);
-       setup_sidebar_from_metadata (ev_window, document);
-}
+       /* 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
+ev_window_setup_document (EvWindow *ev_window)
+{
+       const EvDocumentInfo *info;
+       EvDocument *document;
+       EvView *view = EV_VIEW (ev_window->priv->view);
+       EvSidebar *sidebar = EV_SIDEBAR (ev_window->priv->sidebar);
+       EvAttachmentBar *attachbar = EV_ATTACHMENT_BAR (ev_window->priv->attachment_bar);
+       GtkAction *action;
+
+       document = ev_window->priv->document;
+       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);
+
+       if (EV_IS_DOCUMENT_FIND (document)) {
+               g_signal_connect_object (G_OBJECT (document),
+                                        "find_changed",
+                                        G_CALLBACK (find_changed_cb),  
+                                        ev_window, 0);
+       }
+
+       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_attachment_bar_set_document (attachbar, document);
+       update_attachment_bar_visibility (ev_window);
+
+       ev_window_title_set_document (ev_window->priv->title, document);
+       ev_window_title_set_uri (ev_window->priv->title, ev_window->priv->uri);
+
+       action = gtk_action_group_get_action (ev_window->priv->action_group, PAGE_SELECTOR_ACTION);
+       ev_page_action_set_document (EV_PAGE_ACTION (action), document);
+       ev_window_setup_action_sensitivity (ev_window);
+
+       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
 password_dialog_response (GtkWidget *password_dialog,
@@ -724,8 +821,6 @@ password_dialog_response (GtkWidget *password_dialog,
        char *password;
        
        if (response_id == GTK_RESPONSE_OK) {
-               EvDocument *document;
-               gchar *uri;
 
                password = ev_password_dialog_get_password (EV_PASSWORD_DIALOG (password_dialog));
                if (password) {
@@ -738,21 +833,14 @@ password_dialog_response (GtkWidget *password_dialog,
 
                ev_password_dialog_save_password (EV_PASSWORD_DIALOG (password_dialog));
 
-               document = ev_window->priv->password_document;
-               uri = ev_window->priv->password_uri;
-
+               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_job_queue_add_job (ev_window->priv->xfer_job, EV_JOB_PRIORITY_HIGH);
                
                gtk_widget_destroy (password_dialog);
                        
-               g_object_unref (document);
-               g_free (uri);
-
                return;
        }
 
@@ -760,7 +848,7 @@ password_dialog_response (GtkWidget *password_dialog,
        gtk_widget_destroy (password_dialog);
 }
 
-/* Called either by ev_window_load_job_cb or by the "unlock" callback on the
+/* Called either by ev_window_xfer_job_cb or by the "unlock" callback on the
  * password_view page.  It assumes that ev_window->priv->password_* has been set
  * correctly.  These are cleared by password_dialog_response() */
 
@@ -768,16 +856,15 @@ 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);
 
-       ev_window_title_set_uri (ev_window->priv->title, ev_window->priv->password_uri);
+       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);
 
        if (ev_window->priv->password_dialog == NULL) {
                ev_window->priv->password_dialog =
-                       g_object_new (EV_TYPE_PASSWORD_DIALOG, "uri", ev_window->priv->password_uri, NULL);
+                       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),
@@ -792,20 +879,9 @@ ev_window_popup_password_dialog (EvWindow *ev_window)
        }
 }
 
-
 static void
-ev_window_clear_jobs (EvWindow *ev_window)
+ev_window_clear_xfer_job (EvWindow *ev_window)
 {
-    if (ev_window->priv->load_job != NULL) {
-
-       if (!ev_window->priv->load_job->finished)
-               ev_job_queue_remove_job (ev_window->priv->load_job);
-
-       g_signal_handlers_disconnect_by_func (ev_window->priv->load_job, ev_window_load_job_cb, ev_window);
-       g_object_unref (ev_window->priv->load_job);
-       ev_window->priv->load_job = NULL;
-    }
-
     if (ev_window->priv->xfer_job != NULL) {
 
        if (!ev_window->priv->xfer_job->finished)
@@ -842,34 +918,41 @@ ev_window_clear_local_uri (EvWindow *ev_window)
  * function should _not_ necessarily expect those to exist after being
  * called. */
 static void
-ev_window_load_job_cb  (EvJobLoad *job,
+ev_window_xfer_job_cb  (EvJobXfer *job,
                        gpointer data)
 {
        EvWindow *ev_window = EV_WINDOW (data);
        EvDocument *document = EV_JOB (job)->document;
 
-       g_assert (document);
-       g_assert (document != ev_window->priv->document);
        g_assert (job->uri);
+       
+       ev_view_set_loading (EV_VIEW (ev_window->priv->view), 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) {
+
+               g_free (ev_window->priv->uri);
+               ev_window->priv->uri = g_strdup (job->uri);
+               setup_view_from_metadata (ev_window);
+
+               if (job->local_uri) {
+                       ev_window->priv->local_uri = g_strdup (job->local_uri);
+               } else {
+                       ev_window->priv->local_uri = 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_clear_jobs (ev_window);
+               ev_window_setup_document (ev_window);
+               ev_window_add_recent (ev_window, ev_window->priv->uri);         
+               ev_window_clear_xfer_job (ev_window);
                
                return;
        }
@@ -878,8 +961,11 @@ ev_window_load_job_cb  (EvJobLoad *job,
            job->error->code == EV_DOCUMENT_ERROR_ENCRYPTED) {
                gchar *base_name, *file_name;
 
+               g_free (ev_window->priv->uri);
+               ev_window->priv->uri = g_strdup (job->uri);
+               setup_view_from_metadata (ev_window);
+
                ev_window->priv->password_document = g_object_ref (document);
-               ev_window->priv->password_uri = g_strdup (job->uri);
 
                file_name = gnome_vfs_format_uri_for_display (job->uri);
                base_name = g_path_get_basename (file_name);
@@ -891,166 +977,52 @@ ev_window_load_job_cb  (EvJobLoad *job,
 
                ev_window_popup_password_dialog (ev_window);
        } else {
-               unable_to_load (ev_window, job->error->message);
+               ev_window_error_dialog (GTK_WINDOW (ev_window), 
+                                       _("Unable to open document"),
+                                       job->error);
+               ev_window_clear_xfer_job (ev_window);
        }       
 
        return;
 }
 
-static void
-ev_window_xfer_job_cb  (EvJobXfer *job,
-                       gpointer data)
+const char *
+ev_window_get_uri (EvWindow *ev_window)
 {
-       EvWindow *ev_window = EV_WINDOW (data);
-
-
-       
-       if (job->error != NULL) {
-               unable_to_load (ev_window, job->error->message);
-               ev_window_clear_jobs (ev_window);
-       } else {
-               char *uri;
-               
-               EvDocument *document = g_object_ref (EV_JOB (job)->document);
-               
-               if (job->local_uri) {
-                       ev_window->priv->local_uri = g_strdup (job->local_uri);
-                       uri = ev_window->priv->local_uri;
-               } else {
-                       ev_window->priv->local_uri = NULL;
-                       uri = ev_window->priv->uri;
-               }
-               
-               ev_window_clear_jobs (ev_window);
-               
-               ev_window->priv->load_job = ev_job_load_new (document, uri);
-               g_signal_connect (ev_window->priv->load_job,
-                                 "finished",
-                                 G_CALLBACK (ev_window_load_job_cb),
-                                 ev_window);
-               ev_job_queue_add_job (ev_window->priv->load_job, EV_JOB_PRIORITY_HIGH);
-               g_object_unref (document);
-       }               
+       return ev_window->priv->uri;
 }
 
 static void
-setup_view_from_metadata (EvWindow *window)
+ev_window_close_dialogs (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, };
-       GValue rotation = { 0, };
-
-       if (window->priv->uri == NULL) {
-               return;
-       }
-
-       /* 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));
-       }
-
-       /* Dual page */
-       if (ev_metadata_manager_get (uri, "dual-page", &dual_page)) {
-               ev_view_set_dual_page (view, g_value_get_boolean (&dual_page));
-       }
-
-       /* Presentation */
-       if (ev_metadata_manager_get (uri, "presentation", &presentation)) {
-               if (g_value_get_boolean (&presentation)) {
-                       ev_window_run_presentation (window);
-               }
-       }
+       if (ev_window->priv->password_dialog)
+               gtk_widget_destroy (ev_window->priv->password_dialog);
+       ev_window->priv->password_dialog = NULL;
 
-       /* Fullscreen */
-       if (ev_metadata_manager_get (uri, "fullscreen", &fullscreen)) {
-               if (g_value_get_boolean (&fullscreen)) {
-                       ev_window_run_fullscreen (window);
-               }
+#ifdef WITH_GNOME_PRINT
+       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;
+#endif
 
-       /* Rotation */
-       if (ev_metadata_manager_get (uri, "rotation", &rotation)) {
-               if (g_value_get_int (&rotation)) {
-                       switch (g_value_get_int (&rotation)) {
-                       case 90:
-                               ev_view_set_rotation (view, 90);
-                               break;
-                       case 180:
-                               ev_view_set_rotation (view, 180);
-                               break;
-                       case 270:
-                               ev_view_set_rotation (view, 270);
-                               break;
-                       default:
-                               break;
-                       }
-               }
-       }
+       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->priv->uri = NULL;
        
-       ev_window_clear_jobs (ev_window);
+       ev_window_close_dialogs (ev_window);
+       ev_window_clear_xfer_job (ev_window);
        ev_window_clear_local_uri (ev_window);
+       ev_view_set_loading (EV_VIEW (ev_window->priv->view), TRUE);
        
        ev_window->priv->xfer_job = ev_job_xfer_new (uri);
        g_signal_connect (ev_window->priv->xfer_job,
@@ -1075,6 +1047,8 @@ file_open_dialog_response_cb (GtkWidget *chooser,
                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);
 }
@@ -1092,10 +1066,13 @@ ev_window_cmd_file_open (GtkAction *action, EvWindow *window)
                                               GTK_STOCK_OPEN, GTK_RESPONSE_OK,
                                               NULL);
 
-       ev_document_types_add_filters (chooser, NULL);
+       ev_document_factory_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 (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_signal_connect (chooser, "response",
                          G_CALLBACK (file_open_dialog_response_cb),
                          window);
@@ -1150,72 +1127,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)
-{
-       GtkWidget *error_dialog;
-
-       error_dialog = gtk_message_dialog_new (
-               window,
-               (GtkDialogFlags)GTK_DIALOG_DESTROY_WITH_PARENT,
-               GTK_MESSAGE_ERROR,
-               GTK_BUTTONS_CLOSE,
-               _("The file could not be saved as \"%s\"."),
-               file_name);
-
-       /* Easy way to make the text bold while keeping the string
-        * above free from pango markup (FIXME ?) */
-       gtk_message_dialog_format_secondary_text (
-               GTK_MESSAGE_DIALOG (error_dialog), " ");
-
-       gtk_dialog_run (GTK_DIALOG (error_dialog));
-       gtk_widget_destroy (error_dialog);
-}
-
 static void
 file_save_dialog_response_cb (GtkWidget *fc,
                              gint       response_id,
@@ -1225,15 +1136,19 @@ file_save_dialog_response_cb (GtkWidget *fc,
 
        if (response_id == GTK_RESPONSE_OK) {
                const char *uri;
+               GError *err = NULL;
 
                uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (fc));
 
                ev_document_doc_mutex_lock ();
-               success = ev_document_save (ev_window->priv->document, uri, NULL);
+               success = ev_document_save (ev_window->priv->document, uri, &err);
                ev_document_doc_mutex_unlock ();
 
-               if (!success) {
-                       save_error_dialog (GTK_WINDOW (fc), uri);
+               if (err) {
+                       gchar *msg;
+                       msg = g_strdup_printf (_("The file could not be saved as \"%s\"."), uri);
+                       ev_window_error_dialog (GTK_WINDOW (fc), msg, err);
+                       g_free (msg);
                }
        }
 
@@ -1254,9 +1169,12 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
                GTK_STOCK_SAVE, GTK_RESPONSE_OK,
                NULL);
 
-       ev_document_types_add_filters (fc, ev_window->priv->document);
+       ev_document_factory_add_filters (fc, ev_window->priv->document);
        gtk_dialog_set_default_response (GTK_DIALOG (fc), GTK_RESPONSE_OK);
-       
+
+#ifdef HAVE_GTK_FILE_CHOOSER_SET_DO_OVERWRITE_CONFIRMATION
+       gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER (fc), TRUE);    
+#endif 
        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);
@@ -1270,264 +1188,234 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
        gtk_widget_show (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)
+static void
+ev_window_print (EvWindow *window)
 {
-       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");
+       EvPageCache *page_cache;
+       int last_page;
 
-       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;
-       }
+       page_cache = ev_page_cache_get (window->priv->document);
+       last_page = ev_page_cache_get_n_pages (page_cache);
 
-       return FALSE;
+#ifdef WITH_GNOME_PRINT
+       ev_window_print_range (window, 1, last_page);
+#endif
 }
 
-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)
+#ifdef WITH_GNOME_PRINT
+static gboolean
+ev_window_print_dialog_response_cb (GtkDialog *print_dialog, gint response, gpointer data)
 {
-       char *file_name, *str;
-
-       g_return_if_fail (config != NULL);
-
-       str = gnome_print_config_to_string (config, 0);
-       if (str == NULL) return;
-
-       file_name = g_build_filename (ev_dot_dir (),
-                                     PRINT_CONFIG_FILENAME,
-                                     NULL);
+    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;
+    }
 
-#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
+    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;
+    }
 
-       g_free (file_name);
-       g_free (str);
-}
+    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);
 
-static void
-ev_window_print (EvWindow *window)
-{
-       EvPageCache *page_cache;
-       int last_page;
+    if (print_job != NULL) {
+       ev_print_job_print (print_job, GTK_WINDOW (ev_window));
+       g_object_unref (print_job);
+    }
 
-       page_cache = ev_page_cache_get (window->priv->document);
-       last_page = ev_page_cache_get_n_pages (page_cache);
+    g_object_unref (config);
 
-       ev_window_print_range (window, 1, -1);
-}
+    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;
 
-const char *
-ev_window_get_uri (EvWindow *ev_window)
-{
-       return ev_window->priv->uri;
+    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));
+       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);                                                                
 
        pages_label = g_strconcat (_("Pages"), " ", NULL);
-       gnome_print_dialog_construct_range_page (GNOME_PRINT_DIALOG (print_dialog),
+       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 (print_dialog),
+       gtk_dialog_set_response_sensitive (GTK_DIALOG (ev_window->priv->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);
+       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;
+}
+#endif /* WITH_GNOME_PRINT */
+       
+static void
+ev_window_cmd_file_print (GtkAction *action, EvWindow *ev_window)
+{
+       ev_window_print (ev_window);
+}
 
-               print_job = g_object_new (EV_TYPE_PRINT_JOB,
-                                         "gnome_print_job", job,
-                                         "document", ev_window->priv->document,
-                                         "print_dialog", print_dialog,
-                                         NULL);
-               break;
+static void
+ev_window_cmd_file_properties (GtkAction *action, EvWindow *ev_window)
+{
+       if (ev_window->priv->properties == NULL) {
+               ev_window->priv->properties = ev_properties_dialog_new ();
+               ev_properties_dialog_set_document (EV_PROPERTIES_DIALOG (ev_window->priv->properties),
+                                                  ev_window->priv->document);
+               g_object_add_weak_pointer (G_OBJECT (ev_window->priv->properties),
+                                          (gpointer *) &(ev_window->priv->properties));
+               gtk_window_set_transient_for (GTK_WINDOW (ev_window->priv->properties),
+                                             GTK_WINDOW (ev_window));
        }
 
-       g_object_unref (job);
+       gtk_widget_show (ev_window->priv->properties);
+}
+                                       
+static void
+ev_window_cmd_file_close_window (GtkAction *action, EvWindow *ev_window)
+{
+       g_return_if_fail (EV_IS_WINDOW (ev_window));
 
-       gtk_widget_destroy (print_dialog);
+       gtk_widget_destroy (GTK_WIDGET (ev_window));
+}
 
-       if (print_job != NULL) {
-               ev_print_job_print (print_job, GTK_WINDOW (ev_window));
-               g_object_unref (print_job);
-       }
+static void
+ev_window_cmd_focus_page_selector (GtkAction *act, EvWindow *window)
+{
+       GtkAction *action;
+       
+       update_chrome_flag (window, EV_CHROME_RAISE_TOOLBAR, TRUE);
+       ev_window_set_action_sensitive (window, "ViewToolbar", FALSE);
+       
+       action = gtk_action_group_get_action (window->priv->action_group,
+                                             PAGE_SELECTOR_ACTION);
+       ev_page_action_grab_focus (EV_PAGE_ACTION (action));
+}
+
+static void
+ev_window_cmd_scroll_forward (GtkAction *action, EvWindow *window)
+{
+       ev_view_scroll (EV_VIEW (window->priv->view), EV_SCROLL_PAGE_FORWARD, FALSE);
+}
 
-       g_object_unref (config);
+static void
+ev_window_cmd_scroll_backward (GtkAction *action, EvWindow *window)
+{
+       ev_view_scroll (EV_VIEW (window->priv->view), EV_SCROLL_PAGE_BACKWARD, FALSE);
 }
 
 static void
-ev_window_cmd_file_print (GtkAction *action, EvWindow *ev_window)
+ev_window_cmd_continuous (GtkAction *action, EvWindow *ev_window)
 {
-       ev_window_print (ev_window);
+       gboolean continuous;
+
+       ev_window_stop_presentation (ev_window);
+       continuous = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
+       g_object_set (G_OBJECT (ev_window->priv->view),
+                     "continuous", continuous,
+                     NULL);
+       ev_window_update_actions (ev_window);
 }
 
 static void
-ev_window_cmd_file_properties (GtkAction *action, EvWindow *ev_window)
+ev_window_cmd_dual (GtkAction *action, EvWindow *ev_window)
 {
-       if (ev_window->priv->properties == NULL) {
-               ev_window->priv->properties = ev_properties_dialog_new ();
-               ev_properties_dialog_set_document (EV_PROPERTIES_DIALOG (ev_window->priv->properties),
-                                                  ev_window->priv->document);
-               g_object_add_weak_pointer (G_OBJECT (ev_window->priv->properties),
-                                          (gpointer *) &(ev_window->priv->properties));
-               gtk_window_set_transient_for (GTK_WINDOW (ev_window->priv->properties),
-                                             GTK_WINDOW (ev_window));
-       }
+       gboolean dual_page;
 
-       gtk_widget_show (ev_window->priv->properties);
+       ev_window_stop_presentation (ev_window);
+       dual_page = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
+       g_object_set (G_OBJECT (ev_window->priv->view),
+                     "dual-page", dual_page,
+                     NULL);
+       ev_window_update_actions (ev_window);
 }
-                                       
+
 static void
-ev_window_cmd_file_close_window (GtkAction *action, EvWindow *ev_window)
+ev_window_cmd_view_best_fit (GtkAction *action, EvWindow *ev_window)
 {
-       g_return_if_fail (EV_IS_WINDOW (ev_window));
+       ev_window_stop_presentation (ev_window);
 
-       gtk_widget_destroy (GTK_WIDGET (ev_window));
+       if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) {
+               ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_BEST_FIT);
+       } else {
+               ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_FREE);
+       }
+       ev_window_update_actions (ev_window);
 }
 
 static void
-find_not_supported_dialog (EvWindow   *ev_window)
+ev_window_cmd_view_page_width (GtkAction *action, EvWindow *ev_window)
 {
-       GtkWidget *dialog;
-
-       /* If you change this so it isn't modal, be sure you don't
-        * allow multiple copies of the dialog...
-        */
+       ev_window_stop_presentation (ev_window);
 
-       dialog = gtk_message_dialog_new (GTK_WINDOW (ev_window),
-                                        GTK_DIALOG_DESTROY_WITH_PARENT,
-                                        GTK_MESSAGE_ERROR,
-                                        GTK_BUTTONS_CLOSE,
-                                        _("The \"Find\" feature will not work with this document"));
-       gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-                                                 _("Searching for text is only supported for PDF documents."));
-       gtk_dialog_run (GTK_DIALOG (dialog));
-       gtk_widget_destroy (dialog);
+       if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) {
+               ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_FIT_WIDTH);
+       } else {
+               ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), EV_SIZING_FREE);
+       }
+       ev_window_update_actions (ev_window);
 }
 
+
 static void
 ev_window_cmd_edit_select_all (GtkAction *action, EvWindow *ev_window)
 {
@@ -1541,15 +1429,13 @@ ev_window_cmd_edit_find (GtkAction *action, EvWindow *ev_window)
 {
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
-       if (ev_window->priv->document == NULL) {
-               g_printerr ("We should have set the Find menu item insensitive since there's no document\n");
-       } 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);
+       if (ev_window->priv->document == NULL || !EV_IS_DOCUMENT_FIND (ev_window->priv->document)) {
+               g_error ("Find action should be insensitive since document doesn't support find");
+               return;
+       } 
 
-               gtk_widget_grab_focus (ev_window->priv->find_bar);
-       }
+       update_chrome_flag (ev_window, EV_CHROME_FINDBAR, TRUE);
+       gtk_widget_grab_focus (ev_window->priv->find_bar);
 }
 
 static void
@@ -1626,10 +1512,9 @@ static void
 ev_window_sidebar_position_change_cb (GObject *object, GParamSpec *pspec,
                                      EvWindow *ev_window)
 {
-       if (ev_window->priv->uri) {
+       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
@@ -1826,6 +1711,7 @@ ev_window_run_fullscreen (EvWindow *window)
 
        update_chrome_visibility (window);
        gtk_widget_hide (window->priv->sidebar);
+       gtk_widget_hide (window->priv->attachment_bar);
 
        g_object_set (G_OBJECT (window->priv->scrolled_window),
                      "shadow-type", GTK_SHADOW_NONE,
@@ -1846,9 +1732,8 @@ ev_window_run_fullscreen (EvWindow *window)
        gtk_window_fullscreen (GTK_WINDOW (window));
        ev_window_update_fullscreen_popup (window);
 
-       if (window->priv->uri) {
+       if (!ev_window_is_empty (window))
                ev_metadata_manager_set_boolean (window->priv->uri, "fullscreen", TRUE);
-       }
 }
 
 static void
@@ -1876,10 +1761,10 @@ ev_window_stop_fullscreen (EvWindow *window)
        gtk_window_unfullscreen (GTK_WINDOW (window));
        update_chrome_visibility (window);
        update_sidebar_visibility (window);
+       update_attachment_bar_visibility (window);
 
-       if (window->priv->uri) {
+       if (!ev_window_is_empty (window))
                ev_metadata_manager_set_boolean (window->priv->uri, "fullscreen", FALSE);
-       }
 }
 
 static void
@@ -1925,10 +1810,10 @@ ev_window_run_presentation (EvWindow *window)
        ev_window_update_presentation_action (window);
        update_chrome_visibility (window);
        gtk_widget_hide (window->priv->sidebar);
+       gtk_widget_hide (window->priv->attachment_bar);
 
-       if (window->priv->uri) {
+       if (!ev_window_is_empty (window))
                ev_metadata_manager_set_boolean (window->priv->uri, "presentation", TRUE);
-       }
 }
 
 static void
@@ -1945,10 +1830,10 @@ ev_window_stop_presentation (EvWindow *window)
        ev_window_update_presentation_action (window);
        update_chrome_visibility (window);
        update_sidebar_visibility (window);
+       update_attachment_bar_visibility (window);
 
-       if (window->priv->uri) {
+       if (!ev_window_is_empty (window))
                ev_metadata_manager_set_boolean (window->priv->uri, "presentation", FALSE);
-       }
 }
 
 static void
@@ -2057,18 +1942,9 @@ ev_window_set_page_mode (EvWindow         *window,
                gtk_container_add (GTK_CONTAINER (window->priv->scrolled_window),
                                   child);
        }
-       update_action_sensitivity (window);
+       ev_window_update_actions (window);
 }
 
-static void
-ev_window_cmd_edit_toolbar_cb (GtkDialog *dialog, gint response, gpointer data)
-{
-       EvWindow *ev_window = EV_WINDOW (data);
-        egg_editable_toolbar_set_edit_mode
-                       (EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar), FALSE);
-       ev_application_save_toolbars_model (EV_APP);
-        gtk_widget_destroy (GTK_WIDGET (dialog));
-}
 
 static void
 ev_window_cmd_edit_rotate_left (GtkAction *action, EvWindow *ev_window)
@@ -2082,6 +1958,16 @@ ev_window_cmd_edit_rotate_right (GtkAction *action, EvWindow *ev_window)
        ev_view_rotate_right (EV_VIEW (ev_window->priv->view));
 }
 
+static void
+ev_window_cmd_edit_toolbar_cb (GtkDialog *dialog, gint response, gpointer data)
+{
+       EvWindow *ev_window = EV_WINDOW (data);
+        egg_editable_toolbar_set_edit_mode
+                       (EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar), FALSE);
+       ev_application_save_toolbars_model (EV_APP);
+        gtk_widget_destroy (GTK_WIDGET (dialog));
+}
+
 static void
 ev_window_cmd_edit_toolbar (GtkAction *action, EvWindow *ev_window)
 {
@@ -2212,7 +2098,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);
 
@@ -2247,7 +2133,7 @@ ev_window_cmd_escape (GtkAction *action, EvWindow *window)
 
        widget = gtk_window_get_focus (GTK_WINDOW (window));
        if (widget && gtk_widget_get_ancestor (widget, EGG_TYPE_FIND_BAR)) {
-               update_chrome_flag (window, EV_CHROME_FINDBAR, NULL, FALSE);
+               update_chrome_flag (window, EV_CHROME_FINDBAR, FALSE);
                gtk_widget_grab_focus (window->priv->view);
        } else {
                gboolean fullscreen;
@@ -2306,13 +2192,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     
@@ -2367,9 +2252,9 @@ ev_window_sizing_mode_changed_cb (EvView *view, GParamSpec *pspec,
 static void     
 ev_window_zoom_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_window)
 {
-        update_action_sensitivity (ev_window);
+        ev_window_update_actions (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));
        }
@@ -2408,10 +2293,9 @@ ev_window_continuous_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_w
 {
        ev_window_update_continuous_action (ev_window);
 
-       if (ev_window->priv->uri) {
+       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     
@@ -2421,10 +2305,9 @@ ev_window_rotation_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *window
 
        rotation = ev_view_get_rotation (EV_VIEW (window->priv->view));
 
-       if (window->priv->uri) {
+       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);
@@ -2433,7 +2316,7 @@ ev_window_rotation_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *window
 static void
 ev_window_has_selection_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *window)
 {
-       update_action_sensitivity (window);
+        ev_window_update_actions (window);
 }
 
 static void     
@@ -2441,10 +2324,9 @@ ev_window_dual_mode_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_wi
 {
        ev_window_update_dual_page_action (ev_window);
 
-       if (ev_window->priv->uri) {
+       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 *
@@ -2482,6 +2364,7 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window)
                "Marco Pesenti Gritti <marco@gnome.org>",
                "Nickolay V. Shmyrev <nshmyrev@yandex.ru>",
                "Bryan Clark <clarkbw@gnome.org>",
+               "Carlos Garcia Campos  <carlosgc@gnome.org>",
                NULL
        };
 
@@ -2542,9 +2425,11 @@ 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
@@ -2574,9 +2459,8 @@ ev_window_sidebar_current_page_changed_cb (EvSidebar  *ev_sidebar,
 
        g_object_unref (current_page);
 
-       if (ev_window->priv->uri) {
+       if (!ev_window_is_empty (ev_window))
                ev_metadata_manager_set_string (ev_window->priv->uri, "sidebar_page", id);
-       }
 }
 
 static void
@@ -2595,12 +2479,105 @@ ev_window_sidebar_visibility_changed_cb (EvSidebar *ev_sidebar, GParamSpec *pspe
        g_signal_handlers_unblock_by_func
                (action, G_CALLBACK (ev_window_view_sidebar_cb), ev_window);
 
-       if (!ev_view_get_presentation (view) && !ev_view_get_fullscreen (view)) {
+       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
+ev_window_attachment_bar_toggled_cb (EvAttachmentBar *ev_attachbar,
+                                    GParamSpec      *param_spec,
+                                    EvWindow        *ev_window)
+{
+       if (gtk_expander_get_expanded (GTK_EXPANDER (ev_attachbar))) {
+               gtk_widget_grab_focus (GTK_WIDGET (ev_attachbar));
+       } else {
+               gtk_widget_grab_focus (ev_window->priv->view);
+       }
+}
+
+static gboolean
+view_menu_popup_cb (EvView         *view,
+                   EvLink         *link,
+                   EvWindow       *ev_window)
+{
+       GtkWidget *popup;
+       gboolean   show_external = FALSE;
+       gboolean   show_internal = FALSE;
+       GtkAction *action;
+
+       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->view_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->view_popup_action_group,
+                                             "OpenLink");
+       gtk_action_set_visible (action, show_external);
+
+       action = gtk_action_group_get_action (ev_window->priv->view_popup_action_group,
+                                             "CopyLinkAddress");
+       gtk_action_set_visible (action, show_external);
+
+       action = gtk_action_group_get_action (ev_window->priv->view_popup_action_group,
+                                             "GoLink");
+       gtk_action_set_visible (action, show_internal);
+
+       gtk_menu_popup (GTK_MENU (popup), NULL, NULL,
+                       NULL, NULL,
+                       3, gtk_get_current_event_time ());
+       return FALSE;
+}
+
+static void
+attachment_bar_menu_popup_cb (EvAttachmentBar *attachbar,
+                             EvAttachment    *attachment,
+                             EvWindow        *ev_window)
+{
+       GtkWidget *popup;
+
+       if (ev_window->priv->attachment)
+               g_object_unref (ev_window->priv->attachment);
+       if (attachment)
+               ev_window->priv->attachment = g_object_ref (attachment);
+       else
+               ev_window->priv->attachment = NULL;
+       
+       popup = ev_window->priv->attachment_popup;
+
+       gtk_menu_popup (GTK_MENU (popup), NULL, NULL,
+                       NULL, NULL,
+                       3, gtk_get_current_event_time ());
+}
+
 static void
 view_find_status_changed_cb (EvView     *view,
                             GParamSpec *pspec,
@@ -2631,7 +2608,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
@@ -2655,9 +2632,7 @@ find_bar_search_changed_cb (EggFindBar *find_bar,
        visible = GTK_WIDGET_VISIBLE (find_bar);
        search_string = egg_find_bar_get_search_string (find_bar);
 
-#if 0
-       g_printerr ("search for '%s'\n", search_string ? search_string : "(nil)");
-#endif
+       ev_view_search_changed (EV_VIEW(ev_window->priv->view));
 
        if (ev_window->priv->document &&
            EV_IS_DOCUMENT_FIND (ev_window->priv->document)) {
@@ -2673,7 +2648,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);
+                       ev_window_update_actions (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));
@@ -2681,6 +2656,12 @@ find_bar_search_changed_cb (EggFindBar *find_bar,
        }
 }
 
+static void
+find_bar_scroll(EggFindBar *find_bar, GtkScrollType scroll, EvWindow* ev_window)
+{
+       ev_view_scroll(EV_VIEW(ev_window->priv->view), scroll, FALSE);
+}
+
 static void
 zoom_control_changed_cb (EphyZoomAction *action,
                         float           zoom,
@@ -2716,7 +2697,6 @@ ev_window_finalize (GObject *object)
                g_list_free (windows);
        }
        
-       g_list_free (windows);
        G_OBJECT_CLASS (ev_window_parent_class)->finalize (object);
 }
 
@@ -2746,6 +2726,16 @@ ev_window_dispose (GObject *object)
                priv->action_group = NULL;
        }
 
+       if (priv->view_popup_action_group) {
+               g_object_unref (priv->view_popup_action_group);
+               priv->view_popup_action_group = NULL;
+       }
+
+       if (priv->attachment_popup_action_group) {
+               g_object_unref (priv->attachment_popup_action_group);
+               priv->attachment_popup_action_group = NULL;
+       }
+
        if (priv->page_cache) {
                g_signal_handlers_disconnect_by_func (priv->page_cache, page_changed_cb, window);
                priv->page_cache = NULL;
@@ -2761,13 +2751,8 @@ ev_window_dispose (GObject *object)
                priv->view = NULL;
        }
 
-       if (priv->page_view) {
-               g_object_unref (priv->page_view);
-               priv->page_view = NULL;
-       }
-
-       if (priv->load_job || priv->xfer_job) {
-               ev_window_clear_jobs (window);
+       if (priv->xfer_job) {
+               ev_window_clear_xfer_job (window);
        }
        
        if (priv->local_uri) {
@@ -2779,13 +2764,16 @@ 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->link) {
+               g_object_unref (priv->link);
+               priv->link = NULL;
        }
 
-       if (priv->password_dialog) {
-               gtk_widget_destroy (priv->password_dialog);
+       if (priv->attachment) {
+               g_object_unref (priv->attachment);
+               priv->attachment = NULL;
        }
 
        if (priv->find_bar) {
@@ -2839,7 +2827,8 @@ static const GtkActionEntry entries[] = {
        { "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, NULL,
+               { "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",
          N_("Print this document"),
@@ -2920,6 +2909,10 @@ static const GtkActionEntry entries[] = {
           G_CALLBACK (ev_window_cmd_scroll_backward) },
         { "ShiftBackSpace", NULL, "", "<shift>BackSpace", NULL,
           G_CALLBACK (ev_window_cmd_scroll_forward) },
+        { "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", NULL,
@@ -2950,7 +2943,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 },
-        { "ViewSidebar", NULL, N_("Side _Pane"), "F9",
+        { "ViewSidebar", GTK_STOCK_INDEX, 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,
@@ -2973,6 +2966,25 @@ static const GtkToggleActionEntry toggle_entries[] = {
           G_CALLBACK (ev_window_cmd_view_page_width) },
 };
 
+/* Popups specific items */
+static const GtkActionEntry view_popup_entries [] = {
+       /* Links */
+       { "OpenLink", GTK_STOCK_OPEN, N_("_Open Link"), NULL,
+         NULL, G_CALLBACK (ev_view_popup_cmd_open_link) },
+       { "GoLink", GTK_STOCK_GO_FORWARD, N_("_Go To"), NULL,
+         NULL, G_CALLBACK (ev_view_popup_cmd_open_link) },
+       { "CopyLinkAddress", NULL, N_("_Copy Link Address"), NULL,
+         NULL,
+         G_CALLBACK (ev_view_popup_cmd_copy_link_address) },
+};
+
+static const GtkActionEntry attachment_popup_entries [] = {
+       { "OpenAttachment", GTK_STOCK_OPEN, N_("_Open..."), NULL,
+         NULL, G_CALLBACK (ev_attachment_popup_cmd_open_attachment) },
+       { "SaveAttachmentAs", GTK_STOCK_SAVE_AS, N_("_Save a Copy..."), NULL,
+         NULL, G_CALLBACK (ev_attachment_popup_cmd_save_attachment_as) },
+};
+
 static void
 drag_data_received_cb (GtkWidget *widget, GdkDragContext *context,
                       gint x, gint y, GtkSelectionData *selection_data,
@@ -2997,8 +3009,6 @@ drag_data_received_cb (GtkWidget *widget, GdkDragContext *context,
                ev_application_open_uri_list (EV_APP, uris, 0);
                
                g_slist_free (uris);
-
-               gtk_drag_finish (context, TRUE, FALSE, time);
        }
 }
 
@@ -3107,28 +3117,6 @@ set_chrome_actions (EvWindow *window)
                (action, G_CALLBACK (ev_window_view_toolbar_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);
-       }
-
-       g_object_unref (client);
-
-       return chrome;
-}
-
 static void
 sidebar_widget_model_set (EvSidebarLinks *ev_sidebar_links,
                          GParamSpec     *pspec,
@@ -3146,31 +3134,11 @@ sidebar_widget_model_set (EvSidebarLinks *ev_sidebar_links,
        g_object_unref (model);
 }
 
-
-static void
-ev_window_set_view_accels_sensitivity (EvWindow *window, gboolean sensitive)
-{
-       if (window->priv->action_group) {
-               set_action_sensitive (window, "PageDown", sensitive);
-               set_action_sensitive (window, "PageUp", sensitive);
-               set_action_sensitive (window, "Space", sensitive);
-               set_action_sensitive (window, "ShiftSpace", sensitive);
-               set_action_sensitive (window, "BackSpace", sensitive);
-               set_action_sensitive (window, "ShiftBackSpace", 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);
-       set_action_sensitive (window, "ViewToolbar", TRUE);
+       update_chrome_flag (window, EV_CHROME_RAISE_TOOLBAR, FALSE);
+       ev_window_set_action_sensitive (window, "ViewToolbar", TRUE);
 
        ev_window_set_view_accels_sensitivity (window, TRUE);
 
@@ -3208,13 +3176,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;
@@ -3229,14 +3196,16 @@ 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;
@@ -3310,6 +3279,96 @@ view_external_link_cb (EvView *view, EvLink *link, EvWindow *window)
        }
 }
 
+static void
+ev_view_popup_cmd_open_link (GtkAction *action, EvWindow *window)
+{
+       ev_view_goto_link (EV_VIEW (window->priv->view), window->priv->link);
+}
+
+static void
+ev_view_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_attachment_popup_cmd_open_attachment (GtkAction *action, EvWindow *window)
+{
+       GError *error = NULL;
+       
+       if (!window->priv->attachment)
+               return;
+       
+       ev_attachment_open (window->priv->attachment, &error);
+
+       if (error) {
+               ev_window_error_dialog (GTK_WINDOW (window),
+                                       _("Unable to open attachment"),
+                                       error);
+               g_error_free (error);
+       }
+}
+
+static void
+attachment_save_dialog_response_cb (GtkWidget *fc,
+                                   gint       response_id,
+                                   EvWindow  *ev_window)
+{
+       if (response_id == GTK_RESPONSE_OK) {
+               const char *uri;
+               GError     *error = NULL;
+
+               uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (fc));
+
+               ev_attachment_save (ev_window->priv->attachment, uri, &error);
+
+               if (error) {
+                       ev_window_error_dialog (GTK_WINDOW (fc),
+                                                _("The attachment could not be saved."),
+                                                error);
+                       g_error_free (error);
+               }
+       }
+
+       gtk_widget_destroy (fc);
+}
+
+static void
+ev_attachment_popup_cmd_save_attachment_as (GtkAction *action, EvWindow *window)
+{
+       GtkWidget *fc;
+
+       fc = gtk_file_chooser_dialog_new (_("Save a Copy"),
+                                         GTK_WINDOW (window),
+                                         GTK_FILE_CHOOSER_ACTION_SAVE,
+                                         GTK_STOCK_CANCEL,
+                                         GTK_RESPONSE_CANCEL,
+                                         GTK_STOCK_SAVE, GTK_RESPONSE_OK,
+                                         NULL);
+
+       gtk_dialog_set_default_response (GTK_DIALOG (fc), GTK_RESPONSE_OK);
+
+#ifdef HAVE_GTK_FILE_CHOOSER_SET_DO_OVERWRITE_CONFIRMATION
+       gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (fc), TRUE);
+#endif
+
+       gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (fc),
+                                          ev_attachment_get_name (window->priv->attachment));
+
+       g_signal_connect (fc, "response",
+                         G_CALLBACK (attachment_save_dialog_response_cb),
+                         window);
+
+       gtk_widget_show (fc);
+}
+
 static void
 ev_window_init (EvWindow *ev_window)
 {
@@ -3353,6 +3412,24 @@ ev_window_init (EvWindow *ev_window)
 
        ev_window_set_view_accels_sensitivity (ev_window, FALSE);
 
+       action_group = gtk_action_group_new ("ViewPopupActions");
+       ev_window->priv->view_popup_action_group = action_group;
+       gtk_action_group_set_translation_domain (action_group, NULL);
+       gtk_action_group_add_actions (action_group, view_popup_entries,
+                                     G_N_ELEMENTS (view_popup_entries),
+                                     ev_window);
+       gtk_ui_manager_insert_action_group (ev_window->priv->ui_manager,
+                                           action_group, 0);
+
+       action_group = gtk_action_group_new ("AttachmentPopupActions");
+       ev_window->priv->attachment_popup_action_group = action_group;
+       gtk_action_group_set_translation_domain (action_group, NULL);
+       gtk_action_group_add_actions (action_group, attachment_popup_entries,
+                                     G_N_ELEMENTS (attachment_popup_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",
                                              &error)) {
@@ -3453,13 +3530,31 @@ ev_window_init (EvWindow *ev_window)
        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);
 
+       /* Attachments Bar */
+       ev_window->priv->attachment_bar = ev_attachment_bar_new ();
+       gtk_box_pack_end (GTK_BOX (ev_window->priv->main_box),
+                         ev_window->priv->attachment_bar,
+                         FALSE, TRUE, 0);
+       g_signal_connect_object (ev_window->priv->attachment_bar,
+                                "popup",
+                                G_CALLBACK (attachment_bar_menu_popup_cb),
+                                ev_window, 0);
+
+       /* Find Bar */
+       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);
-       //g_object_ref (ev_window->priv->page_view);
        g_object_ref (ev_window->priv->password_view);
 
        gtk_container_add (GTK_CONTAINER (ev_window->priv->scrolled_window),
@@ -3494,17 +3589,7 @@ ev_window_init (EvWindow *ev_window)
                          G_CALLBACK (ev_window_has_selection_changed_cb),
                          ev_window);
 
-       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),
@@ -3514,6 +3599,12 @@ ev_window_init (EvWindow *ev_window)
                          G_CALLBACK (ev_window_sidebar_current_page_changed_cb),
                          ev_window);
 
+       /* Connect attachment bar sgignals */
+       g_signal_connect (G_OBJECT (ev_window->priv->attachment_bar),
+                         "notify::expanded",
+                         G_CALLBACK (ev_window_attachment_bar_toggled_cb),
+                         ev_window);
+
        /* Connect to find bar signals */
        g_signal_connect (ev_window->priv->find_bar,
                          "previous",
@@ -3539,22 +3630,47 @@ ev_window_init (EvWindow *ev_window)
                          "notify::visible",
                          G_CALLBACK (find_bar_search_changed_cb),
                          ev_window);
+       g_signal_connect (ev_window->priv->find_bar,
+                         "scroll",
+                         G_CALLBACK (find_bar_scroll),
+                         ev_window);
+
+       /* Popups */
+       ev_window->priv->view_popup = gtk_ui_manager_get_widget (ev_window->priv->ui_manager,
+                                                                "/DocumentPopup");
+       ev_window->priv->link = NULL;
+
+       ev_window->priv->attachment_popup = gtk_ui_manager_get_widget (ev_window->priv->ui_manager,
+                                                                      "/AttachmentPopup");
+       ev_window->priv->attachment = NULL;
 
        /* Give focus to the document view */
        gtk_widget_grab_focus (ev_window->priv->view);
 
        /* Drag and Drop */
        gtk_drag_dest_unset (GTK_WIDGET (ev_window));
-       gtk_drag_dest_set (GTK_WIDGET (ev_window), GTK_DEST_DEFAULT_ALL, ev_drop_types,
+       gtk_drag_dest_set (GTK_WIDGET (ev_window), GTK_DEST_DEFAULT_ALL,
+                          ev_drop_types,
                           sizeof (ev_drop_types) / sizeof (ev_drop_types[0]),
                           GDK_ACTION_COPY);
-       g_signal_connect (G_OBJECT (ev_window), "drag_data_received",
+       g_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);
+       update_attachment_bar_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);
+       ev_window_setup_action_sensitivity (ev_window);
 }
 
 GtkWidget *
@@ -3564,8 +3680,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;