From: Lukáš Bezdička <255993@mail.muni.cz>
Date: Thu, 28 Apr 2011 17:51:32 +0000 (+0200)
Subject: [dualscreen] in short "Disziplin ist Macht."
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?p=evince.git;a=commitdiff_plain;h=b43ae08397c06479da37a5bf094a0a071cb4d394

[dualscreen] in short "Disziplin ist Macht."
---

diff --git a/libview/ev-view-presentation.c b/libview/ev-view-presentation.c
index fa8ceff9..c3e40bf5 100644
--- a/libview/ev-view-presentation.c
+++ b/libview/ev-view-presentation.c
@@ -1334,7 +1334,7 @@ ev_view_presentation_realize (GtkWidget *widget)
                                           window);
 
 	g_idle_add ((GSourceFunc)init_presentation, widget);
-	}
+}
 
 static void
 ev_view_presentation_change_page (EvViewPresentation *pview,
diff --git a/shell/ev-dualscreen.c b/shell/ev-dualscreen.c
index f5dc1cb9..208fe349 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;
@@ -313,8 +315,12 @@ 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);
 
+	GtkWidget *hbox = gtk_hbox_new (FALSE,0);
+	gtk_box_pack_start (GTK_BOX (hbox), expander, FALSE, TRUE, 0);
+	ev_dscwindow->priv->timer = ev_presentation_timer_new ();
+	gtk_box_pack_end (GTK_BOX (hbox), ev_dscwindow->priv->timer, TRUE, TRUE, 0);
+	gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
 	gtk_widget_show_all(vbox);
 	gtk_container_add (GTK_CONTAINER (ev_dscwindow), vbox);
 }
diff --git a/shell/ev-dualscreen.h b/shell/ev-dualscreen.h
index 9cd2355d..6317430f 100644
--- a/shell/ev-dualscreen.h
+++ b/shell/ev-dualscreen.h
@@ -41,13 +41,13 @@ typedef struct _EvDSCWindowPrivate EvDSCWindowPrivate;
 #define EV_IS_DSCWINDOW_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE((klass), EV_TYPE_DSCWINDOW))
 #define EV_DSCWINDOW_GET_CLASS(object)  (G_TYPE_INSTANCE_GET_CLASS((object), EV_TYPE_DSCWINDOW, EvDSCWindowClass))
 
-struct _EvDSCWindow {
-	GtkWindow		base_instance;
-	EvDSCWindowPrivate      *priv;
+struct _EvDSCWindowClass {
+	GtkWindowClass		base_class;
 };
 
-struct _EvDSCWindowClass {
-	GtkWindowClass base_class;
+struct _EvDSCWindow {
+	GtkWindow		 base_instance;
+	EvDSCWindowPrivate      *priv;
 };
 
 GType		ev_dscwindow_get_type   (void);