X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-dualscreen.c;h=a3b1117d42e7cc7d691ef4f2cd4d005d9ff872be;hb=648a3193781bad3fe1cf5e581c8b6ccf1bc2ee15;hp=0fa9782179e591efeba0be1756013fa49c6e79be;hpb=156da1afa7b81a00d6308bbf519db965db01fcf2;p=evince.git diff --git a/shell/ev-dualscreen.c b/shell/ev-dualscreen.c index 0fa97821..a3b1117d 100644 --- a/shell/ev-dualscreen.c +++ b/shell/ev-dualscreen.c @@ -62,40 +62,45 @@ struct _EvDSCWindowPrivate { #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 300 -#define MAX_PRESENTATION_TIME 1440 /*60*24: ONE DAY*/ +#define SIDEBAR_DEFAULT_SIZE 30 /* This seems like bug in gtk to me */ +#define MAX_PRESENTATION_TIME 1440 /* 60*24 ONE DAY */ G_DEFINE_TYPE (EvDSCWindow, ev_dscwindow, GTK_TYPE_WINDOW) +static gint +ev_dscwindow_get_presentation_window_monitor (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))); + return work_monitor; +} static gboolean -ev_dscwindow_switch_monitors (GtkWidget *widget, EvDSCWindow *ev_dscwindow) +ev_dscwindow_windows_placement (EvDSCWindow *ev_dscwindow) { 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; + GdkScreen *screen = gtk_window_get_screen (GTK_WINDOW (ev_dscwindow)); + gint presentation_monitor = ev_dscwindow_get_presentation_window_monitor(ev_dscwindow); + gint control_monitor = presentation_monitor; - gdk_screen_get_monitor_geometry (screen, monitor_1, &coords); + gdk_screen_get_monitor_geometry (screen, control_monitor, &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; + + presentation_monitor = (control_monitor + 1) % 2; + gdk_screen_get_monitor_geometry (screen, presentation_monitor,&coords); + gtk_window_move (GTK_WINDOW (ev_dscwindow->priv->presentation_window), coords.x, coords.y); + + return TRUE; + } else + return FALSE; } static void @@ -107,7 +112,6 @@ ev_dscwindow_sidebar_visibility_cb (GtkWidget *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) { @@ -131,16 +135,16 @@ ev_dscwindow_presentation_time_cb (EvDSCWindow *ev_dscwindow) static void ev_dscwindow_page_changed_cb (EvDocumentModel *model, - GParamSpec *pspec, - EvDSCWindow *ev_dscwindow) + 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_presentation_page_changed_cb (EvViewPresentation *pview, + GParamSpec *pspec, + EvDSCWindow *ev_dscwindow) { ev_dscwindow_set_page (ev_dscwindow, ev_view_presentation_get_current_page (pview)); } @@ -177,10 +181,14 @@ ev_dscwindow_notes_interaction (GtkContainer *container, EvDSCWindow *ev_dscwind 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_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), @@ -199,7 +207,7 @@ ev_dscwindow_notes_interaction (GtkContainer *container, EvDSCWindow *ev_dscwind EvDSCWindow * ev_dscwindow_get_control (void) { - static EvDSCWindow * control = NULL; + static EvDSCWindow *control = NULL; if (!control || !EV_IS_DSCWINDOW (control)) { control = EV_DSCWINDOW (g_object_new (EV_TYPE_DSCWINDOW, NULL)); @@ -208,23 +216,6 @@ ev_dscwindow_get_control (void) return control; } -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) @@ -236,6 +227,7 @@ ev_dscwindow_set_presentation (EvDSCWindow *ev_dscwindow, 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_dscwindow->priv->moveback_monitor = ev_dscwindow_get_presentation_window_monitor (ev_dscwindow); ev_document_model_set_document(ev_dscwindow->priv->model, document); ev_document_model_set_page(ev_dscwindow->priv->model, ev_dscwindow->priv->page); @@ -243,7 +235,7 @@ ev_dscwindow_set_presentation (EvDSCWindow *ev_dscwindow, g_signal_connect_swapped (ev_dscwindow->priv->presentation_view, "destroy", G_CALLBACK (gtk_widget_destroy), - ev_dscwindow); + GTK_WIDGET (ev_dscwindow)); g_signal_connect (G_OBJECT(ev_dscwindow->priv->model), "notify::page", G_CALLBACK (ev_dscwindow_page_changed_cb), @@ -252,15 +244,19 @@ ev_dscwindow_set_presentation (EvDSCWindow *ev_dscwindow, "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); + ev_presentation_timer_set_pages (EV_PRESENTATION_TIMER(ev_dscwindow->priv->timer), + ev_document_get_n_pages (document)); + /* Wait for windows to get shown before moving them */ + while(gtk_events_pending()) + gtk_main_iteration(); + /* something like http://mail.gnome.org/archives/gtk-list/2008-June/msg00061.html */ + ev_dscwindow_windows_placement (ev_dscwindow); } static gboolean ev_dscwindow_end (GtkWidget *widget, GdkEvent *event) { - gtk_widget_destroy (GTK_WIDGET (ev_dscwindow_get_control ())); + gtk_widget_destroy (widget); return TRUE; } @@ -281,7 +277,8 @@ ev_dscwindow_init (EvDSCWindow *ev_dscwindow) ev_dscwindow->priv->model = ev_document_model_new (); 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_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), @@ -292,19 +289,25 @@ ev_dscwindow_init (EvDSCWindow *ev_dscwindow) 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); - + ev_dscwindow->priv->notesview_scrolled_window = + GTK_WIDGET (g_object_new(GTK_TYPE_SCROLLED_WINDOW, + "shadow-type", + GTK_SHADOW_IN, + NULL)); ev_dscwindow->priv->notesview = ev_view_new (); gtk_container_add (GTK_CONTAINER (ev_dscwindow->priv->notesview_scrolled_window), - ev_dscwindow->priv->notesview); - + ev_dscwindow->priv->notesview); ev_dscwindow->priv->notes_model = ev_dscwindow->priv->model; - ev_view_set_model (EV_VIEW (ev_dscwindow->priv->notesview), ev_dscwindow->priv->notes_model); + ev_view_set_model (EV_VIEW (ev_dscwindow->priv->notesview), + ev_dscwindow->priv->notes_model); + gtk_paned_pack1 (GTK_PANED (hpaned), + ev_dscwindow->priv->sidebar, + FALSE, + TRUE); + gtk_paned_pack2 (GTK_PANED (hpaned), + ev_dscwindow->priv->notesview_scrolled_window, + FALSE, + FALSE); gtk_box_pack_start(GTK_BOX(vbox),hpaned,TRUE,TRUE,0); @@ -313,25 +316,30 @@ ev_dscwindow_init (EvDSCWindow *ev_dscwindow) GtkWidget *toolbar = gtk_toolbar_new (); GtkToolItem *b_switch = gtk_tool_button_new (NULL, _("Switch monitors")); + gtk_tool_item_set_tooltip_text (b_switch, + _("Switch monitors, In case of more than two monitor window placing has to be manual.")); gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (b_switch), "object-flip-horizontal"); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), b_switch, -1); - g_signal_connect (b_switch, "clicked", - G_CALLBACK (ev_dscwindow_switch_monitors), ev_dscwindow); + g_signal_connect_swapped (b_switch, "clicked", + G_CALLBACK (ev_dscwindow_windows_placement), ev_dscwindow); 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_tool_item_set_tooltip_text (b_notes, _("Load your notes document")); 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_from_stock (GTK_STOCK_CLOSE); gtk_tool_button_set_label (GTK_TOOL_BUTTON(b_close), _("End presentation")); + gtk_tool_item_set_tooltip_text (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); + g_signal_connect_swapped (b_close, "clicked", + G_CALLBACK (ev_dscwindow_end), ev_dscwindow); 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_tool_item_set_tooltip_text (b_sidebar, _("Show/hide 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); @@ -345,6 +353,8 @@ ev_dscwindow_init (EvDSCWindow *ev_dscwindow) 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_tool_item_set_tooltip_text (b_spinner, + _("To enable timer, set presentation timer to expected time in minutes. Timer starts by changing from first slide to second one. Value -1 means disabled.")); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), b_spinner, -1); gtk_container_add (GTK_CONTAINER (expander), toolbar); @@ -352,34 +362,29 @@ ev_dscwindow_init (EvDSCWindow *ev_dscwindow) 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_paned_pack2 (GTK_PANED(hpan),ev_dscwindow->priv->timer, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (vbox), hpan, FALSE, TRUE, 0); gtk_container_add (GTK_CONTAINER (ev_dscwindow), vbox); gtk_widget_show_all(vbox); + gtk_paned_set_position (GTK_PANED (hpan), SIDEBAR_DEFAULT_SIZE); + gtk_paned_set_position (GTK_PANED (hpaned), SIDEBAR_DEFAULT_SIZE); } static void ev_dscwindow_dispose (GObject *obj) { EvDSCWindow *ev_dscwindow = EV_DSCWINDOW (obj); - EvDSCWindowPrivate *priv = ev_dscwindow->priv; + EvDSCWindowPrivate *priv = EV_DSCWINDOW (ev_dscwindow)->priv; if (priv->moveback_monitor >= 0) { - GtkWindow * presentation_window = GTK_WINDOW (priv->presentation_window); + GtkWindow *presentation_window = GTK_WINDOW (priv->presentation_window); GdkRectangle coords; - gdk_screen_get_monitor_geometry ( - gtk_window_get_screen (presentation_window), - priv->moveback_monitor, &coords); - + gdk_screen_get_monitor_geometry (gtk_window_get_screen (presentation_window), + priv->moveback_monitor, &coords); 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); }