]> www.fi.muni.cz Git - evince.git/blobdiff - shell/ev-window.c
https://www.fi.muni.cz/~kas/git / evince.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Updated Norwegian bokmål translation.
[evince.git] / shell / ev-window.c
diff --git a/shell/ev-window.c b/shell/ev-window.c
index 2fad47bfadc6ce092611f377ba5d7789924ece91..29b6a039b17b6987ac0df4487897b95be378bd2a 100644 (file)
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -33,11 +33,11 @@
 #include "ev-page-action.h"
 #include "ev-sidebar.h"
 #include "ev-sidebar-links.h"
 #include "ev-page-action.h"
 #include "ev-sidebar.h"
 #include "ev-sidebar-links.h"
+#include "ev-sidebar-attachments.h"
 #include "ev-sidebar-thumbnails.h"
 #include "ev-view.h"
 #include "ev-password.h"
 #include "ev-password-view.h"
 #include "ev-sidebar-thumbnails.h"
 #include "ev-view.h"
 #include "ev-password.h"
 #include "ev-password-view.h"
-#include "ev-attachment-bar.h"
 #include "ev-properties-dialog.h"
 #include "ev-ps-exporter.h"
 #include "ev-document-thumbnails.h"
 #include "ev-properties-dialog.h"
 #include "ev-ps-exporter.h"
 #include "ev-document-thumbnails.h"
@@ -90,7 +90,9 @@ typedef enum {
        EV_CHROME_TOOLBAR       = 1 << 1,
        EV_CHROME_FINDBAR       = 1 << 2,
        EV_CHROME_RAISE_TOOLBAR = 1 << 3,
        EV_CHROME_TOOLBAR       = 1 << 1,
        EV_CHROME_FINDBAR       = 1 << 2,
        EV_CHROME_RAISE_TOOLBAR = 1 << 3,
-       EV_CHROME_NORMAL        = EV_CHROME_MENUBAR | EV_CHROME_TOOLBAR
+       EV_CHROME_FULLSCREEN_TOOLBAR    = 1 << 4,
+       EV_CHROME_SIDEBAR       = 1 << 5,
+       EV_CHROME_NORMAL        = EV_CHROME_MENUBAR | EV_CHROME_TOOLBAR | EV_CHROME_SIDEBAR
 } EvChrome;
 
 struct _EvWindowPrivate {
 } EvChrome;
 
 struct _EvWindowPrivate {
@@ -109,7 +111,7 @@ struct _EvWindowPrivate {
        GtkWidget *password_view;
        GtkWidget *sidebar_thumbs;
        GtkWidget *sidebar_links;
        GtkWidget *password_view;
        GtkWidget *sidebar_thumbs;
        GtkWidget *sidebar_links;
-       GtkWidget *attachment_bar;
+       GtkWidget *sidebar_attachments;
 
        /* Dialogs */
        GtkWidget *properties;
 
        /* Dialogs */
        GtkWidget *properties;
@@ -175,6 +177,7 @@ static const GtkTargetEntry ev_drop_types[] = {
 #define SIDEBAR_DEFAULT_SIZE    132
 #define LINKS_SIDEBAR_ID "links"
 #define THUMBNAILS_SIDEBAR_ID "thumbnails"
 #define SIDEBAR_DEFAULT_SIZE    132
 #define LINKS_SIDEBAR_ID "links"
 #define THUMBNAILS_SIDEBAR_ID "thumbnails"
+#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_update_actions                (EvWindow *ev_window);
 static void     ev_window_update_fullscreen_popup       (EvWindow         *window);
@@ -201,7 +204,6 @@ static void     ev_window_run_presentation              (EvWindow         *windo
 static void     ev_window_stop_presentation             (EvWindow         *window);
 static void     ev_window_cmd_view_presentation         (GtkAction        *action,
                                                         EvWindow         *window);
 static void     ev_window_stop_presentation             (EvWindow         *window);
 static void     ev_window_cmd_view_presentation         (GtkAction        *action,
                                                         EvWindow         *window);
-static void     show_fullscreen_popup                   (EvWindow         *window);
 static void     ev_view_popup_cmd_open_link             (GtkAction        *action,
                                                         EvWindow         *window);
 static void     ev_view_popup_cmd_copy_link_address     (GtkAction        *action,
 static void     ev_view_popup_cmd_open_link             (GtkAction        *action,
                                                         EvWindow         *window);
 static void     ev_view_popup_cmd_copy_link_address     (GtkAction        *action,
@@ -214,6 +216,13 @@ 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);
                                                         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);
 
 G_DEFINE_TYPE (EvWindow, ev_window, GTK_TYPE_WINDOW)
 
 
 G_DEFINE_TYPE (EvWindow, ev_window, GTK_TYPE_WINDOW)
 
@@ -410,7 +419,7 @@ static void
 update_chrome_visibility (EvWindow *window)
 {
        EvWindowPrivate *priv = window->priv;
 update_chrome_visibility (EvWindow *window)
 {
        EvWindowPrivate *priv = window->priv;
-       gboolean menubar, toolbar, findbar, fullscreen_toolbar;
+       gboolean menubar, toolbar, findbar, fullscreen_toolbar, sidebar;
        gboolean fullscreen_mode, presentation, fullscreen;
 
        presentation = ev_view_get_presentation (EV_VIEW (priv->view));
        gboolean fullscreen_mode, presentation, fullscreen;
 
        presentation = ev_view_get_presentation (EV_VIEW (priv->view));
@@ -420,24 +429,22 @@ update_chrome_visibility (EvWindow *window)
        menubar = (priv->chrome & EV_CHROME_MENUBAR) != 0 && !fullscreen_mode;
        toolbar = ((priv->chrome & EV_CHROME_TOOLBAR) != 0  || 
                   (priv->chrome & EV_CHROME_RAISE_TOOLBAR) != 0) && !fullscreen_mode;
        menubar = (priv->chrome & EV_CHROME_MENUBAR) != 0 && !fullscreen_mode;
        toolbar = ((priv->chrome & EV_CHROME_TOOLBAR) != 0  || 
                   (priv->chrome & EV_CHROME_RAISE_TOOLBAR) != 0) && !fullscreen_mode;
-       fullscreen_toolbar = ((priv->chrome & EV_CHROME_TOOLBAR) != 0 ||
-                             (priv->chrome & EV_CHROME_RAISE_TOOLBAR) != 0);
+       fullscreen_toolbar = ((priv->chrome & EV_CHROME_FULLSCREEN_TOOLBAR) != 0 || 
+                             (priv->chrome & EV_CHROME_RAISE_TOOLBAR) != 0) && fullscreen;
        findbar = (priv->chrome & EV_CHROME_FINDBAR) != 0;
        findbar = (priv->chrome & EV_CHROME_FINDBAR) != 0;
+       sidebar = (priv->chrome & EV_CHROME_SIDEBAR) != 0 && !fullscreen_mode;
 
        set_widget_visibility (priv->menubar, menubar); 
        set_widget_visibility (priv->toolbar_dock, toolbar);
        set_widget_visibility (priv->find_bar, findbar);
 
        set_widget_visibility (priv->menubar, menubar); 
        set_widget_visibility (priv->toolbar_dock, toolbar);
        set_widget_visibility (priv->find_bar, findbar);
+       set_widget_visibility (priv->sidebar, sidebar);
 
        ev_window_set_action_sensitive (window, "EditToolbar", toolbar);
        gtk_widget_set_sensitive (priv->menubar, menubar);
 
        if (priv->fullscreen_popup != NULL) {
 
        ev_window_set_action_sensitive (window, "EditToolbar", toolbar);
        gtk_widget_set_sensitive (priv->menubar, menubar);
 
        if (priv->fullscreen_popup != NULL) {
-               if (fullscreen)
-                       show_fullscreen_popup (window);
-               else
-                       set_widget_visibility (priv->fullscreen_popup, FALSE);
-
                set_widget_visibility (priv->fullscreen_toolbar, fullscreen_toolbar);
                set_widget_visibility (priv->fullscreen_toolbar, fullscreen_toolbar);
+               set_widget_visibility (priv->fullscreen_popup, fullscreen_toolbar);
        }
 }
 
        }
 }
 
@@ -582,26 +589,6 @@ update_document_mode (EvWindow *window, EvDocumentMode mode)
        }
 }
 
        }
 }
 
