aboutsummaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorPhilip Langdale <philipl@mail.utexas.edu>2005-10-22 00:15:10 +0800
committerPhilip Langdale <philipl@src.gnome.org>2005-10-22 00:15:10 +0800
commite5bda8ab43ca8f63376714a00dea3228ada16a9e (patch)
tree2bba75a47a2a10cded18cc6785177133eb9f2a92 /data
parent8e4b79936d79e1fb33947fbfbea1f69141488790 (diff)
downloadgsoc2013-epiphany-e5bda8ab43ca8f63376714a00dea3228ada16a9e.tar
gsoc2013-epiphany-e5bda8ab43ca8f63376714a00dea3228ada16a9e.tar.gz
gsoc2013-epiphany-e5bda8ab43ca8f63376714a00dea3228ada16a9e.tar.bz2
gsoc2013-epiphany-e5bda8ab43ca8f63376714a00dea3228ada16a9e.tar.lz
gsoc2013-epiphany-e5bda8ab43ca8f63376714a00dea3228ada16a9e.tar.xz
gsoc2013-epiphany-e5bda8ab43ca8f63376714a00dea3228ada16a9e.tar.zst
gsoc2013-epiphany-e5bda8ab43ca8f63376714a00dea3228ada16a9e.zip
Point main menu UI at toolbar actions. Don't try and change the state of
2005-10-21 Philip Langdale <philipl@mail.utexas.edu> * data/ui/epiphany-ui.xml: Point main menu UI at toolbar actions. * src/ephy-lockdown.c: (update_window): Don't try and change the state of the now non-existent menu specific actions. * src/ephy-toolbar.c (ephy_toolbar_set_window): Sync up toolbar actions so that they will appear in menus to be identical to the old menu specific actions. This just means adding accelerators and shortcuts and adjusting tooltip text. * src/ephy-window.c (sync_tab_navigation): Remove the menu specific actions and consequently, don't try to manipulate them. * src/window-commands.c * src/window-commands.h: (window_cmd_go_up): Remove unused callback.
Diffstat (limited to 'data')
-rw-r--r--data/ui/epiphany-ui.xml22
1 files changed, 11 insertions, 11 deletions
diff --git a/data/ui/epiphany-ui.xml b/data/ui/epiphany-ui.xml
index 1e30279c5..0bf29d3de 100644
--- a/data/ui/epiphany-ui.xml
+++ b/data/ui/epiphany-ui.xml
@@ -58,9 +58,9 @@
</menu>
<menu name="GoMenu" action="Go">
- <menuitem name="GoBackMenu" action="GoBack"/>
- <menuitem name="GoForwardMenu" action="GoForward"/>
- <menuitem name="GoUpMenu" action="GoUp"/>
+ <menuitem name="GoBackMenu" action="NavigationBack"/>
+ <menuitem name="GoForwardMenu" action="NavigationForward"/>
+ <menuitem name="GoUpMenu" action="NavigationUp"/>
<separator name="GoSep1"/>
<menuitem name="GoHomeMenu" action="GoHome"/>
<menuitem name="GoHistoryMenu" action="GoHistory"/>
@@ -109,8 +109,8 @@
</popup>
<popup name="EphyDocumentPopup" action="PopupAction">
- <menuitem name="GoBackDP" action="GoBack"/>
- <menuitem name="GoForwardDP" action="GoForward"/>
+ <menuitem name="GoBackDP" action="NavigationBack"/>
+ <menuitem name="GoForwardDP" action="NavigationForward"/>
<menuitem name="GoReloadDP" action="ViewReload"/>
<separator name="DPSep1"/>
<menuitem name="EditCopyDP" action="EditCopy"/>
@@ -125,8 +125,8 @@
</popup>
<popup name="EphyFullscreenDocumentPopup" action="PopupAction">
- <menuitem name="GoBackFSDP" action="GoBack"/>
- <menuitem name="GoForwardFSDP" action="GoForward"/>
+ <menuitem name="GoBackFSDP" action="NavigationBack"/>
+ <menuitem name="GoForwardFSDP" action="NavigationForward"/>
<menuitem name="GoReloadFSDP" action="ViewReload"/>
<separator />
<menuitem name="EditCopyFSDP" action="EditCopy"/>
@@ -143,8 +143,8 @@
</popup>
<popup name="EphyFramedDocumentPopup" action="PopupAction">
- <menuitem name="GoBackFDP" action="GoBack"/>
- <menuitem name="GoForwardFDP" action="GoForward"/>
+ <menuitem name="GoBackFDP" action="NavigationBack"/>
+ <menuitem name="GoForwardFDP" action="NavigationForward"/>
<menuitem name="GoReloadFDP" action="ViewReload"/>
<separator />
<menuitem name="EditCopyFDP" action="EditCopy"/>
@@ -161,8 +161,8 @@
</popup>
<popup name="EphyFullscreenFramedDocumentPopup" action="PopupAction">
- <menuitem name="GoBackFSFDP" action="GoBack"/>
- <menuitem name="GoForwardFSFDP" action="GoForward"/>
+ <menuitem name="GoBackFSFDP" action="NavigationBack"/>
+ <menuitem name="GoForwardFSFDP" action="NavigationForward"/>
<menuitem name="GoReloadFSFDP" action="ViewReload"/>
<separator />
<menuitem name="EditCopyFSFDP" action="EditCopy"/>