X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-dualscreen.c;h=ee4cb7c1af8a8dbbed3de33d1f21e887b0bb4aaa;hb=a286dc20debfdc7514acaf03c34a2be8fe56c138;hp=740cb8e1241f6da4e6d4c906d22a1dcb1dddc501;hpb=22fbb9654dd44689f89bbf7c957b42e489daa2ac;p=evince.git

diff --git a/shell/ev-dualscreen.c b/shell/ev-dualscreen.c
index 740cb8e1..ee4cb7c1 100644
--- a/shell/ev-dualscreen.c
+++ b/shell/ev-dualscreen.c
@@ -1,6 +1,11 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; c-indent-level: 8 -*- */
 /* this file is part of evince, a gnome document viewer
  *
+ *  Copyright (C) 2007 Johannes Buchner
+ *
+ *  Author:
+ *    Johannes Buchner <buchner.johannes@gmx.at>
+ *    Lukas Bezdicka <255993@mail.muni.cz>
  *
  * Evince is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by
@@ -27,29 +32,34 @@
 #include "ev-dualscreen.h"
 #include "ev-window.h"
 #include "ev-view.h"
+#include "ev-view-presentation.h"
 #include "ev-utils.h"
+#include "ev-sidebar.h"
+#include "ev-sidebar-thumbnails.h"
 
 struct _EvDSCWindowPrivate {
-	GtkWidget *main_box;
-	GtkWidget *menubar;
-	GtkWidget *overview;
-	GtkWidget *notesview;
+	GtkWidget       *main_box;
+	GtkWidget       *menubar;
+	GtkWidget       *sidebar;
+	GtkWidget       *notesview;
 	EvDocumentModel *model;
-	EvDocument * notesdocument;
+	EvDocumentModel *notes_model;
+	EvDocument      *presentation_document;
+	EvDocument      *notes_document;
 
-	GtkWidget *overview_scrolled_window;
-	GtkWidget *notesview_scrolled_window;
+	GtkWidget       *presentation_window;
+	GtkWidget       *overview_scrolled_window;
+	GtkWidget       *notesview_scrolled_window;
 
-	EvWindow *presentation_window;
-	EvDocument * presentation_document;
-	gint moveback_monitor;
+	EvViewPresentation *presentation_view;
+	gint		moveback_monitor;
 };
 
 #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    132
 
-/*static gpointer parent_class = NULL;*/
 
 G_DEFINE_TYPE (EvDSCWindow, ev_dscwindow, GTK_TYPE_WINDOW)
 
@@ -60,84 +70,117 @@ G_DEFINE_TYPE (EvDSCWindow, ev_dscwindow, GTK_TYPE_WINDOW)
  * @self: EvDSCWindow
  **/
 static gboolean
-ev_dscwindow_switch_monitors (GtkWidget *widget, EvDSCWindow *self)
+ev_dscwindow_switch_monitors (GtkWidget *widget, EvDSCWindow *ev_dscwindow)
 {
-/*
-+	if (!EV_IS_DSCWINDOW (self))
-+		return FALSE;
-+
-+	EvDSCWindowPrivate *priv = EV_DSCWINDOW_GET_PRIVATE (self);
-+
-+	gint num_monitors = get_num_monitors (GTK_WINDOW (self));
-+
-+	if (num_monitors == 2) {
-+		GtkWindow * presentation_window = GTK_WINDOW (priv->presentation_window);
-+		GdkScreen * screen = gtk_window_get_screen (presentation_window);
-+
-+		gint monitor_1 = gdk_screen_get_monitor_at_window (screen,
-+			GTK_WIDGET (presentation_window)->window);
-+
-+		gint monitor_2 = (monitor_1 + 1) % 2;
-+
-+		GdkRectangle coords;
-+		gdk_screen_get_monitor_geometry (screen, monitor_2, &coords);
-+		ev_window_stop_presentation (priv->presentation_window);
-+		gtk_window_move (presentation_window, coords.x, coords.y);
-+		ev_window_run_presentation (priv->presentation_window);
-+		priv->moveback_monitor = monitor_1;
-+
-+		gdk_screen_get_monitor_geometry (screen, monitor_1, &coords);
-+		gtk_window_unmaximize (GTK_WINDOW (self));
-+		gtk_window_move (GTK_WINDOW (self), coords.x, coords.y);
-+		gtk_window_maximize (GTK_WINDOW (self));
-+	}*/
+
+	if (!EV_IS_DSCWINDOW (ev_dscwindow))
+		return FALSE;
+
+	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 monitor_1 = gdk_screen_get_monitor_at_window (screen,
+			gtk_widget_get_window (GTK_WIDGET (presentation_window)));
+
+		gint monitor_2 = (monitor_1 + 1) % 2;
+
+		GdkRectangle coords;
+		gdk_screen_get_monitor_geometry (screen, monitor_2, &coords);
+		gtk_window_move (presentation_window, coords.x, coords.y);
+		ev_dscwindow->priv->moveback_monitor = monitor_1;
+
+		gdk_screen_get_monitor_geometry (screen, monitor_1, &coords);
+		gtk_window_unmaximize (GTK_WINDOW (ev_dscwindow));
+		gtk_window_move (GTK_WINDOW (ev_dscwindow), coords.x, coords.y);
+		gtk_window_maximize (GTK_WINDOW (ev_dscwindow));
+	}
 	return TRUE;
 }
 
