[dualscreen] [presentation] make presentation control dscwindow, presentation ->...

[evince.git] / libview / ev-view-presentation.c

diff --git a/libview/ev-view-presentation.c b/libview/ev-view-presentation.c
index a4498f4c20d5b948592ff4d5a34691e175eb5e22..3612904ae025cd539d3d5edb2b094cb3a414b739 100644 (file)
--- a/libview/ev-view-presentation.c
+++ b/libview/ev-view-presentation.c
@@ -31,10 +31,13 @@
 #include "ev-view-cursor.h"
 #include "ev-page-cache.h"
 
+
+
 enum {
        PROP_0,
        PROP_DOCUMENT,
        PROP_CURRENT_PAGE,
+       PROP_PAGE,
        PROP_ROTATION,
        PROP_INVERTED_COLORS
 };
@@ -57,6 +60,8 @@ struct _EvViewPresentation
 {
        GtkWidget base;
 
+        guint                  is_constructing : 1;
+
        guint                  current_page;
        cairo_surface_t       *current_surface;
        EvDocument            *document;
@@ -104,8 +109,6 @@ struct _EvViewPresentationClass
 
 static guint signals[N_SIGNALS] = { 0 };
 
-static void ev_view_presentation_next_page               (EvViewPresentation *pview);
-static void ev_view_presentation_previous_page           (EvViewPresentation *pview);
 static void ev_view_presentation_set_cursor_for_location (EvViewPresentation *pview,
                                                          gdouble             x,
                                                          gdouble             y);
@@ -381,6 +384,25 @@ ev_view_presentation_delete_job (EvViewPresentation *pview,
        g_object_unref (job);
 }
 
+static void
+ev_view_presentation_reset_jobs (EvViewPresentation *pview)
+{
+        if (pview->curr_job) {
+                ev_view_presentation_delete_job (pview, pview->curr_job);
+                pview->curr_job = NULL;
+        }
+
+        if (pview->prev_job) {
+                ev_view_presentation_delete_job (pview, pview->prev_job);
+                pview->prev_job = NULL;
+        }
+
+        if (pview->next_job) {
+                ev_view_presentation_delete_job (pview, pview->next_job);
+                pview->next_job = NULL;
+        }
+}
+
 static void
 ev_view_presentation_update_current_page (EvViewPresentation *pview,
                                          guint               page)
@@ -470,6 +492,7 @@ ev_view_presentation_update_current_page (EvViewPresentation *pview,
        }
 
        pview->current_page = page;
+       g_object_notify (G_OBJECT(pview), "page");
 
        if (pview->page_cache)
                ev_page_cache_set_page_range (pview->page_cache, page, page);
@@ -485,7 +508,20 @@ ev_view_presentation_update_current_page (EvViewPresentation *pview,
                gtk_widget_queue_draw (GTK_WIDGET (pview));
 }
 
-static void
+void
+ev_view_presentation_set_page (EvViewPresentation *pview, gint new_page)
+{
+               guint n_pages;
+
+       n_pages = ev_document_get_n_pages (pview->document);
+
+       if (new_page >= n_pages)
+               ev_view_presentation_set_end (pview);
+       else
+               ev_view_presentation_update_current_page (pview, new_page);
+}
+
+void
 ev_view_presentation_next_page (EvViewPresentation *pview)
 {
        guint n_pages;
@@ -510,7 +546,7 @@ ev_view_presentation_next_page (EvViewPresentation *pview)
                ev_view_presentation_update_current_page (pview, new_page);
 }
 
-static void
+void
 ev_view_presentation_previous_page (EvViewPresentation *pview)
 {
        gint new_page = 0;
@@ -630,9 +666,9 @@ ev_view_presentation_goto_window_create (EvViewPresentation *pview)
        GtkWindow *toplevel, *goto_window;
 
        toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (pview)));
-       goto_window = GTK_WINDOW (pview->goto_window);
 
        if (pview->goto_window) {
+                goto_window = GTK_WINDOW (pview->goto_window);
                if (gtk_window_has_group (toplevel))
                        gtk_window_group_add_window (gtk_window_get_group (toplevel), goto_window);
                else if (gtk_window_has_group (goto_window))
@@ -642,6 +678,7 @@ ev_view_presentation_goto_window_create (EvViewPresentation *pview)
        }
 
        pview->goto_window = gtk_window_new (GTK_WINDOW_POPUP);
+        goto_window = GTK_WINDOW (pview->goto_window);
        gtk_window_set_screen (goto_window, gtk_widget_get_screen (GTK_WIDGET (pview)));
 
        if (gtk_window_has_group (toplevel))
@@ -929,21 +966,7 @@ ev_view_presentation_dispose (GObject *object)
        ev_view_presentation_animation_cancel (pview);
        ev_view_presentation_transition_stop (pview);
        ev_view_presentation_hide_cursor_timeout_stop (pview);
