aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog13
-rw-r--r--data/epiphany.schemas.in33
-rw-r--r--lib/ephy-prefs.h3
-rw-r--r--src/ephy-window.c41
4 files changed, 25 insertions, 65 deletions
diff --git a/ChangeLog b/ChangeLog
index e89b65e11..6f9a4df8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,17 @@
2003-04-30 David Bordoley <bordoley@msu.edu>
+
+ * 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 <lwillis@plus.net>
+
+2003-04-30 David Bordoley <bordoley@msu.edu>
* 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
@@ -183,39 +183,6 @@
</locale>
</schema>
<schema>
- <key>/schemas/apps/epiphany/interface/show_toolbars_in_fullscreen</key>
- <applyto>/apps/epiphany/interface/show_toolbars_in_fullscreen</applyto>
- <owner>epiphany</owner>
- <type>bool</type>
- <default>1</default>
- <locale name="C">
- <short>Show toolbars in full screen mode</short>
- <long>Show toolbars in full screen mode.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/epiphany/interface/show_statusbar_in_fullscreen</key>
- <applyto>/apps/epiphany/interface/show_statusbar_in_fullscreen</applyto>
- <owner>epiphany</owner>
- <type>bool</type>
- <default>0</default>
- <locale name="C">
- <short>Show statusbar in full screen mode</short>
- <long>Show statusbar in full screen mode.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/epiphany/interface/show_sidebar_in_fullscreen</key>
- <applyto>/apps/epiphany/interface/show_sidebar_in_fullscreen</applyto>
- <owner>epiphany</owner>
- <type>bool</type>
- <default>0</default>
- <locale name="C">
- <short>Show sidebar in full screen mode</short>
- <long>Show sidebar in full screen mode.</long>
- </locale>
- </schema>
- <schema>
<key>/schemas/apps/epiphany/interface/show_sidebar</key>
<applyto>/apps/epiphany/interface/show_sidebar</applyto>
<owner>epiphany</owner>
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;
}
}