+/**
+ * ev_dscwindow_page_changed_cb: Callback to change page on all views
+ *
+ **/
+static void
+ev_dscwindow_page_changed_cb (EvDocumentModel *model,
+			   GParamSpec      *pspec,
+			   EvDSCWindow     *ev_dscwindow)
+{
+	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)
+		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);
+	}
+}
+static void
+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_notes_interaction: User wants to load a different file as notes.
  **/
 static gboolean
-ev_dscwindow_notes_interaction (GtkContainer *container, EvDSCWindow *self)
+ev_dscwindow_notes_interaction (GtkContainer *container, EvDSCWindow *ev_dscwindow)
 {
-/*
-+	EvDSCWindowPrivate *priv = EV_DSCWINDOW_GET_PRIVATE (self);
-+	GtkWidget *dialog;
-+
-+	dialog = gtk_file_chooser_dialog_new (
-+		_("Open Document"),
-+		GTK_WINDOW (self),
-+		GTK_FILE_CHOOSER_ACTION_OPEN,
-+		GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
-+		GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
-+		NULL);
-+
-+	ev_document_factory_add_filters (dialog, NULL);
-+	gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), FALSE);
-+	gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (dialog), TRUE);
-+
-+	if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
-+	{
-+		char * uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog));
-+		GError * error = NULL;
-+		ev_view_set_loading (EV_VIEW (priv->notesview), TRUE);
-+
-+		if (priv->notesdocument) {
-+			ev_document_load (priv->notesdocument, uri, &error);
-+		} else {
-+			priv->notesdocument = ev_document_factory_get_document (uri,
-+				&error);
-+		}
-+		g_free (uri);
-+		if (error == NULL){
-+			ev_view_set_document (EV_VIEW (priv->notesview),
-+				priv->notesdocument);
-+			/* TODO: go to the same page that is open at the moment, or
-+			 * move the presentation to the beginning. *//*
-+		}
-+	}
-+	gtk_widget_destroy (dialog);
-*/
+	GtkWidget *dialog;
+
+	dialog = gtk_file_chooser_dialog_new (
+		_("Open Document"),
+		GTK_WINDOW (ev_dscwindow),
+		GTK_FILE_CHOOSER_ACTION_OPEN,
+		GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
+		GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+		NULL);
+
+	ev_document_factory_add_filters (dialog, NULL);
+	gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), FALSE);
+	gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (dialog), TRUE);
+
+	if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
+	{
+		char * uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog));
+		GError * error = NULL;
+		ev_view_set_loading (EV_VIEW (ev_dscwindow->priv->notesview), TRUE);
+
+		if (ev_dscwindow->priv->notes_document) {
+			ev_document_load (ev_dscwindow->priv->notes_document, uri, &error);
+		} else {
+			ev_dscwindow->priv->notes_document = ev_document_factory_get_document (uri,
+				&error);
+		}
+		g_free (uri);
+		if (error == NULL){
+			ev_dscwindow->priv->notes_model = ev_document_model_new ();
+			ev_document_model_set_document (ev_dscwindow->priv->notes_model, ev_dscwindow->priv->notes_document);
+			ev_document_model_set_continuous (ev_dscwindow->priv->notes_model, FALSE);
+			ev_document_model_set_dual_page (ev_dscwindow->priv->notes_model, FALSE);
+			ev_document_model_set_sizing_mode (ev_dscwindow->priv->notes_model, EV_SIZING_BEST_FIT);
+			ev_document_model_set_page (ev_dscwindow->priv->notes_model,
+			        ev_document_model_get_page (ev_dscwindow->priv->model));
+			ev_view_set_model(EV_VIEW(ev_dscwindow->priv->notesview),
+					  ev_dscwindow->priv->notes_model);
+			g_signal_connect (G_OBJECT(ev_dscwindow->priv->notes_model),
+					  "notify::page",
+					  G_CALLBACK (ev_dscwindow_page_changed_cb),
+					  ev_dscwindow);
+		}
+	}
+	gtk_widget_destroy (dialog);
+
 	return TRUE;
 }
 
