Merge lp:~midori/midori/navigationAction into lp:midori

[Cris Dywan]

Split Back, Forward and friends into NavigationAction

[Danielle Foré (danrabbit)]

Gtk.Stock is deprecated. Relevant icon names are "go-next", "go-previous", "go-home", "media-skip-forward", "media-skip-backward", "view-refresh"

review: Needs Fixing

[lp:~midori/midori/navigationAction]

6950. By Cris Dywan on 2015-06-07

Merge lp:midori

6951. By Cris Dywan on 2015-06-07

Remaining NavigationAction subclasses

6952. By Cris Dywan on 2015-06-07

Coding style fixes

[Cris Dywan (kalikiana)]

In 10 minutes I couldn't find a way to use GLib.Icon with ThemedIcon.with_fallbacks so that icons show (at all) and hide as per style, so for now I'll stick to stock icons.

[lp:~midori/midori/navigationAction]

6953. By Cris Dywan on 2015-06-07

Related page boilerplate in NavigationAction

[Danielle Foré (danrabbit)]

For what it's worth, Gtk.Action is also deprecated :p The only thing I can really figure out so far is that the button itself is visible but the Gtk.Image packed into it is set visible = false.

[Cris Dywan (kalikiana)]

The slight predicament is that there's nothing replacing Gtk.Action. We need something with an icon, a short cut, sub menus and a label. We have Midori.ContextAction. But it still inherits from Gtk.Action because otherwise a lot of code would have to be changed for the sake of re-implementing the same functionality without existing API... and trying to get away from that you hit these very stupid time sink bugs where GTK+ doesn't work the same way if you use gicon, historical bugs never fixed in Gtk.Action and code that wasn't tested because, well, GNOME default apps are never used with non-recent GTK+ releases.

That said, what I would like to see is icon names on ContextAction that automatically append -symbolic, alternate icon names and an accelerators property (plural). I did the midori_browser_add_action method as a step towards that, but I just don't see it happening in one branch.

[Danielle Foré (danrabbit)]

Hrm accoring to valadoc, GLib.Action replaces it http://valadoc.org/#!api=gio-2.0/GLib.Action

Unmerged revisions

6953. By Cris Dywan on 2015-06-07

Related page boilerplate in NavigationAction

6952. By Cris Dywan on 2015-06-07

Coding style fixes

6951. By Cris Dywan on 2015-06-07

Remaining NavigationAction subclasses

6950. By Cris Dywan on 2015-06-07

Merge lp:midori

6949. By Cris Dywan on 2015-04-27

Split Back, Forward and friends into NavigationAction

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2015-06-03 02:05:28 +0000
+++ midori/midori-browser.c	2015-06-07 21:30:55 +0000
@@ -192,12 +192,6 @@
                                 GParamSpec*        pspec,
                                 MidoriBrowser*     browser);
 
-static void
-midori_browser_toolbar_popup_context_menu_history (MidoriBrowser* browser,
-                                                   GtkWidget* widget,
-                                                   gboolean back,
-                                                   gint x,
-                                                   gint y);
 void
 midori_panel_set_toolbar_style (MidoriPanel*    panel,
                                 GtkToolbarStyle style);
@@ -292,13 +286,6 @@
 {
     GtkAction* action;
 
-    _action_set_sensitive (browser, "Back", midori_view_can_go_back (view));
-    _action_set_sensitive (browser, "Forward", midori_tab_can_go_forward (MIDORI_TAB (view)));
-    _action_set_sensitive (browser, "Previous",
-        midori_view_get_previous_page (view) != NULL);
-    _action_set_sensitive (browser, "Next",
-        midori_view_get_next_page (view) != NULL);
-
     _action_set_sensitive (browser, "AddSpeedDial", !midori_view_is_blank (view));
     _action_set_sensitive (browser, "BookmarkAdd", !midori_view_is_blank (view));
     _action_set_sensitive (browser, "MailTo", !midori_view_is_blank (view));
@@ -314,22 +301,6 @@
     _action_set_sensitive (browser, "SourceViewDom",
         midori_tab_can_view_source (MIDORI_TAB (view)));
 
-    action = _action_by_name (browser, "NextForward");
-    if (midori_tab_can_go_forward (MIDORI_TAB (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);
-    }
-
     action = _action_by_name (browser, "Location");
     if (midori_tab_is_blank (MIDORI_TAB (view)))
     {
@@ -432,23 +403,6 @@
     action = _action_by_name (browser, "Location");
     midori_location_action_set_progress (MIDORI_LOCATION_ACTION (action), progress);
 
-    _action_set_sensitive (browser, "Reload", !loading);
-    _action_set_sensitive (browser, "Stop", loading);
-
-    action = _action_by_name (browser, "ReloadStop");
-    if (!loading)
-    {
-        g_object_set (action,
-                      "stock-id", GTK_STOCK_REFRESH,
-                      "tooltip", _("Reload the current page"), NULL);
-    }
-    else
-    {
-        g_object_set (action,
-                      "stock-id", GTK_STOCK_STOP,
-                      "tooltip", _("Stop loading the current page"), NULL);
-    }
-
     g_object_set (browser->throbber, "active", loading, "visible", loading, NULL);
 }
 
@@ -734,8 +688,6 @@
         const gchar* uri = midori_view_get_display_uri (view);
         GtkAction* action = _action_by_name (browser, "Location");
         midori_location_action_set_text (MIDORI_LOCATION_ACTION (action), uri);
-        _action_set_sensitive (browser, "Back", midori_view_can_go_back (view));
-        _action_set_sensitive (browser, "Forward", midori_tab_can_go_forward (MIDORI_TAB (view)));
         g_object_notify (G_OBJECT (browser), "uri");
     }
 }
