]> www.fi.muni.cz Git - evince.git/blobdiff - shell/ev-window.c
Don't use libgnome to open help, instead call Yelp directly.
[evince.git] / shell / ev-window.c
index 9c74f3970fd45443ba53630e9fc860c9a01ae43e..b18abe7625ce1af8df1c51166c1f8e5543f6f327 100644 (file)
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <gnome.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <libgnomevfs/gnome-vfs-async-ops.h>
 #include <gconf/gconf-client.h>
 
+#include <errno.h>
+#include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
+
+char *xdg_user_dir_lookup (char *type);
 
 typedef enum {
        PAGE_MODE_DOCUMENT,
@@ -116,7 +120,6 @@ struct _EvWindowPrivate {
 
        GtkWidget *main_box;
        GtkWidget *menubar;
-       GtkWidget *toolbar_dock;
        GtkWidget *toolbar;
        GtkWidget *hpaned;
        GtkWidget *sidebar;
@@ -127,7 +130,6 @@ struct _EvWindowPrivate {
        GtkWidget *sidebar_thumbs;
        GtkWidget *sidebar_links;
        GtkWidget *sidebar_attachments;
-       GtkWidget *preview_toolbar;
 
        /* Dialogs */
        GtkWidget *properties;
@@ -149,8 +151,12 @@ struct _EvWindowPrivate {
 
        /* Fullscreen mode */
        GtkWidget *fullscreen_toolbar;
-       GtkWidget *fullscreen_popup;
-       guint      fullscreen_timeout_id;
+
+       /* Presentation mode */
+       guint      presentation_timeout_id;
+
+       /* Preview mode */
+       GtkWidget *preview_toolbar;
 
        /* Popup view */
        GtkWidget *view_popup;
@@ -202,7 +208,7 @@ struct _EvWindowPrivate {
 #define GCONF_LOCKDOWN_SAVE         "/desktop/gnome/lockdown/disable_save_to_disk"
 #define GCONF_LOCKDOWN_PRINT        "/desktop/gnome/lockdown/disable_printing"
 
-#define FULLSCREEN_TIMEOUT 5 * 1000
+#define PRESENTATION_TIMEOUT 5 * 1000
 
 #define SIDEBAR_DEFAULT_SIZE    132
 #define LINKS_SIDEBAR_ID "links"
@@ -210,7 +216,6 @@ struct _EvWindowPrivate {
 #define ATTACHMENTS_SIDEBAR_ID "attachments"
 
 static void    ev_window_update_actions                (EvWindow *ev_window);
-static void     ev_window_update_fullscreen_popup       (EvWindow         *window);
 static void     ev_window_sidebar_visibility_changed_cb (EvSidebar        *ev_sidebar,
                                                         GParamSpec       *pspec,
                                                         EvWindow         *ev_window);
@@ -259,13 +264,6 @@ static void        ev_window_cmd_view_best_fit             (GtkAction        *action,
                                                         EvWindow         *ev_window);
 static void    ev_window_cmd_view_page_width           (GtkAction        *action, 
                                                         EvWindow         *ev_window);
-static void    fullscreen_set_timeout                  (EvWindow *window);
-static gboolean fullscreen_motion_notify_cb            (GtkWidget *widget,
-                                                        GdkEventMotion *event,
-                                                        gpointer user_data);
-static gboolean fullscreen_leave_notify_cb             (GtkWidget *widget,
-                                                        GdkEventCrossing *event,
-                                                        gpointer user_data);
 static void    view_handle_link_cb                     (EvView *view, 
                                                         EvLink *link, 
                                                         EvWindow *window);
@@ -522,17 +520,18 @@ update_chrome_visibility (EvWindow *window)
        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->toolbar, toolbar);
        set_widget_visibility (priv->find_bar, findbar);
        set_widget_visibility (priv->sidebar, sidebar);
-       set_widget_visibility (priv->preview_toolbar, preview_toolbar);
+       
+       if (priv->preview_toolbar)
+               set_widget_visibility (priv->preview_toolbar, preview_toolbar);
 
        ev_window_set_action_sensitive (window, "EditToolbar", toolbar);
        gtk_widget_set_sensitive (priv->menubar, menubar);
 
-       if (priv->fullscreen_popup != NULL) {
+       if (priv->fullscreen_toolbar != NULL) {
                set_widget_visibility (priv->fullscreen_toolbar, fullscreen_toolbar);
-               set_widget_visibility (priv->fullscreen_popup, fullscreen_toolbar);
        }
 }
 
@@ -604,6 +603,16 @@ update_sizing_buttons (EvWindow *window)
        }
 }
 
+/**
+ * ev_window_is_empty:
+ * @ev_window: The instance of the #EvWindow.
+ *
+ * It does look if there is any document loaded or if there is any job to load
+ * a document.
+ *
+ * Returns: %TRUE if there isn't any document loaded or any any documente to be
+ *          loaded, %FALSE in other case.
+ */
 gboolean
 ev_window_is_empty (const EvWindow *ev_window)
 {
@@ -842,7 +851,7 @@ setup_sidebar_from_metadata (EvWindow *window, EvDocument *document)
                } else if (strcmp (page_id, THUMBNAILS_SIDEBAR_ID) && ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (thumbs), document)) {
                        ev_sidebar_set_page (EV_SIDEBAR (sidebar), thumbs);
                } else if (strcmp (page_id, ATTACHMENTS_SIDEBAR_ID) && ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (attachments), document)) {
-                       ev_sidebar_set_page (EV_SIDEBAR (sidebar), thumbs);
+                       ev_sidebar_set_page (EV_SIDEBAR (sidebar), attachments);
                }
                g_value_unset (&sidebar_page);
        } else if (document && ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (links), document)) {
@@ -898,8 +907,14 @@ setup_size_from_metadata (EvWindow *window)
         if (window->priv->page_cache &&
            ev_metadata_manager_get (uri, "window_width_ratio", &width_ratio, FALSE) &&
            ev_metadata_manager_get (uri, "window_height_ratio", &height_ratio, FALSE)) {
+               
                gint document_width;
                gint document_height;
+               
+               GdkScreen *screen;
+               
+               gint request_width;
+               gint request_height;
 
                ev_page_cache_get_max_width (window->priv->page_cache, 
                                             0, 1.0,
@@ -908,9 +923,19 @@ setup_size_from_metadata (EvWindow *window)
                                             0, 1.0,
                                             &document_height);                 
                
+               request_width = g_value_get_double (&width_ratio) * document_width;
+               request_height = g_value_get_double (&height_ratio) * document_height;
+               
+               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));
+               }
+                               
                gtk_window_resize (GTK_WINDOW (window),
-                                  g_value_get_double (&width_ratio) * document_width,
-                                  g_value_get_double (&height_ratio) * document_height);
+                                  request_width,
+                                  request_height);
                g_value_unset (&width_ratio);
                g_value_unset (&height_ratio);
        }
