From 6a6479ca2b2c1fd5aa78c860299d1a96ef51f199 Mon Sep 17 00:00:00 2001 From: David Bordoley Date: Wed, 30 Apr 2003 15:23:59 +0000 Subject: src/ephy-window.c data/epiphany.schemas.in 2003-04-30 David Bordoley * src/ephy-window.c * data/epiphany.schemas.in * lib/ephy-prefs.h: Remove fullscreen-only prefs for which UI items to display. Now fullscreen respects the "View" menu toggles for UI items - but the menu bar is not shown in fullscreen view. See bug 111747 for details. Patch from Lee Willis --- ChangeLog | 13 +++++++++++++ data/epiphany.schemas.in | 33 --------------------------------- lib/ephy-prefs.h | 3 --- src/ephy-window.c | 41 ++++++++++++----------------------------- 4 files changed, 25 insertions(+), 65 deletions(-) diff --git a/ChangeLog b/ChangeLog index e89b65e11..6f9a4df8c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2003-04-30 David Bordoley + + * src/ephy-window.c + * data/epiphany.schemas.in + * lib/ephy-prefs.h: + + Remove fullscreen-only prefs for which UI items to display. + Now fullscreen respects the "View" menu toggles for UI + items - but the menu bar is not shown in fullscreen view. + See bug 111747 for details. + + Patch from Lee Willis + 2003-04-30 David Bordoley * src/session.c: (parse_embed): diff --git a/data/epiphany.schemas.in b/data/epiphany.schemas.in index 06d0afd5f..f56d3038e 100644 --- a/data/epiphany.schemas.in +++ b/data/epiphany.schemas.in @@ -182,39 +182,6 @@ Middle click on the web page will load the url in X clipboard. - - /schemas/apps/epiphany/interface/show_toolbars_in_fullscreen - /apps/epiphany/interface/show_toolbars_in_fullscreen - epiphany - bool - 1 - - Show toolbars in full screen mode - Show toolbars in full screen mode. - - - - /schemas/apps/epiphany/interface/show_statusbar_in_fullscreen - /apps/epiphany/interface/show_statusbar_in_fullscreen - epiphany - bool - 0 - - Show statusbar in full screen mode - Show statusbar in full screen mode. - - - - /schemas/apps/epiphany/interface/show_sidebar_in_fullscreen - /apps/epiphany/interface/show_sidebar_in_fullscreen - epiphany - bool - 0 - - Show sidebar in full screen mode - Show sidebar in full screen mode. - - /schemas/apps/epiphany/interface/show_sidebar /apps/epiphany/interface/show_sidebar diff --git a/lib/ephy-prefs.h b/lib/ephy-prefs.h index d8bf1a317..02c1d04fb 100644 --- a/lib/ephy-prefs.h +++ b/lib/ephy-prefs.h @@ -31,9 +31,6 @@ G_BEGIN_DECLS #define CONF_TABS_TABBED_AUTOJUMP "/apps/epiphany/interface/jumpto_tab" #define CONF_WINDOWS_SIDEBAR_PAGE "/apps/epiphany/interface/sidebar_page" #define CONF_WINDOWS_SIDEBAR_SIZE "/apps/epiphany/interface/sidebar_size" -#define CONF_WINDOWS_FS_SHOW_SIDEBAR "/apps/epiphany/interface/show_sidebar_in_fullscreen" -#define CONF_WINDOWS_FS_SHOW_TOOLBARS "/apps/epiphany/interface/show_toolbars_in_fullscreen" -#define CONF_WINDOWS_FS_SHOW_STATUSBAR "/apps/epiphany/interface/show_statusbar_in_fullscreen" #define CONF_WINDOWS_SHOW_SIDEBAR "/apps/epiphany/interface/show_sidebar" #define CONF_WINDOWS_SHOW_TOOLBARS "/apps/epiphany/interface/show_toolbars" #define CONF_WINDOWS_SHOW_BOOKMARKS_BAR "/apps/epiphany/interface/show_bookmarks_bar" diff --git a/src/ephy-window.c b/src/ephy-window.c index 34cfc588c..fc7df0281 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -604,13 +604,6 @@ save_window_chrome (EphyWindow *window) else if (flags & EMBED_CHROME_PPVIEWTOOLBARON) { } - else if (flags & EMBED_CHROME_OPENASFULLSCREEN) - { - eel_gconf_set_boolean (CONF_WINDOWS_FS_SHOW_TOOLBARS, - flags & EMBED_CHROME_TOOLBARON); - eel_gconf_set_boolean (CONF_WINDOWS_FS_SHOW_STATUSBAR, - flags & EMBED_CHROME_STATUSBARON); - } else { eel_gconf_set_boolean (CONF_WINDOWS_SHOW_BOOKMARKS_BAR, @@ -749,32 +742,22 @@ translate_default_chrome (EmbedChromeMask *chrome_mask) EMBED_CHROME_OPENASFULLSCREEN); /* Load defaults */ - if (*chrome_mask & EMBED_CHROME_OPENASFULLSCREEN) + if (eel_gconf_get_boolean (CONF_WINDOWS_SHOW_STATUSBAR)) { - if (eel_gconf_get_boolean (CONF_WINDOWS_FS_SHOW_STATUSBAR)) - { - *chrome_mask |= EMBED_CHROME_STATUSBARON; - } - if (eel_gconf_get_boolean (CONF_WINDOWS_FS_SHOW_TOOLBARS)) - { - *chrome_mask |= EMBED_CHROME_TOOLBARON; - } + *chrome_mask |= EMBED_CHROME_STATUSBARON; } - else + if (eel_gconf_get_boolean (CONF_WINDOWS_SHOW_TOOLBARS)) { - if (eel_gconf_get_boolean (CONF_WINDOWS_SHOW_STATUSBAR)) - { - *chrome_mask |= EMBED_CHROME_STATUSBARON; - } - if (eel_gconf_get_boolean (CONF_WINDOWS_SHOW_TOOLBARS)) - { - *chrome_mask |= EMBED_CHROME_TOOLBARON; - } - if (eel_gconf_get_boolean (CONF_WINDOWS_SHOW_BOOKMARKS_BAR)) - { - *chrome_mask |= EMBED_CHROME_BOOKMARKSBARON; - } + *chrome_mask |= EMBED_CHROME_TOOLBARON; + } + if (eel_gconf_get_boolean (CONF_WINDOWS_SHOW_BOOKMARKS_BAR)) + { + *chrome_mask |= EMBED_CHROME_BOOKMARKSBARON; + } + // Show the menu bar if we're not in fullscreen + if (!(*chrome_mask & EMBED_CHROME_OPENASFULLSCREEN)) + { *chrome_mask |= EMBED_CHROME_MENUBARON; } } -- cgit v1.2.3