diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/ui/Makefile.am | 2 | ||||
| -rw-r--r-- | data/ui/epiphany-fs-toolbar.xml | 10 | ||||
| -rw-r--r-- | data/ui/epiphany-toolbar.xml | 36 | ||||
| -rw-r--r-- | data/ui/epiphany-ui.xml | 14 |
4 files changed, 8 insertions, 54 deletions
diff --git a/data/ui/Makefile.am b/data/ui/Makefile.am index 7ffa3b1cb..4e148e1c6 100644 --- a/data/ui/Makefile.am +++ b/data/ui/Makefile.am @@ -1,10 +1,8 @@ xmldir = $(pkgdatadir) xml_DATA = \ epiphany-bookmarksbar.xml \ - epiphany-fs-toolbar.xml \ epiphany-bookmark-editor-ui.xml \ epiphany-ui.xml \ - epiphany-toolbar.xml \ epiphany-history-window-ui.xml cssdir = $(pkgdatadir) diff --git a/data/ui/epiphany-fs-toolbar.xml b/data/ui/epiphany-fs-toolbar.xml deleted file mode 100644 index db1648422..000000000 --- a/data/ui/epiphany-fs-toolbar.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0"?> -<toolbars version="1.0"> -<toolbar name="Toolbar" style="icons-only" editable="false"> - <toolitem name="NavigationBack"/> - <toolitem name="NavigationForward"/> - <toolitem name="ViewStop"/> - <toolitem name="ViewReload"/> - <toolitem name="Location"/> -</toolbar> -</toolbars> diff --git a/data/ui/epiphany-toolbar.xml b/data/ui/epiphany-toolbar.xml deleted file mode 100644 index 80d74ed4f..000000000 --- a/data/ui/epiphany-toolbar.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0"?> -<toolbars version="1.0"> -<available> - <toolitem name="NavigationBack"/> - <toolitem name="NavigationForward"/> - <toolitem name="NavigationUp"/> - <toolitem name="ViewStop"/> - <toolitem name="ViewReload"/> - <toolitem name="GoHome"/> - <toolitem name="GoHistory"/> - <toolitem name="GoBookmarks"/> - <toolitem name="FileNewTab"/> - <toolitem name="FileNewWindow"/> - <toolitem name="FileOpen"/> - <toolitem name="FileSaveAs"/> - <toolitem name="FilePrint"/> - <toolitem name="FileBookmarkPage"/> - <toolitem name="ViewFullscreen"/> - <toolitem name="EditFind"/> - <toolitem name="Location"/> - <toolitem name="ToolbarGo"/> - <toolitem name="Zoom"/> - <toolitem name="ViewZoomIn"/> - <toolitem name="ViewZoomOut"/> - <toolitem name="ViewZoomNormal"/> -</available> -<toolbar name="DefaultToolbar"> - <toolitem name="NavigationBack"/> - <toolitem name="NavigationForward"/> - <toolitem name="ViewStop"/> - <toolitem name="ViewReload"/> - <toolitem name="Location"/> - <toolitem name="ViewZoomOut"/> - <toolitem name="ViewZoomIn"/> -</toolbar> -</toolbars> diff --git a/data/ui/epiphany-ui.xml b/data/ui/epiphany-ui.xml index d9eb56de7..ebce0c372 100644 --- a/data/ui/epiphany-ui.xml +++ b/data/ui/epiphany-ui.xml @@ -164,12 +164,6 @@ <popup name="ToolbarPopup"> <placeholder name="SpecificItemsGroup"> </placeholder> - <separator/> - <menuitem action="MoveToolItem"/> - <menuitem action="RemoveToolItem"/> - <separator/> - <menuitem action="RemoveToolbar"/> - <separator/> <placeholder name="ViewToolbarsGroup"> </placeholder> <separator/> @@ -177,6 +171,14 @@ <menuitem name="ViewDownloadsBar" action="ViewDownloadsBar"/> </popup> + <toolbar name="DefaultToolbar"> + <toolitem action="NavigationBack"/> + <toolitem action="NavigationForward"/> + <toolitem action="ViewStop"/> + <toolitem action="ViewReload"/> + <toolitem action="Location"/> + </toolbar> + <accelerator name="AlwaysStopAccel" action="ViewAlwaysStop"/> <accelerator name="BrowseWithCaretAccel" action="BrowseWithCaret"/> |