aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog19
-rw-r--r--data/ui/epiphany-ui.xml22
-rw-r--r--src/ephy-lockdown.c6
-rwxr-xr-xsrc/ephy-toolbar.c19
-rw-r--r--src/ephy-window.c17
-rw-r--r--src/window-commands.c14
-rw-r--r--src/window-commands.h3
7 files changed, 41 insertions, 59 deletions
diff --git a/ChangeLog b/ChangeLog
index be5c041cc..e2dd169ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+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.
+
2005-10-21 Christian Persch <chpe@cvs.gnome.org>
* lib/ephy-loader.c: (ephy_loader_get_object):
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"/>
diff --git a/src/ephy-lockdown.c b/src/ephy-lockdown.c
index 2495a7b46..5af6216b4 100644
--- a/src/ephy-lockdown.c
+++ b/src/ephy-lockdown.c
@@ -158,20 +158,14 @@ update_window (EphyWindow *window,
ephy_action_change_sensitivity_flags (action, LOCKDOWN_FLAG, disabled);
action = gtk_action_group_get_action (toolbar_action_group, "Location");
update_location_editable (window, action, !disabled);
- action = gtk_action_group_get_action (action_group, "GoUp");
- ephy_action_change_sensitivity_flags (action, LOCKDOWN_FLAG, disabled);
action = gtk_action_group_get_action (toolbar_action_group, "NavigationUp");
ephy_action_change_sensitivity_flags (action, LOCKDOWN_FLAG, disabled);
disabled = eel_gconf_get_boolean (CONF_LOCKDOWN_DISABLE_HISTORY);
action = gtk_action_group_get_action (action_group, "GoHistory");
ephy_action_change_sensitivity_flags (action, LOCKDOWN_FLAG, disabled);
- action = gtk_action_group_get_action (action_group, "GoBack");
- ephy_action_change_sensitivity_flags (action, LOCKDOWN_FLAG, disabled);
action = gtk_action_group_get_action (toolbar_action_group, "NavigationBack");
ephy_action_change_sensitivity_flags (action, LOCKDOWN_FLAG, disabled);
- action = gtk_action_group_get_action (action_group, "GoForward");
- ephy_action_change_sensitivity_flags (action, LOCKDOWN_FLAG, disabled);
action = gtk_action_group_get_action (toolbar_action_group, "NavigationForward");
ephy_action_change_sensitivity_flags (action, LOCKDOWN_FLAG, disabled);
diff --git a/src/ephy-toolbar.c b/src/ephy-toolbar.c
index 3b40c0b9c..6cf7f9fcb 100755
--- a/src/ephy-toolbar.c
+++ b/src/ephy-toolbar.c
@@ -248,9 +248,9 @@ ephy_toolbar_set_window (EphyToolbar *toolbar,
action = priv->actions[BACK_ACTION] =
g_object_new (EPHY_TYPE_NAVIGATION_ACTION,
"name", "NavigationBack",
- "label", _("Back"),
+ "label", _("_Back"),
"stock_id", GTK_STOCK_GO_BACK,
- "tooltip", _("Go back"),
+ "tooltip", _("Go to the previous visited page"),
/* this is the tooltip on the Back button's drop-down arrow, which will show
* a menu with all sites you can go 'back' to
*/
@@ -261,15 +261,16 @@ ephy_toolbar_set_window (EphyToolbar *toolbar,
NULL);
g_signal_connect_swapped (action, "open-link",
G_CALLBACK (ephy_link_open), toolbar);
- gtk_action_group_add_action (priv->action_group, action);
+ gtk_action_group_add_action_with_accel (priv->action_group, action,
+ "<alt>Left");
g_object_unref (action);
action = priv->actions[FORWARD_ACTION] =
g_object_new (EPHY_TYPE_NAVIGATION_ACTION,
"name", "NavigationForward",
- "label", _("Forward"),
+ "label", _("_Forward"),
"stock_id", GTK_STOCK_GO_FORWARD,
- "tooltip", _("Go forward"),
+ "tooltip", _("Go to the next visited page"),
/* this is the tooltip on the Forward button's drop-down arrow, which will show
* a menu with all sites you can go 'forward' to
*/
@@ -279,13 +280,14 @@ ephy_toolbar_set_window (EphyToolbar *toolbar,
NULL);
g_signal_connect_swapped (action, "open-link",
G_CALLBACK (ephy_link_open), toolbar);
- gtk_action_group_add_action (priv->action_group, action);
+ gtk_action_group_add_action_with_accel (priv->action_group, action,
+ "<alt>Right");
g_object_unref (action);
action = priv->actions[UP_ACTION] =
g_object_new (EPHY_TYPE_NAVIGATION_ACTION,
"name", "NavigationUp",
- "label", _("Up"),
+ "label", _("_Up"),
"stock_id", GTK_STOCK_GO_UP,
"tooltip", _("Go up one level"),
/* this is the tooltip on the Up button's drop-down arrow, which will show
@@ -297,7 +299,8 @@ ephy_toolbar_set_window (EphyToolbar *toolbar,
NULL);
g_signal_connect_swapped (action, "open-link",
G_CALLBACK (ephy_link_open), toolbar);
- gtk_action_group_add_action (priv->action_group, action);
+ gtk_action_group_add_action_with_accel (priv->action_group, action,
+ "<alt>Up");
g_object_unref (action);
/* FIXME: I'm still waiting for the exact term to
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 553928d42..9d9948e2b 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -234,15 +234,6 @@ static const GtkActionEntry ephy_menu_entries [] = {
/* Go menu */
- { "GoBack", GTK_STOCK_GO_BACK, N_("_Back"), "<alt>Left",
- N_("Go to the previous visited page"),
- G_CALLBACK (window_cmd_go_back) },
- { "GoForward", GTK_STOCK_GO_FORWARD, N_("_Forward"), "<alt>Right",
- N_("Go to the next visited page"),
- G_CALLBACK (window_cmd_go_forward) },
- { "GoUp", GTK_STOCK_GO_UP, N_("_Up"), "<alt>Up",
- N_("Go up one level"),
- G_CALLBACK (window_cmd_go_up) },
{ "GoLocation", NULL, N_("_Location..."), "<control>L",
N_("Go to a specified location"),
G_CALLBACK (window_cmd_go_location) },
@@ -1374,14 +1365,6 @@ sync_tab_navigation (EphyTab *tab,
forward = TRUE;
}
- action_group = window->priv->action_group;
- action = gtk_action_group_get_action (action_group, "GoUp");
- ephy_action_change_sensitivity_flags (action, SENS_FLAG_NAVIGATION, !up);
- action = gtk_action_group_get_action (action_group, "GoBack");
- ephy_action_change_sensitivity_flags (action, SENS_FLAG_NAVIGATION, !back);
- action = gtk_action_group_get_action (action_group, "GoForward");
- ephy_action_change_sensitivity_flags (action, SENS_FLAG_NAVIGATION, !forward);
-
ephy_toolbar_set_navigation_actions (window->priv->toolbar,
back, forward, up);
}
diff --git a/src/window-commands.c b/src/window-commands.c
index 6d555857f..0b5a5fc8d 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -110,20 +110,6 @@ window_cmd_go_back (GtkAction *action,
}
void
-window_cmd_go_up (GtkAction *action,
- EphyWindow *window)
-{
- EphyEmbed *embed;
-
- embed = ephy_window_get_active_embed (window);
- g_return_if_fail (embed != NULL);
-
- gtk_widget_grab_focus (GTK_WIDGET (embed));
-
- ephy_embed_go_up (embed);
-}
-
-void
window_cmd_file_send_to (GtkAction *action,
EphyWindow *window)
{
diff --git a/src/window-commands.h b/src/window-commands.h
index 4669b3971..d74a54fab 100644
--- a/src/window-commands.h
+++ b/src/window-commands.h
@@ -37,9 +37,6 @@ void window_cmd_go_forward (GtkAction *action,
void window_cmd_go_location (GtkAction *action,
EphyWindow *window);
-void window_cmd_go_up (GtkAction *action,
- EphyWindow *window);
-
void window_cmd_go_myportal (GtkAction *action,
EphyWindow *window);
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-10 00:17:17 +0800