@@ -160,7 +203,6 @@ ev_dscwindow_get_control (void)
 	return control;
 }
 
-/*TODO: Fix me!*/
 static void
 ev_dscwindow_window_placement (EvDSCWindow *ev_dscwindow)
 {
@@ -168,24 +210,36 @@ ev_dscwindow_window_placement (EvDSCWindow *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_window_run_presentation (ev_dscwindow->priv->presentation_window);
 		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;
+}
 
 /**
  * ev_dscwindow_set_presentation: Set presentation document
@@ -193,25 +247,33 @@ ev_dscwindow_window_placement (EvDSCWindow *ev_dscwindow)
  **/
 void
 ev_dscwindow_set_presentation (EvDSCWindow *ev_dscwindow,
-	EvWindow *presentation_window, EvDocument *document)
+	EvWindow *presentation_window, EvDocument *document, EvViewPresentation *pview)
 {
 	if (!EV_IS_WINDOW (presentation_window))
 		return;
 
-	ev_dscwindow->priv->presentation_window = presentation_window;
+	ev_dscwindow->priv->presentation_window = GTK_WIDGET(presentation_window);
 	ev_dscwindow->priv->presentation_document = document;
-
-	ev_document_model_set_document(ev_dscwindow->priv->model,
-		document);
-/*	ev_view_set_document (EV_VIEW (priv->notesview),
-		priv->presentation_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));
+	g_signal_connect_swapped (ev_dscwindow->priv->presentation_view,
+				  "destroy",
+				  G_CALLBACK (gtk_widget_destroy),
+				  ev_dscwindow);
+	g_signal_connect (G_OBJECT(ev_dscwindow->priv->model),
+			  "notify::page",
+			  G_CALLBACK (ev_dscwindow_page_changed_cb),
+			  ev_dscwindow);
+	g_signal_connect (G_OBJECT(ev_dscwindow->priv->presentation_view),
+			  "notify::page",
+			  G_CALLBACK (ev_dscwindow_presentation_page_changed_cb),
+			  ev_dscwindow);
 	ev_dscwindow_window_placement (ev_dscwindow);
-	/*ev_dscwindow_handle_resized (NULL, NULL, self);
-	*/
 }
 
 /**
- * ev_dscwindow_end: Stop presentation mode.
+ * ev_dscwindow_end: Destroy control window but keep presentation
  */
 static gboolean
 ev_dscwindow_end (GtkWidget *widget, GdkEvent *event)
@@ -221,100 +283,93 @@ ev_dscwindow_end (GtkWidget *widget, GdkEvent *event)
 }
 
 /**
-* ev_dscwindow_init: Initialize multihead presentation
+ * ev_dscwindow_init: Initialize multihead presentation
 *
-* @self: EvDSCWindow.
+* @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)
 {
+	/*TODO - cleanup!!*/
+
 	ev_dscwindow->priv = EV_DSCWINDOW_GET_PRIVATE (ev_dscwindow);
 	ev_dscwindow->priv->moveback_monitor = -1;
-	ev_dscwindow->priv->notesdocument = NULL;
+	ev_dscwindow->priv->notes_document = NULL;
 
 	gtk_window_set_title (GTK_WINDOW (ev_dscwindow), _("Presentation Control"));
 