@@ -1035,22 +1060,14 @@ ev_window_set_icon_from_thumbnail (EvJobThumbnail *job,
        ev_window_clear_thumbnail_job (ev_window);
 }
 
-static void
+static gboolean
 ev_window_setup_document (EvWindow *ev_window)
 {
        const EvDocumentInfo *info;
-       EvDocument *document;
-       EvView *view = EV_VIEW (ev_window->priv->view);
+       EvDocument *document = ev_window->priv->document;
        EvSidebar *sidebar = EV_SIDEBAR (ev_window->priv->sidebar);
        GtkAction *action;
-
-       document = ev_window->priv->document;
-       ev_window->priv->page_cache = ev_page_cache_get (ev_window->priv->document);
-       g_signal_connect (ev_window->priv->page_cache, "page-changed",
-                         G_CALLBACK (page_changed_cb), ev_window);
-       g_signal_connect (ev_window->priv->page_cache, "history-changed",
-                         G_CALLBACK (history_changed_cb), ev_window);
-
+       
        if (EV_IS_DOCUMENT_FIND (document)) {
                g_signal_connect_object (G_OBJECT (document),
                                         "find_changed",
@@ -1079,16 +1096,12 @@ ev_window_setup_document (EvWindow *ev_window)
                g_object_unref (rc);
        }
 
-       ev_sidebar_set_document (sidebar, document);
-
-       if (ev_page_cache_get_n_pages (ev_window->priv->page_cache) > 0) {
-               ev_view_set_document (view, document);
-       }
        ev_window_set_page_mode (ev_window, PAGE_MODE_DOCUMENT);
-
        ev_window_title_set_document (ev_window->priv->title, document);
        ev_window_title_set_uri (ev_window->priv->title, ev_window->priv->uri);
 
+       ev_sidebar_set_document (sidebar, document);
+
        action = gtk_action_group_get_action (ev_window->priv->action_group, PAGE_SELECTOR_ACTION);
        ev_page_action_set_document (EV_PAGE_ACTION (action), document);
        ev_window_setup_action_sensitivity (ev_window);
@@ -1104,12 +1117,36 @@ ev_window_setup_document (EvWindow *ev_window)
                                                   ev_window->priv->document);
        }
        
