]> www.fi.muni.cz Git - evince.git/blobdiff - shell/ev-window.c
[shell] Remove unused variable and code
[evince.git] / shell / ev-window.c
index 22319aef141c9f2584e94bc6c7822b452a40ac5b..d4057b115bc97b05451917f10b254ff21db7b858 100644 (file)
@@ -23,7 +23,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -62,6 +62,7 @@
 #include "ev-document-thumbnails.h"
 #include "ev-document-annotations.h"
 #include "ev-document-type-builtins.h"
+#include "ev-document-misc.h"
 #include "ev-file-exporter.h"
 #include "ev-file-helpers.h"
 #include "ev-file-monitor.h"
@@ -86,6 +87,7 @@
 #include "ev-utils.h"
 #include "ev-keyring.h"
 #include "ev-view.h"
+#include "ev-view-presentation.h"
 #include "ev-view-type-builtins.h"
 #include "ev-window.h"
 #include "ev-window-title.h"
 #include "ev-media-player-keys.h"
 #endif /* ENABLE_DBUS */
 
-#ifdef ENABLE_PDF
-#include <poppler.h>
-#endif
-
 typedef enum {
        PAGE_MODE_DOCUMENT,
        PAGE_MODE_PASSWORD
@@ -134,6 +132,7 @@ struct _EvWindowPrivate {
        GtkWidget *find_bar;
        GtkWidget *scrolled_window;
        GtkWidget *view;
+       GtkWidget *presentation_view;
        GtkWidget *message_area;
        GtkWidget *password_view;
        GtkWidget *sidebar_thumbs;
@@ -141,6 +140,10 @@ struct _EvWindowPrivate {
        GtkWidget *sidebar_attachments;
        GtkWidget *sidebar_layers;
 
+       /* Settings */
+       GSettings *settings;
+       GSettings *last_settings;
+
        /* Menubar accels */
        guint           menubar_accel_keyval;
        GdkModifierType menubar_accel_modifier;
@@ -165,9 +168,6 @@ struct _EvWindowPrivate {
        /* Fullscreen mode */
        GtkWidget *fullscreen_toolbar;
 
-       /* Presentation mode */
-       guint      presentation_timeout_id;
-
        /* Popup view */
        GtkWidget *view_popup;
        EvLink    *link;
@@ -216,17 +216,19 @@ struct _EvWindowPrivate {
 #define EV_WINDOW_GET_PRIVATE(object) \
        (G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_WINDOW, EvWindowPrivate))
 
+#define EV_WINDOW_IS_PRESENTATION(w) (w->priv->presentation_view != NULL)
+
 #define PAGE_SELECTOR_ACTION   "PageSelector"
 #define ZOOM_CONTROL_ACTION    "ViewZoom"
 #define NAVIGATION_ACTION      "Navigation"
 
 #define GCONF_LOCKDOWN_DIR          "/desktop/gnome/lockdown"
-#define GCONF_OVERRIDE_RESTRICTIONS "/apps/evince/override_restrictions"
 #define GCONF_LOCKDOWN_SAVE         "/desktop/gnome/lockdown/disable_save_to_disk"
 #define GCONF_LOCKDOWN_PRINT        "/desktop/gnome/lockdown/disable_printing"
 #define GCONF_LOCKDOWN_PRINT_SETUP  "/desktop/gnome/lockdown/disable_print_setup"
 
-#define PRESENTATION_TIMEOUT 5
+#define GS_SCHEMA_NAME           "org.gnome.Evince"
+#define GS_OVERRIDE_RESTRICTIONS "override-restrictions"
 
 #define SIDEBAR_DEFAULT_SIZE    132
 #define LINKS_SIDEBAR_ID "links"
@@ -243,6 +245,8 @@ struct _EvWindowPrivate {
 #define MIN_SCALE 0.05409
 #define MAX_SCALE 4.0
 
+#define MAX_RECENT_ITEM_LEN (40)
+
 static const gchar *document_print_settings[] = {
        GTK_PRINT_SETTINGS_N_COPIES,
        GTK_PRINT_SETTINGS_COLLATE,
@@ -326,6 +330,15 @@ static guint ev_window_n_copies = 0;
 
 G_DEFINE_TYPE (EvWindow, ev_window, GTK_TYPE_WINDOW)
 
+static gdouble
+get_screen_dpi (EvWindow *window)
+{
+       GdkScreen *screen;
+
+       screen = gtk_window_get_screen (GTK_WINDOW (window));
+       return ev_document_misc_get_screen_dpi (screen);
+}
+
 static void
 ev_window_set_action_sensitive (EvWindow   *ev_window,
                                const char *name,
@@ -344,7 +357,6 @@ ev_window_setup_action_sensitivity (EvWindow *ev_window)
        const EvDocumentInfo *info = NULL;
        gboolean has_document = FALSE;
        gboolean ok_to_print = TRUE;
-       gboolean ok_to_print_setup = TRUE;
        gboolean ok_to_copy = TRUE;
        gboolean has_properties = TRUE;
        gboolean override_restrictions = TRUE;
@@ -370,12 +382,12 @@ ev_window_setup_action_sensitivity (EvWindow *ev_window)
                can_find = TRUE;
        }
 
-#ifdef WITH_GCONF
-       if (has_document)
-               override_restrictions = gconf_client_get_bool (ev_window->priv->gconf_client,
-                                                              GCONF_OVERRIDE_RESTRICTIONS,
-                                                              NULL);
-#endif
+       if (has_document && ev_window->priv->settings) {
+               override_restrictions =
+                       g_settings_get_boolean (ev_window->priv->settings,
+                                               GS_OVERRIDE_RESTRICTIONS);
+       }
+
        if (!override_restrictions && info && info->fields_mask & EV_DOCUMENT_INFO_PERMISSIONS) {
                ok_to_print = (info->permissions & EV_DOCUMENT_PERMISSIONS_OK_TO_PRINT);
                ok_to_copy = (info->permissions & EV_DOCUMENT_PERMISSIONS_OK_TO_COPY);
@@ -394,19 +406,11 @@ ev_window_setup_action_sensitivity (EvWindow *ev_window)
            gconf_client_get_bool (ev_window->priv->gconf_client, GCONF_LOCKDOWN_PRINT, NULL)) {
                ok_to_print = FALSE;
        }
-
-       if (has_document &&
-           gconf_client_get_bool (ev_window->priv->gconf_client, GCONF_LOCKDOWN_PRINT_SETUP, NULL)) {
-               ok_to_print_setup = FALSE;
-       }
 #endif
 
        /* 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);
-#if !GTK_CHECK_VERSION (2, 17, 4)
-       ev_window_set_action_sensitive (ev_window, "FilePageSetup", has_pages && ok_to_print && ok_to_print_setup);
-#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);
 
@@ -463,7 +467,7 @@ ev_window_update_actions (EvWindow *ev_window)
         ev_window_set_action_sensitive (ev_window, "F3",
                                         has_pages && can_find_in_page);
 
-       presentation_mode = ev_view_get_presentation (view);
+       presentation_mode = EV_WINDOW_IS_PRESENTATION (ev_window);
        
        ev_window_set_action_sensitive (ev_window, "ViewZoomIn",
                                        has_pages &&
@@ -497,7 +501,7 @@ ev_window_update_actions (EvWindow *ev_window)
                                                      ZOOM_CONTROL_ACTION);
 
                real_zoom = ev_document_model_get_scale (ev_window->priv->model);
-               real_zoom *= 72.0 / get_screen_dpi (GTK_WINDOW (ev_window));
+               real_zoom *= 72.0 / get_screen_dpi (ev_window);
                zoom = ephy_zoom_get_nearest_zoom_level (real_zoom);
 
                ephy_zoom_action_set_zoom_level (EPHY_ZOOM_ACTION (action), zoom);
@@ -551,7 +555,7 @@ update_chrome_visibility (EvWindow *window)
        gboolean menubar, toolbar, findbar, fullscreen_toolbar, sidebar;
        gboolean fullscreen_mode, presentation, fullscreen;
 
-       presentation = ev_view_get_presentation (EV_VIEW (priv->view));
+       presentation = EV_WINDOW_IS_PRESENTATION (window);
        fullscreen = ev_document_model_get_fullscreen (priv->model);
        fullscreen_mode = fullscreen || presentation;
 
@@ -561,7 +565,7 @@ update_chrome_visibility (EvWindow *window)
        fullscreen_toolbar = ((priv->chrome & EV_CHROME_FULLSCREEN_TOOLBAR) != 0 || 
                              (priv->chrome & EV_CHROME_RAISE_TOOLBAR) != 0) && fullscreen;
        findbar = (priv->chrome & EV_CHROME_FINDBAR) != 0;
-       sidebar = (priv->chrome & EV_CHROME_SIDEBAR) != 0 && !presentation;
+       sidebar = (priv->chrome & EV_CHROME_SIDEBAR) != 0 && priv->document && !presentation;
 
        set_widget_visibility (priv->menubar, menubar); 
        set_widget_visibility (priv->toolbar, toolbar);
@@ -798,8 +802,7 @@ ev_window_add_history (EvWindow *window, gint page, EvLink *link)
        if (link) {
                action = g_object_ref (ev_link_get_action (link));
                dest = ev_link_action_get_dest (action);
-               page = ev_link_dest_get_page (dest);
-               page_label = ev_view_page_label_from_dest (EV_VIEW (window->priv->view), dest);
+               page_label = ev_document_links_get_dest_page_label (EV_DOCUMENT_LINKS (window->priv->document), dest);
        } else {
                dest = ev_link_dest_new_page (page);
                action = ev_link_action_new_dest (dest);
@@ -827,7 +830,7 @@ ev_window_add_history (EvWindow *window, gint page, EvLink *link)
        }
 
        if (find_task.chapter)
-               link_title = g_strdup_printf (_("Page %s - %s"), page_label, find_task.chapter);
+               link_title = g_strdup_printf (_("Page %s  %s"), page_label, find_task.chapter);
        else
                link_title = g_strdup_printf (_("Page %s"), page_label);
        
@@ -850,6 +853,14 @@ view_handle_link_cb (EvView *view, EvLink *link, EvWindow *window)
        ev_window_add_history (window, current_page, NULL);
 }
 
+static void
+view_selection_changed_cb (EvView   *view,
+                          EvWindow *window)
+{
+       ev_window_set_action_sensitive (window, "EditCopy",
+                                       ev_view_get_has_selection (view));
+}
+
 static void
 ev_window_page_changed_cb (EvWindow        *ev_window,
                           gint             old_page,
@@ -886,11 +897,16 @@ setup_chrome_from_metadata (EvWindow *window)
        EvChrome chrome = EV_CHROME_NORMAL;
        gboolean show_toolbar;
 
-       if (window->priv->metadata &&
-           ev_metadata_get_boolean (window->priv->metadata, "show_toolbar", &show_toolbar)) {
+       if (window->priv->document) {
+               if (!window->priv->metadata ||
+                   !ev_metadata_get_boolean (window->priv->metadata, "show_toolbar", &show_toolbar)) {
+                       show_toolbar = g_settings_get_boolean (window->priv->last_settings, "show-toolbar");
+               }
+
                if (!show_toolbar)
                        chrome &= ~EV_CHROME_TOOLBAR;
        }
+
        window->priv->chrome = chrome;
 }
 
@@ -907,6 +923,15 @@ setup_sidebar_from_metadata (EvWindow *window)
        gint        sidebar_size;
        gboolean    sidebar_visibility;
 
+       if (document) {
+               if (!window->priv->metadata ||
+                   !ev_metadata_get_boolean (window->priv->metadata, "sidebar_visibility", &sidebar_visibility)) {
+                       sidebar_visibility = g_settings_get_boolean (window->priv->last_settings, "show-sidebar");
+               }
+               update_chrome_flag (window, EV_CHROME_SIDEBAR, sidebar_visibility);
+               update_chrome_visibility (window);
+       }
+
        if (!window->priv->metadata)
                return;
 
@@ -935,11 +960,6 @@ setup_sidebar_from_metadata (EvWindow *window)
                        ev_sidebar_set_page (EV_SIDEBAR (sidebar), layers);
                }
        }
-
-       if (ev_metadata_get_boolean (window->priv->metadata, "sidebar_visibility", &sidebar_visibility)) {
-               update_chrome_flag (window, EV_CHROME_SIDEBAR, sidebar_visibility);
-               update_chrome_visibility (window);
-       }
 }
 
 static void
@@ -975,7 +995,7 @@ setup_model_from_metadata (EvWindow *window)
        /* Zoom */
        if (ev_document_model_get_sizing_mode (window->priv->model) == EV_SIZING_FREE &&
            ev_metadata_get_double (window->priv->metadata, "zoom", &zoom)) {
-               zoom *= get_screen_dpi (GTK_WINDOW (window)) / 72.0;
+               zoom *= get_screen_dpi (window) / 72.0;
                ev_document_model_set_scale (window->priv->model, zoom);
        }
 
@@ -1029,26 +1049,25 @@ setup_document_from_metadata (EvWindow *window)
        gdouble width_ratio;
        gdouble height_ratio;
 
-       if (!window->priv->metadata)
-               return;
-
-       /* Make sure to not open a document on the last page,
-        * since closing it on the last page most likely means the
-        * user was finished reading the document. In that case, reopening should
-        * show the first page. */
-       page = ev_document_model_get_page (window->priv->model);
-       n_pages = ev_document_get_n_pages (window->priv->document);
-       if (page == n_pages - 1)
-               ev_document_model_set_page (window->priv->model, 0);
+       if (window->priv->metadata) {
+               /* Make sure to not open a document on the last page,
+                * since closing it on the last page most likely means the
+                * user was finished reading the document. In that case, reopening should
+                * show the first page. */
+               page = ev_document_model_get_page (window->priv->model);
+               n_pages = ev_document_get_n_pages (window->priv->document);
+               if (page == n_pages - 1)
+                       ev_document_model_set_page (window->priv->model, 0);
 
-       setup_sidebar_from_metadata (window);
+               setup_sidebar_from_metadata (window);
 
-       if (ev_metadata_get_int (window->priv->metadata, "window_width", &width) &&
-           ev_metadata_get_int (window->priv->metadata, "window_height", &height))
-               return; /* size was already set in setup_size_from_metadata */
+               if (ev_metadata_get_int (window->priv->metadata, "window_width", &width) &&
+                   ev_metadata_get_int (window->priv->metadata, "window_height", &height))
+                       return; /* size was already set in setup_size_from_metadata */
+       }
 
-       if (ev_metadata_get_double (window->priv->metadata, "window_width_ratio", &width_ratio) &&
-           ev_metadata_get_double (window->priv->metadata, "window_height_ratio", &height_ratio)) {
+       g_settings_get (window->priv->last_settings, "window-ratio", "(dd)", &width_ratio, &height_ratio);
+       if (width_ratio > 0. && height_ratio > 0.) {
                gdouble    document_width;
                gdouble    document_height;
                GdkScreen *screen;
@@ -1064,7 +1083,7 @@ setup_document_from_metadata (EvWindow *window)
                screen = gtk_window_get_screen (GTK_WINDOW (window));
                if (screen) {
                        request_width = MIN (request_width, gdk_screen_get_width (screen));
-                       request_height = MIN (request_width, gdk_screen_get_height (screen));
+                       request_height = MIN (request_height, gdk_screen_get_height (screen));
                }
 
                if (request_width > 0 && request_height > 0) {
@@ -1153,10 +1172,11 @@ ev_window_set_icon_from_thumbnail (EvJobThumbnail *job,
 }
 
 static void
-ev_window_refresh_window_thumbnail (EvWindow *ev_window, int rotation)
+ev_window_refresh_window_thumbnail (EvWindow *ev_window)
 {
        gdouble page_width;
        gdouble scale;
+       gint rotation;
        EvDocument *document = ev_window->priv->document;
 
        if (!EV_IS_DOCUMENT_THUMBNAILS (document) ||
@@ -1169,6 +1189,7 @@ ev_window_refresh_window_thumbnail (EvWindow *ev_window, int rotation)
 
        ev_document_get_page_size (document, 0, &page_width, NULL);
        scale = 128. / page_width;
+       rotation = ev_document_model_get_rotation (ev_window->priv->model);
 
        ev_window->priv->thumbnail_job = ev_job_thumbnail_new (document, 0, rotation, scale);
        g_signal_connect (ev_window->priv->thumbnail_job, "finished",
@@ -1177,6 +1198,14 @@ ev_window_refresh_window_thumbnail (EvWindow *ev_window, int rotation)
        ev_job_scheduler_push_job (ev_window->priv->thumbnail_job, EV_JOB_PRIORITY_NONE);
 }
 
+static void
+override_restrictions_changed (GSettings *settings,
+                              gchar     *key,
+                              EvWindow  *ev_window)
+{
+       ev_window_setup_action_sensitivity (ev_window);
+}
+
 #ifdef WITH_GCONF
 static void
 lockdown_changed (GConfClient *client,
@@ -1197,12 +1226,18 @@ ev_window_setup_document (EvWindow *ev_window)
 
        ev_window->priv->setup_document_idle = 0;
        
-       ev_window_refresh_window_thumbnail (ev_window, 0);
+       ev_window_refresh_window_thumbnail (ev_window);
 
        ev_window_set_page_mode (ev_window, PAGE_MODE_DOCUMENT);
        ev_window_title_set_document (ev_window->priv->title, document);
        ev_window_title_set_uri (ev_window->priv->title, ev_window->priv->uri);
 
+       ev_window->priv->settings = g_settings_new (GS_SCHEMA_NAME);
+       g_signal_connect (ev_window->priv->settings,
+                         "changed::"GS_OVERRIDE_RESTRICTIONS,
+                         G_CALLBACK (override_restrictions_changed),
+                         ev_window);
+
 #ifdef WITH_GCONF
        if (!ev_window->priv->gconf_client)
                ev_window->priv->gconf_client = gconf_client_get_default ();
@@ -1210,18 +1245,10 @@ ev_window_setup_document (EvWindow *ev_window)
                              GCONF_LOCKDOWN_DIR,
                              GCONF_CLIENT_PRELOAD_ONELEVEL,
                              NULL);
-       gconf_client_add_dir (ev_window->priv->gconf_client,
-                             GCONF_OVERRIDE_RESTRICTIONS,
-                             GCONF_CLIENT_PRELOAD_NONE,
-                             NULL);
        gconf_client_notify_add (ev_window->priv->gconf_client,
                                 GCONF_LOCKDOWN_DIR,
                                 (GConfClientNotifyFunc)lockdown_changed,
                                 ev_window, NULL, NULL);
-       gconf_client_notify_add (ev_window->priv->gconf_client,
-                                GCONF_OVERRIDE_RESTRICTIONS,
-                                (GConfClientNotifyFunc)lockdown_changed,
-                                ev_window, NULL, NULL);
 #endif /* WITH_GCONF */
 
        ev_window_setup_action_sensitivity (ev_window);
@@ -1241,7 +1268,10 @@ ev_window_setup_document (EvWindow *ev_window)
        info = ev_document_get_info (document);
        update_document_mode (ev_window, info->mode);
 
-       gtk_widget_grab_focus (ev_window->priv->view);
+       if (EV_WINDOW_IS_PRESENTATION (ev_window))
+               gtk_widget_grab_focus (ev_window->priv->presentation_view);
+       else
+               gtk_widget_grab_focus (ev_window->priv->view);
 
        return FALSE;
 }
@@ -1835,7 +1865,8 @@ ev_window_open_uri (EvWindow       *ev_window,
                g_object_unref (ev_window->priv->metadata);
 
        source_file = g_file_new_for_uri (uri);
-       if (ev_is_metadata_supported_for_file (source_file))
+       if (!ev_file_is_temp (source_file) &&
+           ev_is_metadata_supported_for_file (source_file))
                ev_window->priv->metadata = ev_metadata_new (source_file);
        else
                ev_window->priv->metadata = NULL;
@@ -2310,6 +2341,23 @@ ev_window_get_recent_file_label (gint index, const gchar *filename)
        return g_string_free (str, FALSE);
 }
 
+static void
+ev_window_recent_action_connect_proxy_cb (GtkActionGroup *action_group,
+                                          GtkAction *action,
+                                          GtkWidget *proxy,
+                                          gpointer data)
+{
+        GtkLabel *label;
+
+        if (!GTK_IS_MENU_ITEM (proxy))
+                return;
+
+        label = GTK_LABEL (gtk_bin_get_child (GTK_BIN (proxy)));
+
+        gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_MIDDLE);
+        gtk_label_set_max_width_chars (label, MAX_RECENT_ITEM_LEN);
+}
+
 static void
 ev_window_setup_recent (EvWindow *ev_window)
 {
@@ -2331,8 +2379,11 @@ ev_window_setup_recent (EvWindow *ev_window)
                g_object_unref (ev_window->priv->recent_action_group);
        }
        ev_window->priv->recent_action_group = gtk_action_group_new ("RecentFilesActions");
+        g_signal_connect (ev_window->priv->recent_action_group, "connect-proxy",
+                          G_CALLBACK (ev_window_recent_action_connect_proxy_cb), NULL);
+
        gtk_ui_manager_insert_action_group (ev_window->priv->ui_manager,
-                                           ev_window->priv->recent_action_group, 0);
+                                           ev_window->priv->recent_action_group, -1);
 
        items = gtk_recent_manager_get_items (ev_window->priv->recent_manager);
        items = g_list_sort (items, (GCompareFunc) compare_recent_items);
@@ -2342,6 +2393,9 @@ ev_window_setup_recent (EvWindow *ev_window)
                GtkAction     *action;
                gchar         *action_name;
                gchar         *label;
+                const gchar   *mime_type;
+                gchar         *content_type;
+                GIcon         *icon = NULL;
 
                info = (GtkRecentInfo *) l->data;
 
@@ -2352,10 +2406,19 @@ ev_window_setup_recent (EvWindow *ev_window)
                action_name = g_strdup_printf ("RecentFile%u", i++);
                label = ev_window_get_recent_file_label (
                        n_items + 1, gtk_recent_info_get_display_name (info));
-               
+
+                mime_type = gtk_recent_info_get_mime_type (info);
+                content_type = g_content_type_from_mime_type (mime_type);
+                if (content_type != NULL) {
+                        icon = g_content_type_get_icon (content_type);
+                        g_free (content_type);
+                }
+
                action = g_object_new (GTK_TYPE_ACTION,
                                       "name", action_name,
                                       "label", label,
+                                       "gicon", icon,
+                                       "always-show-image", TRUE,
                                       NULL);
 
                g_object_set_data_full (G_OBJECT (action),
@@ -2380,6 +2443,8 @@ ev_window_setup_recent (EvWindow *ev_window)
                                       FALSE);
                g_free (action_name);
                g_free (label);
+                if (icon != NULL)
+                        g_object_unref (icon);
 
                if (++n_items == 5)
                        break;
@@ -2560,6 +2625,8 @@ ev_window_save_job_cb (EvJob     *job,
                ev_window_error_message (window, job->error,
                                         _("The file could not be saved as “%s”."),
                                         EV_JOB_SAVE (job)->uri);
+       } else {
+               ev_window_add_recent (window, EV_JOB_SAVE (job)->uri);
        }
 
        ev_window_clear_save_job (window);
@@ -2858,43 +2925,6 @@ get_print_page_setup (GKeyFile *key_file)
        return page_setup ? page_setup : gtk_page_setup_new ();
 }
 
-static void
-ev_window_print_page_setup_done_cb (GtkPageSetup *page_setup,
-                                   EvWindow     *window)
-{
-       /* Dialog was canceled */
-       if (!page_setup)
-               return;
-
-       ev_window_save_print_page_setup (window, page_setup);
-}
-
-static void
-ev_window_cmd_file_print_setup (GtkAction *action,
-                               EvWindow  *ev_window)
-{
-       GKeyFile         *print_settings_file;
-       GtkPrintSettings *print_settings;
-       GtkPageSetup     *print_page_setup;
-
-       print_settings_file = get_print_settings_file ();
-
-       print_settings = get_print_settings (print_settings_file);
-       ev_window_load_print_settings_from_metadata (ev_window, print_settings);
-
-       print_page_setup = get_print_page_setup (print_settings_file);
-       ev_window_load_print_page_setup_from_metadata (ev_window, print_page_setup);
-
-       gtk_print_run_page_setup_dialog_async (GTK_WINDOW (ev_window),
-                                              print_page_setup,
-                                              print_settings,
-                                              (GtkPageSetupDoneFunc)ev_window_print_page_setup_done_cb,
-                                              ev_window);
-       g_object_unref (print_settings);
-       g_object_unref (print_page_setup);
-       g_key_file_free (print_settings_file);
-}
-
 static void
 ev_window_print_cancel (EvWindow *ev_window)
 {
@@ -3220,6 +3250,15 @@ ev_window_cmd_file_close_window (GtkAction *action, EvWindow *ev_window)
        gchar     *text, *markup;
        gint       n_print_jobs;
 
+       if (EV_WINDOW_IS_PRESENTATION (ev_window)) {
+               gint current_page;
+
+               /* Save current page */
+               current_page = ev_view_presentation_get_current_page (
+                       EV_VIEW_PRESENTATION (ev_window->priv->presentation_view));
+               ev_document_model_set_page (ev_window->priv->model, current_page);
+       }
+
        n_print_jobs = ev_window->priv->print_queue ?
                g_queue_get_length (ev_window->priv->print_queue) : 0;
        
@@ -3471,7 +3510,6 @@ fullscreen_toolbar_remove_shadow (GtkWidget *toolbar)
 static void
 ev_window_run_fullscreen (EvWindow *window)
 {
-       EvView  *view = EV_VIEW (window->priv->view);
        gboolean fullscreen_window = TRUE;
 
        if (ev_document_model_get_fullscreen (window->priv->model))
@@ -3494,7 +3532,7 @@ ev_window_run_fullscreen (EvWindow *window)
                                       window->priv->fullscreen_toolbar, 1);
        }
 
-       if (ev_view_get_presentation (view)) {
+       if (EV_WINDOW_IS_PRESENTATION (window)) {
                ev_window_stop_presentation (window, FALSE);
                fullscreen_window = FALSE;
        }
@@ -3556,70 +3594,6 @@ ev_window_cmd_view_fullscreen (GtkAction *action, EvWindow *window)
        }
 }
 
-static gboolean
-presentation_timeout_cb (EvWindow *window)
-{
-       EvView *view = EV_VIEW (window->priv->view);
-
-       if (!view || !ev_view_get_presentation (EV_VIEW (view)))
-               return FALSE;
-
-       ev_view_hide_cursor (EV_VIEW (window->priv->view));
-       window->priv->presentation_timeout_id = 0;
-
-       return FALSE;
-}
-
-static void
-presentation_set_timeout (EvWindow *window)
-{
-       if (window->priv->presentation_timeout_id > 0) {
-               g_source_remove (window->priv->presentation_timeout_id);
-       }
-
-       window->priv->presentation_timeout_id =
-               g_timeout_add_seconds (PRESENTATION_TIMEOUT,
-                                      (GSourceFunc)presentation_timeout_cb, window);
-
-       ev_view_show_cursor (EV_VIEW (window->priv->view));
-}
-
-static void
-presentation_clear_timeout (EvWindow *window)
-{
-       if (window->priv->presentation_timeout_id > 0) {
-               g_source_remove (window->priv->presentation_timeout_id);
-       }
-       
-       window->priv->presentation_timeout_id = 0;
-
-       ev_view_show_cursor (EV_VIEW (window->priv->view));
-}
-
-static gboolean
-presentation_motion_notify_cb (GtkWidget *widget,
-                              GdkEventMotion *event,
-                              gpointer user_data)
-{
-       EvWindow *window = EV_WINDOW (user_data);
-
-       presentation_set_timeout (window);
-
-       return FALSE;
-}
-
-static gboolean
-presentation_leave_notify_cb (GtkWidget *widget,
-                             GdkEventCrossing *event,
-                             gpointer user_data)
-{
-       EvWindow *window = EV_WINDOW (user_data);
-
-       presentation_clear_timeout (window);
-
-       return FALSE;
-}
-
 static void
 ev_window_update_presentation_action (EvWindow *window)
 {
@@ -3629,50 +3603,60 @@ ev_window_update_presentation_action (EvWindow *window)
        g_signal_handlers_block_by_func
                (action, G_CALLBACK (ev_window_cmd_view_presentation), window);
        gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
-                                     ev_view_get_presentation (EV_VIEW (window->priv->view)));
+                                     EV_WINDOW_IS_PRESENTATION (window));
        g_signal_handlers_unblock_by_func
                (action, G_CALLBACK (ev_window_cmd_view_presentation), window);
 }
 
+static void
+ev_window_view_presentation_finished (EvWindow *window)
+{
+       ev_window_stop_presentation (window, TRUE);
+}
+
 static void
 ev_window_run_presentation (EvWindow *window)
 {
-       EvView  *view = EV_VIEW (window->priv->view);
        gboolean fullscreen_window = TRUE;
+       guint    current_page;
+       guint    rotation;
+       gboolean inverted_colors;
 
-       if (ev_view_get_presentation (view))
+       if (EV_WINDOW_IS_PRESENTATION (window))
                return;
 
        if (ev_document_model_get_fullscreen (window->priv->model)) {
                ev_window_stop_fullscreen (window, FALSE);
                fullscreen_window = FALSE;
        }
-       
-       g_object_set (G_OBJECT (window->priv->scrolled_window),
-                     "shadow-type", GTK_SHADOW_NONE,
-                     NULL);
 
-       ev_view_set_presentation (view, TRUE);
-       ev_window_update_presentation_action (window);
+       current_page = ev_document_model_get_page (window->priv->model);
+       rotation = ev_document_model_get_rotation (window->priv->model);
+       inverted_colors = ev_document_model_get_inverted_colors (window->priv->model);
+       window->priv->presentation_view = ev_view_presentation_new (window->priv->document,
+                                                                   current_page,
+                                                                   rotation,
+                                                                   inverted_colors);
+       g_signal_connect_swapped (window->priv->presentation_view, "finished",
+                                 G_CALLBACK (ev_window_view_presentation_finished),
+                                 window);
+
+       gtk_box_pack_start (GTK_BOX (window->priv->main_box),
+                           window->priv->presentation_view,
+                           TRUE, TRUE, 0);
 
+       gtk_widget_hide (window->priv->hpaned);
+       ev_window_update_presentation_action (window);
        update_chrome_visibility (window);
-       
-       gtk_widget_grab_focus (window->priv->view);
+
+       gtk_widget_grab_focus (window->priv->presentation_view);
        if (fullscreen_window)
                gtk_window_fullscreen (GTK_WINDOW (window));
 
-       g_signal_connect (window->priv->view,
-                         "motion-notify-event",
-                         G_CALLBACK (presentation_motion_notify_cb),
-                         window);
-       g_signal_connect (window->priv->view,
-                         "leave-notify-event",
-                         G_CALLBACK (presentation_leave_notify_cb),
-                         window);
-       presentation_set_timeout (window);
+       gtk_widget_show (window->priv->presentation_view);
 
        ev_application_screensaver_disable (EV_APP);
-       
+
        if (window->priv->metadata && !ev_window_is_empty (window))
                ev_metadata_set_boolean (window->priv->metadata, "presentation", TRUE);
 }
@@ -3681,28 +3665,25 @@ static void
 ev_window_stop_presentation (EvWindow *window,
                             gboolean  unfullscreen_window)
 {
-       EvView *view = EV_VIEW (window->priv->view);
-       
-       if (!ev_view_get_presentation (view))
+       guint current_page;
+
+       if (!EV_WINDOW_IS_PRESENTATION (window))
                return;
 
-       g_object_set (G_OBJECT (window->priv->scrolled_window),
-                     "shadow-type", GTK_SHADOW_IN,
-                     NULL);
+       current_page = ev_view_presentation_get_current_page (EV_VIEW_PRESENTATION (window->priv->presentation_view));
+       ev_document_model_set_page (window->priv->model, current_page);
 
-       ev_view_set_presentation (EV_VIEW (window->priv->view), FALSE);
+       gtk_container_remove (GTK_CONTAINER (window->priv->main_box),
+                             window->priv->presentation_view);
+       window->priv->presentation_view = NULL;
+
+       gtk_widget_show (window->priv->hpaned);
        ev_window_update_presentation_action (window);
        update_chrome_visibility (window);
        if (unfullscreen_window)
                gtk_window_unfullscreen (GTK_WINDOW (window));
 
-       g_signal_handlers_disconnect_by_func (window->priv->view,
-                                             (gpointer) presentation_motion_notify_cb,
-                                             window);
-       g_signal_handlers_disconnect_by_func (window->priv->view,
-                                             (gpointer) presentation_leave_notify_cb,
-                                             window);
-       presentation_clear_timeout (window);
+       gtk_widget_grab_focus (window->priv->view);
 
        ev_application_screensaver_enable (EV_APP);
 
@@ -3764,7 +3745,7 @@ ev_window_screen_changed (GtkWidget *widget,
                return;
 
        ev_window_setup_gtk_settings (window);
-       dpi = get_screen_dpi (GTK_WINDOW (window));
+       dpi = get_screen_dpi (window);
        ev_document_model_set_min_scale (priv->model, MIN_SCALE * dpi / 72.0);
        ev_document_model_set_max_scale (priv->model, MAX_SCALE * dpi / 72.0);
 
@@ -3778,7 +3759,6 @@ ev_window_state_event (GtkWidget           *widget,
                       GdkEventWindowState *event)
 {
        EvWindow *window = EV_WINDOW (widget);
-       EvView   *view = EV_VIEW (window->priv->view);
 
        if (GTK_WIDGET_CLASS (ev_window_parent_class)->window_state_event) {
                GTK_WIDGET_CLASS (ev_window_parent_class)->window_state_event (widget, event);
@@ -3788,14 +3768,14 @@ ev_window_state_event (GtkWidget           *widget,
                return FALSE;
 
        if (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) {
-               if (ev_document_model_get_fullscreen (window->priv->model) || ev_view_get_presentation (view))
+               if (ev_document_model_get_fullscreen (window->priv->model) || EV_WINDOW_IS_PRESENTATION (window))
                        return FALSE;
                
                ev_window_run_fullscreen (window);
        } else {
                if (ev_document_model_get_fullscreen (window->priv->model))
                        ev_window_stop_fullscreen (window, FALSE);
-               else if (ev_view_get_presentation (view))
+               else if (EV_WINDOW_IS_PRESENTATION (window))
                        ev_window_stop_presentation (window, FALSE);
        }
 
@@ -3885,6 +3865,7 @@ ev_window_cmd_edit_toolbar (GtkAction *action, EvWindow *ev_window)
 {
        GtkWidget          *dialog;
        GtkWidget          *editor;
+       GtkWidget          *content_area;
        EggEditableToolbar *toolbar;
 
        dialog = gtk_dialog_new_with_buttons (_("Toolbar Editor"),
@@ -3893,9 +3874,10 @@ ev_window_cmd_edit_toolbar (GtkAction *action, EvWindow *ev_window)
                                              GTK_STOCK_CLOSE,
                                              GTK_RESPONSE_CLOSE,
                                              NULL);
+       content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
        gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
        gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)), 5);
-       gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 2);
+       gtk_box_set_spacing (GTK_BOX (content_area), 2);
        gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
        gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 400);
 
@@ -3906,7 +3888,7 @@ ev_window_cmd_edit_toolbar (GtkAction *action, EvWindow *ev_window)
        gtk_container_set_border_width (GTK_CONTAINER (editor), 5);
        gtk_box_set_spacing (GTK_BOX (EGG_TOOLBAR_EDITOR (editor)), 5);
 
-       gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), editor);
+       gtk_container_add (GTK_CONTAINER (content_area), editor);
 
        egg_editable_toolbar_set_edit_mode (toolbar, TRUE);
 
@@ -4008,13 +3990,19 @@ ev_window_cmd_view_autoscroll (GtkAction *action, EvWindow *ev_window)
        ev_view_autoscroll_start (EV_VIEW (ev_window->priv->view));
 }
 
+#if OFFLINE_HELP_ENABLED
+#define EV_HELP "ghelp:evince"
+#else
+#define EV_HELP "http://library.gnome.org/users/evince/stable/"
+#endif
+
 static void
 ev_window_cmd_help_contents (GtkAction *action, EvWindow *ev_window)
 {
        GError  *error = NULL;
 
        gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (ev_window)),
-                     "ghelp:evince",
+                     EV_HELP,
                      gtk_get_current_event_time (),
                      &error);
        if (error) {
@@ -4050,23 +4038,19 @@ ev_window_cmd_escape (GtkAction *action, EvWindow *window)
                gtk_widget_grab_focus (window->priv->view);
        } else {
                gboolean fullscreen;
-               gboolean presentation;
 
                fullscreen = ev_document_model_get_fullscreen (window->priv->model);
-               g_object_get (window->priv->view,
-                             "presentation", &presentation,
-                             NULL);
 
                if (fullscreen) {
                        ev_window_stop_fullscreen (window, TRUE);
-               } else if (presentation) {
+               } else if (EV_WINDOW_IS_PRESENTATION (window)) {
                        ev_window_stop_presentation (window, TRUE);
                        gtk_widget_grab_focus (window->priv->view);
                } else {
                        gtk_widget_grab_focus (window->priv->view);
                }
 
-               if (fullscreen && presentation)
+               if (fullscreen && EV_WINDOW_IS_PRESENTATION (window))
                        g_warning ("Both fullscreen and presentation set somehow");
        }
 }