-static void
-update_sidebar_visibility (EvWindow *window)
-{
-       char *uri = window->priv->uri;
-       GValue sidebar_visibility = { 0, };
-
-       if (ev_metadata_manager_get (uri, "sidebar_visibility", &sidebar_visibility, FALSE)) {
-               set_widget_visibility (window->priv->sidebar,
-                                      g_value_get_boolean (&sidebar_visibility));
-       }
-}
-
-static void
-update_attachment_bar_visibility (EvWindow *window)
-{
-       set_widget_visibility (window->priv->attachment_bar,
-                              (window->priv->document &&
-                              ev_document_has_attachments (window->priv->document)));
-}
-
 static void
 setup_document_from_metadata (EvWindow *window)
 {
 static void
 setup_document_from_metadata (EvWindow *window)
 {
@@ -629,7 +616,6 @@ setup_chrome_from_metadata (EvWindow *window)
        window->priv->chrome = chrome;
 }
 
        window->priv->chrome = chrome;
 }
 
-
 static void
 setup_sidebar_from_metadata (EvWindow *window, EvDocument *document)
 {
 static void
 setup_sidebar_from_metadata (EvWindow *window, EvDocument *document)
 {
@@ -637,29 +623,33 @@ setup_sidebar_from_metadata (EvWindow *window, EvDocument *document)
        GtkWidget *sidebar = window->priv->sidebar;
        GtkWidget *links = window->priv->sidebar_links;
        GtkWidget *thumbs = window->priv->sidebar_thumbs;
        GtkWidget *sidebar = window->priv->sidebar;
        GtkWidget *links = window->priv->sidebar_links;
        GtkWidget *thumbs = window->priv->sidebar_thumbs;
+       GtkWidget *attachments = window->priv->sidebar_attachments;
        GValue sidebar_size = { 0, };
        GValue sidebar_page = { 0, };
        GValue sidebar_size = { 0, };
        GValue sidebar_page = { 0, };
+       GValue sidebar_visibility = { 0, };
 
        if (ev_metadata_manager_get (uri, "sidebar_size", &sidebar_size, FALSE)) {
                gtk_paned_set_position (GTK_PANED (window->priv->hpaned),
                                        g_value_get_int (&sidebar_size));
        }
 
        if (ev_metadata_manager_get (uri, "sidebar_size", &sidebar_size, FALSE)) {
                gtk_paned_set_position (GTK_PANED (window->priv->hpaned),
                                        g_value_get_int (&sidebar_size));
        }
-
-       if (ev_metadata_manager_get (uri, "sidebar_page", &sidebar_page, FALSE)) {
+       
+       if (document && ev_metadata_manager_get (uri, "sidebar_page", &sidebar_page, FALSE)) {
                const char *page_id = g_value_get_string (&sidebar_page);
 
                const char *page_id = g_value_get_string (&sidebar_page);
 
-               if (strcmp (page_id, "links") == 0 && ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (links), document)) {
+               if (strcmp (page_id, LINKS_SIDEBAR_ID) == 0 && ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (links), document)) {
                        ev_sidebar_set_page (EV_SIDEBAR (sidebar), links);
                        ev_sidebar_set_page (EV_SIDEBAR (sidebar), links);
-               } else if (strcmp (page_id, "thumbnails") && ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (thumbs), 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), thumbs);
                }
-       } else {
-               if (ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (links), document)) {
-                       ev_sidebar_set_page (EV_SIDEBAR (sidebar), links);
-               }
+       } else if (document && ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (links), document)) {
+               ev_sidebar_set_page (EV_SIDEBAR (sidebar), links);
        }
 
        }
 
