]> www.fi.muni.cz Git - evince.git/blobdiff - shell/ev-window.c
Allow multiple selection of attachments
[evince.git] / shell / ev-window.c
index 60479ba74a2ed085aac93ec61437d81bb9dffc5f..71cf0ec403ed172517154773eeca045abf128ba0 100644 (file)
@@ -37,6 +37,7 @@
 #include "ev-view.h"
 #include "ev-password.h"
 #include "ev-password-view.h"
+#include "ev-attachment-bar.h"
 #include "ev-properties-dialog.h"
 #include "ev-ps-exporter.h"
 #include "ev-document-thumbnails.h"
@@ -44,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"
@@ -108,6 +109,7 @@ struct _EvWindowPrivate {
        GtkWidget *password_view;
        GtkWidget *sidebar_thumbs;
        GtkWidget *sidebar_links;
+       GtkWidget *attachment_bar;
 
        /* Dialogs */
        GtkWidget *properties;
@@ -118,7 +120,8 @@ struct _EvWindowPrivate {
 
        /* UI Builders */
        GtkActionGroup *action_group;
-       GtkActionGroup *popups_action_group;
+       GtkActionGroup *view_popup_action_group;
+       GtkActionGroup *attachment_popup_action_group;
        GtkUIManager   *ui_manager;
 
        /* Fullscreen mode */
@@ -127,9 +130,13 @@ struct _EvWindowPrivate {
        GSource   *fullscreen_timeout_source;
        
        /* Popup link */
-       GtkWidget *popup;
+       GtkWidget *view_popup;
        EvLink    *link;
 
+       /* Popup attachment */
+       GtkWidget    *attachment_popup;
+       GList        *attach_list;
+
        /* Document */
        char *uri;
        char *local_uri;
@@ -141,9 +148,7 @@ struct _EvWindowPrivate {
        EvWindowTitle *title;
        EggRecentViewUIManager *recent_view;
 
-       /* Job used to load document */
        EvJob *xfer_job;
-       EvJob *load_job;
 #ifdef WITH_GNOME_PRINT
        GnomePrintJob *print_job;
 #endif
@@ -170,14 +175,13 @@ static const GtkTargetEntry ev_drop_types[] = {
 #define LINKS_SIDEBAR_ID "links"
 #define THUMBNAILS_SIDEBAR_ID "thumbnails"
 
+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,
@@ -197,10 +201,14 @@ static void     ev_window_stop_presentation             (EvWindow         *windo
 static void     ev_window_cmd_view_presentation         (GtkAction        *action,
                                                         EvWindow         *window);
 static void     show_fullscreen_popup                   (EvWindow         *window);
-static void     ev_popup_cmd_open_link                  (GtkAction        *action,
+static void     ev_view_popup_cmd_open_link             (GtkAction        *action,
                                                         EvWindow         *window);
-static void     ev_popup_cmd_copy_link_address          (GtkAction        *action,
+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, 
@@ -209,46 +217,52 @@ static void       ev_window_cmd_view_page_width           (GtkAction        *action,
 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 ();
@@ -263,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;
@@ -274,66 +285,77 @@ update_action_sensitivity (EvWindow *ev_window)
        if (gconf_client_get_bool (client, GCONF_LOCKDOWN_PRINT, NULL)) {
                ok_to_print = FALSE;
        }
-       
-       g_object_unref (client);
-
-       if (has_document && ev_document_can_get_text (document)) {
-               can_get_text = TRUE;
-               ok_to_copy_text = ev_view_get_has_selection (view);
-       }
-       
 #ifndef WITH_GNOME_PRINT
        ok_to_print = FALSE;
 #endif
+       g_object_unref (client);
+
 
        /* 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, "EditFindPrevious",
+                             ev_view_can_find_previous (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) {
@@ -351,10 +373,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);
@@ -380,13 +423,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);
@@ -466,84 +509,6 @@ update_sizing_buttons (EvWindow *window)
        }
 }
 
-static void
-ev_window_cmd_focus_page_selector (GtkAction *act, EvWindow *window)
-{
-       GtkAction *action;
-       
-       update_chrome_flag (window, EV_CHROME_RAISE_TOOLBAR, TRUE);
-       set_action_sensitive (window, "ViewToolbar", FALSE);
-       
-       action = gtk_action_group_get_action (window->priv->action_group,
-                                             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);
-}
-
-
 void
 ev_window_open_page_label (EvWindow   *ev_window, 
                           const char *label)
@@ -560,12 +525,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)
 {
@@ -573,28 +537,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
@@ -602,7 +565,8 @@ 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_is_empty (ev_window))
                ev_metadata_manager_set_int (ev_window->priv->uri, "page", page);
 }
@@ -630,6 +594,14 @@ update_sidebar_visibility (EvWindow *window)
        }
 }
 
+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)
 {
@@ -800,6 +772,7 @@ ev_window_setup_document (EvWindow *ev_window)
        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;
@@ -820,12 +793,15 @@ ev_window_setup_document (EvWindow *ev_window)
        }
        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);
-       update_action_sensitivity (ev_window);
+       ev_window_setup_action_sensitivity (ev_window);
 
        if (ev_window->priv->properties) {
                ev_properties_dialog_set_document (EV_PROPERTIES_DIALOG (ev_window->priv->properties),
@@ -863,7 +839,7 @@ password_dialog_response (GtkWidget *password_dialog,
                ev_window->priv->password_document = 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);
                        
@@ -874,7 +850,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() */
 
@@ -905,20 +881,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)
@@ -955,14 +920,12 @@ 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);
@@ -974,6 +937,16 @@ ev_window_load_job_cb  (EvJobLoad *job,
 
        /* 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);
@@ -981,7 +954,7 @@ ev_window_load_job_cb  (EvJobLoad *job,
                
                ev_window_setup_document (ev_window);
                ev_window_add_recent (ev_window, ev_window->priv->uri);         
-               ev_window_clear_jobs (ev_window);
+               ev_window_clear_xfer_job (ev_window);
                
                return;
        }
@@ -990,6 +963,10 @@ 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);
 
                file_name = gnome_vfs_format_uri_for_display (job->uri);
@@ -1002,49 +979,15 @@ 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)
-{
-       EvWindow *ev_window = EV_WINDOW (data);
-
-
-       
-       if (job->error != NULL) {
-               unable_to_load (ev_window, job->error->message);
-               ev_window_clear_jobs (ev_window);
-               ev_view_set_loading (EV_VIEW (ev_window->priv->view), FALSE);
-       } 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);
-       }               
-}
-
 const char *
 ev_window_get_uri (EvWindow *ev_window)
 {
@@ -1075,14 +1018,11 @@ ev_window_close_dialogs (EvWindow *ev_window)
 void
 ev_window_open_uri (EvWindow *ev_window, const char *uri)
 {
-
        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_close_dialogs (ev_window);
-       ev_window_clear_jobs (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);
        
@@ -1128,7 +1068,7 @@ 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)
@@ -1189,28 +1129,6 @@ ev_window_setup_recent (EvWindow *ev_window)
                        G_CALLBACK (ev_window_cmd_recent_file_activate), ev_window);
 }
 
-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,
@@ -1219,17 +1137,23 @@ file_save_dialog_response_cb (GtkWidget *fc,
        gboolean success;
 
        if (response_id == GTK_RESPONSE_OK) {
-               const char *uri;
+               gchar *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);
                }
+
+               g_free (uri);
        }
 
        gtk_widget_destroy (fc);
@@ -1249,9 +1173,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);
@@ -1315,10 +1242,9 @@ ev_window_print_dialog_response_cb (GtkDialog *print_dialog, gint response, gpoi
            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_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;
@@ -1417,25 +1343,83 @@ ev_window_cmd_file_close_window (GtkAction *action, EvWindow *ev_window)
 }
 
 static void
-find_not_supported_dialog (EvWindow   *ev_window)
+ev_window_cmd_focus_page_selector (GtkAction *act, EvWindow *window)
 {
-       GtkWidget *dialog;
+       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));
+}
 
-       /* If you change this so it isn't modal, be sure you don't
-        * allow multiple copies of the dialog...
-        */
+static void
+ev_window_cmd_scroll_forward (GtkAction *action, EvWindow *window)
+{
+       ev_view_scroll (EV_VIEW (window->priv->view), EV_SCROLL_PAGE_FORWARD, FALSE);
+}
 
-       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);
+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_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);
+       ev_window_update_actions (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);
+       ev_window_update_actions (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);
+       }
+       ev_window_update_actions (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);
+       }
+       ev_window_update_actions (ev_window);
 }
 
+
 static void
 ev_window_cmd_edit_select_all (GtkAction *action, EvWindow *ev_window)
 {
@@ -1449,15 +1433,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, 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
@@ -1468,6 +1450,14 @@ ev_window_cmd_edit_find_next (GtkAction *action, EvWindow *ev_window)
        ev_view_find_next (EV_VIEW (ev_window->priv->view));
 }
 
+static void
+ev_window_cmd_edit_find_previous (GtkAction *action, EvWindow *ev_window)
+{
+        g_return_if_fail (EV_IS_WINDOW (ev_window));
+
+       ev_view_find_previous (EV_VIEW (ev_window->priv->view));
+}
+
 static void
 ev_window_cmd_edit_copy (GtkAction *action, EvWindow *ev_window)
 {
@@ -1733,6 +1723,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,
@@ -1782,6 +1773,7 @@ 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 (!ev_window_is_empty (window))
                ev_metadata_manager_set_boolean (window->priv->uri, "fullscreen", FALSE);
@@ -1830,6 +1822,7 @@ 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 (!ev_window_is_empty (window))
                ev_metadata_manager_set_boolean (window->priv->uri, "presentation", TRUE);
@@ -1849,6 +1842,7 @@ 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 (!ev_window_is_empty (window))
                ev_metadata_manager_set_boolean (window->priv->uri, "presentation", FALSE);
@@ -1960,18 +1954,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)
@@ -1985,6 +1970,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)
 {
@@ -2269,7 +2264,7 @@ 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 && !ev_window_is_empty (ev_window)) {
                ev_metadata_manager_set_double (ev_window->priv->uri, "zoom",
@@ -2333,7 +2328,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     
@@ -2381,6 +2376,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
        };
 
@@ -2503,6 +2499,18 @@ ev_window_sidebar_visibility_changed_cb (EvSidebar *ev_sidebar, GParamSpec *pspe
        }
 }
 
+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,
@@ -2523,7 +2531,7 @@ view_menu_popup_cb (EvView         *view,
        else    
                ev_window->priv->link = NULL;
 
-       popup = ev_window->priv->popup;
+       popup = ev_window->priv->view_popup;
 
        if (ev_window->priv->link) 
                switch (ev_link_get_link_type (ev_window->priv->link)) {
@@ -2543,15 +2551,15 @@ view_menu_popup_cb (EvView         *view,
                                break;
                }
        
-       action = gtk_action_group_get_action (ev_window->priv->popups_action_group,
+       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->popups_action_group,
+       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->popups_action_group,
+       action = gtk_action_group_get_action (ev_window->priv->view_popup_action_group,
                                              "GoLink");
        gtk_action_set_visible (action, show_internal);
 
@@ -2561,6 +2569,32 @@ view_menu_popup_cb (EvView         *view,
        return FALSE;
 }
 
+static gboolean
+attachment_bar_menu_popup_cb (EvAttachmentBar *attachbar,
+                             GList           *attach_list,
+                             EvWindow        *ev_window)
+{
+       GtkWidget *popup;
+
+       g_assert (attach_list != NULL);
+
+       if (ev_window->priv->attach_list) {
+               g_list_foreach (ev_window->priv->attach_list,
+                               (GFunc) g_object_unref, NULL);
+               g_list_free (ev_window->priv->attach_list);
+       }
+       
+       ev_window->priv->attach_list = attach_list;
+       
+       popup = ev_window->priv->attachment_popup;
+
+       gtk_menu_popup (GTK_MENU (popup), NULL, NULL,
+                       NULL, NULL,
+                       3, gtk_get_current_event_time ());
+
+       return TRUE;
+}
+
 static void
 view_find_status_changed_cb (EvView     *view,
                             GParamSpec *pspec,
@@ -2615,9 +2649,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)) {
@@ -2633,7 +2665,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));
@@ -2641,6 +2673,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,
@@ -2705,9 +2743,14 @@ ev_window_dispose (GObject *object)
                priv->action_group = NULL;
        }
 
-       if (priv->popups_action_group) {
-               g_object_unref (priv->popups_action_group);
-               priv->popups_action_group = NULL;
+       if (priv->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) {
@@ -2725,8 +2768,8 @@ ev_window_dispose (GObject *object)
                priv->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) {
@@ -2745,6 +2788,14 @@ ev_window_dispose (GObject *object)
                priv->link = NULL;
        }
 
+       if (priv->attach_list) {
+               g_list_foreach (priv->attach_list,
+                               (GFunc) g_object_unref,
+                               NULL);
+               g_list_free (priv->attach_list);
+               priv->attach_list = NULL;
+       }
+
        if (priv->find_bar) {
                g_signal_handlers_disconnect_by_func
                        (window->priv->find_bar,
@@ -2812,11 +2863,13 @@ static const GtkActionEntry entries[] = {
           G_CALLBACK (ev_window_cmd_edit_copy) },
        { "EditSelectAll", NULL, N_("Select _All"), "<control>A", NULL,
          G_CALLBACK (ev_window_cmd_edit_select_all) },
-        { "EditFind", GTK_STOCK_FIND, NULL, "<control>F",
+        { "EditFind", GTK_STOCK_FIND, N_("_Find..."), "<control>F",
           N_("Find a word or phrase in the document"),
           G_CALLBACK (ev_window_cmd_edit_find) },
        { "EditFindNext", NULL, N_("Find Ne_xt"), "<control>G", NULL,
          G_CALLBACK (ev_window_cmd_edit_find_next) },
+       { "EditFindPrevious", NULL, N_("Find Pre_vious"), "<shift><control>G", NULL,
+         G_CALLBACK (ev_window_cmd_edit_find_previous) },
         { "EditToolbar", NULL, N_("T_oolbar"), NULL, NULL,
           G_CALLBACK (ev_window_cmd_edit_toolbar) },
        { "EditRotateLeft", NULL, N_("Rotate _Left"), NULL, NULL,
@@ -2912,7 +2965,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,
@@ -2936,15 +2989,22 @@ static const GtkToggleActionEntry toggle_entries[] = {
 };
 
 /* Popups specific items */
-static const GtkActionEntry popups_entries [] = {
+static const GtkActionEntry view_popup_entries [] = {
        /* Links */
        { "OpenLink", GTK_STOCK_OPEN, N_("_Open Link"), NULL,
-         NULL, G_CALLBACK (ev_popup_cmd_open_link) },
+         NULL, G_CALLBACK (ev_view_popup_cmd_open_link) },
        { "GoLink", GTK_STOCK_GO_FORWARD, N_("_Go To"), NULL,
-         NULL, G_CALLBACK (ev_popup_cmd_open_link) },
+         NULL, G_CALLBACK (ev_view_popup_cmd_open_link) },
        { "CopyLinkAddress", NULL, N_("_Copy Link Address"), NULL,
          NULL,
-         G_CALLBACK (ev_popup_cmd_copy_link_address) },
+         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
@@ -2971,8 +3031,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);
        }
 }
 
@@ -3098,33 +3156,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, "Return", sensitive);
-               set_action_sensitive (window, "ShiftReturn", sensitive);
-               set_action_sensitive (window, "Slash", sensitive);
-               set_action_sensitive (window, "Plus", sensitive);
-               set_action_sensitive (window, "Minus", sensitive);
-               set_action_sensitive (window, "KpPlus", sensitive);
-               set_action_sensitive (window, "KpMinus", sensitive);
-               set_action_sensitive (window, "Equal", sensitive);
-       }
-}
-
 static gboolean
 view_actions_focus_in_cb (GtkWidget *widget, GdkEventFocus *event, EvWindow *window)
 {
        update_chrome_flag (window, EV_CHROME_RAISE_TOOLBAR, FALSE);
-       set_action_sensitive (window, "ViewToolbar", TRUE);
+       ev_window_set_action_sensitive (window, "ViewToolbar", TRUE);
 
        ev_window_set_view_accels_sensitivity (window, TRUE);
 
@@ -3266,13 +3302,13 @@ view_external_link_cb (EvView *view, EvLink *link, EvWindow *window)
 }
 
 static void
-ev_popup_cmd_open_link (GtkAction *action, EvWindow *window)
+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_popup_cmd_copy_link_address (GtkAction *action, EvWindow *window)
+ev_view_popup_cmd_copy_link_address (GtkAction *action, EvWindow *window)
 {
        GtkClipboard *clipboard;
        const gchar *uri;
@@ -3284,6 +3320,120 @@ ev_popup_cmd_copy_link_address (GtkAction *action, EvWindow *window)
        gtk_clipboard_set_text (clipboard, uri, -1);
 }
 
+static void
+ev_attachment_popup_cmd_open_attachment (GtkAction *action, EvWindow *window)
+{
+       GList *l;
+       
+       if (!window->priv->attach_list)
+               return;
+
+       for (l = window->priv->attach_list; l && l->data; l = g_list_next (l)) {
+               EvAttachment *attachment;
+               GError       *error = NULL;
+               
+               attachment = (EvAttachment *) l->data;
+               
+               ev_attachment_open (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)
+{
+       gchar                *uri;
+       GList                *l;
+       GtkFileChooserAction  fc_action;
+       gboolean              is_dir;
+       
+       if (response_id != GTK_RESPONSE_OK) {
+               gtk_widget_destroy (fc);
+               return;
+       }
+
+       uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (fc));
+       
+       g_object_get (G_OBJECT (fc), "action", &fc_action, NULL);
+       is_dir = (fc_action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+       
+       for (l = ev_window->priv->attach_list; l && l->data; l = g_list_next (l)) {
+               EvAttachment *attachment;
+               gchar        *filename;
+               GError       *error = NULL;
+               
+               attachment = (EvAttachment *) l->data;
+
+               if (is_dir) {
+                       filename = g_strjoin ("/", uri,
+                                             ev_attachment_get_name (attachment),
+                                             NULL);
+               } else {
+                       filename = g_strdup (uri);
+               }
+               
+               ev_attachment_save (attachment, filename, &error);
+               g_free (filename);
+               
+               if (error) {
+                       ev_window_error_dialog (GTK_WINDOW (fc),
+                                               _("The attachment could not be saved."),
+                                               error);
+                       g_error_free (error);
+               }
+       }
+
+       g_free (uri);
+
+       gtk_widget_destroy (fc);
+}
+
+static void
+ev_attachment_popup_cmd_save_attachment_as (GtkAction *action, EvWindow *window)
+{
+       GtkWidget    *fc;
+       EvAttachment *attachment = NULL;
+
+       if (!window->priv->attach_list)
+               return;
+
+       if (g_list_length (window->priv->attach_list) == 1)
+               attachment = (EvAttachment *) window->priv->attach_list->data;
+       
+       fc = gtk_file_chooser_dialog_new (
+               _("Save a Copy"),
+               GTK_WINDOW (window),
+               attachment ? GTK_FILE_CHOOSER_ACTION_SAVE : GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
+               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
+
+       if (attachment)
+               gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (fc),
+                                                  ev_attachment_get_name (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)
 {
@@ -3327,11 +3477,21 @@ ev_window_init (EvWindow *ev_window)
 
        ev_window_set_view_accels_sensitivity (ev_window, FALSE);
 
-       action_group = gtk_action_group_new ("PopupsActions");
-       ev_window->priv->popups_action_group = action_group;
+       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, popups_entries,
-                                     G_N_ELEMENTS (popups_entries), ev_window);
+       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);
 
@@ -3442,6 +3602,17 @@ ev_window_init (EvWindow *ev_window)
        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,
@@ -3493,6 +3664,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",
@@ -3518,22 +3695,33 @@ 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->popup = gtk_ui_manager_get_widget (ev_window->priv->ui_manager,
-                                                          "/DocumentPopup");
+       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->attach_list = 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_unset (GTK_WIDGET (ev_window->priv->view));
+       gtk_drag_dest_set (GTK_WIDGET (ev_window->priv->view),
+                          GTK_DEST_DEFAULT_ALL,
+                          ev_drop_types,
                           sizeof (ev_drop_types) / sizeof (ev_drop_types[0]),
                           GDK_ACTION_COPY);
-       g_signal_connect (G_OBJECT (ev_window), "drag_data_received",
-                         G_CALLBACK (drag_data_received_cb), NULL);
+       g_signal_connect_swapped (G_OBJECT (ev_window->priv->view), "drag-data-received",
+                                 G_CALLBACK (drag_data_received_cb),
+                                 ev_window);
 
        /* Set it user interface params */
 
@@ -3542,13 +3730,14 @@ ev_window_init (EvWindow *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 *