X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-window.c;h=ee6160b79f20dd581b2cdcad809210cd63b562c8;hb=135399e734f6c9ba1da51b7db39ec42612afaca5;hp=013ae3d36654d9dfc9b1278932388dcafa1de709;hpb=edf80d6543a90f386f34c37d35998cd286736263;p=evince.git

diff --git a/shell/ev-window.c b/shell/ev-window.c
index 013ae3d3..ee6160b7 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -442,6 +442,7 @@ ev_window_setup_action_sensitivity (EvWindow *ev_window)
 	ev_window_set_action_sensitive (ev_window, "FileSaveAs", has_document && ok_to_copy);
 	ev_window_set_action_sensitive (ev_window, "FilePrint", has_pages && ok_to_print);
 	ev_window_set_action_sensitive (ev_window, "FileProperties", has_document && has_properties);
+	ev_window_set_action_sensitive (ev_window, "FileOpenContainingFolder", has_document);
 
         /* Edit menu */
 	ev_window_set_action_sensitive (ev_window, "EditSelectAll", has_pages && can_get_text);
@@ -3975,6 +3976,22 @@ ev_window_view_presentation_finished (EvWindow *window)
 	ev_window_stop_presentation (window, TRUE);
 }
 
+static gboolean
+ev_window_view_presentation_focus_in (EvWindow *window)
+{
+	ev_application_screensaver_disable (EV_APP);
+
+	return FALSE;
+}
+
+static gboolean
+ev_window_view_presentation_focus_out (EvWindow *window)
+{
+	ev_application_screensaver_enable (EV_APP);
+
+	return FALSE;
+}
+
 static void
 ev_window_run_presentation (EvWindow *window)
 {
@@ -4004,6 +4021,12 @@ ev_window_run_presentation (EvWindow *window)
 	g_signal_connect_swapped (window->priv->presentation_view, "external-link",
 				  G_CALLBACK (view_external_link_cb),
 				  window);
+	g_signal_connect_swapped (window->priv->presentation_view, "focus-in-event",
+				  G_CALLBACK (ev_window_view_presentation_focus_in),
+				  window);
+	g_signal_connect_swapped (window->priv->presentation_view, "focus-out-event",
+				  G_CALLBACK (ev_window_view_presentation_focus_out),
+				  window);
 
 	gtk_box_pack_start (GTK_BOX (window->priv->main_box),
 			    window->priv->presentation_view,
@@ -4873,6 +4896,8 @@ ev_window_sidebar_visibility_changed_cb (EvSidebar  *ev_sidebar,
 		if (ev_window->priv->metadata)
 			ev_metadata_set_boolean (ev_window->priv->metadata, "sidebar_visibility",
 						 visible);
+		if (!visible)
+			gtk_widget_grab_focus (ev_window->priv->view);
 	}
 }
 
@@ -7110,6 +7135,10 @@ ev_window_init (EvWindow *ev_window)
 			       NULL));
 	g_object_unref (toolbars_model);
 
+	gtk_style_context_add_class
+		(gtk_widget_get_style_context (GTK_WIDGET (ev_window->priv->toolbar)),
+		 GTK_STYLE_CLASS_PRIMARY_TOOLBAR);
+
 	egg_editable_toolbar_show (EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar),
 				   "DefaultToolBar");
 	gtk_box_pack_start (GTK_BOX (ev_window->priv->main_box),