@@ -2059,53 +2011,6 @@
     /* Nothing to do */
 }
 
-static void
-_update_tooltip_if_changed (GtkAction* action,
-                            const gchar* text)
-{
-    gchar *old;
-    g_object_get (action, "tooltip", &old, NULL);
-    if (g_strcmp0(old, text)) {
-        g_object_set (action,
-                      "tooltip", text, NULL);
-    }
-    g_free (old);
-}
-
-static void
-_update_reload_tooltip (GtkWidget*   widget,
-                        GdkEventKey* event,
-                        gboolean released)
-{
-    MidoriBrowser* browser = MIDORI_BROWSER (widget);
-
-    /* Update the reload/stop tooltip in case we are holding the hard refresh modifiers*/
-    GtkAction *reload_stop = _action_by_name (browser, "ReloadStop");
-    GtkAction *reload = _action_by_name (browser, "Reload");
-    GdkModifierType mask;
-    gdk_window_get_pointer (gtk_widget_get_window (widget), NULL, NULL, &mask);
-    const gchar *target;
-
-    if ( mask & GDK_SHIFT_MASK)
-    {
-        target = _("Reload page without caching");
-    }
-    else
-    {
-        target = _("Reload the current page");
-    }
-    _update_tooltip_if_changed (reload_stop, target);
-    _update_tooltip_if_changed (reload, target);
-}
-
-static gboolean
-midori_browser_key_release_event (GtkWidget*   widget,
-                                  GdkEventKey* event)
-{
-    _update_reload_tooltip (widget, event, TRUE);
-    return GTK_WIDGET_CLASS (midori_browser_parent_class)->key_release_event (widget, event);
-}
-
 static gboolean
 midori_browser_key_press_event (GtkWidget*   widget,
                                 GdkEventKey* event)
@@ -2115,7 +2020,6 @@
     GtkWidgetClass* widget_class;
     guint clean_state;
 
-    _update_reload_tooltip(widget, event, FALSE);
     /* Interpret Ctrl(+Shift)+Tab as tab switching for compatibility */
     if (midori_browser_get_nth_tab (browser, 1) != NULL
      && event->keyval == GDK_KEY_Tab
@@ -2156,18 +2060,15 @@
           && !webkit_web_view_can_paste_clipboard (WEBKIT_WEB_VIEW (focus)))
     {
         /* Space at the bottom of the page: Go to next page */
-        MidoriView* view = midori_view_get_for_widget (focus);
         GtkScrolledWindow* scrolled = GTK_SCROLLED_WINDOW (gtk_widget_get_parent (focus));
         GtkAdjustment* vadjust = gtk_scrolled_window_get_vadjustment (scrolled);
         if (gtk_adjustment_get_value (vadjust)
          == (gtk_adjustment_get_upper (vadjust) - gtk_adjustment_get_page_size (vadjust)))
         {
-            /* Duplicate here because the URI pointer might change */
-            gchar* uri = g_strdup (midori_view_get_next_page (view));
-            if (uri != NULL)
+            GtkAction* next = _action_by_name (browser, "Next");
+            if (gtk_action_get_sensitive (next))
             {
-                midori_view_set_uri (view, uri);
-                g_free (uri);
+                gtk_action_activate (next);
                 return TRUE;
             }
         }
@@ -2441,7 +2342,6 @@
 
     gtkwidget_class = GTK_WIDGET_CLASS (class);
     gtkwidget_class->key_press_event = midori_browser_key_press_event;
-    gtkwidget_class->key_release_event = midori_browser_key_release_event;
 
     gobject_class = G_OBJECT_CLASS (class);
     gobject_class->dispose = midori_browser_dispose;
@@ -3515,37 +3415,6 @@
 }
 
 static void
-_action_reload_stop_activate (GtkAction*     action,
-                              MidoriBrowser* browser)
-{
-    GtkWidget* view = midori_browser_get_current_tab (browser);
-    gchar* stock_id;
-    g_object_get (action, "stock-id", &stock_id, NULL);
-
-    /* Refresh or stop, depending on the stock id */
-    if (!strcmp (stock_id, GTK_STOCK_REFRESH))
-    {
-        GdkModifierType state = (GdkModifierType)0;
-        gint x, y;
-        GdkWindow* window;
-        gboolean from_cache = TRUE;
-
-        if (!strcmp (gtk_action_get_name (action), "ReloadUncached"))
-            from_cache = FALSE;
-        else if ((window = gtk_widget_get_window (GTK_WIDGET (browser))))
-        {
-            gdk_window_get_pointer (window, &x, &y, &state);
-            if (state & GDK_SHIFT_MASK)
-                from_cache = FALSE;
-        }
-        midori_view_reload (MIDORI_VIEW (view), from_cache);
-    }
-    else
-        midori_tab_stop_loading (MIDORI_TAB (view));
-    g_free (stock_id);
-}
-
-static void
 _action_zoom_activate (GtkAction*     action,
                        MidoriBrowser* browser)
 {
@@ -3792,129 +3661,6 @@
     g_free (stylesheet);
 }
 
