Fix Reload/ Stop menu items.

The menu items were sensitive in reversed logic and the Stop item
had the icon and accelerator of the Reload item.

Now the sensitivity is fixed and the Stop item is Stop again.
This commit is contained in:
Christian Dywan 2008-04-03 23:33:32 +02:00
parent f4abaeb00f
commit 793b030d3a

View file

@ -174,8 +174,8 @@ _midori_browser_update_interface (MidoriBrowser* browser)
webkit_web_view_can_go_back (WEBKIT_WEB_VIEW (web_view))); webkit_web_view_can_go_back (WEBKIT_WEB_VIEW (web_view)));
_action_set_sensitive (browser, "Forward", _action_set_sensitive (browser, "Forward",
webkit_web_view_can_go_forward (WEBKIT_WEB_VIEW (web_view))); webkit_web_view_can_go_forward (WEBKIT_WEB_VIEW (web_view)));
_action_set_sensitive (browser, "Reload", loading); _action_set_sensitive (browser, "Reload", !loading);
_action_set_sensitive (browser, "Stop", !loading); _action_set_sensitive (browser, "Stop", loading);
GtkAction* action = gtk_action_group_get_action (priv->action_group, GtkAction* action = gtk_action_group_get_action (priv->action_group,
"ReloadStop"); "ReloadStop");
@ -1930,8 +1930,8 @@ static const GtkActionEntry entries[] = {
{ "Reload", GTK_STOCK_REFRESH, { "Reload", GTK_STOCK_REFRESH,
NULL, "<Ctrl>r", NULL, "<Ctrl>r",
N_("Reload the current page"), G_CALLBACK (_action_reload_stop_activate) }, N_("Reload the current page"), G_CALLBACK (_action_reload_stop_activate) },
{ "Stop", GTK_STOCK_REFRESH, { "Stop", GTK_STOCK_STOP,
NULL, "<Ctrl>r", NULL, "Escape",
N_("Stop loading the current page"), G_CALLBACK (_action_reload_stop_activate) }, N_("Stop loading the current page"), G_CALLBACK (_action_reload_stop_activate) },
{ "ReloadStop", GTK_STOCK_STOP, { "ReloadStop", GTK_STOCK_STOP,
NULL, "<Ctrl>r", NULL, "<Ctrl>r",