]> www.fi.muni.cz Git - evince.git/blobdiff - shell/ev-window.c
Updated Danish translation.
[evince.git] / shell / ev-window.c
index 0d8124f6e89ce7ede07201ce48d3b0b162cb858d..e5c6bace054f7391cdccb78d2220c2d292300cd5 100644 (file)
 #endif
 
 #include "ev-window.h"
+#include "ev-page-action.h"
 #include "ev-sidebar.h"
-#include "ev-sidebar-bookmarks.h"
+#include "ev-sidebar-links.h"
 #include "ev-sidebar-thumbnails.h"
 #include "ev-view.h"
+#include "ev-page-view.h"
+#include "ev-password.h"
+#include "ev-password-view.h"
 #include "ev-print-job.h"
 #include "ev-document-find.h"
+#include "ev-document-security.h"
 #include "eggfindbar.h"
 
 #include "pdf-document.h"
 #include "pixbuf-document.h"
-#include "gtkgs.h"
+#include "ps-document.h"
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
+
 #include <libgnomevfs/gnome-vfs-mime-utils.h>
 #include <libgnomeprintui/gnome-print-dialog.h>
 
 #include "ev-application.h"
 #include "ev-stock-icons.h"
 
-enum {
-       PROP_0,
-       PROP_ATTRIBUTE
-};
-
-enum {
-       SIGNAL,
-       N_SIGNALS
-};
+typedef enum {
+       PAGE_MODE_SINGLE_PAGE,
+       PAGE_MODE_CONTINUOUS_PAGE,
+       PAGE_MODE_PASSWORD,
+} EvWindowPageMode;
 
 struct _EvWindowPrivate {
        GtkWidget *main_box;
        GtkWidget *hpaned;
        GtkWidget *sidebar;
+       GtkWidget *thumbs_sidebar;
        GtkWidget *find_bar;
+       GtkWidget *scrolled_window;
        GtkWidget *view;
+       GtkWidget *page_view;
+       GtkWidget *password_view;
        GtkActionGroup *action_group;
        GtkUIManager *ui_manager;
        GtkWidget *statusbar;
        guint help_message_cid;
+       guint view_message_cid;
        GtkWidget *exit_fullscreen_popup;
+       char *uri;
 
        EvDocument *document;
 
+       EvWindowPageMode page_mode;
+       /* These members are used temporarily when in PAGE_MODE_PASSWORD */
+       EvDocument *password_document;
+       GtkWidget *password_dialog;
+       char *password_uri;
+
        gboolean fullscreen_mode;
 };
-
-#if 0
-/* enable these to add support for signals */
-static guint ev_window_signals [N_SIGNALS] = { 0 };
-#endif
-
-static void update_fullscreen_popup (EvWindow *window);
-
-static GObjectClass *parent_class = NULL;
-
-G_DEFINE_TYPE (EvWindow, ev_window, GTK_TYPE_WINDOW)
-
 #define EV_WINDOW_GET_PRIVATE(object) \
        (G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_WINDOW, EvWindowPrivate))
 
-#if 0
-const char *
-ev_window_get_attribute (EvWindow *self)
-{
-       g_return_val_if_fail (self != NULL && EV_IS_WINDOW (self), NULL);
-       
-       return self->priv->attribute;
-}
-
-void
-ev_window_set_attribute (EvWindow* self, const char *attribute)
-{
-       g_assert (self != NULL && EV_IS_WINDOW (self));
-       g_assert (attribute != NULL);
-
-       if (self->priv->attribute != NULL) {
-               g_free (self->priv->attribute);
-       }
-
-       self->priv->attribute = g_strdup (attribute);
 
-       g_object_notify (G_OBJECT (self), "attribute");
-}
+#define PAGE_SELECTOR_ACTION "PageSelector"
 
-static void
-ev_window_get_property (GObject *object, guint prop_id, GValue *value,
-                       GParamSpec *param_spec)
-{
-       EvWindow *self;
 
-       self = EV_WINDOW (object);
+static void     ev_window_update_fullscreen_popup (EvWindow         *window);
+static void     ev_window_set_page_mode           (EvWindow         *window,
+                                                  EvWindowPageMode  page_mode);
+static gboolean start_loading_document            (EvWindow         *ev_window,
+                                                  EvDocument       *document,
+                                                  const char       *uri);
 
-       switch (prop_id) {
-       case PROP_ATTRIBUTE:
-               g_value_set_string (value, self->priv->attribute);
-               break;
-       default:
-               G_OBJECT_WARN_INVALID_PROPERTY_ID (object,
-                                                  prop_id,
-                                                  param_spec);
-               break;
-       }
-}
 
