EvDocument *notes_document;
GtkWidget *presentation_window;
- GtkWidget *overview_scrolled_window;
- GtkWidget *notesview_scrolled_window;
+ GtkWidget *overview_scrolled_window;
+ GtkWidget *notesview_scrolled_window;
EvViewPresentation *presentation_view;
gint moveback_monitor;
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;
}
return control;
}
-/*TODO: Fix me!*/
static void
ev_dscwindow_window_placement (EvDSCWindow *ev_dscwindow)
{
gint num_monitors = get_num_monitors (GTK_WINDOW (ev_dscwindow));
- //if (num_monitors == 2) {
+ 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,
&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));
- //}
-}
-/**
- * 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);
-}
-static void
-ev_dscwindow_presentation_page_changed_cb (EvViewPresentation *pview,
- GParamSpec *pspec,
- EvDSCWindow *ev_dscwindow)
-{
- gint page = ev_view_presentation_get_current_page (pview);
- ev_document_model_set_page (ev_dscwindow->priv->model, page);
+ }
}
static gboolean
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_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),
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->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);
+ GtkWidget *hpaned = gtk_hpaned_new ();
+ GtkWidget *vbox = gtk_vbox_new (FALSE, 0);
ev_dscwindow->priv->model = ev_document_model_new ();
- g_signal_connect (G_OBJECT(ev_dscwindow->priv->model),
- "notify::page",
- G_CALLBACK (ev_dscwindow_page_changed_cb),
- ev_dscwindow);
+
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->sidebar, TRUE , TRUE, 0);
- gtk_widget_show (ev_dscwindow->priv->sidebar);
-
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_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);
- /*TODO: rework close*/
+ 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_widget_show_all (h);
- gtk_container_add (GTK_CONTAINER (ev_dscwindow), h);
+ 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*/
- g_signal_connect (ev_dscwindow->priv->notesview, "button-press-event",
- G_CALLBACK (ev_dscwindow_notes_clicked), ev_dscwindow);
+ /* TODO: actions, this part is broken...*/
+ /*g_signal_connect (ev_dscwindow->priv->notesview, "button-press-event",
+ G_CALLBACK (ev_dscwindow_notes_clicked), ev_dscwindow);*/
}
https://www.fi.muni.cz/~kas/git / evince.git / blobdiff