X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-dualscreen.c;h=0fa9782179e591efeba0be1756013fa49c6e79be;hb=156da1afa7b81a00d6308bbf519db965db01fcf2;hp=4df456cc3575527dd41c10995a1f2e8e175783ca;hpb=d3f9bc975c0b9219b1f6659570e0693a2cfd84e9;p=evince.git diff --git a/shell/ev-dualscreen.c b/shell/ev-dualscreen.c index 4df456cc..0fa97821 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 + * 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,126 +32,170 @@ #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" +#include "ev-presentation-timer.h" struct _EvDSCWindowPrivate { - GtkWidget *main_box; - GtkWidget *menubar; - GtkWidget *overview; - GtkWidget *notesview; - EvDocumentModel *model; - EvDocument * notesdocument; + GtkWidget *main_box; + GtkWidget *menubar; + GtkWidget *sidebar; + GtkWidget *notesview; + GtkWidget *timer; + GtkWidget *spinner; + GtkWidget *presentation_window; + GtkWidget *overview_scrolled_window; + GtkWidget *notesview_scrolled_window; - GtkWidget *overview_scrolled_window; - GtkWidget *notesview_scrolled_window; + EvDocumentModel *model; + EvDocumentModel *notes_model; + EvDocument *presentation_document; + EvDocument *notes_document; - EvWindow *presentation_window; - EvDocument * presentation_document; - gint moveback_monitor; + 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 */ - -/*static gpointer parent_class = NULL;*/ +#define SIDEBAR_DEFAULT_SIZE 300 +#define MAX_PRESENTATION_TIME 1440 /*60*24: ONE DAY*/ G_DEFINE_TYPE (EvDSCWindow, ev_dscwindow, GTK_TYPE_WINDOW) -/** - * ev_dscwindow_switch_monitors: Bring the presentation window and the control window each on the other monitor. - * - * @widget: Callback widget - * @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_notes_interaction: User wants to load a different file as notes. - **/ +static void +ev_dscwindow_sidebar_visibility_cb (GtkWidget *sidebar) +{ + gtk_widget_set_visible (sidebar, !(gtk_widget_get_visible(sidebar))); +} + +static void +ev_dscwindow_set_page (EvDSCWindow *ev_dscwindow, gint page) +{ + guint n_pages = ev_document_get_n_pages(ev_dscwindow->priv->presentation_document); + if((ev_dscwindow->priv->page == 0) && (page == 1)) + ev_presentation_timer_start (EV_PRESENTATION_TIMER (ev_dscwindow->priv->timer)); + if(ev_dscwindow->priv->page != page) { + if(ev_view_presentation_get_current_page (EV_VIEW_PRESENTATION(ev_dscwindow->priv->presentation_view)) != page); + 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); + ev_dscwindow->priv->page = page; + } + ev_presentation_timer_set_page (EV_PRESENTATION_TIMER(ev_dscwindow->priv->timer), 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 +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 +ev_dscwindow_presentation_page_changed_cb (EvViewPresentation *pview, + GParamSpec *pspec, + EvDSCWindow *ev_dscwindow) +{ + ev_dscwindow_set_page (ev_dscwindow, ev_view_presentation_get_current_page (pview)); +} + 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; } -/** - * ev_dscwindow_get_control: Get the control instance. - * - * If there is none, create one. - * - * Returns: control instance - **/ EvDSCWindow * ev_dscwindow_get_control (void) { @@ -159,9 +208,55 @@ ev_dscwindow_get_control (void) return control; } -/** - * ev_dscwindow_end: Stop presentation mode. - */ +static void +ev_dscwindow_window_placement (EvDSCWindow *ev_dscwindow) +{ + 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 +ev_dscwindow_set_presentation (EvDSCWindow *ev_dscwindow, + EvWindow *presentation_window, EvDocument *document, EvViewPresentation *pview) +{ + if (!EV_IS_WINDOW (presentation_window)) + return; + + 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_dscwindow->priv->page); + /*signals*/ + 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_presentation_timer_set_pages (EV_PRESENTATION_TIMER(ev_dscwindow->priv->timer), ev_document_get_n_pages (document)); + + ev_dscwindow_window_placement (ev_dscwindow); +} + static gboolean ev_dscwindow_end (GtkWidget *widget, GdkEvent *event) { @@ -169,132 +264,107 @@ ev_dscwindow_end (GtkWidget *widget, GdkEvent *event) return TRUE; } - - -/** -* ev_dscwindow_init: Initialize multihead presentation -* -* @self: EvDSCWindow. -* -* ev_dscwindow_set_presentation has to be called afterwards for loading in a document. TBD -**/ static void 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->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_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); + ev_dscwindow->priv->sidebar = ev_sidebar_new (); + ev_sidebar_set_model (EV_SIDEBAR (ev_dscwindow->priv->sidebar), + ev_dscwindow->priv->model); - gtk_container_add (GTK_CONTAINER (ev_dscwindow->priv->overview_scrolled_window), - ev_dscwindow->priv->overview); + GtkWidget *sidebar_widget; + sidebar_widget = ev_sidebar_thumbnails_new (); + ev_sidebar_add_page (EV_SIDEBAR (ev_dscwindow->priv->sidebar), + sidebar_widget); + ev_dscwindow->priv->notesview_scrolled_window = GTK_WIDGET ( + g_object_new (GTK_TYPE_SCROLLED_WINDOW,"shadow-type", + GTK_SHADOW_IN, NULL)); + 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); - GtkWidget *e = gtk_expander_new (_("Expensive features")); - gtk_expander_set_expanded (GTK_EXPANDER (e), TRUE); + ev_dscwindow->priv->notesview = ev_view_new (); + gtk_container_add (GTK_CONTAINER (ev_dscwindow->priv->notesview_scrolled_window), + ev_dscwindow->priv->notesview); - GtkWidget *t = gtk_toolbar_new (); + ev_dscwindow->priv->notes_model = ev_dscwindow->priv->model; + ev_view_set_model (EV_VIEW (ev_dscwindow->priv->notesview), ev_dscwindow->priv->notes_model); - GtkToolItem* b_switch = gtk_tool_button_new (NULL, _("Switch monitors")); + gtk_box_pack_start(GTK_BOX(vbox),hpaned,TRUE,TRUE,0); + + GtkWidget *expander = gtk_expander_new (_("Expensive features")); + gtk_expander_set_expanded (GTK_EXPANDER (expander), TRUE); + 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); + GtkToolItem *b_close = gtk_tool_button_new_from_stock (GTK_STOCK_CLOSE); + gtk_tool_button_set_label (GTK_TOOL_BUTTON(b_close), _("End presentation")); + 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); - -/* - 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), priv->notesview_scrolled_window); - - priv->notesview = ev_view_new (); - g_object_ref (priv->notesview); - ev_view_set_screen_dpi (EV_VIEW (priv->notesview), - get_screen_dpi (GTK_WINDOW (self))); -+ gtk_container_add (GTK_CONTAINER (priv->notesview_scrolled_window), -+ priv->notesview); -+ -+ ev_view_set_continuous (EV_VIEW (priv->notesview), FALSE); -+ ev_view_set_dual_page (EV_VIEW (priv->notesview), FALSE); -+ ev_view_set_sizing_mode (EV_VIEW (priv->notesview), EV_SIZING_BEST_FIT); -+ } -+ -+ gtk_paned_set_position (GTK_PANED (h), 400); -+ gtk_widget_show_all (h); -+ gtk_container_add (GTK_CONTAINER (self), 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); -*/ + GtkToolItem *b_sidebar = gtk_tool_button_new_from_stock (GTK_STOCK_PAGE_SETUP); + 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_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); + + 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) { - EvDSCWindow * ev_dscwindow = EV_DSCWINDOW (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; @@ -305,16 +375,19 @@ ev_dscwindow_dispose (GObject *obj) gtk_window_move (presentation_window, coords.x, coords.y); } - + /*if (priv->timer) { + g_object_unref (priv->timer); + priv->timer = NULL; + }*/ + ev_presentation_timer_stop(priv->timer); + ev_window_stop_presentation (EV_WINDOW(priv->presentation_window), TRUE); 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; }