diff options
| author | Xan Lopez <xan@igalia.com> | 2011-12-13 23:45:10 +0800 |
|---|---|---|
| committer | Xan Lopez <xan@igalia.com> | 2011-12-14 23:30:21 +0800 |
| commit | c1c74c929c1e773d1f79d1b3bd0cf10bb572f8f9 (patch) | |
| tree | 407b07bc318b263f518747ece8e668b933f9ed04 /data/ui/epiphany-ui.xml | |
| parent | 1ce161d56a3db3c436e5fbf888472c1f864cebb8 (diff) | |
| download | gsoc2013-epiphany-c1c74c929c1e773d1f79d1b3bd0cf10bb572f8f9.tar gsoc2013-epiphany-c1c74c929c1e773d1f79d1b3bd0cf10bb572f8f9.tar.gz gsoc2013-epiphany-c1c74c929c1e773d1f79d1b3bd0cf10bb572f8f9.tar.bz2 gsoc2013-epiphany-c1c74c929c1e773d1f79d1b3bd0cf10bb572f8f9.tar.lz gsoc2013-epiphany-c1c74c929c1e773d1f79d1b3bd0cf10bb572f8f9.tar.xz gsoc2013-epiphany-c1c74c929c1e773d1f79d1b3bd0cf10bb572f8f9.tar.zst gsoc2013-epiphany-c1c74c929c1e773d1f79d1b3bd0cf10bb572f8f9.zip | |
Remove custom EphyToolbar in favor of a vanilla GtkToolbar
This allows us to stop using EggEditableToolbar here, we just load a
normal toolbar from GtkUIManager in EphyWindow. The special toolbar
actions and methods have been moved to EphyWindow too, mostly in a
mechanical fashion (probably some simplifications are possible).
The code in the bookmarks UI that depended on EphyToolbar has been #if
zeroed instead of porting it, since it will go away in the near future
too.
https://bugzilla.gnome.org/show_bug.cgi?id=664483
Diffstat (limited to 'data/ui/epiphany-ui.xml')
| -rw-r--r-- | data/ui/epiphany-ui.xml | 14 |
1 files changed, 8 insertions, 6 deletions
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"/> |