@@ -4125,7 +4109,7 @@ ev_window_zoom_changed_cb (EvDocumentModel *model, GParamSpec *pspec, EvWindow *
                gdouble zoom;
 
                zoom = ev_document_model_get_scale (model);
-               zoom *= 72.0 / get_screen_dpi (GTK_WINDOW (ev_window));
+               zoom *= 72.0 / get_screen_dpi (ev_window);
                ev_metadata_set_double (ev_window->priv->metadata, "zoom", zoom);
        }
 }
@@ -4181,7 +4165,7 @@ ev_window_rotation_changed_cb (EvDocumentModel *model,
                ev_metadata_set_int (window->priv->metadata, "rotation",
                                     rotation);
 
-       ev_window_refresh_window_thumbnail (window, rotation);
+       ev_window_refresh_window_thumbnail (window);
 }
 
 static void
@@ -4204,7 +4188,6 @@ ev_window_inverted_colors_changed_cb (EvDocumentModel *model,
                                      EvWindow        *window)
 {
        gboolean inverted_colors = ev_document_model_get_inverted_colors (model);
-       gint rotation = ev_document_model_get_rotation (model);
 
        ev_window_update_inverted_colors_action (window);
 
@@ -4212,13 +4195,7 @@ ev_window_inverted_colors_changed_cb (EvDocumentModel *model,
                ev_metadata_set_boolean (window->priv->metadata, "inverted-colors",
                                         inverted_colors);
 
-       ev_window_refresh_window_thumbnail (window, rotation);
-}
-
-static void
-ev_window_has_selection_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *window)
-{
-        ev_window_update_actions (window);
+       ev_window_refresh_window_thumbnail (window);
 }
 
 static void