+       info = ev_page_cache_get_info (ev_window->priv->page_cache);
+       update_document_mode (ev_window, info->mode);
+
+       return FALSE;
+}
+
+static void
+ev_window_set_document (EvWindow *ev_window, EvDocument *document)
+{
+       EvView *view = EV_VIEW (ev_window->priv->view);
+
+       if (ev_window->priv->document)
+               g_object_unref (ev_window->priv->document);
+       ev_window->priv->document = g_object_ref (document);
+       
+       ev_window->priv->page_cache = ev_page_cache_get (ev_window->priv->document);
+       g_signal_connect (ev_window->priv->page_cache, "page-changed",
+                         G_CALLBACK (page_changed_cb), ev_window);
+       g_signal_connect (ev_window->priv->page_cache, "history-changed",
+                         G_CALLBACK (history_changed_cb), ev_window);
+
        setup_size_from_metadata (ev_window);
-       setup_document_from_metadata (ev_window);
        setup_sidebar_from_metadata (ev_window, document);
+       setup_document_from_metadata (ev_window);
 
-       info = ev_page_cache_get_info (ev_window->priv->page_cache);
-       update_document_mode (ev_window, info->mode);
+       if (ev_page_cache_get_n_pages (ev_window->priv->page_cache) > 0) {
+               ev_view_set_document (view, document);
+       }
+
+       g_idle_add ((GSourceFunc)ev_window_setup_document, ev_window);
 }
 
 static void
@@ -1255,17 +1292,16 @@ ev_window_load_job_cb  (EvJobLoad *job,
 
        /* Success! */
        if (job->error == NULL) {
-               if (ev_window->priv->document)
-                       g_object_unref (ev_window->priv->document);
-               ev_window->priv->document = g_object_ref (document);
+               ev_window_set_document (ev_window, document);
+               
+               if (job->mode != EV_WINDOW_MODE_PREVIEW) {
+                       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);
-
                if (job->dest) {
                        EvLink *link;
                        EvLinkAction *link_action;
@@ -1319,12 +1355,27 @@ ev_window_load_job_cb  (EvJobLoad *job,
        return;
 }
 
+/**
+ * ev_window_get_uri:
+ * @ev_window: The instance of the #EvWindow.
+ *
+ * It returns the uri of the document showed in the #EvWindow.
+ *
+ * Returns: the uri of the document showed in the #EvWindow.
+ */
 const char *
 ev_window_get_uri (EvWindow *ev_window)
 {
        return ev_window->priv->uri;
 }
 
+/**
+ * ev_window_close_dialogs:
+ * @ev_window: The window where dialogs will be closed.
+ *
+ * It looks for password, print and properties dialogs and closes them and
+ * frees them from memory. If there is any print job it does free it too.
+ */
 static void
 ev_window_close_dialogs (EvWindow *ev_window)
 {
@@ -1491,6 +1542,13 @@ ev_window_cmd_file_open (GtkAction *action, EvWindow *window)
                gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (chooser),
                                          window->priv->uri);
        }
+       else {
+               char *folder;
+               folder = xdg_user_dir_lookup ("DOCUMENTS");
+               gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (chooser),
+                                                    folder);
+               free (folder);
+       }
        
        g_signal_connect (chooser, "response",
                          G_CALLBACK (file_open_dialog_response_cb),
@@ -1628,8 +1686,10 @@ ev_window_cmd_recent_file_activate (GtkAction *action,
 
        uri = egg_recent_item_get_uri (item);
 
-       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 (ev_window)),
+                                        NULL, 0, FALSE,
+                                        GDK_CURRENT_TIME);
        
        g_free (uri);
 }
@@ -1920,6 +1980,7 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
        GtkWidget *fc;
        gchar *base_name;
        gchar *file_name;
+       gchar *folder;
 
        fc = gtk_file_chooser_dialog_new (
                _("Save a Copy"),
@@ -1934,10 +1995,13 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
        gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER (fc), TRUE);    
        file_name = gnome_vfs_format_uri_for_display (ev_window->priv->uri);
        base_name = g_path_get_basename (file_name);
+        folder = xdg_user_dir_lookup ("DOCUMENTS");
        gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (fc), base_name);
+        gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (fc), folder);
        g_free (file_name);
        g_free (base_name);
-
+        free (folder);
+        
        g_signal_connect (fc, "response",
                          G_CALLBACK (file_save_dialog_response_cb),
                          ev_window);
@@ -2556,60 +2620,6 @@ ev_window_cmd_edit_copy (GtkAction *action, EvWindow *ev_window)
        ev_view_copy (EV_VIEW (ev_window->priv->view));
 }
 
