From: xbezdick <255993@mail.muni.cz> Date: Mon, 2 May 2011 13:18:33 +0000 (+0200) Subject: [dualscreen] This should be stable release, now refactoring and cleanup should come... X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?p=evince.git;a=commitdiff_plain;h=aab1fa5bcd4045b0f2278c4c8b3d4598c6f4491e [dualscreen] This should be stable release, now refactoring and cleanup should come [timer] continuing work --- diff --git a/shell/ev-dualscreen.c b/shell/ev-dualscreen.c index 80c029b2..c439e84d 100644 --- a/shell/ev-dualscreen.c +++ b/shell/ev-dualscreen.c @@ -44,23 +44,26 @@ struct _EvDSCWindowPrivate { GtkWidget *sidebar; GtkWidget *notesview; GtkWidget *timer; + GtkWidget *spinner; + GtkWidget *presentation_window; + GtkWidget *overview_scrolled_window; + GtkWidget *notesview_scrolled_window; + EvDocumentModel *model; EvDocumentModel *notes_model; EvDocument *presentation_document; EvDocument *notes_document; - GtkWidget *presentation_window; - GtkWidget *overview_scrolled_window; - GtkWidget *notesview_scrolled_window; - EvViewPresentation *presentation_view; gint moveback_monitor; + guint page; }; #define EV_DSCWINDOW_GET_PRIVATE(object) \ (G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_DSCWINDOW, EvDSCWindowPrivate)) #define PAGE_CACHE_SIZE 52428800 /* 50MB */ #define SIDEBAR_DEFAULT_SIZE 300 +#define MAX_PRESENTATION_TIME 1440 /*60*24: ONE DAY*/ G_DEFINE_TYPE (EvDSCWindow, ev_dscwindow, GTK_TYPE_WINDOW) @@ -96,7 +99,7 @@ ev_dscwindow_switch_monitors (GtkWidget *widget, EvDSCWindow *ev_dscwindow) } static void -ev_dscwindow_sidebar_visibility(GtkWidget *sidebar) +ev_dscwindow_sidebar_visibility_cb (GtkWidget *sidebar) { gtk_widget_set_visible (sidebar, !(gtk_widget_get_visible(sidebar))); } @@ -104,14 +107,24 @@ ev_dscwindow_sidebar_visibility(GtkWidget *sidebar) static void ev_dscwindow_set_page (EvDSCWindow *ev_dscwindow, gint page) { - if(page != ev_view_presentation_get_current_page (ev_dscwindow->priv->presentation_view)) { - ev_view_presentation_set_page (EV_VIEW_PRESENTATION(ev_dscwindow->priv->presentation_view), page); - if( ev_document_model_get_page (ev_dscwindow->priv->model) != page) - ev_document_model_set_page(ev_dscwindow->priv->model, page); - if( ev_document_model_get_page (ev_dscwindow->priv->notes_model) != page) - ev_document_model_set_page(ev_dscwindow->priv->notes_model, page); - } + guint n_pages = ev_document_get_n_pages(ev_dscwindow->priv->presentation_document); + + if((ev_dscwindow->priv->page == 0) && (page == 1)) + ; + if((ev_dscwindow->priv->page == n_pages-1) && (page == n_pages)) + ; + ev_view_presentation_set_page (EV_VIEW_PRESENTATION(ev_dscwindow->priv->presentation_view), page); + ev_document_model_set_page(ev_dscwindow->priv->model, page); + ev_document_model_set_page(ev_dscwindow->priv->notes_model, page); ev_presentation_timer_set_page (EV_PRESENTATION_TIMER(ev_dscwindow->priv->timer), page); + ev_dscwindow->priv->page = page; +} + +static void +ev_dscwindow_presentation_time_cb (EvDSCWindow *ev_dscwindow) +{ + gint time = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (ev_dscwindow->priv->spinner)); + ev_presentation_timer_set_time (EV_PRESENTATION_TIMER (ev_dscwindow->priv->timer),time); } static void @@ -220,9 +233,10 @@ ev_dscwindow_set_presentation (EvDSCWindow *ev_dscwindow, ev_dscwindow->priv->presentation_window = GTK_WIDGET(presentation_window); ev_dscwindow->priv->presentation_document = document; ev_dscwindow->priv->presentation_view = EV_VIEW_PRESENTATION(pview); + ev_dscwindow->priv->page = ev_view_presentation_get_current_page (pview); ev_document_model_set_document(ev_dscwindow->priv->model, document); - ev_document_model_set_page(ev_dscwindow->priv->model, ev_view_presentation_get_current_page (pview)); + ev_document_model_set_page(ev_dscwindow->priv->model, ev_dscwindow->priv->page); /*signals*/ g_signal_connect_swapped (ev_dscwindow->priv->presentation_view, "destroy", @@ -253,6 +267,7 @@ ev_dscwindow_init (EvDSCWindow *ev_dscwindow) { ev_dscwindow->priv = EV_DSCWINDOW_GET_PRIVATE (ev_dscwindow); + ev_dscwindow->priv->page = 0; ev_dscwindow->priv->moveback_monitor = -1; ev_dscwindow->priv->notes_document = NULL; @@ -283,7 +298,6 @@ ev_dscwindow_init (EvDSCWindow *ev_dscwindow) gtk_paned_set_position (GTK_PANED (hpaned), SIDEBAR_DEFAULT_SIZE); ev_dscwindow->priv->notesview = ev_view_new (); -// g_object_ref (ev_dscwindow->priv->notesview); gtk_container_add (GTK_CONTAINER (ev_dscwindow->priv->notesview_scrolled_window), ev_dscwindow->priv->notesview); @@ -318,7 +332,18 @@ ev_dscwindow_init (EvDSCWindow *ev_dscwindow) gtk_tool_button_set_label (GTK_TOOL_BUTTON(b_sidebar), _("Show sidebar")); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), b_sidebar, -1); g_signal_connect_swapped (b_sidebar, "clicked", - G_CALLBACK (ev_dscwindow_sidebar_visibility), ev_dscwindow->priv->sidebar); + G_CALLBACK (ev_dscwindow_sidebar_visibility_cb), ev_dscwindow->priv->sidebar); + + GtkToolItem *b_spinner = gtk_tool_item_new (); + GtkWidget* alignment = gtk_alignment_new (0.0f, 0.5f, 1.0f, 0.1f); + GtkAdjustment *timer_adjust = gtk_adjustment_new (-1.0, -1.0, + MAX_PRESENTATION_TIME, 1.0, 10.0, 10.0); + ev_dscwindow->priv->spinner = gtk_spin_button_new (timer_adjust, 1.0, 0); + g_signal_connect_swapped (ev_dscwindow->priv->spinner, "value-changed", + G_CALLBACK (ev_dscwindow_presentation_time_cb), ev_dscwindow); + gtk_container_add (GTK_CONTAINER (b_spinner), alignment); + gtk_container_add (GTK_CONTAINER (alignment), ev_dscwindow->priv->spinner); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), b_spinner, -1); gtk_container_add (GTK_CONTAINER (expander), toolbar); diff --git a/shell/ev-presentation-timer.c b/shell/ev-presentation-timer.c index 6c5b9309..72a97152 100644 --- a/shell/ev-presentation-timer.c +++ b/shell/ev-presentation-timer.c @@ -83,6 +83,19 @@ ev_presentation_timer_init (EvPresentationTimer *ev_timer) ev_timer->priv->pages = 0; } +void ev_presentation_timer_start (EvPresentationTimer *ev_timer) +{ +} + +void ev_presentation_timer_stop (EvPresentationTimer *ev_timer) +{ +} + +void ev_presentation_timer_set_time (EvPresentationTimer *ev_timer, + gint time) +{ +} + static void ev_presentation_timer_class_init (EvPresentationTimerClass *klass) { diff --git a/shell/ev-presentation-timer.h b/shell/ev-presentation-timer.h index 5da7a3e1..24906412 100644 --- a/shell/ev-presentation-timer.h +++ b/shell/ev-presentation-timer.h @@ -51,6 +51,10 @@ void ev_presentation_timer_set_pages (EvPresentationTimer *ev_timer, guint pages); void ev_presentation_timer_set_page (EvPresentationTimer *ev_timer, guint page); +void ev_presentation_timer_start (EvPresentationTimer *ev_timer); +void ev_presentation_timer_stop (EvPresentationTimer *ev_timer); +void ev_presentation_timer_set_time (EvPresentationTimer *ev_timer, + gint time); GType ev_presentation_timer_get_type (void); GtkWidget *ev_presentation_timer_new (void);