X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-dualscreen.c;h=507c76b1d80bc0754567fc8bd8df2dc05f726f2d;hb=054abf70e4d37877fa12d442af5abc4e8170b046;hp=2332d859f284e55bbd8d3567e94136473555c83e;hpb=05b9ca3b6f18794c7c69493efc8352303a020df8;p=evince.git diff --git a/shell/ev-dualscreen.c b/shell/ev-dualscreen.c index 2332d859..507c76b1 100644 --- a/shell/ev-dualscreen.c +++ b/shell/ev-dualscreen.c @@ -62,12 +62,29 @@ 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 21 /* This seems like bug in gtk to me */ +#define SIDEBAR_DEFAULT_SIZE 25 /* 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 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)); +} + static gboolean ev_dscwindow_switch_monitors (GtkWidget *widget, EvDSCWindow *ev_dscwindow) { @@ -130,16 +147,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)); } @@ -202,7 +219,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)); @@ -211,23 +228,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) @@ -246,7 +246,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), @@ -255,7 +255,8 @@ 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_presentation_timer_set_pages (EV_PRESENTATION_TIMER(ev_dscwindow->priv->timer), + ev_document_get_n_pages (document)); ev_dscwindow_window_placement (ev_dscwindow); } @@ -263,7 +264,7 @@ ev_dscwindow_set_presentation (EvDSCWindow *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; } @@ -284,7 +285,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), @@ -295,16 +297,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)); + 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); - 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); + 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,7 +324,8 @@ 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_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", @@ -330,8 +342,8 @@ ev_dscwindow_init (EvDSCWindow *ev_dscwindow) 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")); @@ -371,10 +383,10 @@ 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 ( @@ -383,11 +395,6 @@ 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(EV_PRESENTATION_TIMER (priv->timer)); ev_window_stop_presentation (EV_WINDOW(priv->presentation_window), TRUE); G_OBJECT_CLASS (ev_dscwindow_parent_class)->dispose (obj); }