-static void
-ev_window_update_fullscreen_popup (EvWindow *window)
-{
-       GtkWidget *popup = window->priv->fullscreen_popup;
-       int popup_width, popup_height;
-       GdkScreen *screen;
-       GdkRectangle screen_rect;
-       gboolean toolbar;
-
-       g_return_if_fail (popup != NULL);
-
-       if (GTK_WIDGET (window)->window == NULL)
-               return;
-
-       toolbar = (window->priv->chrome & EV_CHROME_FULLSCREEN_TOOLBAR) != 0 || 
-                 (window->priv->chrome & EV_CHROME_RAISE_TOOLBAR) != 0;
-       popup_width = popup->requisition.width;
-       popup_height = popup->requisition.height;
-
-       screen = gtk_widget_get_screen (GTK_WIDGET (window));
-       gdk_screen_get_monitor_geometry (screen,
-                       gdk_screen_get_monitor_at_window
-                        (screen,
-                         GTK_WIDGET (window)->window),
-                         &screen_rect);
-       if (toolbar) {
-               gtk_widget_set_size_request (popup,
-                                            screen_rect.width,
-                                            -1);
-               gtk_window_move (GTK_WINDOW (popup),
-                                screen_rect.x,
-                                screen_rect.y);
-
-       } else {
-               if (gtk_widget_get_direction (popup) == GTK_TEXT_DIR_RTL)
-               {
-                       gtk_window_move (GTK_WINDOW (popup),
-                                        screen_rect.x,
-                                        screen_rect.y);
-               } else {
-                       gtk_window_move (GTK_WINDOW (popup),
-                                        screen_rect.x + screen_rect.width - popup_width,
-                                        screen_rect.y);
-               }
-       }
-}
-
-static void
-screen_size_changed_cb (GdkScreen *screen,
-                       EvWindow *window)
-{
-       ev_window_update_fullscreen_popup (window);
-}
-
 static void
 ev_window_sidebar_position_change_cb (GObject *object, GParamSpec *pspec,
                                      EvWindow *ev_window)
@@ -2620,187 +2630,55 @@ ev_window_sidebar_position_change_cb (GObject *object, GParamSpec *pspec,
 }
 
 static void
-destroy_fullscreen_popup (EvWindow *window)
-{
-       if (window->priv->fullscreen_popup != NULL)
-       {
-               gtk_widget_destroy (window->priv->fullscreen_popup);
-               window->priv->fullscreen_popup = NULL;
-       }
-}
-
-static void
-exit_fullscreen_button_clicked_cb (GtkWidget *button, EvWindow *window)
+ev_window_update_fullscreen_action (EvWindow *window)
 {
        GtkAction *action;
 
        action = gtk_action_group_get_action (window->priv->action_group, "ViewFullscreen");
-       g_return_if_fail (action != NULL);
-
-       gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), FALSE);
+       g_signal_handlers_block_by_func
+               (action, G_CALLBACK (ev_window_cmd_view_fullscreen), window);
+       gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
+                                     ev_view_get_fullscreen (EV_VIEW (window->priv->view)));
+       g_signal_handlers_unblock_by_func
+               (action, G_CALLBACK (ev_window_cmd_view_fullscreen), window);
 }
 
 static void
-fullscreen_popup_size_request_cb (GtkWidget *popup, GtkRequisition *req, EvWindow *window)
-{
-       ev_window_update_fullscreen_popup (window);
-}
-
-static gboolean
-fullscreen_timeout_cb (EvWindow *window)
+fullscreen_toolbar_setup_item_properties (GtkUIManager *ui_manager)
 {
-       EvView *view = EV_VIEW (window->priv->view);
-
-       if (!view ||
-           (!ev_view_get_fullscreen (EV_VIEW (view)) &&
-            !ev_view_get_presentation (EV_VIEW (view))))
-               return FALSE;
-
-       update_chrome_flag (window, EV_CHROME_FULLSCREEN_TOOLBAR, FALSE);
-       ev_view_hide_cursor (EV_VIEW (window->priv->view));
-       window->priv->fullscreen_timeout_id = 0;
-
-       return FALSE;
-}
+       GtkWidget *item;
 
-static void
-fullscreen_set_timeout (EvWindow *window)
-{
-       if (window->priv->fullscreen_timeout_id != 0) {
-               g_source_remove (window->priv->fullscreen_timeout_id);
-       }
-       
-       window->priv->fullscreen_timeout_id = 
-           g_timeout_add (FULLSCREEN_TIMEOUT, (GSourceFunc)fullscreen_timeout_cb, window);
+       item = gtk_ui_manager_get_widget (ui_manager, "/FullscreenToolbar/GoPreviousPage");
+       g_object_set (item, "is-important", FALSE, NULL);
 
-       update_chrome_flag (window, EV_CHROME_FULLSCREEN_TOOLBAR, TRUE);
-       update_chrome_visibility (window);
-       ev_view_show_cursor (EV_VIEW (window->priv->view));
-}
+       item = gtk_ui_manager_get_widget (ui_manager, "/FullscreenToolbar/GoNextPage");
+       g_object_set (item, "is-important", FALSE, NULL);
 