-
-       if (pview->curr_job) {
-               ev_view_presentation_delete_job (pview, pview->curr_job);
-               pview->curr_job = NULL;
-       }
-
-       if (pview->prev_job) {
-               ev_view_presentation_delete_job (pview, pview->prev_job);
-               pview->prev_job = NULL;
-       }
-
-       if (pview->next_job) {
-               ev_view_presentation_delete_job (pview, pview->next_job);
-               pview->next_job = NULL;
-       }
+        ev_view_presentation_reset_jobs (pview);
 
        if (pview->current_surface) {
                cairo_surface_destroy (pview->current_surface);
@@ -1346,8 +1369,11 @@ ev_view_presentation_set_property (GObject      *object,
        case PROP_CURRENT_PAGE:
                pview->current_page = g_value_get_uint (value);
                break;
+       case PROP_PAGE:
+               pview->current_page = g_value_get_uint (value);
+               break;
        case PROP_ROTATION:
-               pview->rotation = g_value_get_uint (value);
+                ev_view_presentation_set_rotation (pview, g_value_get_uint (value));
                break;
        case PROP_INVERTED_COLORS:
                pview->inverted_colors = g_value_get_boolean (value);
@@ -1357,10 +1383,30 @@ ev_view_presentation_set_property (GObject      *object,
        }
 }
 
+static void
+ev_view_presentation_get_property (GObject    *object,
+                                   guint       prop_id,
+                                   GValue     *value,
+                                   GParamSpec *pspec)
+{
+        EvViewPresentation *pview = EV_VIEW_PRESENTATION (object);
+
+        switch (prop_id) {
+               case PROP_PAGE:
+                               g_value_set_uint (value, ev_view_presentation_get_current_page (pview));
+                               break;
+        case PROP_ROTATION:
+                g_value_set_uint (value, ev_view_presentation_get_rotation (pview));
+                break;
+        default:
+                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+        }
+}
+
 static GObject *
 ev_view_presentation_constructor (GType                  type,
-                                 guint                  n_construct_properties,
-                                 GObjectConstructParam *construct_params)
+                                                                 guint                  n_construct_properties,
+                                                                 GObjectConstructParam *construct_params)
 {
        GObject            *object;
        EvViewPresentation *pview;
@@ -1369,6 +1415,7 @@ ev_view_presentation_constructor (GType                  type,
                                                                                  n_construct_properties,
                                                                                  construct_params);
        pview = EV_VIEW_PRESENTATION (object);
+        pview->is_constructing = FALSE;
 
        if (EV_IS_DOCUMENT_LINKS (pview->document)) {
                pview->page_cache = ev_page_cache_new (pview->document);
@@ -1402,6 +1449,7 @@ ev_view_presentation_class_init (EvViewPresentationClass *klass)
 
        gobject_class->constructor = ev_view_presentation_constructor;
        gobject_class->set_property = ev_view_presentation_set_property;
+        gobject_class->get_property = ev_view_presentation_get_property;
 
        g_object_class_install_property (gobject_class,
                                         PROP_DOCUMENT,
@@ -1411,13 +1459,20 @@ ev_view_presentation_class_init (EvViewPresentationClass *klass)
                                                              EV_TYPE_DOCUMENT,
                                                              G_PARAM_WRITABLE |
                                                              G_PARAM_CONSTRUCT_ONLY));
+       g_object_class_install_property (gobject_class,
+                                        PROP_PAGE,
+                                        g_param_spec_uint ("page",
+                                                           "Current Page",
+                                                           "The current page",
+                                                           0, G_MAXUINT, 0,
+                                                               G_PARAM_READWRITE));
        g_object_class_install_property (gobject_class,
                                         PROP_CURRENT_PAGE,
                                         g_param_spec_uint ("current_page",
                                                            "Current Page",
                                                            "The current page",
                                                            0, G_MAXUINT, 0,
-                                                           G_PARAM_WRITABLE |
+                                                               G_PARAM_WRITABLE |
                                                            G_PARAM_CONSTRUCT_ONLY));
        g_object_class_install_property (gobject_class,
                                         PROP_ROTATION,
@@ -1425,8 +1480,8 @@ ev_view_presentation_class_init (EvViewPresentationClass *klass)
                                                            "Rotation",
                                                            "Current rotation angle",
                                                            0, 360, 0,
-                                                           G_PARAM_WRITABLE |
-                                                           G_PARAM_CONSTRUCT_ONLY));
+                                                           G_PARAM_READWRITE |
+                                                           G_PARAM_CONSTRUCT));
        g_object_class_install_property (gobject_class,
                                         PROP_INVERTED_COLORS,
                                         g_param_spec_boolean ("inverted_colors",
@@ -1445,6 +1500,7 @@ ev_view_presentation_class_init (EvViewPresentationClass *klass)
                              g_cclosure_marshal_VOID__ENUM,
                              G_TYPE_NONE, 1,
                              GTK_TYPE_SCROLL_TYPE);
+
        signals[FINISHED] =
                g_signal_new ("finished",
                              G_OBJECT_CLASS_TYPE (gobject_class),
@@ -1509,6 +1565,7 @@ static void
 ev_view_presentation_init (EvViewPresentation *pview)
 {
        gtk_widget_set_can_focus (GTK_WIDGET (pview), TRUE);
+        pview->is_constructing = TRUE;
 }
 
 GtkWidget *
@@ -1533,3 +1590,31 @@ ev_view_presentation_get_current_page (EvViewPresentation *pview)
 {
        return pview->current_page;
 }
+
+void
+ev_view_presentation_set_rotation (EvViewPresentation *pview,
+                                   gint                rotation)
+{
+        if (rotation >= 360)
+                rotation -= 360;
+        else if (rotation < 0)
+                rotation += 360;
+
+        if (pview->rotation == rotation)
+                return;
+
+        pview->rotation = rotation;
+        g_object_notify (G_OBJECT (pview), "rotation");
+        if (pview->is_constructing)
+                return;
+
+        pview->scale = 0;
+        ev_view_presentation_reset_jobs (pview);
+        ev_view_presentation_update_current_page (pview, pview->current_page);
+}
+
+guint
+ev_view_presentation_get_rotation (EvViewPresentation *pview)
+{
+        return pview->rotation;
+}