-static gboolean
-_action_navigation_activate (GtkAction*     action,
-                             MidoriBrowser* browser)
-{
-    MidoriView* view;
-    GtkWidget* tab;
-    gchar* uri;
-    const gchar* name;
-    gboolean middle_click;
-
-    g_assert (GTK_IS_ACTION (action));
-
-    if (GPOINTER_TO_INT (g_object_get_data (G_OBJECT (action),
-                                            "midori-middle-click")))
-    {
-        middle_click = TRUE;
-        g_object_set_data (G_OBJECT (action),
-                           "midori-middle-click",
-                           GINT_TO_POINTER(0));
-    }
-    else
-        middle_click = FALSE;
-
-    tab = midori_browser_get_current_tab (browser);
-    view = MIDORI_VIEW (tab);
-    name = gtk_action_get_name (action);
-
-    if (!strcmp (name, "NextForward"))
-        name = midori_tab_can_go_forward (MIDORI_TAB (view)) ? "Forward" : "Next";
-
-    if (g_str_equal (name, "Back"))
-    {
-        if (middle_click)
-        {
-            WebKitWebView* web_view = WEBKIT_WEB_VIEW (midori_view_get_web_view (view));
-            #ifdef HAVE_WEBKIT2
-            WebKitBackForwardList* list = webkit_web_view_get_back_forward_list (web_view);
-            WebKitBackForwardListItem* item = webkit_back_forward_list_get_back_item (list);
-            const gchar* back_uri = webkit_back_forward_list_item_get_uri (item);
-            #else
-            WebKitWebBackForwardList* list = webkit_web_view_get_back_forward_list (web_view);
-            WebKitWebHistoryItem* item = webkit_web_back_forward_list_get_forward_item (list);
-            const gchar* back_uri = webkit_web_history_item_get_uri (item);
-            #endif
-
-            GtkWidget* new_view = midori_browser_add_uri (browser, back_uri);
-            midori_browser_set_current_tab_smartly (browser, new_view);
-        }
-        else
-            midori_view_go_back (view);
-
-        return TRUE;
-    }
-    else if (g_str_equal (name, "Forward"))
-    {
-        if (middle_click)
-        {
-            WebKitWebView* web_view = WEBKIT_WEB_VIEW (midori_view_get_web_view (view));
-            #ifdef HAVE_WEBKIT2
-            WebKitBackForwardList* list = webkit_web_view_get_back_forward_list (web_view);
-            WebKitBackForwardListItem* item = webkit_back_forward_list_get_forward_item (list);
-            const gchar* forward_uri = webkit_back_forward_list_item_get_uri (item);
-            #else
-            WebKitWebBackForwardList* list = webkit_web_view_get_back_forward_list (web_view);
-            WebKitWebHistoryItem* item = webkit_web_back_forward_list_get_forward_item (list);
-            const gchar* forward_uri = webkit_web_history_item_get_uri (item);
-            #endif
-
-            GtkWidget* new_view = midori_browser_add_uri (browser, forward_uri);
-            midori_browser_set_current_tab_smartly (browser, new_view);
-        }
-        else
-          midori_tab_go_forward (MIDORI_TAB (view));
-
-        return TRUE;
-    }
-    else if (g_str_equal (name, "Previous"))
-    {
-        /* Duplicate here because the URI pointer might change */
-        uri = g_strdup (midori_view_get_previous_page (view));
-
-        if (middle_click)
-        {
-            GtkWidget* new_view = midori_browser_add_uri (browser, uri);
-            midori_browser_set_current_tab_smartly (browser, new_view);
-        }
-        else
-            midori_view_set_uri (view, uri);
-
-        g_free (uri);
-        return TRUE;
-    }
-    else if (g_str_equal (name, "Next"))
-    {
-        /* Duplicate here because the URI pointer might change */
-        uri = g_strdup (midori_view_get_next_page (view));
-
-        if (middle_click)
-        {
-            GtkWidget* new_view = midori_browser_add_uri (browser, uri);
-            midori_browser_set_current_tab_smartly (browser, new_view);
-        }
-        else
-            midori_view_set_uri (view, uri);
-
-        g_free (uri);
-        return TRUE;
-    }
-    else if (g_str_equal (name, "Homepage"))
-    {
-        if (middle_click)
-        {
-            GtkWidget* new_view = midori_browser_add_uri (browser, "about:home");
-            midori_browser_set_current_tab_smartly (browser, new_view);
-        }
-        else
-            midori_view_set_uri (view, "about:home");
-
-        return TRUE;
-    }
-    return FALSE;
-}
-
 static void
 _action_location_activate (GtkAction*     action,
                            MidoriBrowser* browser)
