X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-dualscreen.c;h=80c029b25f79a1b913c81e47584671acffa99be4;hb=f28e9ccf4400e87da3fa9960becc6feb2ed041cb;hp=bdf695ff598127a923ec7a749be8392a61da0e73;hpb=d2a6e474e83e9fe79f4b6a4e0fb84310b4c2e008;p=evince.git

diff --git a/shell/ev-dualscreen.c b/shell/ev-dualscreen.c
index bdf695ff..80c029b2 100644
--- a/shell/ev-dualscreen.c
+++ b/shell/ev-dualscreen.c
@@ -36,12 +36,14 @@
 #include "ev-utils.h"
 #include "ev-sidebar.h"
 #include "ev-sidebar-thumbnails.h"
+#include "ev-presentation-timer.h"
 
 struct _EvDSCWindowPrivate {
 	GtkWidget       *main_box;
 	GtkWidget       *menubar;
 	GtkWidget       *sidebar;
 	GtkWidget       *notesview;
+	GtkWidget       *timer;
 	EvDocumentModel *model;
 	EvDocumentModel *notes_model;
 	EvDocument      *presentation_document;
@@ -58,9 +60,11 @@ struct _EvDSCWindowPrivate {
 #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
 
 G_DEFINE_TYPE (EvDSCWindow, ev_dscwindow, GTK_TYPE_WINDOW)
 
+
 static gboolean
 ev_dscwindow_switch_monitors (GtkWidget *widget, EvDSCWindow *ev_dscwindow)
 {
@@ -98,11 +102,8 @@ ev_dscwindow_sidebar_visibility(GtkWidget *sidebar)
 }
 
 static void
-ev_dscwindow_page_changed_cb (EvDocumentModel *model,
-			   GParamSpec      *pspec,
-			   EvDSCWindow     *ev_dscwindow)
+ev_dscwindow_set_page (EvDSCWindow *ev_dscwindow, gint page)
 {
-	gint page = ev_document_model_get_page (model);
 	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)
@@ -110,6 +111,15 @@ ev_dscwindow_page_changed_cb (EvDocumentModel *model,
 	if( ev_document_model_get_page (ev_dscwindow->priv->notes_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);
+}
+
+static void
+ev_dscwindow_page_changed_cb (EvDocumentModel *model,
+			   GParamSpec      *pspec,
+			   EvDSCWindow     *ev_dscwindow)
+{
+	ev_dscwindow_set_page (ev_dscwindow, ev_document_model_get_page (model));
 }
 
 static void
@@ -117,16 +127,9 @@ ev_dscwindow_presentation_page_changed_cb (EvViewPresentation *pview,
 			   GParamSpec      *pspec,
 			   EvDSCWindow     *ev_dscwindow)
 {
-	gint page = ev_view_presentation_get_current_page (pview);
-	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);
+	ev_dscwindow_set_page (ev_dscwindow, ev_view_presentation_get_current_page (pview));
 }
 
-/**
- * ev_dscwindow_notes_interaction: User wants to load a different file as notes.
- **/
 static gboolean
 ev_dscwindow_notes_interaction (GtkContainer *container, EvDSCWindow *ev_dscwindow)
 {
@@ -178,13 +181,6 @@ ev_dscwindow_notes_interaction (GtkContainer *container, EvDSCWindow *ev_dscwind
 	return TRUE;
 }
 
-/**
- * ev_dscwindow_get_control: Get the control instance.
- *
- * If there is none, create one.
- *
- * Returns: control instance
- **/
 EvDSCWindow *
 ev_dscwindow_get_control (void)
 {
@@ -200,39 +196,18 @@ ev_dscwindow_get_control (void)
 static void
 ev_dscwindow_window_placement (EvDSCWindow *ev_dscwindow)
 {
-	gint num_monitors = get_num_monitors (GTK_WINDOW (ev_dscwindow));
-	if (num_monitors == 2) {
-		GtkWindow * presentation_window = GTK_WINDOW (ev_dscwindow->priv->presentation_window);
-		GdkScreen * screen = gtk_window_get_screen (presentation_window);
-		gint work_monitor = gdk_screen_get_monitor_at_window (screen,
-			gtk_widget_get_window (GTK_WIDGET (presentation_window)));
-		gint presentation_monitor = (work_monitor + 1) % 2;
-		GdkRectangle coords;
-		gdk_screen_get_monitor_geometry (screen, presentation_monitor,
-			&coords);
-
-		gtk_window_move (presentation_window, coords.x, coords.y);
-		ev_dscwindow->priv->moveback_monitor = work_monitor;
-		gtk_window_maximize (GTK_WINDOW (ev_dscwindow));
-	}
-}
-
-static gboolean
-ev_dscwindow_notes_clicked (GtkWidget *widget, GdkEvent *event,
-	EvDSCWindow *self)
-{
-	if (!self || !EV_IS_DSCWINDOW (self) || !event)
-		return FALSE;
-	gint page = ev_document_model_get_page (self->priv->model);
-
-	if (event->type == GDK_2BUTTON_PRESS && ((GdkEventButton *)event)->button == 1) {
-		ev_dscwindow_notes_interaction (NULL, self);
-	} else if (event->type == GDK_BUTTON_PRESS && ((GdkEventButton *)event)->button == 1) {
-		ev_document_model_set_page (self->priv->model, page+1);
-	} else if (event->type == GDK_BUTTON_PRESS && ((GdkEventButton *)event)->button == 3) {
-		ev_document_model_set_page (self->priv->model, page-1);
-	}
-	return FALSE;
+	GtkWindow * presentation_window = GTK_WINDOW (ev_dscwindow->priv->presentation_window);
+	GdkScreen * screen = gtk_window_get_screen (presentation_window);
+	gint work_monitor = gdk_screen_get_monitor_at_window (screen,
+		gtk_widget_get_window (GTK_WIDGET (presentation_window)));
+	gint presentation_monitor = (work_monitor + 1) % 2;
+	GdkRectangle coords;
+	gdk_screen_get_monitor_geometry (screen, presentation_monitor,
+		&coords);
+
+	gtk_window_move (presentation_window, coords.x, coords.y);
+	ev_dscwindow->priv->moveback_monitor = work_monitor;
+	gtk_window_maximize (GTK_WINDOW (ev_dscwindow));
 }
 
 void
@@ -245,8 +220,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_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));
+	/*signals*/
 	g_signal_connect_swapped (ev_dscwindow->priv->presentation_view,
 				  "destroy",
 				  G_CALLBACK (gtk_widget_destroy),
@@ -259,12 +236,11 @@ ev_dscwindow_set_presentation (EvDSCWindow *ev_dscwindow,
 			  "notify::page",
 			  G_CALLBACK (ev_dscwindow_presentation_page_changed_cb),
 			  ev_dscwindow);
+	ev_presentation_timer_set_pages (EV_PRESENTATION_TIMER(ev_dscwindow->priv->timer), ev_document_get_n_pages (document));
+
 	ev_dscwindow_window_placement (ev_dscwindow);
 }
 
-/**
- * ev_dscwindow_end: Destroy control window but keep presentation
- */
 static gboolean
 ev_dscwindow_end (GtkWidget *widget, GdkEvent *event)
 {
@@ -272,13 +248,6 @@ ev_dscwindow_end (GtkWidget *widget, GdkEvent *event)
 	return TRUE;
 }
 
-/**
- * ev_dscwindow_init: Initialize multihead presentation
-*
-* @ev_dscwindow: EvDSCWindow.
-*
-* ev_dscwindow_set_presentation has to be called afterwards for loading in a document. TBD
-**/
 static void
 ev_dscwindow_init (EvDSCWindow *ev_dscwindow)
 {
@@ -300,26 +269,27 @@ ev_dscwindow_init (EvDSCWindow *ev_dscwindow)
 	ev_dscwindow->priv->sidebar = ev_sidebar_new ();
 	ev_sidebar_set_model (EV_SIDEBAR (ev_dscwindow->priv->sidebar),
 			      ev_dscwindow->priv->model);
+
 	GtkWidget *sidebar_widget;
 	sidebar_widget = ev_sidebar_thumbnails_new ();
-	gtk_widget_show (sidebar_widget);
 	ev_sidebar_add_page (EV_SIDEBAR (ev_dscwindow->priv->sidebar),
 			     sidebar_widget);
-	gtk_widget_show (ev_dscwindow->priv->sidebar);
-	gtk_paned_add1(GTK_PANED(hpaned), ev_dscwindow->priv->sidebar);
 
 	ev_dscwindow->priv->notesview_scrolled_window = GTK_WIDGET (
 	        g_object_new (GTK_TYPE_SCROLLED_WINDOW,"shadow-type",
 				GTK_SHADOW_IN, NULL));
-	gtk_paned_add2 (GTK_PANED (hpaned), ev_dscwindow->priv->notesview_scrolled_window);
+	gtk_paned_pack1 (GTK_PANED (hpaned), ev_dscwindow->priv->sidebar, FALSE, TRUE);
+	gtk_paned_pack2 (GTK_PANED (hpaned), ev_dscwindow->priv->notesview_scrolled_window, TRUE, TRUE);
+	gtk_paned_set_position (GTK_PANED (hpaned), SIDEBAR_DEFAULT_SIZE);
 
 	ev_dscwindow->priv->notesview = ev_view_new ();
-	g_object_ref (ev_dscwindow->priv->notesview);
+//	g_object_ref (ev_dscwindow->priv->notesview);
 	gtk_container_add (GTK_CONTAINER (ev_dscwindow->priv->notesview_scrolled_window),
 		ev_dscwindow->priv->notesview);
+
 	ev_dscwindow->priv->notes_model = ev_dscwindow->priv->model;
 	ev_view_set_model (EV_VIEW (ev_dscwindow->priv->notesview), ev_dscwindow->priv->notes_model);
-	gtk_widget_show_all (hpaned);
+
 	gtk_box_pack_start(GTK_BOX(vbox),hpaned,TRUE,TRUE,0);
 
 	GtkWidget *expander = gtk_expander_new (_("Expensive features"));
@@ -351,22 +321,17 @@ ev_dscwindow_init (EvDSCWindow *ev_dscwindow)
 		G_CALLBACK (ev_dscwindow_sidebar_visibility), ev_dscwindow->priv->sidebar);
 
 	gtk_container_add (GTK_CONTAINER (expander), toolbar);
-	gtk_box_pack_end (GTK_BOX (vbox), expander, FALSE, TRUE, 0);
-
-//	gtk_drag_dest_unset (GTK_WIDGET (ev_dscwindow->priv->notesview));
-//      gtk_drag_dest_unset (GTK_WIDGET (ev_dscwindow->priv->sidebar));
 
-//	gint click = GDK_BUTTON1_MOTION_MASK | GDK_KEY_PRESS_MASK;
-//	gtk_widget_add_events (GTK_WIDGET (ev_dscwindow->priv->sidebar), click);
-	/* TODO: actions, this part is broken...*/
-	/*g_signal_connect (ev_dscwindow->priv->notesview, "button-press-event",
-			  G_CALLBACK (ev_dscwindow_notes_clicked), ev_dscwindow);*/
-
-	gtk_widget_show_all(vbox);
+	GtkWidget *hpan = gtk_hpaned_new ();
+	gtk_paned_pack1 (GTK_PANED(hpan), expander, FALSE, TRUE);
+	ev_dscwindow->priv->timer = ev_presentation_timer_new ();
+	gtk_paned_pack2 (GTK_PANED(hpan),ev_dscwindow->priv->timer, TRUE, TRUE);
+	gtk_paned_set_position (GTK_PANED (hpan), SIDEBAR_DEFAULT_SIZE);
+	gtk_box_pack_end (GTK_BOX (vbox), hpan, FALSE, TRUE, 0);
 	gtk_container_add (GTK_CONTAINER (ev_dscwindow), vbox);
+	gtk_widget_show_all(vbox);
 }
 
-
 static void
 ev_dscwindow_dispose (GObject *obj)
 {
@@ -389,7 +354,6 @@ ev_dscwindow_dispose (GObject *obj)
 		priv->overview = NULL;
 	}*/
 
-
 	G_OBJECT_CLASS (ev_dscwindow_parent_class)->dispose (obj);
 }