-       update_sidebar_visibility (window);
+       if (ev_metadata_manager_get (uri, "sidebar_visibility", &sidebar_visibility, FALSE)) {
+               update_chrome_flag (window, EV_CHROME_SIDEBAR, g_value_get_boolean (&sidebar_visibility));
+       }
 }
 
 static void
 }
 
 static void
@@ -772,7 +762,6 @@ ev_window_setup_document (EvWindow *ev_window)
        EvDocument *document;
        EvView *view = EV_VIEW (ev_window->priv->view);
        EvSidebar *sidebar = EV_SIDEBAR (ev_window->priv->sidebar);
        EvDocument *document;
        EvView *view = EV_VIEW (ev_window->priv->view);
        EvSidebar *sidebar = EV_SIDEBAR (ev_window->priv->sidebar);
-       EvAttachmentBar *attachbar = EV_ATTACHMENT_BAR (ev_window->priv->attachment_bar);
        GtkAction *action;
 
        document = ev_window->priv->document;
        GtkAction *action;
 
        document = ev_window->priv->document;
@@ -793,9 +782,6 @@ ev_window_setup_document (EvWindow *ev_window)
        }
        ev_window_set_page_mode (ev_window, PAGE_MODE_DOCUMENT);
 
        }
        ev_window_set_page_mode (ev_window, PAGE_MODE_DOCUMENT);
 
-       ev_attachment_bar_set_document (attachbar, document);
-       update_attachment_bar_visibility (ev_window);
-
        ev_window_title_set_document (ev_window->priv->title, document);
        ev_window_title_set_uri (ev_window->priv->title, ev_window->priv->uri);
 
        ev_window_title_set_document (ev_window->priv->title, document);
        ev_window_title_set_uri (ev_window->priv->title, ev_window->priv->uri);
 
@@ -1189,9 +1175,7 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
        ev_document_factory_add_filters (fc, ev_window->priv->document);
        gtk_dialog_set_default_response (GTK_DIALOG (fc), GTK_RESPONSE_OK);
 
        ev_document_factory_add_filters (fc, ev_window->priv->document);
        gtk_dialog_set_default_response (GTK_DIALOG (fc), GTK_RESPONSE_OK);
 
-#ifdef HAVE_GTK_FILE_CHOOSER_SET_DO_OVERWRITE_CONFIRMATION
        gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER (fc), TRUE);    
        gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER (fc), TRUE);    
-#endif 
        file_name = gnome_vfs_format_uri_for_display (ev_window->priv->uri);
        base_name = g_path_get_basename (file_name);
        gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (fc), base_name);
        file_name = gnome_vfs_format_uri_for_display (ev_window->priv->uri);
        base_name = g_path_get_basename (file_name);
        gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (fc), base_name);
@@ -1493,7 +1477,7 @@ ev_window_update_fullscreen_popup (EvWindow *window)
        if (GTK_WIDGET (window)->window == NULL)
                return;
 
        if (GTK_WIDGET (window)->window == NULL)
                return;
 
-       toolbar = (window->priv->chrome & EV_CHROME_TOOLBAR) != 0 || 
+       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;
                  (window->priv->chrome & EV_CHROME_RAISE_TOOLBAR) != 0;
        popup_width = popup->requisition.width;
        popup_height = popup->requisition.height;
