- 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);
- 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);
-
-/*
- 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), priv->notesview_scrolled_window);
-
- priv->notesview = ev_view_new ();
- g_object_ref (priv->notesview);
- ev_view_set_screen_dpi (EV_VIEW (priv->notesview),
- get_screen_dpi (GTK_WINDOW (self)));
-+ gtk_container_add (GTK_CONTAINER (priv->notesview_scrolled_window),
-+ priv->notesview);
-+
-+ ev_view_set_continuous (EV_VIEW (priv->notesview), FALSE);
-+ ev_view_set_dual_page (EV_VIEW (priv->notesview), FALSE);
-+ ev_view_set_sizing_mode (EV_VIEW (priv->notesview), EV_SIZING_BEST_FIT);
-+ }
-+
-+ gtk_paned_set_position (GTK_PANED (h), 400);
- gtk_widget_show_all (h);
-+ gtk_container_add (GTK_CONTAINER (self), h);
-+
-+ /* fallback if we have >2 monitors (see window placement) */
-/*+ gtk_window_set_default_size (GTK_WINDOW (self), 800, 600);
-+
-+ g_signal_connect (h, "notify::position",
-+ G_CALLBACK (ev_dscwindow_handle_resized), self);
-+
-+ g_signal_connect (self, "size-allocate",
-+ G_CALLBACK (ev_dscwindow_handle_resized), self);
-+
-+ /* 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);
-*/
+ 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_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);
+
+ GtkToolItem *b_spinner = gtk_tool_item_new ();
+ GtkWidget* alignment = gtk_alignment_new (0.0f, 0.5f, 1.0f, 0.1f);
+ GtkAdjustment *timer_adjust = gtk_adjustment_new (-1.0, -1.0,
+ MAX_PRESENTATION_TIME, 1.0, 10.0, 10.0);
+ ev_dscwindow->priv->spinner = gtk_spin_button_new (timer_adjust, 1.0, 0);
+ g_signal_connect_swapped (ev_dscwindow->priv->spinner, "value-changed",
+ 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);
+
+ 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, 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);