]> www.fi.muni.cz Git - evince.git/blobdiff - shell/ev-dualscreen.c
https://www.fi.muni.cz/~kas/git / evince.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
cleanup
[evince.git] / shell / ev-dualscreen.c
diff --git a/shell/ev-dualscreen.c b/shell/ev-dualscreen.c
index 8d474aaa4df5b38d47a6a9769bb181965013b127..648a1f2e759b416be8c7920869fbc0ac71556511 100644 (file)
--- a/shell/ev-dualscreen.c
+++ b/shell/ev-dualscreen.c
@@ -62,7 +62,7 @@ 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 SIDEBAR_DEFAULT_SIZE    21 /* 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)
@@ -130,16 +130,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));
 }
@@ -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);
 }
@@ -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,19 +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));
-       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);
 
@@ -316,6 +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_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",
@@ -323,18 +333,21 @@ ev_dscwindow_init (EvDSCWindow *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);
 
        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);
@@ -348,6 +361,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);
@@ -355,11 +370,13 @@ 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
Dual-screen mode for evince