-static void
-ev_window_set_property (GObject *object, guint prop_id, const GValue *value,
-                       GParamSpec *param_spec)
-{
-       EvWindow *self;
-       
-       self = EV_WINDOW (object);
-       
-       switch (prop_id) {
-       case PROP_ATTRIBUTE:
-               ev_window_set_attribute (self, g_value_get_string (value));
-               break;
-       default:
-               G_OBJECT_WARN_INVALID_PROPERTY_ID (object,
-                                                  prop_id,
-                                                  param_spec);
-               break;
-       }
-}
-#endif
+G_DEFINE_TYPE (EvWindow, ev_window, GTK_TYPE_WINDOW)
 
 static void
 set_action_sensitive (EvWindow   *ev_window,
@@ -170,27 +121,89 @@ set_action_sensitive (EvWindow   *ev_window,
 static void
 update_action_sensitivity (EvWindow *ev_window)
 {
-       int n_pages;
-       int page;
+       EvDocument *document;
+       EvWindowPageMode page_mode;
+       EvView *view;
+
+       document = ev_window->priv->document;
+       page_mode = ev_window->priv->page_mode;
 
-       if (ev_window->priv->document)
-               n_pages = ev_document_get_n_pages (ev_window->priv->document);
+       view = EV_VIEW (ev_window->priv->view);
+
+       /* File menu */
+       /* "FileOpen": always sensitive */
+       set_action_sensitive (ev_window, "FileSaveAs", document!=NULL);
+       set_action_sensitive (ev_window, "FilePrint", document!=NULL);
+       /* "FileCloseWindow": always sensitive */
+
+        /* Edit menu */
+       set_action_sensitive (ev_window, "EditCopy", document!=NULL);
+       set_action_sensitive (ev_window, "EditSelectAll", document!=NULL);
+
+       if (document)
+               set_action_sensitive (ev_window, "EditFind", EV_IS_DOCUMENT_FIND (document));
        else
-               n_pages = 1;
+               set_action_sensitive (ev_window, "EditFind", FALSE);
 
-       page = ev_view_get_page (EV_VIEW (ev_window->priv->view));
+        /* View menu */
+       set_action_sensitive (ev_window, "ViewZoomIn", document!=NULL);
+       set_action_sensitive (ev_window, "ViewZoomOut", document!=NULL);
+       set_action_sensitive (ev_window, "ViewNormalSize", document!=NULL);
+       set_action_sensitive (ev_window, "ViewBestFit", document!=NULL);
+       set_action_sensitive (ev_window, "ViewPageWidth", document!=NULL);
+
+        /* Go menu */
+       if (document) {
+               int n_pages;
+               int page;
+
+               page = ev_view_get_page (EV_VIEW (ev_window->priv->view));
+               n_pages = ev_document_get_n_pages (document);
 
-       set_action_sensitive (ev_window, "GoFirstPage", page > 1);
-       set_action_sensitive (ev_window, "GoPreviousPage", page > 1);
-       set_action_sensitive (ev_window, "GoNextPage", page < n_pages);
-       set_action_sensitive (ev_window, "GoLastPage", page < n_pages);
+               set_action_sensitive (ev_window, "GoPageUp", page > 1);
+               set_action_sensitive (ev_window, "GoPageDown", page < n_pages);
+               set_action_sensitive (ev_window, "GoFirstPage", page > 1);
+               set_action_sensitive (ev_window, "GoLastPage", page < n_pages);
+       } else {
+               set_action_sensitive (ev_window, "GoFirstPage", FALSE);
+               set_action_sensitive (ev_window, "GoPageUp", FALSE);
+               set_action_sensitive (ev_window, "GoPageDown", FALSE);
+               set_action_sensitive (ev_window, "GoLastPage", FALSE);
+       }
+
+       /* Page View radio group */
+       if (document) {
+               set_action_sensitive (ev_window, "SinglePage", page_mode != PAGE_MODE_PASSWORD);
+               set_action_sensitive (ev_window, "ContinuousPage", page_mode != PAGE_MODE_PASSWORD);
+       } else {
+               set_action_sensitive (ev_window, "SinglePage", FALSE);
+               set_action_sensitive (ev_window, "ContinuousPage", FALSE);
+       }
+       /* Help menu */
+       /* "HelpContents": always sensitive */
+       /* "HelpAbout": always sensitive */
+
+       /* Toolbar-specific actions: */
+       set_action_sensitive (ev_window, PAGE_SELECTOR_ACTION, document!=NULL);
+}
+
+void
+ev_window_open_page (EvWindow *ev_window, int page)
+{
+       ev_view_set_page (EV_VIEW (ev_window->priv->view), page);
+}
+
+void
+ev_window_open_link (EvWindow *ev_window, EvLink *link)
+{
+       ev_view_go_to_link (EV_VIEW (ev_window->priv->view), link);
 }
 
 gboolean
 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;
 }
 
@@ -217,79 +230,291 @@ mime_type_supported_by_gdk_pixbuf (const gchar *mime_type)
 {
        GSList *formats, *list;
        gboolean retval = FALSE;
-       
+
        formats = gdk_pixbuf_get_formats ();
-       
+
        list = formats;
        while (list) {
                GdkPixbufFormat *format = list->data;
                int i;
                gchar **mime_types;
-               
+
                if (gdk_pixbuf_format_is_disabled (format))
                        continue;
 
                mime_types = gdk_pixbuf_format_get_mime_types (format);
-               
+
                for (i = 0; mime_types[i] != NULL; i++) {
                        if (strcmp (mime_types[i], mime_type) == 0) {
                                retval = TRUE;
                                break;
                        }
                }
-               
+
                if (retval)
                        break;
-               
+
                list = list->next;
        }
-       
+
        g_slist_free (formats);
 
        return retval;
 }
 
+static void
+update_window_title (EvDocument *document, GParamSpec *pspec, EvWindow *ev_window)
+{
+       char *title = NULL;
+       char *doc_title = NULL;
+       gboolean password_needed;
+
+       password_needed = (ev_window->priv->password_document != NULL);
+
+       if (document) {
+               doc_title = ev_document_get_title (document);
+
+               /* Make sure we get a valid title back */
+               if (doc_title) {
+                       if (doc_title[0] == '\000' ||
+                           !g_utf8_validate (doc_title, -1, NULL)) {
+                               g_free (doc_title);
+                               doc_title = NULL;
+                       }
+               }
+       }
+       if (doc_title == NULL && ev_window->priv->uri) {
+               doc_title = g_path_get_basename (ev_window->priv->uri);
+       }
+
+       if (password_needed) {
+               if (doc_title == NULL) {
+                       title = g_strdup (_("Document Viewer - Password Required"));
+               } else {
+                       title = g_strdup_printf (_("%s - Password Required"), doc_title);
+               }
+       } else {
+               if (doc_title == NULL) {
+                       title = g_strdup (_("Document Viewer"));
+               } else {
+                       title = g_strdup (doc_title);
+               }
+       }
+
+       gtk_window_set_title (GTK_WINDOW (ev_window), title);
+
+       g_free (doc_title);
+       g_free (title);
+}
+
+static void
+update_total_pages (EvWindow *ev_window)
+{
+       GtkAction *action;
+       int pages;
+
+       pages = ev_document_get_n_pages (ev_window->priv->document);
+       action = gtk_action_group_get_action
+               (ev_window->priv->action_group, PAGE_SELECTOR_ACTION);
+       ev_page_action_set_total_pages (EV_PAGE_ACTION (action), pages);
+}
+
+/* This function assumes that ev_window just had ev_window->document set.
+ */
+static void
+ev_window_setup_document (EvWindow *ev_window)
+{
+       EvDocument *document;
+       EvView *view = EV_VIEW (ev_window->priv->view);
+       EvPageView *page_view = EV_PAGE_VIEW (ev_window->priv->page_view);
+       EvSidebar *sidebar = EV_SIDEBAR (ev_window->priv->sidebar);
+
+       document = ev_window->priv->document;
+
+       g_signal_connect_object (G_OBJECT (document),
+                                "notify::title",
+                                G_CALLBACK (update_window_title),
+                                ev_window, 0);
+
+       ev_window_set_page_mode (ev_window, PAGE_MODE_SINGLE_PAGE);
+
+       ev_sidebar_set_document (sidebar, document);
+       ev_view_set_document (view, document);
+       ev_page_view_set_document (page_view, document);
+
+       update_window_title (document, NULL, ev_window);
+       update_total_pages (ev_window);
+       update_action_sensitivity (ev_window);
+}
+
+static void
+password_dialog_response (GtkWidget *password_dialog,
+                         gint       response_id,
+                         EvWindow  *ev_window)
+{
+       char *password;
+       
+       if (response_id == GTK_RESPONSE_OK) {
+               EvDocument *document;
+               gchar *uri;
+
+               password = ev_password_dialog_get_password (password_dialog);
+               if (password)
+                       ev_document_security_set_password (EV_DOCUMENT_SECURITY (ev_window->priv->password_document),
+                                                          password);
+               g_free (password);
+
+               document = ev_window->priv->password_document;
+               uri = ev_window->priv->password_uri;
+
+               ev_window->priv->password_document = NULL;
+               ev_window->priv->password_uri = NULL;
+
+               if (start_loading_document (ev_window, document, uri)) {
+                       gtk_widget_destroy (password_dialog);
+               }
+
+               g_object_unref (document);
+               g_free (uri);
+
+               return;
+       }
+
+       gtk_widget_set_sensitive (ev_window->priv->password_view, TRUE);
+       gtk_widget_destroy (password_dialog);
+}
+
+/* Called either by start_loading_document 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() */
+
+static void
+ev_window_popup_password_dialog (EvWindow *ev_window)
+{
+       g_assert (ev_window->priv->password_document);
+       g_assert (ev_window->priv->password_uri);
+
+       gtk_widget_set_sensitive (ev_window->priv->password_view, FALSE);
+
+       update_window_title (ev_window->priv->password_document, NULL, ev_window);
+       if (ev_window->priv->password_dialog == NULL) {
+               gchar *file_name;
+
+               file_name = g_path_get_basename (ev_window->priv->password_uri);
+               ev_window->priv->password_dialog =
+                       ev_password_dialog_new (GTK_WIDGET (ev_window), file_name);
+               g_object_add_weak_pointer (G_OBJECT (ev_window->priv->password_dialog),
+                                          (gpointer *) &(ev_window->priv->password_dialog));
+               g_signal_connect (ev_window->priv->password_dialog,
+                                 "response",
+                                 G_CALLBACK (password_dialog_response),
+                                 ev_window);
+               g_free (file_name);
+               gtk_widget_show (ev_window->priv->password_dialog);
+       } else {
+               ev_password_dialog_set_bad_pass (ev_window->priv->password_dialog);
+       }
+}
+
+/* This wil try to load the document.  It might be called multiple times on the
+ * same document by the password dialog.
+ *
+ * Since the flow of the error dialog is very confusing, we assume that both
+ * document and uri will go away after this function is called, and thus we need
+ * to ref/dup them.  Additionally, it needs to clear
+ * ev_window->priv->password_{uri,document}, and thus people who call this
+ * function should _not_ necessarily expect those to exist after being
+ * called. */
+static gboolean
+start_loading_document (EvWindow   *ev_window,
+                       EvDocument *document,
+                       const char *uri)
+{
+       gboolean result;
+       GError *error = NULL;
+
+       g_assert (document);
+       g_assert (document != ev_window->priv->document);
+       g_assert (uri);
+       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;
+       }
+
+       result = ev_document_load (document, uri, &error);
+
+       /* Success! */
+       if (result) {
+               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);
+
+               return TRUE;
+       }
+
+       /* unable to load the document */
+       g_assert (error != NULL);
+
+       if (error->domain == EV_DOCUMENT_ERROR &&
+           error->code == EV_DOCUMENT_ERROR_ENCRYPTED) {
+               char *file_name;
+
+               ev_window->priv->password_document = g_object_ref (document);
+               ev_window->priv->password_uri = g_strdup (uri);
+
+               file_name = g_path_get_basename (uri);
+               ev_password_view_set_file_name (EV_PASSWORD_VIEW (ev_window->priv->password_view),
+                                               file_name);
+               g_free (file_name);
+               ev_window_set_page_mode (ev_window, PAGE_MODE_PASSWORD);
+
+               ev_window_popup_password_dialog (ev_window);
+       } else {
+               unable_to_load (ev_window, error->message);
+       }
+       g_error_free (error);
+
+       return FALSE;
+}
+
 void
 ev_window_open (EvWindow *ev_window, const char *uri)
 {
        EvDocument *document = NULL;
        char *mime_type;
 
+       g_free (ev_window->priv->uri);
+       ev_window->priv->uri = g_strdup (uri);
+
        mime_type = gnome_vfs_get_mime_type (uri);
 
-       if (!strcmp (mime_type, "application/pdf"))
+       if (mime_type == NULL)
+               document = NULL;
+       else if (!strcmp (mime_type, "application/pdf"))
                document = g_object_new (PDF_TYPE_DOCUMENT, NULL);
-       else if (!strcmp (mime_type, "application/postscript"))
-               document = g_object_new (GTK_GS_TYPE, NULL);
+       else if (!strcmp (mime_type, "application/postscript") ||
+                !strcmp (mime_type, "application/x-gzpostscript") ||
+                !strcmp (mime_type, "image/x-eps"))
+               document = g_object_new (PS_TYPE_DOCUMENT, NULL);
        else if (mime_type_supported_by_gdk_pixbuf (mime_type))
                document = g_object_new (PIXBUF_TYPE_DOCUMENT, NULL);
-       
-       if (document) {
-               GError *error = NULL;
-
-               if (ev_document_load (document, uri, &error)) {
-                       if (ev_window->priv->document)
-                               g_object_unref (ev_window->priv->document);
-                       ev_window->priv->document = document;
-
-                       ev_view_set_document (EV_VIEW (ev_window->priv->view),
-                                             document);
-                       ev_sidebar_set_document (EV_SIDEBAR (ev_window->priv->sidebar),
-                                                document);
 
-                       update_action_sensitivity (ev_window);
-               
-               } else {
-                       g_assert (error != NULL);
-                       g_object_unref (document);
-                       unable_to_load (ev_window, error->message);
-                       g_error_free (error);
-               }
+       if (document) {
+               start_loading_document (ev_window, document, uri);
+               /* See the comment on start_loading_document on ref counting.
+                * As the password dialog flow is confusing, we're very explicit
+                * on ref counting. */
+               g_object_unref (document);
        } else {
                char *error_message;
 
                error_message = g_strdup_printf (_("Unhandled MIME type: '%s'"),
-                                                mime_type);
+                                                mime_type?mime_type:"<Unknown MIME Type>");
                unable_to_load (ev_window, error_message);
                g_free (error_message);
        }
@@ -303,6 +528,119 @@ ev_window_cmd_file_open (GtkAction *action, EvWindow *ev_window)
        ev_application_open (EV_APP, NULL);
 }
 