@@ -1573,10 +1557,9 @@ static gboolean
 fullscreen_timeout_cb (gpointer data)
 {
        EvWindow *window = EV_WINDOW (data);
 fullscreen_timeout_cb (gpointer data)
 {
        EvWindow *window = EV_WINDOW (data);
-
-       g_object_set (window->priv->fullscreen_popup, "visible", FALSE, NULL);
+       
+       update_chrome_flag (window, EV_CHROME_FULLSCREEN_TOOLBAR, FALSE);
        ev_view_hide_cursor (EV_VIEW (window->priv->view));
        ev_view_hide_cursor (EV_VIEW (window->priv->view));
-
        window->priv->fullscreen_timeout_id = 0;
 
        return FALSE;
        window->priv->fullscreen_timeout_id = 0;
 
        return FALSE;
@@ -1591,6 +1574,10 @@ fullscreen_set_timeout (EvWindow *window)
        
        window->priv->fullscreen_timeout_id = 
            g_timeout_add (FULLSCREEN_TIMEOUT, fullscreen_timeout_cb, window);
        
        window->priv->fullscreen_timeout_id = 
            g_timeout_add (FULLSCREEN_TIMEOUT, fullscreen_timeout_cb, window);
+
+       update_chrome_flag (window, EV_CHROME_FULLSCREEN_TOOLBAR, TRUE);
+       update_chrome_visibility (window);
+       ev_view_show_cursor (EV_VIEW (window->priv->view));
 }
 
 static void
 }
 
 static void
@@ -1599,23 +1586,13 @@ fullscreen_clear_timeout (EvWindow *window)
        if (window->priv->fullscreen_timeout_id != 0) {
                g_source_remove (window->priv->fullscreen_timeout_id);
        }
        if (window->priv->fullscreen_timeout_id != 0) {
                g_source_remove (window->priv->fullscreen_timeout_id);
        }
-
+       
        window->priv->fullscreen_timeout_id = 0;
        window->priv->fullscreen_timeout_id = 0;
+       update_chrome_visibility (window);
        ev_view_show_cursor (EV_VIEW (window->priv->view));
 }
 
 
        ev_view_show_cursor (EV_VIEW (window->priv->view));
 }
 
 
-static void
-show_fullscreen_popup (EvWindow *window)
-{
-       if (!GTK_WIDGET_VISIBLE (window->priv->fullscreen_popup)) {
-               g_object_set (window->priv->fullscreen_popup, "visible", TRUE, NULL);
-               ev_view_show_cursor (EV_VIEW (window->priv->view));
-       }
-
-       fullscreen_set_timeout (window);        
-}
-
 static gboolean
 fullscreen_motion_notify_cb (GtkWidget *widget,
                             GdkEventMotion *event,
 static gboolean
 fullscreen_motion_notify_cb (GtkWidget *widget,
                             GdkEventMotion *event,
@@ -1623,7 +1600,7 @@ fullscreen_motion_notify_cb (GtkWidget *widget,
 {
        EvWindow *window = EV_WINDOW (user_data);
 
 {
        EvWindow *window = EV_WINDOW (user_data);
 
-       show_fullscreen_popup (window);
+       fullscreen_set_timeout (window);
 
        return FALSE;
 }
 
        return FALSE;
 }
@@ -1675,7 +1652,7 @@ ev_window_create_fullscreen_popup (EvWindow *window)
        GdkScreen *screen;
 
        window->priv->fullscreen_toolbar = egg_editable_toolbar_new_with_model
        GdkScreen *screen;
 
        window->priv->fullscreen_toolbar = egg_editable_toolbar_new_with_model
-                       (window->priv->ui_manager, ev_application_get_toolbars_model (EV_APP));
+                       (window->priv->ui_manager, ev_application_get_toolbars_model (EV_APP), NULL);
 
        popup = gtk_window_new (GTK_WINDOW_POPUP);
        hbox = gtk_hbox_new (FALSE, 0);
 
        popup = gtk_window_new (GTK_WINDOW_POPUP);
        hbox = gtk_hbox_new (FALSE, 0);
@@ -1723,19 +1700,21 @@ ev_window_update_fullscreen_action (EvWindow *window)
 static void
 ev_window_run_fullscreen (EvWindow *window)
 {
 static void
 ev_window_run_fullscreen (EvWindow *window)
 {
-       ev_view_set_fullscreen (EV_VIEW (window->priv->view), TRUE);
        if (window->priv->fullscreen_popup == NULL)
                window->priv->fullscreen_popup
                        = ev_window_create_fullscreen_popup (window);
 
        if (window->priv->fullscreen_popup == NULL)
                window->priv->fullscreen_popup
                        = ev_window_create_fullscreen_popup (window);
 
-       update_chrome_visibility (window);
-       gtk_widget_hide (window->priv->sidebar);
-       gtk_widget_hide (window->priv->attachment_bar);
-
        g_object_set (G_OBJECT (window->priv->scrolled_window),
                      "shadow-type", GTK_SHADOW_NONE,
                      NULL);
        g_object_set (G_OBJECT (window->priv->scrolled_window),
                      "shadow-type", GTK_SHADOW_NONE,
                      NULL);
+
+       ev_view_set_fullscreen (EV_VIEW (window->priv->view), TRUE);
+       ev_window_update_fullscreen_action (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),
        g_signal_connect (window->priv->view,
                          "motion-notify-event",
                          G_CALLBACK (fullscreen_motion_notify_cb),
@@ -1746,11 +1725,6 @@ ev_window_run_fullscreen (EvWindow *window)
                          window);
        fullscreen_set_timeout (window);
 
                          window);
        fullscreen_set_timeout (window);
 
-       gtk_widget_grab_focus (window->priv->view);
-       ev_window_update_fullscreen_action (window);
-       gtk_window_fullscreen (GTK_WINDOW (window));
-       ev_window_update_fullscreen_popup (window);
-
        if (!ev_window_is_empty (window))
                ev_metadata_manager_set_boolean (window->priv->uri, "fullscreen", TRUE);
 }
        if (!ev_window_is_empty (window))
                ev_metadata_manager_set_boolean (window->priv->uri, "fullscreen", TRUE);
 }
@@ -1763,24 +1737,21 @@ ev_window_stop_fullscreen (EvWindow *window)
        if (!ev_view_get_fullscreen (EV_VIEW (view)))
                return;
 
        if (!ev_view_get_fullscreen (EV_VIEW (view)))
                return;
 
-       ev_view_set_fullscreen (view, FALSE);
        g_object_set (G_OBJECT (window->priv->scrolled_window),
                      "shadow-type", GTK_SHADOW_IN,
                      NULL);
 
        g_object_set (G_OBJECT (window->priv->scrolled_window),
                      "shadow-type", GTK_SHADOW_IN,
                      NULL);
 
-       fullscreen_clear_timeout (window);
+       ev_view_set_fullscreen (view, FALSE);
+       ev_window_update_fullscreen_action (window);
+       gtk_window_unfullscreen (GTK_WINDOW (window));
 
 
-       g_signal_handlers_disconnect_by_func (view,
+       g_signal_handlers_disconnect_by_func (window->priv->view,
                                              (gpointer) fullscreen_motion_notify_cb,
                                              window);
                                              (gpointer) fullscreen_motion_notify_cb,
                                              window);
-       g_signal_handlers_disconnect_by_func (view,
+       g_signal_handlers_disconnect_by_func (window->priv->view,
                                              (gpointer) fullscreen_leave_notify_cb,
                                              window);
                                              (gpointer) fullscreen_leave_notify_cb,
                                              window);
-       ev_window_update_fullscreen_action (window);
-       gtk_window_unfullscreen (GTK_WINDOW (window));
-       update_chrome_visibility (window);
-       update_sidebar_visibility (window);
-       update_attachment_bar_visibility (window);
+       fullscreen_clear_timeout (window);
 
        if (!ev_window_is_empty (window))
                ev_metadata_manager_set_boolean (window->priv->uri, "fullscreen", FALSE);
 
        if (!ev_window_is_empty (window))
                ev_metadata_manager_set_boolean (window->priv->uri, "fullscreen", FALSE);
@@ -1823,13 +1794,21 @@ ev_window_run_presentation (EvWindow *window)
                      "shadow-type", GTK_SHADOW_NONE,
                      NULL);
 
                      "shadow-type", GTK_SHADOW_NONE,
                      NULL);
 
