[evince] Do not show the find bar in presentation mode
- From: Carlos Garcia Campos <carlosgc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evince] Do not show the find bar in presentation mode
- Date: Sun, 15 Jan 2012 10:28:12 +0000 (UTC)
commit 79b9e1e0d6efa05a875e0db5407c9b760f3939d4
Author: Carlos Garcia Campos <carlosgc gnome org>
Date: Sun Jan 15 11:27:32 2012 +0100
Do not show the find bar in presentation mode
https://bugzilla.gnome.org/show_bug.cgi?id=645976
shell/ev-window.c | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/shell/ev-window.c b/shell/ev-window.c
index 00b915b..b00cd5d 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -1651,7 +1651,8 @@ ev_window_load_job_cb (EvJob *job,
break;
}
- if (ev_window->priv->search_string && EV_IS_DOCUMENT_FIND (document)) {
+ if (ev_window->priv->search_string && EV_IS_DOCUMENT_FIND (document) &&
+ ev_window->priv->window_mode != EV_WINDOW_MODE_PRESENTATION) {
ev_window_cmd_edit_find (NULL, ev_window);
egg_find_bar_set_search_string (EGG_FIND_BAR (ev_window->priv->find_bar),
ev_window->priv->search_string);
@@ -2188,7 +2189,8 @@ ev_window_open_document (EvWindow *ev_window,
break;
}
- if (search_string && EV_IS_DOCUMENT_FIND (document)) {
+ if (search_string && EV_IS_DOCUMENT_FIND (document) &&
+ mode != EV_WINDOW_MODE_PRESENTATION) {
ev_window_cmd_edit_find (NULL, ev_window);
egg_find_bar_set_search_string (EGG_FIND_BAR (ev_window->priv->find_bar),
search_string);
@@ -3777,12 +3779,13 @@ ev_window_cmd_edit_select_all (GtkAction *action, EvWindow *ev_window)
static void
ev_window_cmd_edit_find (GtkAction *action, EvWindow *ev_window)
{
- g_return_if_fail (EV_IS_WINDOW (ev_window));
-
if (ev_window->priv->document == NULL || !EV_IS_DOCUMENT_FIND (ev_window->priv->document)) {
g_error ("Find action should be insensitive since document doesn't support find");
return;
- }
+ }
+
+ if (EV_WINDOW_IS_PRESENTATION (ev_window))
+ return;
update_chrome_flag (ev_window, EV_CHROME_FINDBAR, TRUE);
update_chrome_visibility (ev_window);
@@ -3792,7 +3795,8 @@ ev_window_cmd_edit_find (GtkAction *action, EvWindow *ev_window)
static void
ev_window_cmd_edit_find_next (GtkAction *action, EvWindow *ev_window)
{
- g_return_if_fail (EV_IS_WINDOW (ev_window));
+ if (EV_WINDOW_IS_PRESENTATION (ev_window))
+ return;
update_chrome_flag (ev_window, EV_CHROME_FINDBAR, TRUE);
update_chrome_visibility (ev_window);
@@ -3803,7 +3807,8 @@ ev_window_cmd_edit_find_next (GtkAction *action, EvWindow *ev_window)
static void
ev_window_cmd_edit_find_previous (GtkAction *action, EvWindow *ev_window)
{
- g_return_if_fail (EV_IS_WINDOW (ev_window));
+ if (EV_WINDOW_IS_PRESENTATION (ev_window))
+ return;
update_chrome_flag (ev_window, EV_CHROME_FINDBAR, TRUE);
update_chrome_visibility (ev_window);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]