debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Introduce a merged NextForward akin to StopReload

Browse source 
Fixes: https://bugs.launchpad.net/midori/+bug/823736
This commit is contained in:
Christian Dywan 2012-08-19 15:32:48 +02:00
parent 2e94548d70
commit 544dc08760
2 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
midori/midori-browser.c
View file

@ -320,16 +320,11 @@ _midori_browser_update_interface (MidoriBrowser* browser,
gboolean loading = midori_view_get_load_status (view) != MIDORI_LOAD_FINISHED; gboolean loading = midori_view_get_load_status (view) != MIDORI_LOAD_FINISHED;
gboolean can_reload = midori_view_can_reload (view); gboolean can_reload = midori_view_can_reload (view);
GtkAction* action; GtkAction* action;
GSList* proxies;
_action_set_sensitive (browser, "Reload", can_reload); _action_set_sensitive (browser, "Reload", can_reload);
_action_set_sensitive (browser, "Stop", can_reload && loading); _action_set_sensitive (browser, "Stop", can_reload && loading);
_action_set_sensitive (browser, "Back", midori_view_can_go_back (view)); _action_set_sensitive (browser, "Back", midori_view_can_go_back (view));
_action_set_sensitive (browser, "Forward", midori_view_can_go_forward (view)); _action_set_sensitive (browser, "Forward", midori_view_can_go_forward (view));
proxies = gtk_action_get_proxies (_action_by_name (browser, "Forward"));
for (; proxies != NULL; proxies = g_slist_next (proxies))
if (GTK_IS_TOOL_ITEM (proxies->data))
gtk_widget_set_visible (proxies->data, midori_view_can_go_forward (view));
_action_set_sensitive (browser, "Previous", _action_set_sensitive (browser, "Previous",
midori_view_get_previous_page (view) != NULL); midori_view_get_previous_page (view) != NULL);
_action_set_sensitive (browser, "Next", _action_set_sensitive (browser, "Next",
@ -373,6 +368,23 @@ _midori_browser_update_interface (MidoriBrowser* browser,
"tooltip", _("Stop loading the current page"), NULL); "tooltip", _("Stop loading the current page"), NULL);
} }
action = _action_by_name (browser, "NextForward");
if (midori_view_can_go_forward (view))
{
g_object_set (action,
"stock-id", GTK_STOCK_GO_FORWARD,
"tooltip", _("Go forward to the next page"),
"sensitive", TRUE, NULL);
}
else
{
g_object_set (action,
"stock-id", GTK_STOCK_MEDIA_NEXT,
"tooltip", _("Go to the next sub-page"),
"sensitive", midori_view_get_next_page (view) != NULL, NULL);
}
#if HAVE_HILDON #if HAVE_HILDON
#if HILDON_CHECK_VERSION (2, 2, 0) #if HILDON_CHECK_VERSION (2, 2, 0)
hildon_gtk_window_set_progress_indicator (GTK_WINDOW (browser), loading); hildon_gtk_window_set_progress_indicator (GTK_WINDOW (browser), loading);
@ -2999,7 +3011,7 @@ midori_browser_get_toolbar_actions (MidoriBrowser* browser)
static const gchar* actions[] = { static const gchar* actions[] = {
"WindowNew", "TabNew", "Open", "SaveAs", "Print", "Find", "WindowNew", "TabNew", "Open", "SaveAs", "Print", "Find",
"Fullscreen", "Preferences", "Window", "Bookmarks", "Fullscreen", "Preferences", "Window", "Bookmarks",
"ReloadStop", "ZoomIn", "TabClose", "ReloadStop", "ZoomIn", "TabClose", "NextForward",
"ZoomOut", "Separator", "Back", "Forward", "Homepage", "ZoomOut", "Separator", "Back", "Forward", "Homepage",
"Panel", "Trash", "Search", "BookmarkAdd", "Previous", "Next", NULL }; "Panel", "Trash", "Search", "BookmarkAdd", "Previous", "Next", NULL };
@ -3882,9 +3894,11 @@ _action_navigation_activate (GtkAction* action,
return FALSE; return FALSE;
view = MIDORI_VIEW (tab); view = MIDORI_VIEW (tab);
name = gtk_action_get_name (action); name = gtk_action_get_name (action);
if (!strcmp (name, "NextForward"))
name = midori_view_can_go_forward (view) ? "Forward" : "Next";
if (g_str_equal (name, "Back")) if (g_str_equal (name, "Back"))
{ {
if (middle_click) if (middle_click)
@ -5667,7 +5681,7 @@ static const GtkActionEntry entries[] =
NULL, "Escape", 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, "",
N_("Reload the current page"), G_CALLBACK (_action_reload_stop_activate) }, N_("Reload the current page"), G_CALLBACK (_action_reload_stop_activate) },
{ "ZoomIn", GTK_STOCK_ZOOM_IN, { "ZoomIn", GTK_STOCK_ZOOM_IN,
NULL, "<Ctrl>plus", NULL, "<Ctrl>plus",
@ -5719,6 +5733,9 @@ static const GtkActionEntry entries[] =
NULL, "<Alt><Shift>Right", NULL, "<Alt><Shift>Right",
/* i18n: Visit the following logical page, ie. in a forum or blog */ /* i18n: Visit the following logical page, ie. in a forum or blog */
N_("Go to the next sub-page"), G_CALLBACK (_action_navigation_activate) }, N_("Go to the next sub-page"), G_CALLBACK (_action_navigation_activate) },
{ "NextForward", GTK_STOCK_MEDIA_NEXT,
NULL, "",
N_("Go to the next sub-page"), G_CALLBACK (_action_navigation_activate) },
{ "Homepage", GTK_STOCK_HOME, { "Homepage", GTK_STOCK_HOME,
N_("_Homepage"), "<Alt>Home", N_("_Homepage"), "<Alt>Home",
N_("Go to your homepage"), G_CALLBACK (_action_navigation_activate) }, N_("Go to your homepage"), G_CALLBACK (_action_navigation_activate) },

2
midori/midori-websettings.c
View file

@ -547,7 +547,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
"toolbar-items", "toolbar-items",
_("Toolbar Items"), _("Toolbar Items"),
_("The items to show on the toolbar"), _("The items to show on the toolbar"),
"TabNew,Back,Forward,Next,ReloadStop,BookmarkAdd,Location,Search,Trash,CompactMenu", "TabNew,Back,NextForward,ReloadStop,BookmarkAdd,Location,Search,Trash,CompactMenu",
flags)); flags));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,