-static void
-fullscreen_clear_timeout (EvWindow *window)
-{
-       if (window->priv->fullscreen_timeout_id != 0) {
-               g_source_remove (window->priv->fullscreen_timeout_id);
-       }
+       item = gtk_ui_manager_get_widget (ui_manager, "/FullscreenToolbar/StartPresentation");
+       g_object_set (item, "is-important", TRUE, NULL);
        
-       window->priv->fullscreen_timeout_id = 0;
-       update_chrome_visibility (window);
-       ev_view_show_cursor (EV_VIEW (window->priv->view));
-}
-
-
-static gboolean
-fullscreen_motion_notify_cb (GtkWidget *widget,
-                            GdkEventMotion *event,
-                            gpointer user_data)
-{
-       EvWindow *window = EV_WINDOW (user_data);
-
-       fullscreen_set_timeout (window);
-
-       return FALSE;
-}
-
-static gboolean
-fullscreen_leave_notify_cb (GtkWidget *widget,
-                           GdkEventCrossing *event,
-                           gpointer user_data)
-{
-       EvWindow *window = EV_WINDOW (user_data);
-
-       fullscreen_clear_timeout (window);
-
-       return FALSE;
-}
-
-static GtkWidget *
-ev_window_get_exit_fullscreen_button (EvWindow *window)
-{
-       GtkWidget *button, *icon, *label, *hbox;
-
-       button = gtk_button_new ();
-       g_signal_connect (button, "clicked",
-                         G_CALLBACK (exit_fullscreen_button_clicked_cb),
-                         window);
-       gtk_widget_show (button);
-
-       hbox = gtk_hbox_new (FALSE, 2);
-       gtk_widget_show (hbox);
-       gtk_container_add (GTK_CONTAINER (button), hbox);
-
-       icon = gtk_image_new_from_stock (EV_STOCK_LEAVE_FULLSCREEN, GTK_ICON_SIZE_BUTTON);
-       gtk_widget_show (icon);
-       gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0);
-
-       label = gtk_label_new (_("Leave Fullscreen"));
-       gtk_widget_show (label);
-       gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
-       return button;
-}
-
-static GtkWidget *
-ev_window_create_fullscreen_popup (EvWindow *window)
-{
-       GtkWidget *popup;
-       GtkWidget *hbox;
-       GtkWidget *button;
-       GdkScreen *screen;
-
-       window->priv->fullscreen_toolbar = egg_editable_toolbar_new_with_model
-                       (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);
-       button = ev_window_get_exit_fullscreen_button (window);
-
-       gtk_container_add (GTK_CONTAINER (popup), hbox);
-       gtk_box_pack_start (GTK_BOX (hbox), window->priv->fullscreen_toolbar,
-                           TRUE, TRUE, 0);
-       gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
-
-       gtk_widget_show (button);
-       gtk_widget_show (hbox);
-
-       gtk_window_set_resizable (GTK_WINDOW (popup), FALSE);
-
-       screen = gtk_widget_get_screen (GTK_WIDGET (window));
-       g_signal_connect_object (screen, "size-changed",
-                                G_CALLBACK (screen_size_changed_cb),
-                                window, 0);
-       g_signal_connect_object (popup, "size_request",
-                                G_CALLBACK (fullscreen_popup_size_request_cb),
-                                window, 0);
-
-       gtk_window_set_screen (GTK_WINDOW (popup),
-                              gtk_widget_get_screen (GTK_WIDGET (window)));
-
-       return popup;
+       item = gtk_ui_manager_get_widget (ui_manager, "/FullscreenToolbar/LeaveFullscreen");
+       g_object_set (item, "is-important", TRUE, NULL);
 }
 
-
 static void
-ev_window_update_fullscreen_action (EvWindow *window)
+ev_window_run_fullscreen (EvWindow *window)
 {
-       GtkAction *action;
+       if (!window->priv->fullscreen_toolbar) {
+               window->priv->fullscreen_toolbar =
+                       gtk_ui_manager_get_widget (window->priv->ui_manager,
+                                                  "/FullscreenToolbar");
 
-       action = gtk_action_group_get_action (window->priv->action_group, "ViewFullscreen");
-       g_signal_handlers_block_by_func
-               (action, G_CALLBACK (ev_window_cmd_view_fullscreen), window);
-       gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
-                                     ev_view_get_fullscreen (EV_VIEW (window->priv->view)));
-       g_signal_handlers_unblock_by_func
-               (action, G_CALLBACK (ev_window_cmd_view_fullscreen), window);
-}
+               gtk_toolbar_set_style (GTK_TOOLBAR (window->priv->fullscreen_toolbar),
+                                      GTK_TOOLBAR_BOTH_HORIZ);
+               fullscreen_toolbar_setup_item_properties (window->priv->ui_manager);
 