-       gtk_widget_grab_focus (window->priv->view);
        ev_view_set_presentation (EV_VIEW (window->priv->view), TRUE);
        ev_view_set_presentation (EV_VIEW (window->priv->view), TRUE);
-       gtk_window_fullscreen (GTK_WINDOW (window));
        ev_window_update_presentation_action (window);
        ev_window_update_presentation_action (window);
-       update_chrome_visibility (window);
-       gtk_widget_hide (window->priv->sidebar);
-       gtk_widget_hide (window->priv->attachment_bar);
+
+       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),
+                         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, "presentation", TRUE);
 
        if (!ev_window_is_empty (window))
                ev_metadata_manager_set_boolean (window->priv->uri, "presentation", TRUE);
@@ -1844,12 +1823,18 @@ ev_window_stop_presentation (EvWindow *window)
        g_object_set (G_OBJECT (window->priv->scrolled_window),
                      "shadow-type", GTK_SHADOW_IN,
                      NULL);
        g_object_set (G_OBJECT (window->priv->scrolled_window),
                      "shadow-type", GTK_SHADOW_IN,
                      NULL);
+
        ev_view_set_presentation (EV_VIEW (window->priv->view), FALSE);
        ev_view_set_presentation (EV_VIEW (window->priv->view), FALSE);
-       gtk_window_unfullscreen (GTK_WINDOW (window));
        ev_window_update_presentation_action (window);
        ev_window_update_presentation_action (window);
-       update_chrome_visibility (window);
-       update_sidebar_visibility (window);
-       update_attachment_bar_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, "presentation", FALSE);
 
        if (!ev_window_is_empty (window))
                ev_metadata_manager_set_boolean (window->priv->uri, "presentation", FALSE);
@@ -1876,14 +1861,9 @@ ev_window_focus_in_event (GtkWidget *widget, GdkEventFocus *event)
 {
        EvWindow *window = EV_WINDOW (widget);
        EvWindowPrivate *priv = window->priv;
 {
        EvWindow *window = EV_WINDOW (widget);
        EvWindowPrivate *priv = window->priv;
-       gboolean fullscreen;
-
-       g_object_get (priv->view,
-                     "fullscreen", &fullscreen,
-                     NULL);
 
 
-       if (fullscreen)
-               show_fullscreen_popup (window);
+       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);
 }
 
        return GTK_WIDGET_CLASS (ev_window_parent_class)->focus_in_event (widget, event);
 }
@@ -1893,14 +1873,11 @@ ev_window_focus_out_event (GtkWidget *widget, GdkEventFocus *event)
 {
        EvWindow *window = EV_WINDOW (widget);
        EvWindowPrivate *priv = window->priv;
 {
        EvWindow *window = EV_WINDOW (widget);
        EvWindowPrivate *priv = window->priv;
-       gboolean fullscreen;
-
-       g_object_get (priv->view,
-                     "fullscreen", &fullscreen,
-                     NULL);
 
 
-       if (fullscreen)
+       if (ev_view_get_fullscreen (EV_VIEW (priv->view))) {
+               fullscreen_set_timeout (window);
                gtk_widget_hide (priv->fullscreen_popup);
                gtk_widget_hide (priv->fullscreen_popup);
+       }
 
        return GTK_WIDGET_CLASS (ev_window_parent_class)->focus_out_event (widget, event);
 }
 
        return GTK_WIDGET_CLASS (ev_window_parent_class)->focus_out_event (widget, event);
 }