-	GtkWidget *h = gtk_hpaned_new ();
-	GtkWidget *v = gtk_vbox_new (FALSE, 0);
-
-	ev_dscwindow->priv->overview_scrolled_window = GTK_WIDGET (g_object_new (
-			GTK_TYPE_SCROLLED_WINDOW, "shadow-type", GTK_SHADOW_IN, NULL));
-	gtk_box_pack_start (GTK_BOX (v), ev_dscwindow->priv->overview_scrolled_window, TRUE, TRUE, 0);
+	GtkWidget *hpaned = gtk_hpaned_new ();
+	GtkWidget *vbox = gtk_vbox_new (FALSE, 0);
 
 	ev_dscwindow->priv->model = ev_document_model_new ();
-	ev_dscwindow->priv->overview = ev_view_new ();
-	ev_view_set_page_cache_size (EV_VIEW (ev_dscwindow->priv->overview), PAGE_CACHE_SIZE);
-	ev_view_set_model (EV_VIEW (ev_dscwindow->priv->overview), ev_dscwindow->priv->model);
-	ev_document_model_set_continuous (ev_dscwindow->priv->model, TRUE);
-	ev_document_model_set_dual_page (ev_dscwindow->priv->model, FALSE);
-	ev_document_model_set_sizing_mode (ev_dscwindow->priv->model, EV_SIZING_BEST_FIT);
 
+	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_container_add (GTK_CONTAINER (ev_dscwindow->priv->overview_scrolled_window),
-				   ev_dscwindow->priv->overview);
+	gtk_box_pack_start (GTK_BOX (vbox), ev_dscwindow->priv->sidebar, TRUE, TRUE, 0);
+	gtk_widget_show (ev_dscwindow->priv->sidebar);
 
+	ev_document_model_set_continuous (ev_dscwindow->priv->model, FALSE);
+	ev_document_model_set_dual_page (ev_dscwindow->priv->model, FALSE);
+	ev_document_model_set_sizing_mode (ev_dscwindow->priv->model, EV_SIZING_BEST_FIT);
 
-	GtkWidget *e = gtk_expander_new (_("Expensive features"));
-	gtk_expander_set_expanded (GTK_EXPANDER (e), TRUE);
+	GtkWidget *expander = gtk_expander_new (_("Expensive features"));
+	gtk_expander_set_expanded (GTK_EXPANDER (expander), TRUE);
 
-	GtkWidget *t = gtk_toolbar_new ();
+	GtkWidget *toolbar = gtk_toolbar_new ();
 
 	GtkToolItem* b_switch = gtk_tool_button_new (NULL, _("Switch monitors"));
 	gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (b_switch), "object-flip-horizontal");
-	gtk_toolbar_insert (GTK_TOOLBAR (t), b_switch, -1);
+	gtk_toolbar_insert (GTK_TOOLBAR (toolbar), b_switch, -1);
 	g_signal_connect (b_switch, "clicked",
 		G_CALLBACK (ev_dscwindow_switch_monitors), ev_dscwindow);
 
-	GtkToolItem* b_notes = gtk_tool_button_new (NULL, _("Load notes ..."));
-	gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (b_notes), "object-flip-horizontal");
-	gtk_toolbar_insert (GTK_TOOLBAR (t), b_notes, -1);
+	GtkToolItem* b_notes = gtk_tool_button_new_from_stock (GTK_STOCK_OPEN);
+	gtk_tool_button_set_label (GTK_TOOL_BUTTON(b_notes), _("Load notes..."));
+	gtk_toolbar_insert (GTK_TOOLBAR (toolbar), b_notes, -1);
 	g_signal_connect (b_notes, "clicked",
 		G_CALLBACK (ev_dscwindow_notes_interaction), ev_dscwindow);
 
 	GtkToolItem* b_close = gtk_tool_button_new (NULL, _("End presentation"));
 	gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (b_close), "view-restore");
-	gtk_toolbar_insert (GTK_TOOLBAR (t), b_close, -1);
+	gtk_toolbar_insert (GTK_TOOLBAR (toolbar), b_close, -1);
+
 	g_signal_connect (b_close, "clicked",
 		G_CALLBACK (ev_dscwindow_end), NULL);
 