+/* 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
+ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
+{
+       GtkWidget *fc;
+       GtkFileFilter *pdf_filter, *all_filter;
+       gchar *uri = NULL;
+
+       fc = gtk_file_chooser_dialog_new (
+               _("Save a Copy"),
+               NULL, GTK_FILE_CHOOSER_ACTION_SAVE,
+               GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+               GTK_STOCK_SAVE, GTK_RESPONSE_OK,
+               NULL);
+       gtk_window_set_modal (GTK_WINDOW (fc), TRUE);
+
+       pdf_filter = gtk_file_filter_new ();
+       gtk_file_filter_set_name (pdf_filter, _("PDF Documents"));
+       gtk_file_filter_add_mime_type (pdf_filter, "application/pdf");
+       gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (fc), pdf_filter);
+
+       all_filter = gtk_file_filter_new ();
+       gtk_file_filter_set_name (all_filter, _("All Files"));
+       gtk_file_filter_add_pattern (all_filter, "*");
+       gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (fc), all_filter);
+       gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (fc), pdf_filter);
+
+       gtk_dialog_set_default_response (GTK_DIALOG (fc), GTK_RESPONSE_OK);
+
+       gtk_widget_show (fc);
+
+       while (gtk_dialog_run (GTK_DIALOG (fc)) == GTK_RESPONSE_OK) {
+               uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (fc));
+
+/* FIXME
+               if (g_file_test (uri, G_FILE_TEST_EXISTS) &&
+                   !overwrite_existing_file (GTK_WINDOW (fc), uri))
+                               continue;
+*/
+
+               if (ev_document_save (ev_window->priv->document, uri, NULL))
+                       break;
+               else
+                       save_error_dialog (GTK_WINDOW (fc), uri);
+       }
+       gtk_widget_destroy (fc);
+}
+
 static gboolean
 using_postscript_printer (GnomePrintConfig *config)
 {
@@ -311,20 +649,20 @@ using_postscript_printer (GnomePrintConfig *config)
 
        driver = gnome_print_config_get (
                config, (const guchar *)"Settings.Engine.Backend.Driver");
-       
+
        transport = gnome_print_config_get (
                config, (const guchar *)"Settings.Transport.Backend");
-       
+
        if (driver) {
                if (!strcmp ((const gchar *)driver, "gnome-print-ps"))
                        return TRUE;
-               else 
+               else
                        return FALSE;
        } else  if (transport) {
                if (!strcmp ((const gchar *)transport, "CUPS"))
                        return TRUE;
        }
-       
+
        return FALSE;
 }
 