@@ -2011,8 +1988,6 @@ ev_window_cmd_edit_toolbar (GtkAction *action, EvWindow *ev_window)
        gtk_box_set_spacing (GTK_BOX (EGG_TOOLBAR_EDITOR (editor)), 5);
              
        gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), editor);
        gtk_box_set_spacing (GTK_BOX (EGG_TOOLBAR_EDITOR (editor)), 5);
              
        gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), editor);
-       egg_toolbar_editor_load_actions (EGG_TOOLBAR_EDITOR (editor),
-                                        DATADIR "/evince-toolbar.xml");
 
        egg_editable_toolbar_set_edit_mode
                (EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar), TRUE);
 
        egg_editable_toolbar_set_edit_mode
                (EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar), TRUE);
@@ -2393,16 +2368,16 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window)
        };
 
        const char *license[] = {
        };
 
        const char *license[] = {
-               N_("Evince is free software; you can redistribute it and/or modify\n"
-                  "it under the terms of the GNU General Public License as published by\n"
-                  "the Free Software Foundation; either version 2 of the License, or\n"
+               N_("Evince is free software; you can redistribute it and/or modify "
+                  "it under the terms of the GNU General Public License as published by "
+                  "the Free Software Foundation; either version 2 of the License, or "
                   "(at your option) any later version.\n"),
                   "(at your option) any later version.\n"),
-               N_("Evince is distributed in the hope that it will be useful,\n"
-                  "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-                  "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+               N_("Evince is distributed in the hope that it will be useful, "
+                  "but WITHOUT ANY WARRANTY; without even the implied warranty of "
+                  "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the "
                   "GNU General Public License for more details.\n"),
                   "GNU General Public License for more details.\n"),
-               N_("You should have received a copy of the GNU General Public License\n"
-                  "along with Evince; if not, write to the Free Software Foundation, Inc.,\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")
        };
 
                   "59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n")
        };
 
@@ -2436,6 +2411,7 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window)
                "documenters", documenters,
                "translator-credits", _("translator-credits"),
                "logo-icon-name", "evince",
                "documenters", documenters,
                "translator-credits", _("translator-credits"),
                "logo-icon-name", "evince",
+               "wrap-license", TRUE,
                NULL);
 
        g_free (comments);
                NULL);
 
        g_free (comments);
@@ -2455,8 +2431,8 @@ ev_window_view_toolbar_cb (GtkAction *action, EvWindow *ev_window)
 static void
 ev_window_view_sidebar_cb (GtkAction *action, EvWindow *ev_window)
 {
 static void
 ev_window_view_sidebar_cb (GtkAction *action, EvWindow *ev_window)
 {
-       set_widget_visibility (ev_window->priv->sidebar,
-                              gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
+       update_chrome_flag (ev_window, EV_CHROME_SIDEBAR,
+                           gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
 }
 
 static void
 }
 
 static void
@@ -2473,6 +2449,8 @@ ev_window_sidebar_current_page_changed_cb (EvSidebar  *ev_sidebar,
                id = LINKS_SIDEBAR_ID;
        } else if (current_page == ev_window->priv->sidebar_thumbs) {
                id = THUMBNAILS_SIDEBAR_ID;
                id = LINKS_SIDEBAR_ID;
        } else if (current_page == ev_window->priv->sidebar_thumbs) {
                id = THUMBNAILS_SIDEBAR_ID;
+       } else if (current_page == ev_window->priv->sidebar_attachments) {
+               id = ATTACHMENTS_SIDEBAR_ID;
        } else {
                g_assert_not_reached();
        }
        } else {
                g_assert_not_reached();
        }
@@ -2484,41 +2462,24 @@ ev_window_sidebar_current_page_changed_cb (EvSidebar  *ev_sidebar,
 }
 
 static void
 }
 
 static void
-ev_window_sidebar_visibility_changed_cb (EvSidebar *ev_sidebar, GParamSpec *pspec,
+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");
                                         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");
-       
-       g_signal_handlers_block_by_func
-               (action, G_CALLBACK (ev_window_view_sidebar_cb), ev_window);
        gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
                                      GTK_WIDGET_VISIBLE (ev_sidebar));
        gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
                                      GTK_WIDGET_VISIBLE (ev_sidebar));
-       g_signal_handlers_unblock_by_func
-               (action, G_CALLBACK (ev_window_view_sidebar_cb), ev_window);
 
        if (!ev_view_get_presentation (view) && 
 
        if (!ev_view_get_presentation (view) && 
-           !ev_view_get_fullscreen (view) &&
-           !ev_window_is_empty (ev_window)) {
+           !ev_view_get_fullscreen (view)) {
                ev_metadata_manager_set_boolean (ev_window->priv->uri, "sidebar_visibility",
                                                 GTK_WIDGET_VISIBLE (ev_sidebar));
        }
 }
 
                ev_metadata_manager_set_boolean (ev_window->priv->uri, "sidebar_visibility",
                                                 GTK_WIDGET_VISIBLE (ev_sidebar));
        }
 }
 
