X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-window.c;h=aac080d49a30b0eeee1f0bf66c64f3c5e4a90fca;hb=62df37775327697af13682f058c61fabc4229883;hp=9ef85aab2d7051d56b362c5ebb27c0b5808597ad;hpb=e99ddf071bde87e63a8c64f0609f31a05b6f7080;p=evince.git

diff --git a/shell/ev-window.c b/shell/ev-window.c
index 9ef85aab..aac080d4 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -370,6 +370,12 @@ get_screen_dpi (EvWindow *window)
 	return ev_document_misc_get_screen_dpi (screen);
 }
 
+static gboolean
+ev_window_is_editing_toolbar (EvWindow *ev_window)
+{
+	return egg_editable_toolbar_get_edit_mode (EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar));
+}
+
 static void
 ev_window_set_action_sensitive (EvWindow   *ev_window,
 		    	        const char *name,
@@ -452,6 +458,7 @@ ev_window_setup_action_sensitivity (EvWindow *ev_window)
 	ev_window_set_action_sensitive (ev_window, "EditRotateRight", has_pages);
 
         /* View menu */
+	ev_window_set_action_sensitive (ev_window, "ViewToolbar", !ev_window_is_editing_toolbar (ev_window));
 	ev_window_set_action_sensitive (ev_window, "ViewContinuous", has_pages);
 	ev_window_set_action_sensitive (ev_window, "ViewDual", has_pages);
 	ev_window_set_action_sensitive (ev_window, "ViewBestFit", has_pages);
@@ -4280,6 +4287,7 @@ ev_window_cmd_edit_toolbar_cb (GtkDialog *dialog,
 
 	toolbar = EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar);
         egg_editable_toolbar_set_edit_mode (toolbar, FALSE);
+	ev_window_set_action_sensitive (ev_window, "ViewToolbar", TRUE);
 
 	toolbars_file = g_build_filename (ev_application_get_dot_dir (EV_APP, TRUE),
 					  "evince_toolbar.xml", NULL);
@@ -4320,6 +4328,7 @@ ev_window_cmd_edit_toolbar (GtkAction *action, EvWindow *ev_window)
         gtk_box_pack_start (GTK_BOX (content_area), editor, TRUE, TRUE, 0);
 
 	egg_editable_toolbar_set_edit_mode (toolbar, TRUE);
+	ev_window_set_action_sensitive (ev_window, "ViewToolbar", FALSE);
 
 	g_signal_connect (dialog, "response",
 			  G_CALLBACK (ev_window_cmd_edit_toolbar_cb),
@@ -5187,30 +5196,23 @@ find_bar_close_cb (EggFindBar *find_bar,
 }
 
 static void
-find_bar_search_changed_cb (EggFindBar *find_bar,
-			    GParamSpec *param,
-			    EvWindow   *ev_window)
+ev_window_search_start (EvWindow *ev_window)
 {
-	gboolean case_sensitive;
+	EggFindBar *find_bar = EGG_FIND_BAR (ev_window->priv->find_bar);
 	const char *search_string;
 
 	if (!ev_window->priv->document || !EV_IS_DOCUMENT_FIND (ev_window->priv->document))
 		return;
-	
-	/* Either the string or case sensitivity could have changed. */
-	case_sensitive = egg_find_bar_get_case_sensitive (find_bar);
-	search_string = egg_find_bar_get_search_string (find_bar);
 
-	ev_view_find_search_changed (EV_VIEW (ev_window->priv->view));
+	search_string = egg_find_bar_get_search_string (find_bar);
 
 	ev_window_clear_find_job (ev_window);
-
 	if (search_string && search_string[0]) {
 		ev_window->priv->find_job = ev_job_find_new (ev_window->priv->document,
 							     ev_document_model_get_page (ev_window->priv->model),
 							     ev_document_get_n_pages (ev_window->priv->document),
 							     search_string,
-							     case_sensitive);
+							     egg_find_bar_get_case_sensitive (find_bar));
 		g_signal_connect (ev_window->priv->find_job, "finished",
 				  G_CALLBACK (ev_window_find_job_finished_cb),
 				  ev_window);
@@ -5220,12 +5222,21 @@ find_bar_search_changed_cb (EggFindBar *find_bar,
 		ev_job_scheduler_push_job (ev_window->priv->find_job, EV_JOB_PRIORITY_NONE);
 	} else {
 		ev_window_update_actions (ev_window);
-		egg_find_bar_set_status_text (EGG_FIND_BAR (ev_window->priv->find_bar),
-					      NULL);
+		egg_find_bar_set_status_text (find_bar, NULL);
 		gtk_widget_queue_draw (GTK_WIDGET (ev_window->priv->view));
 	}
 }
 
+static void
+find_bar_search_changed_cb (EggFindBar *find_bar,
+			    GParamSpec *param,
+			    EvWindow   *ev_window)
+{
+	/* Either the string or case sensitivity could have changed. */
+	ev_view_find_search_changed (EV_VIEW (ev_window->priv->view));
+	ev_window_search_start (ev_window);
+}
+
 static void
 find_bar_visibility_changed_cb (EggFindBar *find_bar,
 				GParamSpec *param,
@@ -5238,11 +5249,10 @@ find_bar_visibility_changed_cb (EggFindBar *find_bar,
 	if (ev_window->priv->document &&
 	    EV_IS_DOCUMENT_FIND (ev_window->priv->document)) {
 		ev_view_find_set_highlight_search (EV_VIEW (ev_window->priv->view), visible);
-		ev_view_find_search_changed (EV_VIEW (ev_window->priv->view));
 		ev_window_update_actions (ev_window);
 
 		if (visible)
-			find_bar_search_changed_cb (find_bar, NULL, ev_window);
+			ev_window_search_start (ev_window);
 		else
 			egg_find_bar_set_status_text (EGG_FIND_BAR (ev_window->priv->find_bar), NULL);
 	}
@@ -6043,7 +6053,8 @@ view_actions_focus_in_cb (GtkWidget *widget, GdkEventFocus *event, EvWindow *win
 #endif /* ENABLE_DBUS */
 
 	update_chrome_flag (window, EV_CHROME_RAISE_TOOLBAR, FALSE);
-	ev_window_set_action_sensitive (window, "ViewToolbar", TRUE);
+	ev_window_set_action_sensitive (window, "ViewToolbar",
+					!ev_window_is_editing_toolbar (window));
 
 	ev_window_set_view_accels_sensitivity (window, TRUE);