-static void
-ev_window_run_fullscreen (EvWindow *window)
-{
-       if (window->priv->fullscreen_popup == NULL)
-               window->priv->fullscreen_popup
-                       = ev_window_create_fullscreen_popup (window);
+               gtk_box_pack_start (GTK_BOX (window->priv->main_box),
+                                   window->priv->fullscreen_toolbar,
+                                   FALSE, FALSE, 0);
+               gtk_box_reorder_child (GTK_BOX (window->priv->main_box),
+                                      window->priv->fullscreen_toolbar, 1);
+       }
 
        g_object_set (G_OBJECT (window->priv->scrolled_window),
                      "shadow-type", GTK_SHADOW_NONE,
@@ -2808,20 +2686,12 @@ ev_window_run_fullscreen (EvWindow *window)
 
        ev_view_set_fullscreen (EV_VIEW (window->priv->view), TRUE);
        ev_window_update_fullscreen_action (window);
+
+       update_chrome_flag (window, EV_CHROME_FULLSCREEN_TOOLBAR, TRUE);
+       update_chrome_visibility (window);
        
        gtk_window_fullscreen (GTK_WINDOW (window));
        gtk_widget_grab_focus (window->priv->view);
-       ev_window_update_fullscreen_popup (window);
-
-       g_signal_connect (window->priv->view,
-                         "motion-notify-event",
-                         G_CALLBACK (fullscreen_motion_notify_cb),
-                         window);
-       g_signal_connect (window->priv->view,
-                         "leave-notify-event",
-                         G_CALLBACK (fullscreen_leave_notify_cb),
-                         window);
-       fullscreen_set_timeout (window);
 
        if (!ev_window_is_empty (window))
                ev_metadata_manager_set_boolean (window->priv->uri, "fullscreen", TRUE);
@@ -2841,16 +2711,10 @@ ev_window_stop_fullscreen (EvWindow *window)
 
        ev_view_set_fullscreen (view, FALSE);
        ev_window_update_fullscreen_action (window);
+       update_chrome_flag (window, EV_CHROME_FULLSCREEN_TOOLBAR, FALSE);
+       update_chrome_visibility (window);
        gtk_window_unfullscreen (GTK_WINDOW (window));
 
-       g_signal_handlers_disconnect_by_func (window->priv->view,
-                                             (gpointer) fullscreen_motion_notify_cb,
-                                             window);
-       g_signal_handlers_disconnect_by_func (window->priv->view,
-                                             (gpointer) fullscreen_leave_notify_cb,
-                                             window);
-       fullscreen_clear_timeout (window);
-
        if (!ev_window_is_empty (window))
                ev_metadata_manager_set_boolean (window->priv->uri, "fullscreen", FALSE);
 }
@@ -2871,6 +2735,69 @@ 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 (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)
 {
@@ -2895,18 +2822,20 @@ ev_window_run_presentation (EvWindow *window)
        ev_view_set_presentation (EV_VIEW (window->priv->view), TRUE);
        ev_window_update_presentation_action (window);
 
+       update_chrome_visibility (window);
+       
        gtk_widget_grab_focus (window->priv->view);
        gtk_window_fullscreen (GTK_WINDOW (window));
 
        g_signal_connect (window->priv->view,
                          "motion-notify-event",
-                         G_CALLBACK (fullscreen_motion_notify_cb),
+                         G_CALLBACK (presentation_motion_notify_cb),
                          window);
        g_signal_connect (window->priv->view,
                          "leave-notify-event",
-                         G_CALLBACK (fullscreen_leave_notify_cb),
+                         G_CALLBACK (presentation_leave_notify_cb),
                          window);
-       fullscreen_set_timeout (window);
+       presentation_set_timeout (window);
 
        ev_application_screensaver_disable (EV_APP);
        
@@ -2926,15 +2855,16 @@ ev_window_stop_presentation (EvWindow *window)
 
        ev_view_set_presentation (EV_VIEW (window->priv->view), FALSE);
        ev_window_update_presentation_action (window);
+       update_chrome_visibility (window);
        gtk_window_unfullscreen (GTK_WINDOW (window));
 
        g_signal_handlers_disconnect_by_func (window->priv->view,
-                                             (gpointer) fullscreen_motion_notify_cb,
+                                             (gpointer) presentation_motion_notify_cb,
                                              window);
        g_signal_handlers_disconnect_by_func (window->priv->view,
-                                             (gpointer) fullscreen_leave_notify_cb,
+                                             (gpointer) presentation_leave_notify_cb,
                                              window);
-       fullscreen_clear_timeout (window);
+       presentation_clear_timeout (window);
 
        ev_application_screensaver_enable (EV_APP);
 
@@ -2961,6 +2891,18 @@ ev_window_cmd_view_presentation (GtkAction *action, EvWindow *window)
 static void
 ev_window_run_preview (EvWindow *window)
 {
+       if (!window->priv->preview_toolbar) {
+               window->priv->preview_toolbar =
+                       gtk_ui_manager_get_widget (window->priv->ui_manager,
+                                                  "/PreviewToolbar");
+
+               gtk_box_pack_start (GTK_BOX (window->priv->main_box),
+                                   window->priv->preview_toolbar,
+                                   FALSE, FALSE, 0);
+               gtk_box_reorder_child (GTK_BOX (window->priv->main_box),
+                                      window->priv->preview_toolbar, 1);
+       }
+       
        ev_view_set_continuous (EV_VIEW (window->priv->view), FALSE); 
        
        update_chrome_flag (window, EV_CHROME_TOOLBAR, FALSE);
@@ -2972,32 +2914,6 @@ ev_window_run_preview (EvWindow *window)
        update_chrome_visibility (window);
 }
 
-static gboolean
-ev_window_focus_in_event (GtkWidget *widget, GdkEventFocus *event)
-{
-       EvWindow *window = EV_WINDOW (widget);
-       EvWindowPrivate *priv = window->priv;
-
-       if (ev_view_get_fullscreen (EV_VIEW (priv->view)))
-               fullscreen_set_timeout (window);
-
-       return GTK_WIDGET_CLASS (ev_window_parent_class)->focus_in_event (widget, event);
-}
-
-static gboolean
-ev_window_focus_out_event (GtkWidget *widget, GdkEventFocus *event)
-{
-       EvWindow *window = EV_WINDOW (widget);
-       EvWindowPrivate *priv = window->priv;
-
-       if (ev_view_get_fullscreen (EV_VIEW (priv->view))) {
-               fullscreen_set_timeout (window);
-               gtk_widget_hide (priv->fullscreen_popup);
-       }
-
-       return GTK_WIDGET_CLASS (ev_window_parent_class)->focus_out_event (widget, event);
-}
-
 static void
 ev_window_screen_changed (GtkWidget *widget,
                          GdkScreen *old_screen)
@@ -3030,18 +2946,6 @@ ev_window_screen_changed (GtkWidget *widget,
        if (GTK_WIDGET_CLASS (ev_window_parent_class)->screen_changed) {
                GTK_WIDGET_CLASS (ev_window_parent_class)->screen_changed (widget, old_screen);
        }
-
-       if (priv->fullscreen_popup != NULL) {
-               g_signal_handlers_disconnect_by_func
-                       (old_screen, G_CALLBACK (screen_size_changed_cb), window);
-
-               g_signal_connect_object (screen, "size-changed",
-                                        G_CALLBACK (screen_size_changed_cb),
-                                        window, 0);
-               gtk_window_set_screen (GTK_WINDOW (priv->fullscreen_popup), screen);
-
-               ev_window_update_fullscreen_popup (window);
-       }
 }
 
 static void
@@ -3119,7 +3023,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, FALSE));
+                                        ev_application_get_toolbars_model (EV_APP));
        gtk_container_set_border_width (GTK_CONTAINER (editor), 5);
        gtk_box_set_spacing (GTK_BOX (EGG_TOOLBAR_EDITOR (editor)), 5);
              