-static void
-ev_window_attachment_bar_toggled_cb (EvAttachmentBar *ev_attachbar,
-                                    GParamSpec      *param_spec,
-                                    EvWindow        *ev_window)
-{
-       if (gtk_expander_get_expanded (GTK_EXPANDER (ev_attachbar))) {
-               gtk_widget_grab_focus (GTK_WIDGET (ev_attachbar));
-       } else {
-               gtk_widget_grab_focus (ev_window->priv->view);
-       }
-}
-
 static gboolean
 view_menu_popup_cb (EvView   *view,
                    EvLink   *link,
 static gboolean
 view_menu_popup_cb (EvView   *view,
                    EvLink   *link,
@@ -2582,7 +2543,7 @@ view_menu_popup_cb (EvView   *view,
 }
 
 static gboolean
 }
 
 static gboolean
-attachment_bar_menu_popup_cb (EvAttachmentBar *attachbar,
+attachment_bar_menu_popup_cb (EvSidebarAttachments *attachbar,
                              GList           *attach_list,
                              EvWindow        *ev_window)
 {
                              GList           *attach_list,
                              EvWindow        *ev_window)
 {
@@ -3319,6 +3280,29 @@ open_remote_link (EvWindow *window, EvLinkAction *action)
        g_free (uri);
 }
 
        g_free (uri);
 }
 
+static void
+do_action_named (EvWindow *window, EvLinkAction *action)
+{
+       const gchar *name = ev_link_action_get_name (action);
+
+       if (g_ascii_strcasecmp (name, "FirstPage") == 0) {
+               ev_window_cmd_go_first_page (NULL, window);
+       } else if (g_ascii_strcasecmp (name, "PrevPage") == 0) {
+               ev_window_cmd_go_previous_page (NULL, window);
+       } else if (g_ascii_strcasecmp (name, "NextPage") == 0) {
+               ev_window_cmd_go_next_page (NULL, window);
+       } else if (g_ascii_strcasecmp (name, "LastPage") == 0) {
+               ev_window_cmd_go_last_page (NULL, window);
+       } else if (g_ascii_strcasecmp (name, "GoToPage") == 0) {
+               ev_window_cmd_focus_page_selector (NULL, window);
+       } else if (g_ascii_strcasecmp (name, "Find") == 0) {
+               ev_window_cmd_edit_find (NULL, window);
+       } else {
+               g_warning ("Unimplemented named action: %s, please post a bug report with a testcase.",
+                          name);
+       }
+}
+
 static void
 view_external_link_cb (EvView *view, EvLinkAction *action, EvWindow *window)
 {
 static void
 view_external_link_cb (EvView *view, EvLinkAction *action, EvWindow *window)
 {
@@ -3332,6 +3316,9 @@ view_external_link_cb (EvView *view, EvLinkAction *action, EvWindow *window)
                case EV_LINK_ACTION_TYPE_GOTO_REMOTE:
                        open_remote_link (window, action);
                        break;
                case EV_LINK_ACTION_TYPE_GOTO_REMOTE:
                        open_remote_link (window, action);
                        break;
+               case EV_LINK_ACTION_TYPE_NAMED:
+                       do_action_named (window, action);
+                       break;
                default:
                        g_assert_not_reached ();
        }
                default:
                        g_assert_not_reached ();
        }
@@ -3459,10 +3446,7 @@ ev_attachment_popup_cmd_save_attachment_as (GtkAction *action, EvWindow *window)
                NULL);
 
        gtk_dialog_set_default_response (GTK_DIALOG (fc), GTK_RESPONSE_OK);
                NULL);
 
        gtk_dialog_set_default_response (GTK_DIALOG (fc), GTK_RESPONSE_OK);
-
-#ifdef HAVE_GTK_FILE_CHOOSER_SET_DO_OVERWRITE_CONFIRMATION
        gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (fc), TRUE);
        gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (fc), TRUE);
-#endif
 
        if (attachment)
                gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (fc),
 
        if (attachment)
                gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (fc),
@@ -3562,7 +3546,7 @@ ev_window_init (EvWindow *ev_window)
        gtk_widget_show (toolbar_dock);
 
        ev_window->priv->toolbar = egg_editable_toolbar_new_with_model
        gtk_widget_show (toolbar_dock);
 
        ev_window->priv->toolbar = egg_editable_toolbar_new_with_model
-                               (ev_window->priv->ui_manager, ev_application_get_toolbars_model (EV_APP));
+                               (ev_window->priv->ui_manager, 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,
        egg_editable_toolbar_show (EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar),
                                   "DefaultToolBar");
        gtk_box_pack_start (GTK_BOX (toolbar_dock), ev_window->priv->toolbar,
@@ -3587,6 +3571,7 @@ ev_window_init (EvWindow *ev_window)
        gtk_widget_show (ev_window->priv->sidebar);
 
        /* Stub sidebar, for now */
        gtk_widget_show (ev_window->priv->sidebar);
 
        /* Stub sidebar, for now */
+
        sidebar_widget = ev_sidebar_links_new ();
        ev_window->priv->sidebar_links = sidebar_widget;
        g_signal_connect (sidebar_widget,
        sidebar_widget = ev_sidebar_links_new ();
        ev_window->priv->sidebar_links = sidebar_widget;
        g_signal_connect (sidebar_widget,
@@ -3602,6 +3587,15 @@ ev_window_init (EvWindow *ev_window)
        ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar),
                             sidebar_widget);
 
        ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar),
                             sidebar_widget);
 
