]> www.fi.muni.cz Git - evince.git/blobdiff - shell/ev-window.c
Make pdf compilation optional. See bug #38007.
[evince.git] / shell / ev-window.c
index a88816c859f8b66ec623373a7d9e36b263132191..98d888f41d940726b3724ee64f45fb50d98bc64c 100644 (file)
@@ -30,6 +30,7 @@
 
 #include "ev-window.h"
 #include "ev-window-title.h"
+#include "ev-navigation-action.h"
 #include "ev-page-action.h"
 #include "ev-sidebar.h"
 #include "ev-sidebar-links.h"
@@ -68,6 +69,7 @@
 #include "ev-file-helpers.h"
 #include "ev-utils.h"
 #include "ev-debug.h"
+#include "ev-history.h"
 
 #ifdef WITH_GNOME_PRINT
 #include "ev-print-job.h"
 #include <gtk/gtkprintunixdialog.h>
 #endif
 
+#ifdef ENABLE_PDF
 #include <poppler.h>
+#endif
 
+#include <glib/gstdio.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gnome.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <gconf/gconf-client.h>
 
+#include "totem-scrsaver.h"
+
 #include <string.h>
 
 typedef enum {
@@ -100,6 +107,7 @@ typedef enum {
        EV_CHROME_RAISE_TOOLBAR = 1 << 3,
        EV_CHROME_FULLSCREEN_TOOLBAR    = 1 << 4,
        EV_CHROME_SIDEBAR       = 1 << 5,
+       EV_CHROME_PREVIEW_TOOLBAR       = 1 << 6,
        EV_CHROME_NORMAL        = EV_CHROME_MENUBAR | EV_CHROME_TOOLBAR | EV_CHROME_SIDEBAR
 } EvChrome;
 
@@ -120,6 +128,7 @@ struct _EvWindowPrivate {
        GtkWidget *sidebar_thumbs;
        GtkWidget *sidebar_links;
        GtkWidget *sidebar_attachments;
+       GtkWidget *preview_toolbar;
 
        /* Dialogs */
        GtkWidget *properties;
@@ -143,7 +152,10 @@ struct _EvWindowPrivate {
        GtkWidget *fullscreen_toolbar;
        GtkWidget *fullscreen_popup;
        guint      fullscreen_timeout_id;
-       
+
+       /* Screensaver */
+       TotemScrsaver *screensaver;
+
        /* Popup link */
        GtkWidget *view_popup;
        EvLink    *link;
@@ -156,9 +168,10 @@ struct _EvWindowPrivate {
        char *uri;
        char *local_uri;
        EvLinkDest *dest;
+       gboolean unlink_temp_file;
        
        EvDocument *document;
-
+       EvHistory *history;
        EvPageCache *page_cache;
        EvWindowPageMode page_mode;
        EvWindowTitle *title;
@@ -190,6 +203,7 @@ static const GtkTargetEntry ev_drop_types[] = {
 
 #define PAGE_SELECTOR_ACTION   "PageSelector"
 #define ZOOM_CONTROL_ACTION    "ViewZoom"
+#define NAVIGATION_ACTION      "Navigation"
 
 #define GCONF_OVERRIDE_RESTRICTIONS "/apps/evince/override_restrictions"
 #define GCONF_LOCKDOWN_SAVE         "/desktop/gnome/lockdown/disable_save_to_disk"
@@ -234,6 +248,8 @@ static void     ev_window_cmd_view_presentation         (GtkAction        *actio
 static void     ev_window_run_preview                   (EvWindow         *window);
 static void     ev_view_popup_cmd_open_link             (GtkAction        *action,
                                                         EvWindow         *window);
+static void     ev_view_popup_cmd_open_link_new_window  (GtkAction        *action,
+                                                        EvWindow         *window);
 static void     ev_view_popup_cmd_copy_link_address     (GtkAction        *action,
                                                         EvWindow         *window);
 static void    ev_attachment_popup_cmd_open_attachment (GtkAction        *action,
@@ -330,7 +346,17 @@ ev_window_setup_action_sensitivity (EvWindow *ev_window)
 
 
        /* File menu */
+       ev_window_set_action_sensitive (ev_window, "FileOpenCopy", has_document);
        ev_window_set_action_sensitive (ev_window, "FileSaveAs", has_document && ok_to_copy);
+
+#ifdef WITH_GTK_PRINT
+       ev_window_set_action_sensitive (ev_window, "FilePrintSetup", has_pages && ok_to_print);
+#endif
+
+#ifdef WITH_GNOME_PRINT
+       ev_window_set_action_sensitive (ev_window, "FilePrintSetup", FALSE);
+#endif
+       
        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);
 
@@ -351,6 +377,7 @@ ev_window_setup_action_sensitivity (EvWindow *ev_window)
        /* 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_set_action_sensitive (ev_window, NAVIGATION_ACTION,  has_pages);
 
         ev_window_update_actions (ev_window);
 }
@@ -453,6 +480,7 @@ update_chrome_visibility (EvWindow *window)
        EvWindowPrivate *priv = window->priv;
        gboolean menubar, toolbar, findbar, fullscreen_toolbar, sidebar;
        gboolean fullscreen_mode, presentation, fullscreen;
+       gboolean preview_toolbar;
 
        presentation = ev_view_get_presentation (EV_VIEW (priv->view));
        fullscreen = ev_view_get_fullscreen (EV_VIEW (priv->view));
@@ -465,11 +493,13 @@ update_chrome_visibility (EvWindow *window)
                              (priv->chrome & EV_CHROME_RAISE_TOOLBAR) != 0) && fullscreen;
        findbar = (priv->chrome & EV_CHROME_FINDBAR) != 0;
        sidebar = (priv->chrome & EV_CHROME_SIDEBAR) != 0 && !fullscreen_mode;
+       preview_toolbar = (priv->chrome& EV_CHROME_PREVIEW_TOOLBAR);
 
        set_widget_visibility (priv->menubar, menubar); 
        set_widget_visibility (priv->toolbar_dock, toolbar);
        set_widget_visibility (priv->find_bar, findbar);
        set_widget_visibility (priv->sidebar, sidebar);
+       set_widget_visibility (priv->preview_toolbar, preview_toolbar);
 
        ev_window_set_action_sensitive (window, "EditToolbar", toolbar);
        gtk_widget_set_sensitive (priv->menubar, menubar);
@@ -594,7 +624,15 @@ page_changed_cb (EvPageCache *page_cache,
                 gint         page,
                 EvWindow    *ev_window)
 {
+       gchar *label;
+       
        ev_window_update_actions (ev_window);
+       
+       if (ev_window->priv->history) {
+               label = ev_page_cache_get_page_label (ev_window->priv->page_cache, page);
+               ev_history_add_page (ev_window->priv->history, page, label);
+               g_free (label);
+       }
 
        if (!ev_window_is_empty (ev_window))
                ev_metadata_manager_set_int (ev_window->priv->uri, "page", page);
@@ -864,6 +902,13 @@ ev_window_setup_document (EvWindow *ev_window)
        ev_page_action_set_document (EV_PAGE_ACTION (action), document);
        ev_window_setup_action_sensitivity (ev_window);
 
+       if (ev_window->priv->history)
+               g_object_unref (ev_window->priv->history);
+       ev_window->priv->history = ev_history_new ();
+       action = gtk_action_group_get_action (ev_window->priv->action_group, NAVIGATION_ACTION);
+        ev_navigation_action_set_history (EV_NAVIGATION_ACTION (action), ev_window->priv->history);
+        ev_navigation_action_set_window (EV_NAVIGATION_ACTION (action), ev_window);
+       
        if (ev_window->priv->properties) {
                ev_properties_dialog_set_document (EV_PROPERTIES_DIALOG (ev_window->priv->properties),
                                                   ev_window->priv->document);
@@ -962,7 +1007,7 @@ ev_window_clear_local_uri (EvWindow *ev_window)
     if (ev_window->priv->local_uri) {
            filename = g_filename_from_uri (ev_window->priv->local_uri, NULL, NULL);
            if (filename != NULL) {
-                   unlink (filename);
+                   g_unlink (filename);
                    g_free (filename);
            }
            g_free (ev_window->priv->local_uri);
@@ -970,6 +1015,35 @@ ev_window_clear_local_uri (EvWindow *ev_window)
     }
 }
 
+static void
+ev_window_clear_temp_file (EvWindow *ev_window)
+{
+       GnomeVFSURI *uri;
+       gchar       *filename;
+       const gchar *tempdir;
+
+       if (!ev_window->priv->uri)
+               return;
+
+       uri = gnome_vfs_uri_new (ev_window->priv->uri);
+       if (!gnome_vfs_uri_is_local (uri)) {
+               gnome_vfs_uri_unref (uri);
+               return;
+       }
+       gnome_vfs_uri_unref (uri);
+
+       filename = g_filename_from_uri (ev_window->priv->uri, NULL, NULL);
+       if (!filename)
+               return;
+
+       tempdir = g_get_tmp_dir ();
+       if (g_ascii_strncasecmp (filename, tempdir, strlen (tempdir)) == 0) {
+               g_unlink (filename);
+       }
+
+       g_free (filename);
+}
+
 /* This callback will executed when load job will be finished.
  *
  * Since the flow of the error dialog is very confusing, we assume that both
@@ -1005,9 +1079,12 @@ ev_window_xfer_job_cb  (EvJobXfer *job,
                        g_object_unref (ev_window->priv->document);
                ev_window->priv->document = g_object_ref (document);
 
-               setup_view_from_metadata (ev_window);
+               if (!ev_window->priv->unlink_temp_file) {
+                       setup_view_from_metadata (ev_window);
+                       ev_window_add_recent (ev_window, ev_window->priv->uri);
+               }
+
                ev_window_setup_document (ev_window);
-               ev_window_add_recent (ev_window, ev_window->priv->uri);
 
                if (job->dest)
                        ev_window_goto_dest (ev_window, job->dest);
@@ -1091,13 +1168,16 @@ void
 ev_window_open_uri (EvWindow       *ev_window,
                    const char     *uri,
                    EvLinkDest     *dest,
-                   EvWindowRunMode mode)
+                   EvWindowRunMode mode,
+                   gboolean        unlink_temp_file)
 {
        ev_window_close_dialogs (ev_window);
        ev_window_clear_xfer_job (ev_window);
        ev_window_clear_local_uri (ev_window);
        ev_view_set_loading (EV_VIEW (ev_window->priv->view), TRUE);
 
+       ev_window->priv->unlink_temp_file = unlink_temp_file;
+       
        ev_window->priv->xfer_job = ev_job_xfer_new (uri, dest, mode);
        g_signal_connect (ev_window->priv->xfer_job,
                          "finished",
@@ -1122,7 +1202,9 @@ file_open_dialog_response_cb (GtkWidget *chooser,
 
                uris = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (chooser));
 
-               ev_application_open_uri_list (EV_APP, uris, GDK_CURRENT_TIME);
+               ev_application_open_uri_list (EV_APP, uris,
+                                             gtk_window_get_screen (GTK_WINDOW (ev_window)),
+                                             GDK_CURRENT_TIME);
        
                g_slist_foreach (uris, (GFunc)g_free, NULL);    
                g_slist_free (uris);
@@ -1164,17 +1246,117 @@ ev_window_cmd_file_open (GtkAction *action, EvWindow *window)
        gtk_widget_show (chooser);
 }
 
+static gchar *
+ev_window_create_tmp_symlink (const gchar *filename, GError **error)
+{
+       gchar *tmp_filename = NULL;
+       gchar *name;
+       gint   res;
+       guint  i = 0;
+
+       name = g_path_get_basename (filename);
+       
+       do {
+               gchar *basename;
+
+               if (tmp_filename)
+                       g_free (tmp_filename);
+
+               basename = g_strdup_printf ("%s-%d", name, i++);
+               tmp_filename = g_build_filename (ev_tmp_dir (),
+                                                basename, NULL);
+               
+               g_free (basename);
+       } while ((res = symlink (filename, tmp_filename)) != 0 && errno == EEXIST);
+
+       g_free (name);
+       
+       if (res != 0 && errno != EEXIST) {
+               if (error) {
+                       *error = g_error_new (G_FILE_ERROR,
+                                             g_file_error_from_errno (errno),
+                                             _("Couldn't create symlink ā€œ%sā€: %s"),
+                                             tmp_filename, strerror (errno));
+               }
+
+               g_free (tmp_filename);
+
+               return NULL;
+       }
+       
+       return tmp_filename;
+}
+
+static void
+ev_window_cmd_file_open_copy_at_dest (EvWindow *window, EvLinkDest *dest)
+{
+       GError *error = NULL;
+       gchar *symlink_uri;
+       gchar *old_filename;
+       gchar *new_filename;
+
+       old_filename = g_filename_from_uri (window->priv->uri, NULL, NULL);
+       new_filename = ev_window_create_tmp_symlink (old_filename, &error);
+
+       if (error) {
+               ev_window_error_dialog (GTK_WINDOW (window),
+                                       _("Cannot open a copy."),
+                                       error);
+
+               g_error_free (error);
+               g_free (old_filename);
+               g_free (new_filename);
+
+               return;
+       }
+               
+       g_free (old_filename);
+
+       symlink_uri = g_filename_to_uri (new_filename, NULL, NULL);
+       g_free (new_filename);
+
+       ev_application_open_uri_at_dest (EV_APP,
+                                        symlink_uri,
+                                        gtk_window_get_screen (GTK_WINDOW (window)),
+                                        dest,
+                                        0,
+                                        TRUE,
+                                        GDK_CURRENT_TIME);
+       g_free (symlink_uri);
+}
+
+static void
+ev_window_cmd_file_open_copy (GtkAction *action, EvWindow *window)
+{
+       EvPageCache *page_cache;
+       EvLinkDest  *dest;
+       gint         current_page;
+
+       page_cache = ev_page_cache_get (window->priv->document);
+       current_page = ev_page_cache_get_current_page (page_cache);
+       
+       dest = ev_link_dest_new_page (current_page);
+       ev_window_cmd_file_open_copy_at_dest (window, dest);
+       g_object_unref (dest);
+}
+
 #ifdef HAVE_GTK_RECENT
 static void
 ev_window_cmd_recent_file_activate (GtkAction     *action,
-                                   GtkRecentInfo *info)
+                                   EvWindow      *window)
 {
-       const gchar *uri;
+       GtkRecentInfo *info;
+       const gchar   *uri;
 
+       info = g_object_get_data (G_OBJECT (action), "gtk-recent-info");
+       g_assert (info != NULL);
+       
        uri = gtk_recent_info_get_uri (info);
        
-       ev_application_open_uri (EV_APP, uri, NULL,
-                                GDK_CURRENT_TIME, NULL);
+       ev_application_open_uri_at_dest (EV_APP, uri,
+                                        gtk_window_get_screen (GTK_WINDOW (window)),
+                                        NULL, 0, FALSE,
+                                        GDK_CURRENT_TIME);
 }
 #else
 static void
@@ -1326,12 +1508,14 @@ ev_window_setup_recent (EvWindow *ev_window)
                                       "label", label,
                                       NULL);
 
-               g_object_weak_ref (G_OBJECT (action),
-                                  (GWeakNotify) gtk_recent_info_unref,
-                                  gtk_recent_info_ref (info));
+               g_object_set_data_full (G_OBJECT (action),
+                                       "gtk-recent-info",
+                                       gtk_recent_info_ref (info),
+                                       (GDestroyNotify) gtk_recent_info_unref);
+               
                g_signal_connect (G_OBJECT (action), "activate",
                                  G_CALLBACK (ev_window_cmd_recent_file_activate),
-                                 (gpointer) info);
+                                 (gpointer) ev_window);
 
                gtk_action_group_add_action (ev_window->priv->recent_action_group,
                                             action);
@@ -1432,6 +1616,34 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
        gtk_widget_show (fc);
 }
 
+#ifdef WITH_GTK_PRINT
+static void
+ev_window_print_page_setup_done_cb (GtkPageSetup *page_setup,
+                                   EvWindow     *window)
+{
+       /* Dialog was canceled */
+       if (!page_setup)
+               return;
+
+       if (window->priv->print_page_setup)
+               g_object_unref (window->priv->print_page_setup);
+       window->priv->print_page_setup = g_object_ref (page_setup);
+}
+#endif /* WITH_GTK_PRINT */
+
+static void
+ev_window_cmd_file_print_setup (GtkAction *action, EvWindow *ev_window)
+{
+#ifdef WITH_GTK_PRINT
+       gtk_print_run_page_setup_dialog_async (
+               GTK_WINDOW (ev_window),
+               ev_window->priv->print_page_setup,
+               ev_window->priv->print_settings,
+               (GtkPageSetupDoneFunc) ev_window_print_page_setup_done_cb,
+               ev_window);
+#endif /* WITH_GTK_PRINT */
+}
+
 #ifdef WITH_GTK_PRINT
 static void
 ev_window_clear_print_job (EvWindow *window)
@@ -1521,15 +1733,14 @@ ev_window_print_dialog_response_cb (GtkDialog *dialog,
 {
        EvPrintRange  *ranges = NULL;
        EvPrintPageSet page_set;
-       EvPageCache   *page_cache;
        gint           n_ranges = 0;
        gint           copies;
        gboolean       collate;
        gboolean       reverse;
        gdouble        scale;
        gint           current_page;
-       gint           width;
-       gint           height;
+       gdouble        width;
+       gdouble        height;
        GtkPrintPages  print_pages;
        
        if (response != GTK_RESPONSE_OK) {
@@ -1598,19 +1809,23 @@ ev_window_print_dialog_response_cb (GtkDialog *dialog,
        page_set = (EvPrintPageSet)gtk_print_settings_get_page_set (window->priv->print_settings);
 
        scale = gtk_print_settings_get_scale (window->priv->print_settings) * 0.01;
-       page_cache = ev_page_cache_get (window->priv->document);
-       ev_page_cache_get_size (page_cache,
-                               current_page,
-                               0, scale,
-                               &width, &height);
        
+       width = gtk_page_setup_get_paper_width (window->priv->print_page_setup,
+                                               GTK_UNIT_PIXEL);
+       height = gtk_page_setup_get_paper_height (window->priv->print_page_setup,
+                                                 GTK_UNIT_PIXEL);
+
+       if (scale != 1.0) {
+               width *= scale;
+               height *= scale;
+       }
+
        copies = gtk_print_settings_get_n_copies (window->priv->print_settings);
        collate = gtk_print_settings_get_collate (window->priv->print_settings);
        reverse = gtk_print_settings_get_reverse (window->priv->print_settings);
        
        window->priv->print_job = ev_job_print_new (window->priv->document,
-                                                   (gdouble)width,
-                                                   (gdouble)height,
+                                                   width, height,
                                                    ranges, n_ranges,
                                                    page_set,
                                                    copies, collate,
@@ -1673,6 +1888,7 @@ ev_window_print_range (EvWindow *ev_window, int first_page, int last_page)
                                                       GTK_PRINT_CAPABILITY_REVERSE |
                                                       GTK_PRINT_CAPABILITY_SCALE |
                                                       GTK_PRINT_CAPABILITY_GENERATE_PS);
+
        gtk_print_unix_dialog_set_current_page (GTK_PRINT_UNIX_DIALOG (dialog),
                                                current_page);
        
@@ -2168,7 +2384,7 @@ ev_window_create_fullscreen_popup (EvWindow *window)
        GdkScreen *screen;
 
        window->priv->fullscreen_toolbar = egg_editable_toolbar_new_with_model
-                       (window->priv->ui_manager, ev_application_get_toolbars_model (EV_APP), NULL);
+                       (window->priv->ui_manager, ev_application_get_toolbars_model (EV_APP, FALSE), NULL);
 
        popup = gtk_window_new (GTK_WINDOW_POPUP);
        hbox = gtk_hbox_new (FALSE, 0);
@@ -2326,6 +2542,8 @@ ev_window_run_presentation (EvWindow *window)
                          window);
        fullscreen_set_timeout (window);
 
+       totem_scrsaver_disable (window->priv->screensaver);
+
        if (!ev_window_is_empty (window))
                ev_metadata_manager_set_boolean (window->priv->uri, "presentation", TRUE);
 }
@@ -2352,6 +2570,8 @@ ev_window_stop_presentation (EvWindow *window)
                                              window);
        fullscreen_clear_timeout (window);
 
+       totem_scrsaver_enable (window->priv->screensaver);
+
        if (!ev_window_is_empty (window))
                ev_metadata_manager_set_boolean (window->priv->uri, "presentation", FALSE);
 }
@@ -2375,29 +2595,14 @@ ev_window_cmd_view_presentation (GtkAction *action, EvWindow *window)
 static void
 ev_window_run_preview (EvWindow *window)
 {
-       EggToolbarsModel *model;
-       EggTbModelFlags   flags;
-
-       model = egg_toolbars_model_new ();
-
-       egg_toolbars_model_load_toolbars (model,
-                                         DATADIR"/evince-toolbar.xml");
-       
-       flags = egg_toolbars_model_get_flags (model, 1);
-       egg_toolbars_model_set_flags (model, 1, flags &= ~(EGG_TB_MODEL_HIDDEN));
-
-       egg_editable_toolbar_set_model (EGG_EDITABLE_TOOLBAR (window->priv->toolbar),
-                                       model);
-       
-       egg_editable_toolbar_hide (EGG_EDITABLE_TOOLBAR (window->priv->toolbar),
-                                  "DefaultToolBar");
-       egg_editable_toolbar_show (EGG_EDITABLE_TOOLBAR (window->priv->toolbar),
-                                  "PreviewToolBar");
-
        ev_view_set_continuous (EV_VIEW (window->priv->view), FALSE); 
        
+       update_chrome_flag (window, EV_CHROME_TOOLBAR, FALSE);
        update_chrome_flag (window, EV_CHROME_MENUBAR, FALSE);
        update_chrome_flag (window, EV_CHROME_SIDEBAR, FALSE);
+
+       update_chrome_flag (window, EV_CHROME_PREVIEW_TOOLBAR, TRUE);
+
        update_chrome_visibility (window);
 }
 
@@ -2545,7 +2750,7 @@ ev_window_cmd_edit_toolbar (GtkAction *action, EvWindow *ev_window)
        gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 400);
          
        editor = egg_toolbar_editor_new (ev_window->priv->ui_manager,
-                                        ev_application_get_toolbars_model (EV_APP));
+                                        ev_application_get_toolbars_model (EV_APP, FALSE));
        gtk_container_set_border_width (GTK_CONTAINER (editor), 5);
        gtk_box_set_spacing (GTK_BOX (EGG_TOOLBAR_EDITOR (editor)), 5);
              
@@ -2649,7 +2854,7 @@ ev_window_cmd_view_reload (GtkAction *action, EvWindow *ev_window)
 
        uri = g_strdup (ev_window->priv->uri);
 
-       ev_window_open_uri (ev_window, uri, NULL, 0);
+       ev_window_open_uri (ev_window, uri, NULL, 0, FALSE);
 
        g_free (uri);
 }
@@ -2885,6 +3090,7 @@ ev_window_dual_mode_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_wi
 static char *
 build_comments_string (void)
 {
+#ifdef ENABLE_PDF
        PopplerBackend backend;
        const char *backend_name;
        const char *version;
@@ -2906,6 +3112,9 @@ build_comments_string (void)
        return g_strdup_printf (_("PostScript and PDF File Viewer.\n"
                                  "Using poppler %s (%s)"),
                                version, backend_name);
+#else
+       return g_strdup_printf (_("Document Viewer."));
+#endif
 }
 
 static void
@@ -2963,7 +3172,7 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window)
                "name", _("Evince"),
                "version", VERSION,
                "copyright",
-               _("\xc2\xa9 1996-2005 The Evince authors"),
+               _("\xc2\xa9 1996-2007 The Evince authors"),
                "license", license_trans,
                "website", "http://www.gnome.org/projects/evince",
                "comments", comments,
@@ -3030,11 +3239,13 @@ ev_window_sidebar_visibility_changed_cb (EvSidebar  *ev_sidebar,
        GtkAction *action;
 
        action = gtk_action_group_get_action (ev_window->priv->action_group, "ViewSidebar");
-       gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
-                                     GTK_WIDGET_VISIBLE (ev_sidebar));
 
        if (!ev_view_get_presentation (view) && 
            !ev_view_get_fullscreen (view)) {
+
+               gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
+                                             GTK_WIDGET_VISIBLE (ev_sidebar));
+
                ev_metadata_manager_set_boolean (ev_window->priv->uri, "sidebar_visibility",
                                                 GTK_WIDGET_VISIBLE (ev_sidebar));
        }