@@ -3228,21 +3132,58 @@ static void
 ev_window_cmd_help_contents (GtkAction *action, EvWindow *ev_window)
 {
        GError *error = NULL;
+       char *command;
+       const char *lang;
+       char *uri = NULL;
 
-        g_return_if_fail (EV_IS_WINDOW (ev_window));
+       int i;
+
+       const char * const * langs = g_get_language_names ();
+
+       for (i = 0; langs[i]; i++) {
+               lang = langs[i];
+               if (strchr (lang, '.')) {
+                       continue;
+               }
 
-       gnome_help_display ("evince.xml", NULL, &error);
+               uri = g_build_filename(GNOMEDATADIR,
+                                      "/gnome/help/" PACKAGE,
+                                      lang,
+                                      "/evince.xml",
+                                      NULL);
+                                       
+               if (g_file_test (uri, G_FILE_TEST_EXISTS)) {
+                       break;
+               }
+       }
 
-       if(error != NULL) {
+       if (uri == NULL) {
+               g_warning ("Cannot find help");
+               return;
+       }
+       
+       command = g_strconcat ("gnome-help ghelp://", uri,  NULL);
+       g_free (uri);
+       
+       g_spawn_command_line_async (command, &error);
+       if (error != NULL) {
                g_warning (error->message);
                g_error_free (error);
        }
+       g_free (command);
 }
 
 static void
 ev_window_cmd_leave_fullscreen (GtkAction *action, EvWindow *window)
 {
-       gtk_window_unfullscreen (GTK_WINDOW (window));
+       ev_window_stop_fullscreen (window);
+}
+
+static void
+ev_window_cmd_start_presentation (GtkAction *action, EvWindow *window)
+{
+       ev_window_stop_fullscreen (window);
+       ev_window_run_presentation (window);
 }
 
 static void
@@ -4019,11 +3960,10 @@ ev_window_dispose (GObject *object)
                priv->history = NULL;
        }
 
-       if (priv->fullscreen_timeout_id) {
-               g_source_remove (priv->fullscreen_timeout_id);
-               priv->fullscreen_timeout_id = 0;
+       if (priv->presentation_timeout_id > 0) {
+               g_source_remove (priv->presentation_timeout_id);
+               priv->presentation_timeout_id = 0;
        }
-       destroy_fullscreen_popup (window);
 
        G_OBJECT_CLASS (ev_window_parent_class)->dispose (object);
 }
@@ -4037,8 +3977,6 @@ ev_window_class_init (EvWindowClass *ev_window_class)
        g_object_class->dispose = ev_window_dispose;
        g_object_class->finalize = ev_window_finalize;
 
-       widget_class->focus_in_event = ev_window_focus_in_event;
-       widget_class->focus_out_event = ev_window_focus_out_event;
        widget_class->screen_changed = ev_window_screen_changed;
 
        g_type_class_add_private (g_object_class, sizeof (EvWindowPrivate));
