aboutsummaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorPeter Harvey <peter.a.harvey@gmail.com>2006-02-21 21:44:16 +0800
committerPeter Anthony Harvey <paharvey@src.gnome.org>2006-02-21 21:44:16 +0800
commitc66ab87ed9b35bfafa1ad6aba79419d153e29de7 (patch)
treeb79583242bc9e7387724f658f061fb687c0bc8fb /data
parent6dd4bf1e1ebfee184ebfa38781ab6418c42e652a (diff)
downloadgsoc2013-epiphany-c66ab87ed9b35bfafa1ad6aba79419d153e29de7.tar
gsoc2013-epiphany-c66ab87ed9b35bfafa1ad6aba79419d153e29de7.tar.gz
gsoc2013-epiphany-c66ab87ed9b35bfafa1ad6aba79419d153e29de7.tar.bz2
gsoc2013-epiphany-c66ab87ed9b35bfafa1ad6aba79419d153e29de7.tar.lz
gsoc2013-epiphany-c66ab87ed9b35bfafa1ad6aba79419d153e29de7.tar.xz
gsoc2013-epiphany-c66ab87ed9b35bfafa1ad6aba79419d153e29de7.tar.zst
gsoc2013-epiphany-c66ab87ed9b35bfafa1ad6aba79419d153e29de7.zip
data/ui/epiphany-fs-toolbar.xml lib/egg/egg-toolbars-model.c
2006-02-21 Peter Harvey <peter.a.harvey@gmail.com> * data/ui/epiphany-fs-toolbar.xml * lib/egg/egg-toolbars-model.c * lib/egg/egg-toolbars-model.h Added "editable" attribute for toolbars. * data/ui/epiphany-ui.xml * lib/egg/egg-editable-toolbar.c * lib/egg/egg-editable-toolbar.h * src/ephy-toolbar.c * src/ephy-window.c Many improvements to toolbar menus. Includes changes to show visibility toggles in multiple locations. * lib/ephy-stock-icons.c * lib/ephy-stock-icons.h Additional stock icon for drag and drop. * src/bookmarks/ephy-bookmarks-ui.c Make 'customize toolbar' invisible when editing. * src/ephy-shell.c Mark the full-screen toolbar as non-removable.
Diffstat (limited to 'data')
-rw-r--r--data/ui/epiphany-fs-toolbar.xml2
-rw-r--r--data/ui/epiphany-ui.xml18
2 files changed, 17 insertions, 3 deletions
diff --git a/data/ui/epiphany-fs-toolbar.xml b/data/ui/epiphany-fs-toolbar.xml
index 67ca03ff4..db1648422 100644
--- a/data/ui/epiphany-fs-toolbar.xml
+++ b/data/ui/epiphany-fs-toolbar.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<toolbars version="1.0">
-<toolbar name="Toolbar" style="icons-only">
+<toolbar name="Toolbar" style="icons-only" editable="false">
<toolitem name="NavigationBack"/>
<toolitem name="NavigationForward"/>
<toolitem name="ViewStop"/>
diff --git a/data/ui/epiphany-ui.xml b/data/ui/epiphany-ui.xml
index 45a520e34..4887cbb07 100644
--- a/data/ui/epiphany-ui.xml
+++ b/data/ui/epiphany-ui.xml
@@ -38,9 +38,13 @@
<menu name="ViewMenu" action="View">
<placeholder name="ViewTogglesGroup" position="top">
<menu name="ToolbarMenu" action="Toolbar">
- <menuitem name="ViewToolbarEditorMenu" action="ViewToolbarEditor"/>
+ <separator/>
+ <placeholder name="ViewToolbarsGroup" position="top">
+ </placeholder>
+ <separator/>
<menuitem name="ViewToolbarMenu" action="ViewToolbar"/>
- <separator name="ToolbarSep1"/>
+ <menuitem name="ViewToolbarEditorMenu" action="ViewToolbarEditor"/>
+ <separator/>
</menu>
<menuitem name="ViewStatusbarMenu" action="ViewStatusbar"/>
</placeholder>
@@ -169,6 +173,16 @@
</popup>
<popup name="ToolbarPopup">
+ <placeholder name="SpecificItemsGroup">
+ </placeholder>
+ <separator/>
+ <menuitem action="MoveToolItem"/>
+ <menuitem action="RemoveToolItem"/>
+ <separator/>
+ <menuitem action="RemoveToolbar"/>
+ <separator/>
+ <placeholder name="ViewToolbarsGroup">
+ </placeholder>
<separator/>
<menuitem action="ViewToolbarEditor"/>
<separator/>