@@ -4234,33 +4211,21 @@ ev_window_dual_mode_changed_cb (EvDocumentModel *model,
 }
 
 static char *
-build_comments_string (void)
-{
-#ifdef ENABLE_PDF
-       PopplerBackend backend;
-       const char *backend_name;
-       const char *version;
-
-       backend = poppler_get_backend ();
-       version = poppler_get_version ();
-       switch (backend) {
-               case POPPLER_BACKEND_CAIRO:
-                       backend_name = "cairo";
-                       break;
-               case POPPLER_BACKEND_SPLASH:
-                       backend_name = "splash";
-                       break;
-               default:
-                       backend_name = "unknown";
-                       break;
+build_comments_string (EvDocument *document)
+{
+       gchar *comments = NULL;
+       EvDocumentBackendInfo info;
+
+       if (document && ev_document_get_backend_info (document, &info)) {
+               comments = g_strdup_printf (
+                       _("Document Viewer\nUsing %s (%s)"),
+                       info.name, info.version);
+       } else {
+               comments = g_strdup_printf (
+                       _("Document Viewer"));
        }
 
-       return g_strdup_printf (_("Document Viewer.\n"
-                                 "Using poppler %s (%s)"),
-                               version, backend_name);
-#else
-       return g_strdup_printf (_("Document Viewer"));
-#endif
+       return comments;
 }
 
 static void
@@ -4294,7 +4259,7 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window)
                   "GNU General Public License for more details.\n"),
                N_("You should have received a copy of the GNU General Public License "
                   "along with Evince; if not, write to the Free Software Foundation, Inc., "
-                  "59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n")
+                  "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA\n")
        };
 
        char *license_trans;