@@ -4352,17 +4098,6 @@
                                         GtkAction*     action,
                                         MidoriBrowser* browser)
 {
-    const gchar* name = gtk_action_get_name (action);
-    gboolean back = !g_strcmp0 (name, "Back");
-    if (back
-     || g_str_has_suffix (name, "Forward"))
-    {
-        midori_browser_toolbar_popup_context_menu_history (
-            browser,
-            widget,
-            back, 0, 0);
-        return TRUE;
-    }
     return midori_browser_toolbar_popup_context_menu_cb (widget, 0, 0, 0, browser);
 }
 
@@ -4455,23 +4190,6 @@
     return FALSE;
 }
 
-static gboolean
-midori_browser_menu_item_middle_click_event_cb (GtkWidget*      toolitem,
-                                                GdkEventButton* event,
-                                                MidoriBrowser*  browser)
-{
-    if (MIDORI_EVENT_NEW_TAB (event))
-    {
-        GtkAction* action;
-
-        action = gtk_activatable_get_related_action (GTK_ACTIVATABLE (toolitem));
-        g_object_set_data (G_OBJECT (action), "midori-middle-click", GINT_TO_POINTER (1));
-
-        return _action_navigation_activate (action, browser);
-    }
-    return FALSE;
-}
-
 static void
 _action_bookmark_add_activate (GtkAction*     action,
                                MidoriBrowser* browser)
@@ -5305,18 +5023,6 @@
 
     { "View", NULL, N_("_View") },
     { "Toolbars", NULL, N_("_Toolbars") },
-    { "Reload", GTK_STOCK_REFRESH,
-        NULL, "<Ctrl>r",
-        N_("Reload the current page"), G_CALLBACK (_action_reload_stop_activate) },
-    { "ReloadUncached", GTK_STOCK_REFRESH,
-        N_("Reload page without caching"), "<Ctrl><Shift>r",
-        NULL, G_CALLBACK (_action_reload_stop_activate) },
-    { "Stop", GTK_STOCK_STOP,
-        NULL, "Escape",
-        N_("Stop loading the current page"), G_CALLBACK (_action_reload_stop_activate) },
-    { "ReloadStop", GTK_STOCK_STOP,
-        NULL, "",
-        N_("Reload the current page"), G_CALLBACK (_action_reload_stop_activate) },
     { "ZoomIn", GTK_STOCK_ZOOM_IN,
         NULL, "<Ctrl>plus",
         N_("Increase the zoom level"), G_CALLBACK (_action_zoom_activate) },
@@ -5356,26 +5062,6 @@
         NULL, G_CALLBACK (_action_readable_activate) },
 
     { "Go", NULL, N_("_Go") },
-    { "Back", GTK_STOCK_GO_BACK,
-        NULL, "<Alt>Left",
-        N_("Go back to the previous page"), G_CALLBACK (_action_navigation_activate) },
-    { "Forward", GTK_STOCK_GO_FORWARD,
-        NULL, "<Alt>Right",
-        N_("Go forward to the next page"), G_CALLBACK (_action_navigation_activate) },
-    { "Previous", GTK_STOCK_MEDIA_PREVIOUS,
-        NULL, "<Alt><Shift>Left",
-        /* i18n: Visit the previous logical page, ie. in a forum or blog */
-        N_("Go to the previous sub-page"), G_CALLBACK (_action_navigation_activate) },
-    { "Next", GTK_STOCK_MEDIA_NEXT,
-        NULL, "<Alt><Shift>Right",
-        /* i18n: Visit the following logical page, ie. in a forum or blog */
-        N_("Go to the next sub-page"), G_CALLBACK (_action_navigation_activate) },
-    { "NextForward", GTK_STOCK_MEDIA_NEXT,
-        N_("Next or Forward"), "",
-        N_("Go to the next sub-page or next page in history"), G_CALLBACK (_action_navigation_activate) },
-    { "Homepage", GTK_STOCK_HOME,
-        N_("_Homepage"), "<Alt>Home",
-        N_("Go to your homepage"), G_CALLBACK (_action_navigation_activate) },
     { "TrashEmpty", GTK_STOCK_CLEAR,
         N_("Empty Trash"), "",
         NULL, G_CALLBACK (_action_trash_empty_activate) },
@@ -5914,6 +5600,20 @@
     return FALSE;
 }
 
