/* -*- 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
struct _EvDSCWindowPrivate {
GtkWidget *main_box;
GtkWidget *menubar;
- GtkWidget *overview;
+ GtkWidget *sidebar;
GtkWidget *notesview;
EvDocumentModel *model;
EvDocument * notesdocument;
- GtkWidget *overview_scrolled_window;
GtkWidget *notesview_scrolled_window;
GtkWidget *presentation_window;
- EvView *presentation_view;
+ EvViewPresentation *presentation_view;
EvDocument * presentation_document;
gint moveback_monitor;
};
ev_dscwindow_window_placement (EvDSCWindow *ev_dscwindow)
{
gint num_monitors = get_num_monitors (GTK_WINDOW (ev_dscwindow));
- g_printf ("num_monitors: %d \n",num_monitors);
//if (num_monitors == 2) {
GtkWindow * presentation_window = GTK_WINDOW (ev_dscwindow->priv->presentation_window);
GdkScreen * screen = gtk_window_get_screen (presentation_window);
EvDSCWindow *ev_dscwindow)
{
gint page = ev_document_model_get_page (model);
- g_printf("page:%d\n",page);
-
- ev_view_presentation_set_page (EV_VIEW_PRESENTATION(ev_dscwindow->priv->presentation_view), 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);
}
static void
-ev_dscwindow_presentation_page_changed_cb (EvDocumentModel *model,
+ev_dscwindow_presentation_page_changed_cb (EvViewPresentation *pview,
GParamSpec *pspec,
EvDSCWindow *ev_dscwindow)
{
- gint page = ev_view_presentation_get_current_page (ev_dscwindow->priv->presentation_view);
+ gint page = ev_view_presentation_get_current_page (pview);
ev_document_model_set_page (ev_dscwindow->priv->model, page);
}
+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
* @presentation_window: Main window we can reuse for presentation
**/
void
ev_dscwindow_set_presentation (EvDSCWindow *ev_dscwindow,
- EvWindow *presentation_window, EvDocument *document, GtkWidget *pview)
+ 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_dscwindow->priv->presentation_view = pview;
- g_signal_connect (ev_dscwindow->priv->presentation_view,
+ ev_dscwindow->priv->presentation_view = EV_VIEW_PRESENTATION(pview);
+ ev_document_model_set_document(ev_dscwindow->priv->model,
+ document);
+ 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->presentation_view),
"notify::page",
G_CALLBACK (ev_dscwindow_presentation_page_changed_cb),
ev_dscwindow);
- ev_document_model_set_document(ev_dscwindow->priv->model,
- document);
ev_dscwindow_window_placement (ev_dscwindow);
}
/**
- * ev_dscwindow_end: Stop presentation mode.
+ * ev_dscwindow_end: Destroy control window but keep presentation
*/
static gboolean
ev_dscwindow_end (GtkWidget *widget, GdkEvent *event)
}
/**
-* ev_dscwindow_init: Initialize multihead presentation
+ * ev_dscwindow_init: Initialize multihead presentation
*
* @ev_dscwindow: EvDSCWindow.
*
GtkWidget *v = gtk_vbox_new (FALSE, 0);
ev_dscwindow->priv->model = ev_document_model_new ();
- g_signal_connect (ev_dscwindow->priv->model,
+ g_signal_connect (G_OBJECT(ev_dscwindow->priv->model),
"notify::page",
G_CALLBACK (ev_dscwindow_page_changed_cb),
ev_dscwindow);
- ev_dscwindow->priv->overview = ev_sidebar_new ();
- ev_sidebar_set_model (EV_SIDEBAR (ev_dscwindow->priv->overview),
+ ev_dscwindow->priv->sidebar = ev_sidebar_new ();
+ ev_sidebar_set_model (EV_SIDEBAR (ev_dscwindow->priv->sidebar),
ev_dscwindow->priv->model);
- gtk_box_pack_start (GTK_BOX (v), ev_dscwindow->priv->overview, TRUE , TRUE, 0);
- gtk_widget_show (ev_dscwindow->priv->overview);
+ gtk_box_pack_start (GTK_BOX (v), ev_dscwindow->priv->sidebar, TRUE , TRUE, 0);
+ gtk_widget_show (ev_dscwindow->priv->sidebar);
GtkWidget *sidebar_widget;
sidebar_widget = ev_sidebar_thumbnails_new ();
ev_window);
sidebar_page_main_widget_update_cb (G_OBJECT (sidebar_widget), NULL, ev_window);*/
gtk_widget_show (sidebar_widget);
- ev_sidebar_add_page (EV_SIDEBAR (ev_dscwindow->priv->overview),
+ ev_sidebar_add_page (EV_SIDEBAR (ev_dscwindow->priv->sidebar),
sidebar_widget);
-/* 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);
-
-
- 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);
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);
+ /*TODO: rework close*/
g_signal_connect (b_close, "clicked",
G_CALLBACK (ev_dscwindow_end), NULL);
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);
-+
-+
-+ /* 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);
-*/
+ 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*/
+ g_signal_connect (ev_dscwindow->priv->notesview, "button-press-event",
+ G_CALLBACK (ev_dscwindow_notes_clicked), ev_dscwindow);
}
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;
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);
}
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;
}
https://www.fi.muni.cz/~kas/git / evince.git / blobdiff