@@ -4312,7 +4277,8 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window)
 
        license_trans = g_strconcat (_(license[0]), "\n", _(license[1]), "\n",
                                     _(license[2]), "\n", NULL);
-       comments = build_comments_string ();
+
+       comments = build_comments_string (ev_window->priv->document);
 
        gtk_show_about_dialog (
                GTK_WINDOW (ev_window),
@@ -4344,12 +4310,14 @@ ev_window_view_toolbar_cb (GtkAction *action, EvWindow *ev_window)
        update_chrome_visibility (ev_window);
        if (ev_window->priv->metadata)
                ev_metadata_set_boolean (ev_window->priv->metadata, "show_toolbar", active);
+       if (ev_window->priv->document)
+               g_settings_set_boolean (ev_window->priv->last_settings, "show-toolbar", active);
 }
 
 static void
 ev_window_view_sidebar_cb (GtkAction *action, EvWindow *ev_window)
 {
-       if (ev_view_get_presentation (EV_VIEW (ev_window->priv->view)))
+       if (EV_WINDOW_IS_PRESENTATION (ev_window))
                return;
            
        update_chrome_flag (ev_window, EV_CHROME_SIDEBAR,
@@ -4390,18 +4358,20 @@ ev_window_sidebar_visibility_changed_cb (EvSidebar  *ev_sidebar,
                                         GParamSpec *pspec,
                                         EvWindow   *ev_window)
 {
-       EvView *view = EV_VIEW (ev_window->priv->view);
        GtkAction *action;
 
        action = gtk_action_group_get_action (ev_window->priv->action_group, "ViewSidebar");
 
-       if (!ev_view_get_presentation (view)) {
-               gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
-                                             GTK_WIDGET_VISIBLE (ev_sidebar));
+       if (!EV_WINDOW_IS_PRESENTATION (ev_window)) {
+               gboolean visible = gtk_widget_get_visible (GTK_WIDGET (ev_sidebar));
+
+               gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), visible);
 
                if (ev_window->priv->metadata)
                        ev_metadata_set_boolean (ev_window->priv->metadata, "sidebar_visibility",
-                                                GTK_WIDGET_VISIBLE (ev_sidebar));
+                                                visible);
+               if (ev_window->priv->document)
+                       g_settings_set_boolean (ev_window->priv->last_settings, "show-sidebar", visible);
        }
 }
 