@@ -348,11 +686,11 @@ ev_window_print (EvWindow *ev_window)
        gtk_dialog_set_response_sensitive (GTK_DIALOG (print_dialog),
                                           GNOME_PRINT_DIALOG_RESPONSE_PREVIEW,
                                           FALSE);
-       
+
        while (TRUE) {
                int response;
                response = gtk_dialog_run (GTK_DIALOG (print_dialog));
-               
+
                if (response != GNOME_PRINT_DIALOG_RESPONSE_PRINT)
                        break;
 
@@ -361,7 +699,7 @@ ev_window_print (EvWindow *ev_window)
                 */
                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,
@@ -384,11 +722,13 @@ ev_window_print (EvWindow *ev_window)
                                          NULL);
                break;
        }
-                               
+
        gtk_widget_destroy (print_dialog);
 
-       if (print_job != NULL)
+       if (print_job != NULL) {
                ev_print_job_print (print_job, GTK_WINDOW (ev_window));
+               g_object_unref (print_job);
+       }
 }
 
 static void
@@ -413,7 +753,7 @@ find_not_supported_dialog (EvWindow   *ev_window)
        /* If you change this so it isn't modal, be sure you don't
         * allow multiple copies of the dialog...
         */
-       
+
        dialog = gtk_message_dialog_new (GTK_WINDOW (ev_window),
                                         GTK_DIALOG_DESTROY_WITH_PARENT,
                                         GTK_MESSAGE_ERROR,
@@ -425,6 +765,14 @@ find_not_supported_dialog (EvWindow   *ev_window)
        gtk_widget_destroy (dialog);
 }
 
+static void
+ev_window_cmd_edit_select_all (GtkAction *action, EvWindow *ev_window)
+{
+       g_return_if_fail (EV_IS_WINDOW (ev_window));
+
+       ev_view_select_all (EV_VIEW (ev_window->priv->view));
+}
+
 static void
 ev_window_cmd_edit_find (GtkAction *action, EvWindow *ev_window)
 {
@@ -437,9 +785,9 @@ ev_window_cmd_edit_find (GtkAction *action, EvWindow *ev_window)
        } else {
                gtk_widget_show (ev_window->priv->find_bar);
 
-               if (ev_window->priv->exit_fullscreen_popup) 
-                       update_fullscreen_popup (ev_window);
-       
+               if (ev_window->priv->exit_fullscreen_popup)
+                       ev_window_update_fullscreen_popup (ev_window);
+
                egg_find_bar_grab_focus (EGG_FIND_BAR (ev_window->priv->find_bar));
        }
 }
@@ -449,11 +797,11 @@ ev_window_cmd_edit_copy (GtkAction *action, EvWindow *ev_window)
 {
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
-        /* FIXME */
+       ev_view_copy (EV_VIEW (ev_window->priv->view));
 }
 
 static void