+       sidebar_widget = ev_sidebar_attachments_new ();
+       ev_window->priv->sidebar_attachments = sidebar_widget;
+       g_signal_connect_object (sidebar_widget,
+                                "popup",
+                                G_CALLBACK (attachment_bar_menu_popup_cb),
+                                ev_window, 0);
+       ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar),
+                            sidebar_widget);
+
        sidebar_widget = ev_sidebar_thumbnails_new ();
        ev_window->priv->sidebar_thumbs = sidebar_widget;
        g_signal_connect (sidebar_widget,
        sidebar_widget = ev_sidebar_thumbnails_new ();
        ev_window->priv->sidebar_thumbs = sidebar_widget;
        g_signal_connect (sidebar_widget,
@@ -3613,7 +3607,6 @@ ev_window_init (EvWindow *ev_window)
        ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar),
                             sidebar_widget);
 
        ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar),
                             sidebar_widget);
 
-
        ev_window->priv->scrolled_window =
                GTK_WIDGET (g_object_new (GTK_TYPE_SCROLLED_WINDOW,
                                          "shadow-type", GTK_SHADOW_IN,
        ev_window->priv->scrolled_window =
                GTK_WIDGET (g_object_new (GTK_TYPE_SCROLLED_WINDOW,
                                          "shadow-type", GTK_SHADOW_IN,
@@ -3645,16 +3638,6 @@ ev_window_init (EvWindow *ev_window)
        gtk_widget_show (ev_window->priv->view);
        gtk_widget_show (ev_window->priv->password_view);
 
        gtk_widget_show (ev_window->priv->view);
        gtk_widget_show (ev_window->priv->password_view);
 
-       /* Attachments Bar */
-       ev_window->priv->attachment_bar = ev_attachment_bar_new ();
-       gtk_box_pack_end (GTK_BOX (ev_window->priv->main_box),
-                         ev_window->priv->attachment_bar,
-                         FALSE, TRUE, 0);
-       g_signal_connect_object (ev_window->priv->attachment_bar,
-                                "popup",
-                                G_CALLBACK (attachment_bar_menu_popup_cb),
-                                ev_window, 0);
-
        /* Find Bar */
        ev_window->priv->find_bar = egg_find_bar_new ();
        gtk_box_pack_end (GTK_BOX (ev_window->priv->main_box),
        /* Find Bar */
        ev_window->priv->find_bar = egg_find_bar_new ();
        gtk_box_pack_end (GTK_BOX (ev_window->priv->main_box),
@@ -3707,12 +3690,6 @@ ev_window_init (EvWindow *ev_window)
                          G_CALLBACK (ev_window_sidebar_current_page_changed_cb),
                          ev_window);
 
                          G_CALLBACK (ev_window_sidebar_current_page_changed_cb),
                          ev_window);
 
-       /* Connect attachment bar sgignals */
-       g_signal_connect (G_OBJECT (ev_window->priv->attachment_bar),
-                         "notify::expanded",
-                         G_CALLBACK (ev_window_attachment_bar_toggled_cb),
-                         ev_window);
-
        /* Connect to find bar signals */
        g_signal_connect (ev_window->priv->find_bar,
                          "previous",
        /* Connect to find bar signals */
        g_signal_connect (ev_window->priv->find_bar,
                          "previous",
@@ -3765,19 +3742,18 @@ ev_window_init (EvWindow *ev_window)
        g_signal_connect_swapped (G_OBJECT (ev_window->priv->view), "drag-data-received",
                                  G_CALLBACK (drag_data_received_cb),
                                  ev_window);
        g_signal_connect_swapped (G_OBJECT (ev_window->priv->view), "drag-data-received",
                                  G_CALLBACK (drag_data_received_cb),
                                  ev_window);
-
+       
        /* Set it user interface params */
 
        ev_window_setup_recent (ev_window);
        /* Set it user interface params */
 
        ev_window_setup_recent (ev_window);
+
        setup_chrome_from_metadata (ev_window);
        set_chrome_actions (ev_window);
        update_chrome_visibility (ev_window);
        setup_chrome_from_metadata (ev_window);
        set_chrome_actions (ev_window);
        update_chrome_visibility (ev_window);
-       update_sidebar_visibility (ev_window);
-       update_attachment_bar_visibility (ev_window);
 
 
-       gtk_window_set_default_size (GTK_WINDOW (ev_window),
-                                    600, 600);
+       gtk_window_set_default_size (GTK_WINDOW (ev_window), 600, 600);
        setup_view_from_metadata (ev_window);
        setup_view_from_metadata (ev_window);
+       setup_sidebar_from_metadata (ev_window, NULL);
 
         ev_window_sizing_mode_changed_cb (EV_VIEW (ev_window->priv->view), NULL, ev_window);
        ev_window_setup_action_sensitivity (ev_window);
 
         ev_window_sizing_mode_changed_cb (EV_VIEW (ev_window->priv->view), NULL, ev_window);
        ev_window_setup_action_sensitivity (ev_window);
Dual-screen mode for evince