-	gtk_container_add (GTK_CONTAINER (e), t);
-	gtk_box_pack_end (GTK_BOX (v), e, FALSE, TRUE, 0);
-	gtk_paned_add1 (GTK_PANED (h), v);
+	gtk_container_add (GTK_CONTAINER (expander), toolbar);
+	gtk_box_pack_end (GTK_BOX (vbox), expander, FALSE, TRUE, 0);
+	gtk_paned_add1 (GTK_PANED (hpaned), vbox);
 
 	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 (h), ev_dscwindow->priv->notesview_scrolled_window);
+	gtk_paned_add2 (GTK_PANED (hpaned), ev_dscwindow->priv->notesview_scrolled_window);
 
 	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);
-	ev_view_set_model (EV_VIEW (ev_dscwindow->priv->notesview), ev_dscwindow->priv->model);
-
-	gtk_paned_set_position (GTK_PANED (h), 400);
-	gtk_widget_show_all (h);
-	gtk_container_add (GTK_CONTAINER (ev_dscwindow), h);
-
-/* fallback if we have >2 monitors (see window placement) */
-/*+	gtk_window_set_default_size (GTK_WINDOW (self), 800, 600);
-+
-+	g_signal_connect (h, "notify::position",
-+		G_CALLBACK (ev_dscwindow_handle_resized), self);
-+
-+	g_signal_connect (self, "size-allocate",
-+		G_CALLBACK (ev_dscwindow_handle_resized), self);
-+
-+	/* This would just open new windows. */
-/*+	gtk_drag_dest_unset (GTK_WIDGET (priv->notesview));
-+	gtk_drag_dest_unset (GTK_WIDGET (priv->overview));
-+
-+	gint click = GDK_BUTTON1_MOTION_MASK | GDK_KEY_PRESS_MASK;
-+	gtk_widget_add_events (GTK_WIDGET (priv->overview), click);
-+	g_signal_connect (priv->notesview, "button-press-event",
-+			  G_CALLBACK (ev_dscwindow_notes_clicked), self);
-*/
+	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_container_add (GTK_CONTAINER (ev_dscwindow), hpaned);
+
+	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);*/
 }
 
 
@@ -324,19 +379,6 @@ ev_dscwindow_dispose (GObject *obj)
 	EvDSCWindow * ev_dscwindow = EV_DSCWINDOW (obj);
 	EvDSCWindowPrivate *priv = ev_dscwindow->priv;
 
-/*	if (EV_IS_VIEW (priv->overview) {
-		ev_document_model_set_document (priv->model, NULL);
-
-+		ev_view_set_document (EV_VIEW (priv->overview),  NULL);
-+		g_object_unref (priv->overview);
-+	}
-+	if (EV_IS_VIEW (priv->notesview)) {
-+		ev_view_set_document (EV_VIEW (priv->notesview), NULL);
-+		g_object_unref (priv->notesview);
-+	}*/
-/*TODO: save fulscreen state*/
-	ev_window_stop_presentation (priv->presentation_window, 0);
-
 	if (priv->moveback_monitor >= 0) {
 		GtkWindow * presentation_window = GTK_WINDOW (priv->presentation_window);
 		GdkRectangle coords;
@@ -347,16 +389,20 @@ ev_dscwindow_dispose (GObject *obj)
 
 		gtk_window_move (presentation_window, coords.x, coords.y);
 	}
+	ev_window_stop_presentation (EV_WINDOW(priv->presentation_window), TRUE);
+	/*if (priv->overview) {
+		g_object_unref (priv->overview);
+		priv->overview = NULL;
+	}*/
+
 
 	G_OBJECT_CLASS (ev_dscwindow_parent_class)->dispose (obj);
 }
 
-
 static void
 ev_dscwindow_class_init (EvDSCWindowClass *ev_dscwindow_class)
 {
 	GObjectClass *g_object_class = G_OBJECT_CLASS (ev_dscwindow_class);
-	/*parent_class = g_type_class_peek_parent (ev_dscwindow_class);*/
 	g_type_class_add_private (g_object_class, sizeof (EvDSCWindowPrivate));
 	g_object_class->dispose  = ev_dscwindow_dispose;
 }