@@ -4056,7 +3994,7 @@ 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,
+       { "FileOpenCopy", NULL, N_("Op_en 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",
@@ -4129,9 +4067,12 @@ static const GtkActionEntry entries[] = {
          G_CALLBACK (ev_window_cmd_help_about) },
 
        /* Toolbar-only */
-       { "LeaveFullscreen", EV_STOCK_LEAVE_FULLSCREEN, N_("Leave Fullscreen"), NULL,
+       { "LeaveFullscreen", GTK_STOCK_LEAVE_FULLSCREEN, N_("Leave Fullscreen"), NULL,
          N_("Leave fullscreen mode"),
          G_CALLBACK (ev_window_cmd_leave_fullscreen) },
+       { "StartPresentation", EV_STOCK_RUN_PRESENTATION, N_("Start Presentation"), NULL,
+         N_("Start a presentation"),
+         G_CALLBACK (ev_window_cmd_start_presentation) },
 
        /* Accellerators */
        { "Escape", NULL, "", "Escape", "",
@@ -4484,10 +4425,45 @@ launch_action (EvWindow *window, EvLinkAction *action)
           allowing to launch executables is a good idea though. -- marco */
 }
 
+static gboolean
+uri_is_valid (const gchar *uri)
+{
+       gchar *p = (gchar *) uri;
+       
+       if (!p || !g_ascii_isalpha (*p))
+               return FALSE;
+       
+       p++;
+       while (g_ascii_isalnum (*p))
+               p++;
+
+       return (g_ascii_strncasecmp (p, "://", strlen ("://")) == 0);
+}
+
 static void
 launch_external_uri (EvWindow *window, EvLinkAction *action)
 {
-       gnome_vfs_url_show (ev_link_action_get_uri (action));
+       const gchar *uri = ev_link_action_get_uri (action);
+       
+       if (!uri_is_valid (uri)) {
+               GtkWidget *dialog;
+
+               dialog = gtk_message_dialog_new (GTK_WINDOW (window),
+                                                GTK_DIALOG_DESTROY_WITH_PARENT,
+                                                GTK_MESSAGE_ERROR,
+                                                GTK_BUTTONS_CLOSE,
+                                                _("Unable to open external link"));
+               gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+                                                         _("Invalid URI: ā€œ%sā€"), uri);
+               g_signal_connect (dialog, "response",
+                                 G_CALLBACK (gtk_widget_destroy),
+                                 NULL);
+               gtk_widget_show (dialog);
+
+               return;
+       }
+       
+       gnome_vfs_url_show (uri);
 }
 
 static void
@@ -4808,14 +4784,12 @@ ev_window_init (EvWindow *ev_window)
        GtkActionGroup *action_group;
        GtkAccelGroup *accel_group;
        GError *error = NULL;
-       GtkWidget *sidebar_widget, *toolbar_dock;
+       GtkWidget *sidebar_widget;
 
        g_signal_connect (ev_window, "configure_event",
                          G_CALLBACK (window_configure_event_cb), NULL);
        g_signal_connect (ev_window, "window_state_event",
                          G_CALLBACK (window_state_event_cb), NULL);
-       g_signal_connect (ev_window, "notify",
-                         G_CALLBACK (fullscreen_timeout_cb), NULL);
 
        ev_window->priv = EV_WINDOW_GET_PRIVATE (ev_window);
 
@@ -4890,33 +4864,20 @@ ev_window_init (EvWindow *ev_window)
                            ev_window->priv->menubar,
                            FALSE, FALSE, 0);
 
-       /* This sucks, but there is no way to have a draw=no, expand=true separator
-        * in a GtkUIManager-built toolbar. So, just add another toolbar.
-        * See gtk+ bug 166489.
-        */
-       toolbar_dock = ev_window->priv->toolbar_dock = gtk_hbox_new (FALSE, 0);
-       gtk_box_pack_start (GTK_BOX (ev_window->priv->main_box), toolbar_dock,
-                           FALSE, FALSE, 0);
-       gtk_widget_show (toolbar_dock);
 
        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),
+                        "model", ev_application_get_toolbars_model (EV_APP),
                         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,
+       gtk_box_pack_start (GTK_BOX (ev_window->priv->main_box),
+                           ev_window->priv->toolbar,
                            FALSE, FALSE, 0);
+       gtk_widget_show (ev_window->priv->toolbar);
 
        /* Add the main area */
        ev_window->priv->hpaned = gtk_hpaned_new ();
@@ -5120,6 +5081,13 @@ ev_window_init (EvWindow *ev_window)
        ev_window_setup_action_sensitivity (ev_window);
 }
 
+/**
+ * ev_window_new:
+ *
+ * Creates a #GtkWidget that represents the window.
+ *
+ * Returns: the #GtkWidget that represents the window.
+ */
 GtkWidget *
 ev_window_new (void)
 {