@@ -4519,19 +4489,34 @@ view_menu_annot_popup (EvWindow     *ev_window,
 
 static gboolean
 view_menu_popup_cb (EvView   *view,
-                   GObject  *object,
+                   GList    *items,
                    EvWindow *ev_window)
 {
-       if (ev_view_get_presentation (EV_VIEW (ev_window->priv->view)))
-               return FALSE;
+       GList   *l;
+       gboolean has_link = FALSE;
+       gboolean has_image = FALSE;
+       gboolean has_annot = FALSE;
+
+       for (l = items; l; l = g_list_next (l)) {
+               if (EV_IS_LINK (l->data)) {
+                       view_menu_link_popup (ev_window, EV_LINK (l->data));
+                       has_link = TRUE;
+               } else if (EV_IS_IMAGE (l->data)) {
+                       view_menu_image_popup (ev_window, EV_IMAGE (l->data));
+                       has_image = TRUE;
+               } else if (EV_IS_ANNOTATION (l->data)) {
+                       view_menu_annot_popup (ev_window, EV_ANNOTATION (l->data));
+                       has_annot = TRUE;
+               }
+       }
+
+       if (!has_link)
+               view_menu_link_popup (ev_window, NULL);
+       if (!has_image)
+               view_menu_image_popup (ev_window, NULL);
+       if (!has_annot)
+               view_menu_annot_popup (ev_window, NULL);
 
-       view_menu_link_popup (ev_window,
-                             EV_IS_LINK (object) ? EV_LINK (object) : NULL);
-       view_menu_image_popup (ev_window,
-                              EV_IS_IMAGE (object) ? EV_IMAGE (object) : NULL);
-       view_menu_annot_popup (ev_window,
-                              EV_IS_ANNOTATION (object) ? EV_ANNOTATION (object) : NULL);
-       
        gtk_menu_popup (GTK_MENU (ev_window->priv->view_popup),
                        NULL, NULL, NULL, NULL,
                        3, gtk_get_current_event_time ());
@@ -4705,7 +4690,7 @@ find_bar_visibility_changed_cb (EggFindBar *find_bar,
 {
        gboolean visible;
 
-       visible = GTK_WIDGET_VISIBLE (find_bar);
+       visible = gtk_widget_get_visible (GTK_WIDGET (find_bar));
 
        if (ev_window->priv->document &&
            EV_IS_DOCUMENT_FIND (ev_window->priv->document)) {
@@ -4747,7 +4732,7 @@ zoom_control_changed_cb (EphyZoomAction *action,
 
        if (mode == EV_SIZING_FREE) {
                ev_document_model_set_scale (ev_window->priv->model,
-                                            zoom * get_screen_dpi (GTK_WINDOW (ev_window)) / 72.0);
+                                            zoom * get_screen_dpi (ev_window) / 72.0);
        }
 }
 
@@ -4876,6 +4861,17 @@ ev_window_dispose (GObject *object)
                priv->recent_manager = NULL;
        }
 
+       if (priv->settings) {
+               g_object_unref (priv->settings);
+               priv->settings = NULL;
+       }
+
+       if (priv->last_settings) {
+               g_settings_apply (priv->last_settings);
+               g_object_unref (priv->last_settings);
+               priv->last_settings = NULL;
+       }
+
        priv->recent_ui_id = 0;
 
        if (priv->model) {
@@ -4980,11 +4976,6 @@ ev_window_dispose (GObject *object)
                priv->history = NULL;
        }
 
-       if (priv->presentation_timeout_id > 0) {
-               g_source_remove (priv->presentation_timeout_id);
-               priv->presentation_timeout_id = 0;
-       }
-
        if (priv->print_queue) {
                g_queue_free (priv->print_queue);
                priv->print_queue = NULL;
@@ -5020,18 +5011,18 @@ ev_window_key_press_event (GtkWidget   *widget,
         */
        if (priv->view) {
                g_object_ref (priv->view);
-               if (GTK_WIDGET_IS_SENSITIVE (priv->view))
+               if (gtk_widget_is_sensitive (priv->view))
                        handled = gtk_widget_event (priv->view, (GdkEvent*) event);
                g_object_unref (priv->view);
        }
 
-       if (!handled && !ev_view_get_presentation (EV_VIEW (priv->view))) {
+       if (!handled && !EV_WINDOW_IS_PRESENTATION (ev_window)) {
                guint modifier = event->state & gtk_accelerator_get_default_mod_mask ();
 
                if (priv->menubar_accel_keyval != 0 &&
                    event->keyval == priv->menubar_accel_keyval &&
                    modifier == priv->menubar_accel_modifier) {
-                       if (!GTK_WIDGET_VISIBLE (priv->menubar)) {
+                       if (!gtk_widget_get_visible (priv->menubar)) {
                                g_signal_connect (priv->menubar, "deactivate",
                                                  G_CALLBACK (menubar_deactivate_cb),
                                                  ev_window);
@@ -5077,19 +5068,16 @@ static const GtkActionEntry entries[] = {
        { "Help", NULL, N_("_Help") },
 
        /* File menu */
-       { "FileOpen", GTK_STOCK_OPEN, N_("_Open..."), "<control>O",
+       { "FileOpen", GTK_STOCK_OPEN, N_("_Open"), "<control>O",
          N_("Open an existing document"),
          G_CALLBACK (ev_window_cmd_file_open) },
        { "FileOpenCopy", NULL, N_("Op_en a Copy"), "<control>N",
          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",
+               { "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) },
-       { "FilePageSetup", GTK_STOCK_PAGE_SETUP, N_("Page 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",
+       { "FilePrint", GTK_STOCK_PRINT, N_("_Print…"), "<control>P",
          N_("Print this document"),
          G_CALLBACK (ev_window_cmd_file_print) },
        { "FileProperties", GTK_STOCK_PROPERTIES, N_("P_roperties"), "<alt>Return", NULL,
@@ -5102,7 +5090,7 @@ static const GtkActionEntry entries[] = {
           G_CALLBACK (ev_window_cmd_edit_copy) },
        { "EditSelectAll", GTK_STOCK_SELECT_ALL, N_("Select _All"), "<control>A", NULL,
          G_CALLBACK (ev_window_cmd_edit_select_all) },
-        { "EditFind", GTK_STOCK_FIND, N_("_Find..."), "<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,
@@ -5240,7 +5228,8 @@ static const GtkToggleActionEntry toggle_entries[] = {
         { "ViewPageWidth", EV_STOCK_ZOOM_WIDTH, N_("Fit Page _Width"), NULL,
           N_("Make the current document fill the window width"),
           G_CALLBACK (ev_window_cmd_view_page_width) },
-       { "ViewInvertedColors", EV_STOCK_INVERTED_COLORS, N_("_Inverted Colors"), "<control>I", NULL,
+       { "ViewInvertedColors", EV_STOCK_INVERTED_COLORS, N_("_Inverted Colors"), "<control>I",
+         N_("Show page contents with the colors inverted"),
          G_CALLBACK (ev_window_cmd_view_inverted_colors) },
 
 };
@@ -5256,7 +5245,7 @@ static const GtkActionEntry view_popup_entries [] = {
          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) },
-       { "SaveImageAs", NULL, N_("_Save Image As..."), NULL,
+       { "SaveImageAs", NULL, N_("_Save Image As"), NULL,
          NULL, G_CALLBACK (ev_view_popup_cmd_save_image_as) },
        { "CopyImage", NULL, N_("Copy _Image"), NULL,
          NULL, G_CALLBACK (ev_view_popup_cmd_copy_image) },
@@ -5265,7 +5254,7 @@ static const GtkActionEntry view_popup_entries [] = {
 static const GtkActionEntry attachment_popup_entries [] = {
        { "OpenAttachment", GTK_STOCK_OPEN, N_("_Open Attachment"), NULL,
          NULL, G_CALLBACK (ev_attachment_popup_cmd_open_attachment) },
-       { "SaveAttachmentAs", GTK_STOCK_SAVE_AS, N_("_Save Attachment As..."), NULL,
+       { "SaveAttachmentAs", GTK_STOCK_SAVE_AS, N_("_Save Attachment As"), NULL,
          NULL, G_CALLBACK (ev_attachment_popup_cmd_save_attachment_as) },
 };
 
@@ -5344,7 +5333,7 @@ register_custom_actions (EvWindow *window, GtkActionGroup *group)
 
        action = g_object_new (EV_TYPE_OPEN_RECENT_ACTION,
                               "name", "FileOpenRecent",
-                              "label", _("_Open..."),
+                              "label", _("_Open"),
                               "tooltip", _("Open an existing document"),
                               "stock_id", GTK_STOCK_OPEN,
                               NULL);
@@ -5496,16 +5485,16 @@ window_configure_event_cb (EvWindow *window, GdkEventConfigure *event, gpointer
        if (!window->priv->metadata)
                return FALSE;
 
-       state = gdk_window_get_state (GTK_WIDGET (window)->window);
+       state = gdk_window_get_state (gtk_widget_get_window (GTK_WIDGET (window)));
 
        if (!(state & GDK_WINDOW_STATE_FULLSCREEN)) {
-               if (!ev_window_is_empty (window) && window->priv->document) {
+               if (window->priv->document) {
                        ev_document_get_max_page_size (window->priv->document,
                                                       &document_width, &document_height);
-                       ev_metadata_set_double (window->priv->metadata, "window_width_ratio",
-                                               (double)event->width / document_width);
-                       ev_metadata_set_double (window->priv->metadata, "window_height_ratio",
-                                               (double)event->height / document_height);
+                       g_settings_set (window->priv->last_settings, "window-ratio", "(dd)",
+                                       (double)event->width / document_width,
+                                       (double)event->height / document_height);
+
                        ev_metadata_set_int (window->priv->metadata, "window_x", event->x);
                        ev_metadata_set_int (window->priv->metadata, "window_y", event->y);
                        ev_metadata_set_int (window->priv->metadata, "window_width", event->width);
@@ -5592,18 +5581,35 @@ launch_external_uri (EvWindow *window, EvLinkAction *action)
 
        if (!g_strstr_len (uri, strlen (uri), "://") &&
            !g_str_has_prefix (uri, "mailto:")) {
-               gchar *http;
-               
-               /* Not a valid uri, assuming it's http */
-               http = g_strdup_printf ("http://%s", uri);
-               ret = g_app_info_launch_default_for_uri (http, context, &error);
-               g_free (http);
+               gchar *new_uri;
+
+               /* Not a valid uri, assume http if it starts with www */
+               if (g_str_has_prefix (uri, "www.")) {
+                       new_uri = g_strdup_printf ("http://%s", uri);
+               } else {
+                       GFile *file, *parent;
+
+                       file = g_file_new_for_uri (window->priv->uri);
+                       parent = g_file_get_parent (file);
+                       g_object_unref (file);
+                       if (parent) {
+                               gchar *parent_uri = g_file_get_uri (parent);
+
+                               new_uri = g_build_filename (parent_uri, uri, NULL);
+                               g_free (parent_uri);
+                               g_object_unref (parent);
+                       } else {
+                               new_uri = g_strdup_printf ("file:///%s", uri);
+                       }
+               }
+               ret = g_app_info_launch_default_for_uri (new_uri, context, &error);
+               g_free (new_uri);
        } else {
                ret = g_app_info_launch_default_for_uri (uri, context, &error);
        }
-       
+
        if (ret == FALSE) {
-               ev_window_error_message (window, error, 
+               ev_window_error_message (window, error,
                                         "%s", _("Unable to open external link"));
                g_error_free (error);
        }
@@ -6120,6 +6126,7 @@ ev_window_init (EvWindow *ev_window)
        GtkAccelGroup *accel_group;
        GError *error = NULL;
        GtkWidget *sidebar_widget;
+       GtkWidget *menuitem;
        EggToolbarsModel *toolbars_model;
        GObject *mpkeys;
        gchar *ui_path;
@@ -6190,16 +6197,6 @@ ev_window_init (EvWindow *ev_window)
        }
        g_free (ui_path);
 
-#if GTK_CHECK_VERSION (2, 17, 4)
-       {
-               GtkAction *action;
-
-               action = gtk_action_group_get_action (ev_window->priv->action_group,
-                                                     "FilePageSetup");
-               g_object_set (action, "visible", FALSE, "sensitive", FALSE, NULL);
-       }
-#endif
-
        ev_window->priv->recent_manager = gtk_recent_manager_get_default ();
        ev_window->priv->recent_action_group = NULL;
        ev_window->priv->recent_ui_id = 0;
@@ -6214,6 +6211,12 @@ ev_window_init (EvWindow *ev_window)
        gtk_box_pack_start (GTK_BOX (ev_window->priv->main_box),
                            ev_window->priv->menubar,
                            FALSE, FALSE, 0);
+       menuitem = gtk_ui_manager_get_widget (ev_window->priv->ui_manager,
+                                             "/MainMenu/EditMenu/EditRotateLeftMenu");
+       gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (menuitem), TRUE);
+       menuitem = gtk_ui_manager_get_widget (ev_window->priv->ui_manager,
+                                             "/MainMenu/EditMenu/EditRotateRightMenu");
+       gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (menuitem), TRUE);
 
        toolbars_model = get_toolbars_model ();
        ev_window->priv->toolbar = GTK_WIDGET
@@ -6314,7 +6317,7 @@ ev_window_init (EvWindow *ev_window)
 
        ev_window->priv->view = ev_view_new ();
        ev_view_set_model (EV_VIEW (ev_window->priv->view), ev_window->priv->model);
-       dpi = get_screen_dpi (GTK_WINDOW (ev_window));
+       dpi = get_screen_dpi (ev_window);
        ev_document_model_set_min_scale (ev_window->priv->model, MIN_SCALE * dpi / 72.0);
        ev_document_model_set_max_scale (ev_window->priv->model, MAX_SCALE * dpi / 72.0);
        ev_window->priv->password_view = ev_password_view_new (GTK_WINDOW (ev_window));
@@ -6334,10 +6337,12 @@ ev_window_init (EvWindow *ev_window)
        g_signal_connect_object (ev_window->priv->view, "handle-link",
                                 G_CALLBACK (view_handle_link_cb),
                                 ev_window, 0);
-       g_signal_connect_object (ev_window->priv->view,
-                                "popup",
+       g_signal_connect_object (ev_window->priv->view, "popup",
                                 G_CALLBACK (view_menu_popup_cb),
                                 ev_window, 0);
+       g_signal_connect_object (ev_window->priv->view, "selection-changed",
+                                G_CALLBACK (view_selection_changed_cb),
+                                ev_window, 0);
        gtk_widget_show (ev_window->priv->view);
        gtk_widget_show (ev_window->priv->password_view);
 
@@ -6383,16 +6388,10 @@ ev_window_init (EvWindow *ev_window)
                          "notify::dual-page",
                          G_CALLBACK (ev_window_dual_mode_changed_cb),
                          ev_window);
-
-       /* Connect to view signals */
        g_signal_connect (ev_window->priv->model,
                          "notify::inverted-colors",
                          G_CALLBACK (ev_window_inverted_colors_changed_cb),
                          ev_window);
-       g_signal_connect (ev_window->priv->view,
-                         "notify::has-selection",
-                         G_CALLBACK (ev_window_has_selection_changed_cb),
-                         ev_window);
 
        /* Connect sidebar signals */
        g_signal_connect (ev_window->priv->sidebar,
@@ -6454,6 +6453,9 @@ ev_window_init (EvWindow *ev_window)
        /* Give focus to the document view */
        gtk_widget_grab_focus (ev_window->priv->view);
 
+       ev_window->priv->last_settings = g_settings_new (GS_SCHEMA_NAME".Default");
+       g_settings_delay (ev_window->priv->last_settings);
+
        /* Set it user interface params */
        ev_window_setup_recent (ev_window);