+static GtkAction*
+midori_browser_add_action (MidoriBrowser* browser,
+                           GType          type,
+                           const gchar*   accelerator)
+{
+    GtkAction* action = g_object_new (type, NULL);
+    g_return_val_if_fail (gtk_action_get_name (action) != NULL, action);
+    gtk_action_group_add_action_with_accel (browser->action_group, action, accelerator);
+    if (MIDORI_IS_NAVIGATION_ACTION (action))
+        g_object_bind_property (browser, "tab", action, "tab", 0);
+    g_object_unref (action);
+    return action;
+}
+
 static void
 midori_browser_init (MidoriBrowser* browser)
 {
@@ -5925,9 +5625,6 @@
     GError* error;
     GtkAction* action;
     GtkWidget* menuitem;
-    GtkWidget* homepage;
-    GtkWidget* back;
-    GtkWidget* forward;
     GtkWidget* hpaned;
     GtkWidget* vpaned;
     GtkWidget* scrolled;
@@ -5995,6 +5692,17 @@
     /* Hide the 'Dummy' which only holds otherwise unused actions */
     _action_set_visible (browser, "Dummy", FALSE);
 
+    midori_browser_add_action (browser, MIDORI_TYPE_BACK_ACTION, "<Alt>Left");
+    midori_browser_add_action (browser, MIDORI_TYPE_PREVIOUS_ACTION, "<Alt><Shift>Left");
+    midori_browser_add_action (browser, MIDORI_TYPE_FORWARD_ACTION, "<Alt>Right");
+    midori_browser_add_action (browser, MIDORI_TYPE_NEXT_ACTION, "<Alt><Shift>Right");
+    midori_browser_add_action (browser, MIDORI_TYPE_NEXT_FORWARD_ACTION, "");
+    midori_browser_add_action (browser, MIDORI_TYPE_HOMEPAGE_ACTION, "<Alt>Home");
+    midori_browser_add_action (browser, MIDORI_TYPE_STOP_ACTION, "Escape");
+    midori_browser_add_action (browser, MIDORI_TYPE_RELOAD_ACTION, "<Ctrl>r");
+    midori_browser_add_action (browser, MIDORI_TYPE_RELOAD_UNCACHED_ACTION, "<Ctrl><Shift>r");
+    midori_browser_add_action (browser, MIDORI_TYPE_RELOAD_STOP_ACTION, "");
+
     action = g_object_new (KATZE_TYPE_SEPARATOR_ACTION,
         "name", "Separator",
         "label", _("_Separator"),
@@ -6049,11 +5757,7 @@
         action, "<Ctrl>K");
     g_object_unref (action);
 
-    action = g_object_new (MIDORI_TYPE_PANED_ACTION,
-        "name", "LocationSearch",
-        NULL);
-    gtk_action_group_add_action (browser->action_group, action);
-    g_object_unref (action);
+    midori_browser_add_action (browser, MIDORI_TYPE_PANED_ACTION, "");
 
     action = g_object_new (KATZE_TYPE_ARRAY_ACTION,
         "name", "Trash",
@@ -6178,22 +5882,6 @@
     gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (
         gtk_ui_manager_get_widget (ui_manager, "/menubar/Go/Location")), NULL);
 
-    homepage = gtk_ui_manager_get_widget (ui_manager, "/menubar/Go/Homepage");
-    g_signal_connect (homepage, "button-press-event",
-        G_CALLBACK (midori_browser_menu_item_middle_click_event_cb), browser);
-    back = gtk_ui_manager_get_widget (ui_manager, "/menubar/Go/Back");
-    g_signal_connect (back, "button-press-event",
-        G_CALLBACK (midori_browser_menu_item_middle_click_event_cb), browser);
-    forward = gtk_ui_manager_get_widget (ui_manager, "/menubar/Go/Forward");
-    g_signal_connect (forward, "button-press-event",
-        G_CALLBACK (midori_browser_menu_item_middle_click_event_cb), browser);
-    forward = gtk_ui_manager_get_widget (ui_manager, "/menubar/Go/Previous");
-    g_signal_connect (forward, "button-press-event",
-        G_CALLBACK (midori_browser_menu_item_middle_click_event_cb), browser);
-    forward = gtk_ui_manager_get_widget (ui_manager, "/menubar/Go/Next");
-    g_signal_connect (forward, "button-press-event",
-        G_CALLBACK (midori_browser_menu_item_middle_click_event_cb), browser);
-
     _action_set_sensitive (browser, "EncodingCustom", FALSE);
     _action_set_visible (browser, "LastSession", FALSE);
 
@@ -6376,81 +6064,6 @@
                                     gtk_toolbar_style);
 }
 