-update_fullscreen_popup (EvWindow *window)
+ev_window_update_fullscreen_popup (EvWindow *window)
 {
        GtkWidget *popup = window->priv->exit_fullscreen_popup;
        int popup_width, popup_height;
@@ -463,7 +811,7 @@ update_fullscreen_popup (EvWindow *window)
 
        if (!popup)
                return;
-       
+
        popup_width = popup->requisition.width;
        popup_height = popup->requisition.height;
 
@@ -478,10 +826,10 @@ update_fullscreen_popup (EvWindow *window)
                GtkRequisition req;
 
                gtk_widget_size_request (window->priv->find_bar, &req);
-               
+
                screen_rect.height -= req.height;
        }
-       
+
        if (gtk_widget_get_direction (popup) == GTK_TEXT_DIR_RTL)
        {
                gtk_window_move (GTK_WINDOW (popup),
@@ -499,7 +847,7 @@ static void
 screen_size_changed_cb (GdkScreen *screen,
                        EvWindow *window)
 {
-       update_fullscreen_popup (window);
+       ev_window_update_fullscreen_popup (window);
 }
 
 static void
@@ -531,7 +879,7 @@ exit_fullscreen_button_clicked_cb (GtkWidget *button, EvWindow *window)
 static void
 fullscreen_popup_size_request_cb (GtkWidget *popup, GtkRequisition *req, EvWindow *window)
 {
-       update_fullscreen_popup (window);
+       ev_window_update_fullscreen_popup (window);
 }
 
 static void
@@ -574,8 +922,8 @@ ev_window_fullscreen (EvWindow *window)
        main_menu = gtk_ui_manager_get_widget (window->priv->ui_manager, "/MainMenu");
        gtk_widget_hide (main_menu);
        gtk_widget_hide (window->priv->statusbar);
-       
-       update_fullscreen_popup (window);
+
+       ev_window_update_fullscreen_popup (window);
 
        gtk_widget_show (popup);
 }
@@ -584,21 +932,21 @@ static void
 ev_window_unfullscreen (EvWindow *window)
 {
        GtkWidget *main_menu;
-       
+
        window->priv->fullscreen_mode = FALSE;
 
        main_menu = gtk_ui_manager_get_widget (window->priv->ui_manager, "/MainMenu");
        gtk_widget_show (main_menu);
        gtk_widget_show (window->priv->statusbar);
-       
+
        destroy_exit_fullscreen_popup (window);
 }
+
 static void
 ev_window_cmd_view_fullscreen (GtkAction *action, EvWindow *ev_window)
 {
        gboolean fullscreen;
-       
+
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
        fullscreen = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
@@ -648,10 +996,45 @@ static gboolean
 ev_window_focus_out_cb (GtkWidget *widget, GdkEventFocus *event, EvWindow *ev_window)
 {
        gtk_window_unfullscreen (GTK_WINDOW (ev_window));
-       
+
        return FALSE;
 }
 
+static void
+ev_window_set_page_mode (EvWindow         *window,
+                        EvWindowPageMode  page_mode)
+{
+       GtkWidget *child = NULL;
+       GtkWidget *real_child;
+
+       if (window->priv->page_mode == page_mode)
+               return;
+
+       window->priv->page_mode = page_mode;
+
+       switch (page_mode) {
+       case PAGE_MODE_SINGLE_PAGE:
+               child = window->priv->view;
+               break;
+       case PAGE_MODE_PASSWORD:
+               child = window->priv->password_view;
+               break;
+       case PAGE_MODE_CONTINUOUS_PAGE:
+               child = window->priv->page_view;
+               break;
+       default:
+               g_assert_not_reached ();
+       }
+
+       real_child = gtk_bin_get_child (GTK_BIN (window->priv->scrolled_window));
+       if (child != real_child) {
+               gtk_container_remove (GTK_CONTAINER (window->priv->scrolled_window),
+                                     real_child);
+               gtk_container_add (GTK_CONTAINER (window->priv->scrolled_window),
+                                  child);
+       }
+       update_action_sensitivity (window);
+}
 
 static void
 ev_window_cmd_view_zoom_in (GtkAction *action, EvWindow *ev_window)
@@ -694,23 +1077,7 @@ ev_window_cmd_view_page_width (GtkAction *action, EvWindow *ev_window)
 }
 
 static void
-ev_window_cmd_go_back (GtkAction *action, EvWindow *ev_window)
-{
-        g_return_if_fail (EV_IS_WINDOW (ev_window));
-
-        /* FIXME */
-}
-
-static void
-ev_window_cmd_go_forward (GtkAction *action, EvWindow *ev_window)
-{
-        g_return_if_fail (EV_IS_WINDOW (ev_window));
-
-        /* FIXME */
-}
-
-static void
-ev_window_cmd_go_previous_page (GtkAction *action, EvWindow *ev_window)
+ev_window_cmd_go_page_up (GtkAction *action, EvWindow *ev_window)
 {
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
@@ -719,7 +1086,7 @@ ev_window_cmd_go_previous_page (GtkAction *action, EvWindow *ev_window)
 }
 
 static void
-ev_window_cmd_go_next_page (GtkAction *action, EvWindow *ev_window)
+ev_window_cmd_go_page_down (GtkAction *action, EvWindow *ev_window)
 {
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
@@ -768,7 +1135,7 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window)
                N_("Evince is free software; you can redistribute it and/or modify\n"
                   "it under the terms of the GNU General Public License as published by\n"
                   "the Free Software Foundation; either version 2 of the License, or\n"
-                  "(at your option) any later version.\n"),            
+                  "(at your option) any later version.\n"),
                N_("Evince is distributed in the hope that it will be useful,\n"
                   "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
                   "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
@@ -850,7 +1217,7 @@ menu_item_select_cb (GtkMenuItem *proxy, EvWindow *ev_window)
 
        action = g_object_get_data (G_OBJECT (proxy), "gtk-action");
        g_return_if_fail (action != NULL);
-       
+
        g_object_get (G_OBJECT (action), "tooltip", &message, NULL);
        if (message) {
                gtk_statusbar_push (GTK_STATUSBAR (ev_window->priv->statusbar),
@@ -891,42 +1258,73 @@ disconnect_proxy_cb (GtkUIManager *ui_manager, GtkAction *action,
        }
 }
 
+static void
+update_current_page (EvWindow *ev_window,
+                    EvView   *view)
+{
+       int page;
+       GtkAction *action;
+       EvSidebarThumbnails *thumbs;
+
+       thumbs = EV_SIDEBAR_THUMBNAILS (ev_window->priv->thumbs_sidebar);
+       ev_sidebar_thumbnails_select_page (thumbs, ev_view_get_page (view));
+
+       action = gtk_action_group_get_action
+               (ev_window->priv->action_group, PAGE_SELECTOR_ACTION);
+
+       page = ev_view_get_page (EV_VIEW (ev_window->priv->view));
+       ev_page_action_set_current_page (EV_PAGE_ACTION (action), page);
+}
+
 static void
 view_page_changed_cb (EvView   *view,
                      EvWindow *ev_window)
 {
+       update_current_page (ev_window, view);
        update_action_sensitivity (ev_window);
 }
 
 static void
-view_find_status_changed_cb (EvView   *view,
-                            EvWindow *ev_window)
+view_status_changed_cb (EvView     *view,
+                       GParamSpec *pspec,
+                       EvWindow   *ev_window)
 {
-       char *text;
+       const char *message;
 
-       text = ev_view_get_find_status_message (view);
+       gtk_statusbar_pop (GTK_STATUSBAR (ev_window->priv->statusbar),
+                          ev_window->priv->view_message_cid);
 
+       message = ev_view_get_status (view);
+       if (message) {
+               gtk_statusbar_push (GTK_STATUSBAR (ev_window->priv->statusbar),
+                                   ev_window->priv->view_message_cid, message);
+       }
+}
+
+static void
+view_find_status_changed_cb (EvView     *view,
+                            GParamSpec *pspec,
+                            EvWindow   *ev_window)
+{
+       const char *text;
+
+       text = ev_view_get_find_status (view);
        egg_find_bar_set_status_text (EGG_FIND_BAR (ev_window->priv->find_bar),
                                      text);
-
-       g_free (text);
 }
 
 static void
 find_bar_previous_cb (EggFindBar *find_bar,
                      EvWindow   *ev_window)
 {
-       /* FIXME - highlight previous result */
-       g_printerr ("Find Previous\n");
-
+       ev_view_find_previous (EV_VIEW (ev_window->priv->view));
 }
 
 static void
 find_bar_next_cb (EggFindBar *find_bar,
                  EvWindow   *ev_window)
 {
-       /* FIXME - highlight next result */
-       g_printerr ("Find Next\n");
+       ev_view_find_next (EV_VIEW (ev_window->priv->view));
 }
 
 static void
@@ -936,7 +1334,22 @@ find_bar_close_cb (EggFindBar *find_bar,
        gtk_widget_hide (ev_window->priv->find_bar);
 
        if (ev_window->priv->exit_fullscreen_popup)
-               update_fullscreen_popup (ev_window);
+               ev_window_update_fullscreen_popup (ev_window);
+}
+
+static void
+ev_window_page_mode_cb (GtkRadioAction *action,
+                       GtkRadioAction *activated_action,
+                       EvWindow       *window)
+{
+       int mode;
+
+       mode = gtk_radio_action_get_current_value (action);
+
+       g_assert (mode == PAGE_MODE_CONTINUOUS_PAGE ||
+                 mode == PAGE_MODE_SINGLE_PAGE);
+
+       ev_window_set_page_mode (window, (EvWindowPageMode) mode);
 }
 
 static void
@@ -949,7 +1362,7 @@ find_bar_search_changed_cb (EggFindBar *find_bar,
        const char *search_string;
 
        g_return_if_fail (EV_IS_WINDOW (ev_window));
-       
+
        /* Either the string or case sensitivity could have changed,
         * we connect this callback to both. We also connect it
         * to ::visible so when the find bar is hidden, we should
@@ -959,7 +1372,7 @@ find_bar_search_changed_cb (EggFindBar *find_bar,
        case_sensitive = egg_find_bar_get_case_sensitive (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
@@ -972,6 +1385,7 @@ find_bar_search_changed_cb (EggFindBar *find_bar,
                        ev_document_find_cancel (EV_DOCUMENT_FIND (ev_window->priv->document));
                        egg_find_bar_set_status_text (EGG_FIND_BAR (ev_window->priv->find_bar),
                                                      NULL);
+                       gtk_widget_queue_draw (GTK_WIDGET (ev_window->priv->view));
                }
        }
 }
@@ -994,8 +1408,23 @@ ev_window_dispose (GObject *object)
                g_object_unref (priv->action_group);
                priv->action_group = NULL;
        }
+
+       if (priv->document) {
+               g_object_unref (priv->document);
+               priv->document = NULL;
+       }
        
-       G_OBJECT_CLASS (parent_class)->dispose (object);
+       if (priv->password_document) {
+               g_object_unref (priv->password_document);
+               priv->password_document = NULL;
+       }
+       
+       if (priv->password_uri) {
+               g_free (priv->password_uri);
+               priv->password_uri = NULL;
+       }
+       
+       G_OBJECT_CLASS (ev_window_parent_class)->dispose (object);
 }
 
 static void
@@ -1003,44 +1432,11 @@ ev_window_class_init (EvWindowClass *ev_window_class)
 {
        GObjectClass *g_object_class;
 
-       parent_class = g_type_class_peek_parent (ev_window_class);
-
        g_object_class = G_OBJECT_CLASS (ev_window_class);
        g_object_class->dispose = ev_window_dispose;
 
        g_type_class_add_private (g_object_class, sizeof (EvWindowPrivate));
 
-#if 0
-       /* setting up signal system */
-       ev_window_class->signal = ev_window_signal;
-
-       ev_window_signals [SIGNAL] = g_signal_new (
-               "signal",
-               EV_TYPE_WINDOW,
-               G_SIGNAL_RUN_LAST,
-               G_STRUCT_OFFSET (EvWindowClass,
-                                signal),
-               NULL,
-               NULL,
-               g_cclosure_marshal_VOID__STRING,
-               G_TYPE_NONE,
-               0);
-       /* setting up property system */
-       g_object_class->set_property = ev_window_set_property;
-       g_object_class->get_property = ev_window_get_property;
-
-       g_object_class_install_property (
-               g_object_class,
-               PROP_ATTRIBUTE,
-               g_param_spec_string ("attribute",
-                                    "Attribute",
-                                    "A simple unneccessary attribute that "
-                                    "does nothing special except being a "
-                                    "demonstration for the correct implem"
-                                    "entation of a GObject property",
-                                    "default_value",
-                                    G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
-#endif
 }
 
 /* Normal items */
@@ -1055,7 +1451,10 @@ static GtkActionEntry entries[] = {
        { "FileOpen", GTK_STOCK_OPEN, N_("_Open"), "<control>O",
          N_("Open a file"),
          G_CALLBACK (ev_window_cmd_file_open) },
-        { "FilePrint", GTK_STOCK_PRINT, N_("_Print"), "<control>P",
+               { "FileSaveAs", GTK_STOCK_SAVE_AS, N_("_Save a Copy..."), NULL,
+         N_("Save the current document with a new filename"),
+         G_CALLBACK (ev_window_cmd_save_as) },
+       { "FilePrint", GTK_STOCK_PRINT, N_("_Print"), "<control>P",
          N_("Print this document"),
          G_CALLBACK (ev_window_cmd_file_print) },
        { "FileCloseWindow", GTK_STOCK_CLOSE, N_("_Close"), "<control>W",
@@ -1066,7 +1465,9 @@ static GtkActionEntry entries[] = {
         { "EditCopy", GTK_STOCK_COPY, N_("_Copy"), "<control>C",
           N_("Copy text from the document"),
           G_CALLBACK (ev_window_cmd_edit_copy) },
-        
+       { "EditSelectAll", NULL, N_("Select _All"), "<control>A",
+         N_("Select the entire page"),
+         G_CALLBACK (ev_window_cmd_edit_select_all) },
         { "EditFind", GTK_STOCK_FIND, N_("_Find"), "<control>F",
           N_("Find a word or phrase in the document"),
           G_CALLBACK (ev_window_cmd_edit_find) },
@@ -1089,30 +1490,24 @@ static GtkActionEntry entries[] = {
           G_CALLBACK (ev_window_cmd_view_page_width) },
 
         /* Go menu */
-        { "GoBack", GTK_STOCK_GO_BACK, N_("_Back"), "<mod1>Left",
-          N_("Go to the page viewed before this one"),
-          G_CALLBACK (ev_window_cmd_go_back) },
-        { "GoForward", GTK_STOCK_GO_FORWARD, N_("Fo_rward"), "<mod1>Right",
-          N_("Go to the page viewed before this one"),
-          G_CALLBACK (ev_window_cmd_go_forward) },
-        { "GoPreviousPage", GTK_STOCK_GO_BACK, N_("_Previous Page"), "<control>Page_Up",
+        { "GoPageUp", GTK_STOCK_GO_UP, N_("_Page Up"), "<control>Page_Up",
           N_("Go to the previous page"),
-          G_CALLBACK (ev_window_cmd_go_previous_page) },
-        { "GoNextPage", GTK_STOCK_GO_FORWARD, N_("_Next Page"), "<control>Page_Down",
+          G_CALLBACK (ev_window_cmd_go_page_up) },
+        { "GoPageDown", GTK_STOCK_GO_DOWN, N_("_Page Down"), "<control>Page_Down",
           N_("Go to the next page"),
-          G_CALLBACK (ev_window_cmd_go_next_page) },
+          G_CALLBACK (ev_window_cmd_go_page_down) },
         { "GoFirstPage", GTK_STOCK_GOTO_FIRST, N_("_First Page"), "<control>Home",
           N_("Go to the first page"),
-          G_CALLBACK (ev_window_cmd_go_first_page) },        
+          G_CALLBACK (ev_window_cmd_go_first_page) },
         { "GoLastPage", GTK_STOCK_GOTO_LAST, N_("_Last Page"), "<control>End",
           N_("Go to the last page"),
           G_CALLBACK (ev_window_cmd_go_last_page) },
-        
+
        /* Help menu */
        { "HelpContents", GTK_STOCK_HELP, N_("_Contents"), NULL,
          N_("Display help for the viewer application"),
          G_CALLBACK (ev_window_cmd_help_contents) },
-        
+
        { "HelpAbout", GTK_STOCK_ABOUT, N_("_About"), NULL,
          N_("Display credits for the document viewer creators"),
          G_CALLBACK (ev_window_cmd_help_about) },
@@ -1129,31 +1524,79 @@ static GtkToggleActionEntry toggle_entries[] = {
          G_CALLBACK (ev_window_view_statusbar_cb), TRUE },
         { "ViewSidebar", NULL, N_("Side_bar"), "F9",
          N_("Show or hide sidebar"),
-         G_CALLBACK (ev_window_view_sidebar_cb), FALSE },
+         G_CALLBACK (ev_window_view_sidebar_cb), TRUE },
         { "ViewFullscreen", NULL, N_("_Fullscreen"), "F11",
           N_("Expand the window to fill the screen"),
           G_CALLBACK (ev_window_cmd_view_fullscreen) },
 };
 
+static GtkRadioActionEntry page_view_entries[] = {
+       { "SinglePage", GTK_STOCK_DND, N_("Single"), NULL,
+         N_("Show the document one page at a time"),
+         PAGE_MODE_SINGLE_PAGE },
+       { "ContinuousPage", GTK_STOCK_DND_MULTIPLE, N_("Multi"), NULL,
+         N_("Show the full document at once"),
+         PAGE_MODE_CONTINUOUS_PAGE }
+};
+
+static void
+goto_page_cb (GtkAction *action, int page_number, EvWindow *ev_window)
+{
+       EvView *view = EV_VIEW (ev_window->priv->view);
+
+       if (ev_view_get_page (view) != page_number) {
+               ev_view_set_page (view, page_number);
+       }
+}
+
+static void
+register_custom_actions (EvWindow *window, GtkActionGroup *group)
+{
+       GtkAction *action;
+
+       action = g_object_new (EV_TYPE_PAGE_ACTION,
+                              "name", PAGE_SELECTOR_ACTION,
+                              "label", _("Page"),
+                              "tooltip", _("Select Page"),
+                              NULL);
+       g_signal_connect (action, "goto_page",
+                         G_CALLBACK (goto_page_cb), window);
+       gtk_action_group_add_action (group, action);
+       g_object_unref (action);
+}
+
+static void
+set_short_labels (GtkActionGroup *action_group)
+{
+       GtkAction *action;
+
+       action = gtk_action_group_get_action (action_group, "GoPageUp");
+       g_object_set (action, "short_label", _("Up"), NULL);
+       action = gtk_action_group_get_action (action_group, "GoPageDown");
+       g_object_set (action, "short_label", _("Down"), NULL);
+       action = gtk_action_group_get_action (action_group, "ViewPageWidth");
+       g_object_set (action, "short_label", _("Fit Width"), NULL);
+}
+
 static void
 ev_window_init (EvWindow *ev_window)
 {
        GtkActionGroup *action_group;
        GtkAccelGroup *accel_group;
        GError *error = NULL;
-       GtkWidget *scrolled_window;
        GtkWidget *menubar;
        GtkWidget *toolbar;
        GtkWidget *sidebar_widget;
 
        ev_window->priv = EV_WINDOW_GET_PRIVATE (ev_window);
 
-       gtk_window_set_title (GTK_WINDOW (ev_window), _("Document Viewer"));
+       ev_window->priv->page_mode = PAGE_MODE_SINGLE_PAGE;
+       update_window_title (NULL, NULL, ev_window);
 
        ev_window->priv->main_box = gtk_vbox_new (FALSE, 0);
        gtk_container_add (GTK_CONTAINER (ev_window), ev_window->priv->main_box);
        gtk_widget_show (ev_window->priv->main_box);
-       
+
        action_group = gtk_action_group_new ("MenuActions");
        ev_window->priv->action_group = action_group;
        gtk_action_group_set_translation_domain (action_group, NULL);
@@ -1162,6 +1605,13 @@ ev_window_init (EvWindow *ev_window)
        gtk_action_group_add_toggle_actions (action_group, toggle_entries,
                                             G_N_ELEMENTS (toggle_entries),
                                             ev_window);
+       gtk_action_group_add_radio_actions (action_group, page_view_entries,
+                                           G_N_ELEMENTS (page_view_entries),
+                                           ev_window->priv->page_mode,
+                                           G_CALLBACK (ev_window_page_mode_cb),
+                                           ev_window);
+       set_short_labels (action_group);
+       register_custom_actions (ev_window, action_group);
 
        ev_window->priv->ui_manager = gtk_ui_manager_new ();
        gtk_ui_manager_insert_action_group (ev_window->priv->ui_manager,
@@ -1205,41 +1655,62 @@ ev_window_init (EvWindow *ev_window)
                        ev_window->priv->sidebar);
 
        /* Stub sidebar, for now */
-       sidebar_widget = ev_sidebar_bookmarks_new ();
+       sidebar_widget = ev_sidebar_links_new ();
        gtk_widget_show (sidebar_widget);
        ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar),
-                            "bookmarks",
-                            _("Bookmarks"),
+                            "index",
+                            _("Index"),
                             sidebar_widget);
 
-       sidebar_widget = ev_sidebar_thumbnails_new ();
-       gtk_widget_show (sidebar_widget);
+       ev_window->priv->thumbs_sidebar = ev_sidebar_thumbnails_new ();
+       gtk_widget_show (ev_window->priv->thumbs_sidebar);
        ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar),
                             "thumbnails",
                             _("Thumbnails"),
-                            sidebar_widget);
-       
-       scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-       gtk_widget_show (scrolled_window);
-       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
-                                       GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+                            ev_window->priv->thumbs_sidebar);
+
+       ev_window->priv->scrolled_window =
+               GTK_WIDGET (g_object_new (GTK_TYPE_SCROLLED_WINDOW,
+                                         "hscrollbar-policy", GTK_POLICY_AUTOMATIC,
+                                         "vscrollbar-policy", GTK_POLICY_AUTOMATIC,
+                                         "shadow-type", GTK_SHADOW_IN,
+                                         NULL));
+       gtk_widget_show (ev_window->priv->scrolled_window);
 
        gtk_paned_add2 (GTK_PANED (ev_window->priv->hpaned),
-                       scrolled_window);
+                       ev_window->priv->scrolled_window);
 
        ev_window->priv->view = ev_view_new ();