@@ -3096,6 +3307,10 @@ view_menu_popup_cb (EvView   *view,
                                              "GoLink");
        gtk_action_set_visible (action, show_internal);
 
+       action = gtk_action_group_get_action (ev_window->priv->view_popup_action_group,
+                                             "OpenLinkNewWindow");
+       gtk_action_set_visible (action, show_internal);
+
        gtk_menu_popup (GTK_MENU (popup), NULL, NULL,
                        NULL, NULL,
                        3, gtk_get_current_event_time ());
@@ -3378,6 +3593,8 @@ ev_window_dispose (GObject *object)
        }
 
        if (priv->uri) {
+               if (priv->unlink_temp_file)
+                       ev_window_clear_temp_file (window);
                g_free (priv->uri);
                priv->uri = NULL;
        }
@@ -3387,6 +3604,11 @@ ev_window_dispose (GObject *object)
                priv->dest = NULL;
        }
 
+       if (priv->history) {
+               g_object_unref (priv->history);
+               priv->history = NULL;
+       }
+
        if (priv->fullscreen_timeout_id) {
                g_source_remove (priv->fullscreen_timeout_id);
                priv->fullscreen_timeout_id = 0;
@@ -3424,9 +3646,15 @@ static const GtkActionEntry entries[] = {
        { "FileOpen", GTK_STOCK_OPEN, N_("_Open..."), "<control>O",
          N_("Open an existing document"),
          G_CALLBACK (ev_window_cmd_file_open) },
+       { "FileOpenCopy", NULL, N_("Open a _Copy"), NULL,
+         N_("Open a copy of the current document in a new window"),
+         G_CALLBACK (ev_window_cmd_file_open_copy) },
                { "FileSaveAs", GTK_STOCK_SAVE_AS, N_("_Save a Copy..."), "<control>S",
          N_("Save a copy of the current document"),
          G_CALLBACK (ev_window_cmd_save_as) },
+       { "FilePrintSetup", NULL, N_("Print Set_up..."), NULL,
+         N_("Setup the page settings for printing"),
+         G_CALLBACK (ev_window_cmd_file_print_setup) },
        { "FilePrint", GTK_STOCK_PRINT, N_("_Print..."), "<control>P",
          N_("Print this document"),
          G_CALLBACK (ev_window_cmd_file_print) },
@@ -3449,9 +3677,9 @@ static const GtkActionEntry entries[] = {
          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,
+       { "EditRotateLeft", EV_STOCK_ROTATE_LEFT, N_("Rotate _Left"), NULL, NULL,
          G_CALLBACK (ev_window_cmd_edit_rotate_left) },
-       { "EditRotateRight", NULL, N_("Rotate _Right"), NULL, NULL,
+       { "EditRotateRight", EV_STOCK_ROTATE_RIGHT, N_("Rotate _Right"), NULL, NULL,
          G_CALLBACK (ev_window_cmd_edit_rotate_right) },
 
         /* View menu */
@@ -3572,6 +3800,8 @@ static const GtkActionEntry view_popup_entries [] = {
          NULL, G_CALLBACK (ev_view_popup_cmd_open_link) },
        { "GoLink", GTK_STOCK_GO_FORWARD, N_("_Go To"), NULL,
          NULL, G_CALLBACK (ev_view_popup_cmd_open_link) },
+       { "OpenLinkNewWindow", NULL, N_("Open in New _Window"), NULL,
+         NULL, G_CALLBACK (ev_view_popup_cmd_open_link_new_window) },
        { "CopyLinkAddress", NULL, N_("_Copy Link Address"), NULL,
          NULL,
          G_CALLBACK (ev_view_popup_cmd_copy_link_address) },
@@ -3605,7 +3835,9 @@ drag_data_received_cb (GtkWidget *widget, GdkDragContext *context,
 
                gnome_vfs_uri_list_free (uri_list);
                
-               ev_application_open_uri_list (EV_APP, uris, 0);
+               ev_application_open_uri_list (EV_APP, uris,
+                                             gtk_widget_get_screen (widget),
+                                             0);
                
                g_slist_free (uris);
        }
@@ -3657,6 +3889,17 @@ register_custom_actions (EvWindow *window, GtkActionGroup *group)
                          G_CALLBACK (zoom_control_changed_cb), window);
        gtk_action_group_add_action (group, action);
        g_object_unref (action);
+
+       action = g_object_new (EV_TYPE_NAVIGATION_ACTION,
+                              "name", NAVIGATION_ACTION,
+                              "label", _("Navigation"),
+                              "is_important", TRUE,
+                              "short_label", _("Back"),
+                              "stock_id", GTK_STOCK_GO_DOWN,
+                              "tooltip", _("Move across visited pages"),
+                              NULL);
+       gtk_action_group_add_action (group, action);
+       g_object_unref (action);
 }
 
 static void
@@ -3878,8 +4121,10 @@ open_remote_link (EvWindow *window, EvLinkAction *action)
        g_free (dir);
 
        ev_application_open_uri_at_dest (EV_APP, uri,
+                                        gtk_window_get_screen (GTK_WINDOW (window)),
                                         ev_link_action_get_dest (action),
                                         0,
+                                        FALSE,
                                         GDK_CURRENT_TIME);
 
        g_free (uri);
@@ -3939,6 +4184,23 @@ ev_view_popup_cmd_open_link (GtkAction *action, EvWindow *window)
        ev_view_handle_link (EV_VIEW (window->priv->view), window->priv->link);
 }
 
+static void
+ev_view_popup_cmd_open_link_new_window (GtkAction *action, EvWindow *window)
+{
+       EvLinkAction *ev_action = NULL;
+       EvLinkDest   *dest;
+
+       ev_action = ev_link_get_action (window->priv->link);
+       if (!ev_action)
+               return;
+
+       dest = ev_link_action_get_dest (ev_action);
+       if (!dest)
+               return;
+
+       ev_window_cmd_file_open_copy_at_dest (window, dest);
+}
+
 static void
 ev_view_popup_cmd_copy_link_address (GtkAction *action, EvWindow *window)
 {
@@ -4165,14 +4427,25 @@ ev_window_init (EvWindow *ev_window)
                            FALSE, FALSE, 0);
        gtk_widget_show (toolbar_dock);
 
-       ev_window->priv->toolbar = egg_editable_toolbar_new_with_model
-                               (ev_window->priv->ui_manager, ev_application_get_toolbars_model (EV_APP), NULL);
+       ev_window->priv->toolbar = GTK_WIDGET 
+         (g_object_new (EGG_TYPE_EDITABLE_TOOLBAR,
+                        "ui-manager", ev_window->priv->ui_manager,
+                        "popup-path", "/ToolbarPopup",
+                        "model", ev_application_get_toolbars_model (EV_APP, FALSE),
+                        NULL));
+
        egg_editable_toolbar_show (EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar),
                                   "DefaultToolBar");
        gtk_box_pack_start (GTK_BOX (toolbar_dock), ev_window->priv->toolbar,
                            TRUE, TRUE, 0);
        gtk_widget_show (ev_window->priv->toolbar);
 
+       /* Preview toolbar */
+       ev_window->priv->preview_toolbar = egg_editable_toolbar_new_with_model
+                               (ev_window->priv->ui_manager, ev_application_get_toolbars_model (EV_APP, TRUE), NULL);
+       gtk_box_pack_start (GTK_BOX (ev_window->priv->main_box), ev_window->priv->preview_toolbar,
+                           FALSE, FALSE, 0);
+
        /* Add the main area */
        ev_window->priv->hpaned = gtk_hpaned_new ();
        g_signal_connect (ev_window->priv->hpaned,
@@ -4363,7 +4636,11 @@ ev_window_init (EvWindow *ev_window)
        g_signal_connect_swapped (G_OBJECT (ev_window->priv->view), "drag-data-received",
                                  G_CALLBACK (drag_data_received_cb),
                                  ev_window);
-       
+
+       /* Screensaver */
+
+       ev_window->priv->screensaver = totem_scrsaver_new ();
+
        /* Set it user interface params */
 
        ev_window_setup_recent (ev_window);