-#ifndef HAVE_WEBKIT2
-static void
-midori_browser_toolbar_popup_context_menu_history_cb (GtkMenuItem* menu_item,
-                                                      MidoriBrowser* browser)
-{
-    gint steps = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (menu_item), "steps"));
-    MidoriView* view = MIDORI_VIEW (midori_browser_get_current_tab (browser));
-    midori_view_go_back_or_forward (view, steps);
-}
-#endif
-
-static void
-midori_browser_toolbar_popup_context_menu_history (MidoriBrowser* browser,
-                                                   GtkWidget* widget,
-                                                   gboolean back,
-                                                   gint x,
-                                                   gint y)
-{
-#ifndef HAVE_WEBKIT2
-    const gint step = back ? -1 : 1;
-    gint steps = step;
-    GtkWidget* menu;
-    WebKitWebBackForwardList* list;
-    WebKitWebHistoryItem* current_item;
-    WebKitWebHistoryItem* history_item;
-    WebKitWebHistoryItem* (*history_next)(WebKitWebBackForwardList*);
-    void (*history_action)(WebKitWebBackForwardList*);
-
-    list = webkit_web_view_get_back_forward_list (
-        WEBKIT_WEB_VIEW (midori_view_get_web_view (
-        MIDORI_VIEW (midori_browser_get_current_tab (browser)))));
-
-    if (!list)
-        return;
-
-    menu = gtk_menu_new ();
-
-    history_action = back ?
-        webkit_web_back_forward_list_go_back :
-        webkit_web_back_forward_list_go_forward;
-    history_next = back ?
-        webkit_web_back_forward_list_get_back_item :
-        webkit_web_back_forward_list_get_forward_item;
-    current_item = webkit_web_back_forward_list_get_current_item (list);
-
-    for (; (history_item = history_next (list)); history_action (list), steps += step)
-    {
-        const gchar* uri = webkit_web_history_item_get_uri (history_item);
-        GtkWidget* menu_item = gtk_image_menu_item_new_with_label (
-            webkit_web_history_item_get_title (history_item));
-        GdkPixbuf* pixbuf;
-        if ((pixbuf = midori_paths_get_icon (uri, widget)))
-        {
-            gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item),
-                gtk_image_new_from_pixbuf (pixbuf));
-            g_object_unref (pixbuf);
-        }
-        g_object_set_data (G_OBJECT (menu_item), "uri", (gpointer)uri);
-        g_object_set_data (G_OBJECT (menu_item), "steps", GINT_TO_POINTER (steps));
-        gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-        g_signal_connect (G_OBJECT (menu_item), "activate",
-            G_CALLBACK (midori_browser_toolbar_popup_context_menu_history_cb),
-            browser);
-        if (steps == (10 - 1))
-            break;
-    }
-
-    webkit_web_back_forward_list_go_to_item (list, current_item);
-    gtk_widget_show_all (menu);
-
-    katze_widget_popup (widget, GTK_MENU (menu), NULL,
-        KATZE_MENU_POSITION_LEFT);
-#endif
-}
-
 static void
 _midori_browser_update_settings (MidoriBrowser* browser)
 {
 
=== added file 'midori/midori-navigationaction.vala'
--- midori/midori-navigationaction.vala	1970-01-01 00:00:00 +0000
+++ midori/midori-navigationaction.vala	2015-06-07 21:30:55 +0000
@@ -0,0 +1,293 @@
+/*
+ Copyright (C) 2015 Christian Dywan <[e-mail]>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ See the file COPYING for the full license text.
+*/
+
+namespace Midori {
+    /* Back or forward action, with a submenu
+       Since: 0.6.0 */
+    protected abstract class NavigationAction : Gtk.Action {
+        protected string uri { get; set; }
+        protected double progress { get; set; }
+
+        public Midori.Tab? tab { get; set; }
+        public signal string? middle_click_uri ();
+        public signal Gtk.Menu? context_menu ();
+
+        Gtk.ToolButton? toolitem;
+        public override unowned Gtk.Widget create_tool_item () {
+            toolitem = new Gtk.ToolButton (null, null);
+            toolitem.icon_widget = create_icon (Gtk.IconSize.LARGE_TOOLBAR);
+            bind_property ("label", toolitem, "label");
+            bind_property ("tooltip", toolitem, "tooltip-text");
+            bind_property ("is-important", toolitem, "is-important");
+            // Connect to child because ToolItem blocks button-press-event
+            toolitem.get_child ().button_press_event.connect ((event) => {
+                // Ctrl+click or middle click
+                string? uri = event.button == 2
+                 || (event.button == 1 && (bool)(event.state & Gdk.ModifierType.CONTROL_MASK))
+                 ? middle_click_uri () : null;
+                if (uri != null) {
+                    Midori.Settings? settings = null;
+                    /* Midori.View.settings */
+                    tab.get ("settings", ref settings);
+                    GLib.Signal.emit_by_name (tab, "new-tab", uri, settings.open_tabs_in_the_background);
+                    return true;
+                }
+                Gtk.Menu? menu = event.button == 3 ? context_menu () : null;
+                if (menu != null) {
+                    menu.show ();
+                    menu.attach_to_widget (toolitem, null);
+                    menu.popup (null, null, null, 1, Gtk.get_current_event_time ());
+                    return true;
+                }
+                return false;
+            });
+            return toolitem;
+        }
+
+        construct {
+            notify["tab"].connect (tab_changed);
+        }
+
+        void tab_changed (ParamSpec pspec) {
+            tab.bind_property ("uri", this, "uri", 0);
+            tab.bind_property ("progress", this, "progress", 0);
+        }
+
+        string? related_page (string rel, string local) {
+#if HAVE_WEBKIT2
+            return null;
+#else
+            return null;
+#endif
+        }
+
+        string next_page () {
+            /* i18n: word stem of "next page" type links, case is not important */
+            return related_page ("next", _("next"));
+        }
+
+        string previous_page () {
+            /* i18n: word stem of "previous page" type links, case is not important */
+            return related_page ("prev", _("previous"));
+        }
+
+        protected bool can_go_next () {
+            return next_page () != null;
+        }
+
+        protected void go_next () {
+            tab.web_view.load_uri (next_page ());
+        }
+
+        protected void go_next_or_forward () {
+            if (tab.web_view.can_go_forward ())
+                tab.web_view.go_forward ();
+            else
+                go_next ();
+        }
+
+        protected bool can_go_previous () {
+            return previous_page () != null;
+        }
+
+        protected void go_previous () {
+            tab.web_view.load_uri (previous_page ());
+        }
+
+        GLib.Icon? scale_if_needed (GLib.Icon? icon) {
+            if (icon is Gdk.Pixbuf) {
+                var pixbuf = icon as Gdk.Pixbuf;
+                int icon_width = 16, icon_height = 16;
+                Gtk.icon_size_lookup (Gtk.IconSize.MENU, out icon_width, out icon_height);
+                if (pixbuf.width > icon_width || pixbuf.height > icon_height)
+                    return pixbuf.scale_simple (icon_width, icon_height, Gdk.InterpType.BILINEAR);
+            }
+            return icon;
+        }
+
+#if HAVE_WEBKIT2
+        protected Gtk.Menu? build_menu (List<weak WebKit.BackForwardListItem> items) {
+#else
+        protected Gtk.Menu? build_menu (List<weak WebKit.WebHistoryItem> items) {
+#endif
+            var menu = new Gtk.Menu ();
+            foreach (var item in items) {
+                var menuitem = new Gtk.ImageMenuItem.with_label (item.get_title ());
+                var icon = new Midori.URI.Icon (item.get_uri ());
+                menuitem.image = new Gtk.Image.from_gicon (scale_if_needed (icon), Gtk.IconSize.MENU);
+                menuitem.always_show_image = true;
+                menuitem.show_all ();
+                menuitem.activate.connect (() =>{ tab.web_view.load_uri (item.get_uri ()); });
+                menu.append (menuitem);
+            }
+            return menu;
+        }
+    }
+
+    public class BackAction : NavigationAction {
+        construct {
+            set ("name", "Back",
+                 "tooltip", _("Go back to the previous page"),
+                 "stock-id", Gtk.Stock.GO_BACK,
+                 "is-important", true);
+
+            bind_property ("uri", this, "sensitive", 0,
+                (binding, source, ref target) => { target = tab.web_view.can_go_back (); return true; });
+            activate.connect (() => { tab.web_view.go_back (); });
+            middle_click_uri.connect (() => { return tab.web_view.get_back_forward_list ().get_back_item ().get_uri (); });
+            context_menu.connect (() => { return build_menu (tab.web_view.get_back_forward_list ().get_back_list_with_limit (10)); });
+        }
+    }
+
+    public class PreviousAction : NavigationAction {
+        construct {
+            set ("name", "Previous",
+                 /* i18n: Visit the previous logical page, ie. in a forum or blog */
+                 "tooltip", _("Go to the previous sub-page"),
+                 "stock-id", Gtk.Stock.MEDIA_PREVIOUS);
+
+            bind_property ("uri", this, "sensitive", 0,
+                (binding, source, ref target) => { target = can_go_previous (); return true; });
+            activate.connect (() => { go_previous (); });
+            context_menu.connect (() => { return build_menu (tab.web_view.get_back_forward_list ().get_back_list_with_limit (10)); });
+        }
+    }
+
+    public class ForwardAction : NavigationAction {
+        construct {
+            set ("name", "Forward",
+                 "tooltip", _("Go forward to the next page"),
+                 "stock-id", Gtk.Stock.GO_FORWARD);
+
+            bind_property ("uri", this, "sensitive", 0,
+                (binding, source, ref target) => { target = tab.web_view.can_go_forward (); return true; });
+            activate.connect (() => { tab.web_view.go_forward (); });
+            middle_click_uri.connect (() => { return tab.web_view.get_back_forward_list ().get_forward_item ().get_uri (); });
+            context_menu.connect (() => { return build_menu (tab.web_view.get_back_forward_list ().get_forward_list_with_limit (10)); });
+        }
+    }
+
+    public class NextAction : NavigationAction {
+        construct {
+            set ("name", "Next",
+                 /* i18n: Visit the following logical page, ie. in a forum or blog */
+                 "tooltip", _("Go to the next sub-page"),
+                 "stock-id", Gtk.Stock.MEDIA_NEXT);
+
+            bind_property ("uri", this, "sensitive", 0,
+                (binding, source, ref target) => { target = can_go_next (); return true; });
+            activate.connect (() => { go_next (); });
+            context_menu.connect (() => { return build_menu (tab.web_view.get_back_forward_list ().get_forward_list_with_limit (10)); });
+        }
+    }
+
+    public class NextForwardAction : NavigationAction {
+        construct {
+            set ("name", "NextForward",
+                 "label", _("Next or Forward"));
+
+            bind_property ("uri", this, "sensitive", 0,
+                (binding, source, ref target) => {
+                target = (tab.web_view.can_go_forward () || can_go_next ());
+                stock_id = (can_go_next () ? Gtk.Stock.GO_FORWARD : Gtk.Stock.MEDIA_NEXT);
+                tooltip = (can_go_next () ? _("Go forward to the next page") : _("Go to the next sub-page"));
+                return true;
+            });
+            activate.connect (() => { go_next_or_forward (); });
+            context_menu.connect (() => { return build_menu (tab.web_view.get_back_forward_list ().get_forward_list_with_limit (10)); });
+        }
+    }
+
+    public class HomepageAction : NavigationAction {
+        construct {
+            set ("name", "Homepage",
+                 "label", _("_Homepage"),
+                 "tooltip", _("Go to your homepage"),
+                 "stock-id", Gtk.Stock.HOME);
+
+            activate.connect (() => { tab.web_view.load_uri ("about:home"); });
+            middle_click_uri.connect (() => { return "about:home"; });
+        }
+    }
+
+    public class StopAction : NavigationAction {
+        construct {
+            set ("name", "Stop",
+                 "tooltip",_("Stop loading the current page"),
+                 "stock-id", Gtk.Stock.STOP);
+
+            bind_property ("progress", this, "sensitive", 0,
+                (binding, source, ref target) =>{
+                target = progress > 0.0;
+                return true;
+            });
+            activate.connect (() => { tab.web_view.stop_loading ();  });
+        }
+    }
+
+    public class ReloadAction : NavigationAction {
+        construct {
+            set ("name", "Reload",
+                 "tooltip", _("Reload the current page"),
+                 "stock-id", Gtk.Stock.REFRESH);
+
+            bind_property ("progress", this, "sensitive", 0,
+                (binding, source, ref target) =>{
+                target = progress == 0.0;
+                return true;
+            });
+            activate.connect (() => { tab.web_view.reload ();  });
+            middle_click_uri.connect (() => { return tab.uri; });
+        }
+    }
+
+    public class ReloadUncachedAction : NavigationAction {
+        construct {
+            set ("name", "ReloadUncached",
+                 "tooltip", _("Reload page without caching"),
+                 "stock-id", Gtk.Stock.REFRESH);
+
+            bind_property ("progress", this, "sensitive", 0,
+                (binding, source, ref target) =>{
+                target = progress == 0.0;
+                return true;
+            });
+            activate.connect (() => { tab.web_view.reload_bypass_cache (); });
+            middle_click_uri.connect (() => { return tab.uri; });
+        }
+    }
+
+    public class ReloadStopAction : NavigationAction {
+        construct {
+            set ("name", "ReloadStop");
+
+            bind_property ("progress", this, "stock-id", 0,
+                (binding, source, ref target) => {
+                target = progress > 0.0 ? Gtk.Stock.STOP : Gtk.Stock.REFRESH;
+                tooltip = progress > 0.0 ? _("Stop loading the current page") : _("Reload the current page");
+                return true;
+            });
+            activate.connect (() => {
+                if (progress > 0.0)
+                    tab.web_view.stop_loading ();
+                else {
+                    int x, y, state;
+                    tab.get_window ().get_pointer (out x, out y, out state);
+                    if ((bool)(state & Gdk.ModifierType.SHIFT_MASK))
+                        tab.web_view.reload_bypass_cache ();
+                    else
+                        tab.web_view.reload ();
+                }
+            });
+            middle_click_uri.connect (() => { return tab.uri; });
+        }
+    }
+}
 
=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2015-03-23 11:33:24 +0000
+++ midori/midori-view.c	2015-06-07 21:30:55 +0000
@@ -4638,6 +4638,7 @@
  * Goes back or forward in history.
  *
  * Since: 0.4.5
+ * Deprecated: 0.6.0
  **/
 void
 midori_view_go_back_or_forward (MidoriView* view,
@@ -4722,6 +4723,7 @@
  * Return value: an URI, or %NULL
  *
  * Since: 0.2.3
+ * Deprecated: 0.6.0
  **/
 const gchar*
 midori_view_get_previous_page (MidoriView* view)
@@ -4741,6 +4743,7 @@
  * Return value: an URI, or %NULL
  *
  * Since: 0.2.3
+ * Deprecated: 0.6.0
  **/
 const gchar*
 midori_view_get_next_page (MidoriView* view)
 
=== modified file 'midori/midori-window.vala'
--- midori/midori-window.vala	2015-06-06 12:20:44 +0000
+++ midori/midori-window.vala	2015-06-07 21:30:55 +0000
@@ -85,9 +85,6 @@
 
         Gtk.ToolItem create_tool_item (Gtk.Action action) {
             var toolitem = action.create_tool_item () as Gtk.ToolItem;
-            /* Show label if button has no icon of any kind */
-            if (action.icon_name == null && action.stock_id == null && action.gicon == null)
-                toolitem.is_important = true;
             toolitem.get_child ().button_press_event.connect ((event) => {
                 return event.button == 3 && context_menu (toolitem, action); });
             if (name == "CompactMenu")
 
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2015-05-24 00:19:21 +0000
+++ po/POTFILES.in	2015-06-07 21:30:55 +0000
@@ -11,6 +11,7 @@
 midori/midori-database.vala
 midori/midori-extension.c
 midori/midori-locationaction.c
+midori/midori-navigationaction.vala
 midori/midori-panel.c
 midori/midori-settings.vala
 midori/midori-websettings.c