+       ev_window->priv->page_view = ev_page_view_new ();
+       ev_window->priv->password_view = ev_password_view_new ();
+       g_signal_connect_swapped (ev_window->priv->password_view,
+                                 "unlock",
+                                 G_CALLBACK (ev_window_popup_password_dialog),
+                                 ev_window);
        gtk_widget_show (ev_window->priv->view);
-       gtk_container_add (GTK_CONTAINER (scrolled_window),
+       gtk_widget_show (ev_window->priv->page_view);
+       gtk_widget_show (ev_window->priv->password_view);
+
+       /* We own a ref on these widgets, as we can swap them in and out */
+       g_object_ref (ev_window->priv->view);
+       g_object_ref (ev_window->priv->page_view);
+       g_object_ref (ev_window->priv->password_view);
+
+       gtk_container_add (GTK_CONTAINER (ev_window->priv->scrolled_window),
                           ev_window->priv->view);
        g_signal_connect (ev_window->priv->view,
                          "page-changed",
                          G_CALLBACK (view_page_changed_cb),
                          ev_window);
        g_signal_connect (ev_window->priv->view,
-                         "find-status-changed",
+                         "notify::find-status",
                          G_CALLBACK (view_find_status_changed_cb),
                          ev_window);
-       
+       g_signal_connect (ev_window->priv->view,
+                         "notify::status",
+                         G_CALLBACK (view_status_changed_cb),
+                         ev_window);
+
        ev_window->priv->statusbar = gtk_statusbar_new ();
        gtk_widget_show (ev_window->priv->statusbar);
        gtk_box_pack_end (GTK_BOX (ev_window->priv->main_box),
@@ -1247,12 +1718,14 @@ ev_window_init (EvWindow *ev_window)
                          FALSE, TRUE, 0);
        ev_window->priv->help_message_cid = gtk_statusbar_get_context_id
                (GTK_STATUSBAR (ev_window->priv->statusbar), "help_message");
+       ev_window->priv->view_message_cid = gtk_statusbar_get_context_id
+               (GTK_STATUSBAR (ev_window->priv->statusbar), "view_message");
 
        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);
-       
+
        /* Connect to find bar signals */
        g_signal_connect (ev_window->priv->find_bar,
                          "previous",
@@ -1285,9 +1758,9 @@ ev_window_init (EvWindow *ev_window)
        g_signal_connect (ev_window, "focus_out_event",
                          G_CALLBACK (ev_window_focus_out_cb),
                          ev_window);
-       
+
        /* Give focus to the scrolled window */
-       gtk_widget_grab_focus (scrolled_window);
-       
+       gtk_widget_grab_focus (ev_window->priv->scrolled_window);
+
        update_action_sensitivity (ev_window);
-} 
+}