Show a blank page after the last page in presentation mode with a message

2006-12-09  Carlos Garcia Campos  <carlosgc@gnome.org>
	* shell/ev-view-private.h:
	* shell/ev-view.c: (draw_end_presentation_page),
	(ev_view_expose_event), (ev_view_init), (ev_view_set_presentation):
	Show a blank page after the last page in presentation mode with a
	message indicating that presentation has finished and how to exit.

diff --git a/ChangeLog b/ChangeLog
index 0b66667fbd2ed3874d25a5cde7dee2556af12e18..f20b377260fa497db32b516b08d04184150653dd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-12-09  Carlos Garcia Campos  <carlosgc@gnome.org>
+
+       * shell/ev-view-private.h:
+       * shell/ev-view.c: (draw_end_presentation_page),
+       (ev_view_expose_event), (ev_view_init), (ev_view_set_presentation):
+
+       Show a blank page after the last page in presentation mode with a
+       message indicating that presentation has finished and how to exit. 
+
 2006-12-09  Carlos Garcia Campos  <carlosgc@gnome.org>
 
        * shell/ev-window.c: (fullscreen_timeout_cb):

diff --git a/shell/ev-view-private.h b/shell/ev-view-private.h
index 791256b8a6cf4071765d0aa86fd5160abb13d844..7278a50955cca87e35c4cabe7d44f00914eff21a 100644 (file)
--- a/shell/ev-view-private.h
+++ b/shell/ev-view-private.h
@@ -98,6 +98,7 @@ struct _EvView {
        gboolean dual_page;
        gboolean fullscreen;
        gboolean presentation;
+       gboolean end_presentation;
        EvSizingMode sizing_mode;
 
        /* Common for button press handling */

diff --git a/shell/ev-view.c b/shell/ev-view.c
index 3eed46a803bfe54a2ab76bfe2052c0387c25f9a9..04f052af5a199a28dcd5981199bc80d17cbddefc 100644 (file)
--- a/shell/ev-view.c
+++ b/shell/ev-view.c
@@ -1739,6 +1739,42 @@ find_selection_for_page (EvView *view,
        return NULL;
 }
 
+static void
+draw_end_presentation_page (EvView       *view,
+                           GdkRectangle *page_area)
+{
+       PangoLayout *layout;
+       PangoFontDescription *font_desc;
+       gchar *markup;
+       const gchar *text = _("End of presentation, press Escape to exit.");
+
+       if (!view->end_presentation)
+               return;
+
+       layout = gtk_widget_create_pango_layout (GTK_WIDGET (view), NULL);
+       markup = g_strdup_printf ("<span foreground=\"white\">%s</span>", text);
+       pango_layout_set_markup (layout, markup, -1);
+       g_free (markup);
+
+       font_desc = pango_font_description_new ();
+       pango_font_description_set_size (font_desc, 16 * PANGO_SCALE);
+       pango_layout_set_font_description (layout, font_desc);
+
+       gtk_paint_layout (GTK_WIDGET (view)->style,
+                         GTK_WIDGET (view)->window,
+                         GTK_WIDGET_STATE (view),
+                         FALSE,
+                         page_area,
+                         GTK_WIDGET (view),
+                         NULL,
+                         page_area->x + 15,
+                         page_area->y + 15,
+                         layout);
+
+       pango_font_description_free (font_desc);
+       g_object_unref (layout);
+}
+
 static gboolean
 ev_view_expose_event (GtkWidget      *widget,
                      GdkEventExpose *event)
@@ -1746,6 +1782,17 @@ ev_view_expose_event (GtkWidget      *widget,
        EvView *view = EV_VIEW (widget);
        int i;
 
+       if (view->end_presentation) {
+               GdkRectangle area = {0};
+
+               area.width = widget->allocation.width;
+               area.height = widget->allocation.height;
+               
+               draw_end_presentation_page (view, &area);
+
+               return FALSE;
+       }
+       
        if (view->loading) {
                GdkRectangle area = {0};
                
@@ -2731,6 +2778,7 @@ ev_view_init (EvView *view)
        view->continuous = TRUE;
        view->dual_page = FALSE;
        view->presentation = FALSE;
+       view->end_presentation = FALSE;
        view->fullscreen = FALSE;
        view->sizing_mode = EV_SIZING_FIT_WIDTH;
        view->pending_scroll = SCROLL_TO_KEEP_POSITION;
@@ -3020,6 +3068,9 @@ ev_view_set_presentation (EvView   *view,
        if (view->presentation == presentation)
                return;
 
+       if (!presentation)
+               view->end_presentation = FALSE;
+       
        view->presentation = presentation;
        view->pending_scroll = SCROLL_TO_PAGE_POSITION;
        gtk_widget_queue_resize (GTK_WIDGET (view));
@@ -3033,7 +3084,6 @@ ev_view_set_presentation (EvView   *view,
                                                   &GTK_WIDGET (view)->style->mid [GTK_STATE_NORMAL]);
        }
 
-
        g_object_notify (G_OBJECT (view), "presentation");
 }
 
@@ -4134,7 +4184,7 @@ ev_view_show_cursor (EvView *view)
 gboolean
 ev_view_next_page (EvView *view)
 {
-       int page;
+       int page, n_pages;
 
        g_return_val_if_fail (EV_IS_VIEW (view), FALSE);
        
@@ -4142,16 +4192,21 @@ ev_view_next_page (EvView *view)
                return FALSE;
 
        page = ev_page_cache_get_current_page (view->page_cache);
+       n_pages = ev_page_cache_get_n_pages (view->page_cache);
 
        if (view->dual_page && !view->presentation)
                page = page + 2; 
        else 
                page = page + 1;
 
-       if (page < ev_page_cache_get_n_pages (view->page_cache)) {
+       if (page < n_pages) {
                ev_page_cache_set_current_page (view->page_cache, page);
                return TRUE;
-       } else if (ev_view_get_dual_page (view) && page == ev_page_cache_get_n_pages (view->page_cache)) {
+       } else if (view->presentation && page == n_pages) {
+               view->end_presentation = TRUE;
+               gtk_widget_queue_draw (GTK_WIDGET (view));
+               return TRUE;
+       } else if (view->dual_page && page == n_pages) {
                ev_page_cache_set_current_page (view->page_cache, page - 1);
                return TRUE;
        } else {
@@ -4169,6 +4224,12 @@ ev_view_previous_page (EvView *view)
        if (!view->page_cache)
                return FALSE;
 
+       if (view->end_presentation) {
+               view->end_presentation = FALSE;
+               gtk_widget_queue_draw (GTK_WIDGET (view));
+               return TRUE;
+       }
+
        page = ev_page_cache_get_current_page (view->page_cache);
 
        if (view->dual_page && !view->presentation)