Merge lp:~midori/midori/headerBarSupport into lp:midori

[Cris Dywan]

Implement Midori.Window class with toolbar/ headerbar

[Danielle Foré (danrabbit)]

Packing the urlbar into the title are looks weird and means autocompletion results just aren't legible. I think it would make more sense to just pack it left and expand like you'd do in a regular toolbar.

Since the "Toolbar Editor" extension exposes itself through right clicking on the toolbar, there's now no way to use this extension. It should probably get a little settings icon like other extensions with settings have

review: Needs Fixing

[lp:~midori/midori/headerBarSupport]

6958. By Cris Dywan on 2015-05-24

Fix position of extra actions and paned children

6959. By Cris Dywan on 2015-05-25

Implement search entry width correctly

6960. By Cris Dywan on 2015-05-25

Use max width instead of width for URL entry

[Cris Dywan (kalikiana)]

I'm not sure if I understand the comments fully - I changed the property used to size the URL entry so it expands fully. Is that what you meant by packing?

Right-click on buttons works perfectly for me, like with the classic toolbar, you get the menu to toggle toolbars and the toolbar editor is the last item in it.

[Danielle Foré (danrabbit)]

URL bar looks right here now :)

Can you possibly add a 1px top and bottom margin to the url entry? It looks like without that box-shadow is clipped.

Ah, if you right click the items themselves you'll get the menu. But if you click the headerbar itself, you only get the window menu. I guess I can file this separately. I personally think it's a little counter-intuitive.

I'm not sure how much you care about the separate web search these days. I added it just for kicks and it's really tiny. Also, there's no pane handle to resize like there used to be.

[lp:~midori/midori/headerBarSupport]

6961. By Cris Dywan on 2015-05-31

Add and bottom margin to headerbar title

[Danielle Foré (danrabbit)]

Hey Christian, the last revision didn't seem to fix the issue. The space needs to be reserved for the entry itself. So instead of headerbar.custom_title, you would need to use (widget as Gtk.Entry) directly.

[lp:~midori/midori/headerBarSupport]

6962. By Cris Dywan on 2015-05-31

No toolbar style without a toolbar

6963. By Cris Dywan on 2015-05-31

Use original order of actions in HeaderBar

6964. By Cris Dywan on 2015-05-31

Pixel margins for the entry

[Cris Dywan (kalikiana)]

Right-click to edit has always been on the buttons themselves. Also it's not officially possible to extend the headerbar context menu - so I'd say that should be discussed and dealt with separately.

[Cris Dywan (kalikiana)]

Regarding resizing of web search: I'm not sure if it's worth porting the existing design as-is because it can only work if both entries sit in the headerbar which seems conceptually wrong. If interest is there it can certainly be looked into later.

[Danielle Foré (danrabbit)]

Yeah I'm of the opinion still that the separate web search should just be removed since that functionality is already provided in the urlbar. Just wanted to test possible cases :)

I agree the right click menu bit can/should be a different issue.

[Danielle Foré (danrabbit)]

Crashes when enabling "statusbar features" extension:

ERROR:/home/daniel/Projects/headerBarSupport/extensions/statusbar-features.c:59:statusbar_features_toolbar_notify_toolbar_style_cb: code should not be reached

[Danielle Foré (danrabbit)]

Thoughts on moving the extensions area of the toolbar to the right? This would seem to follow with Chrome and Firefox

[lp:~midori/midori/headerBarSupport]

6965. By Cris Dywan on 2015-06-03

Let statusbar features handle toolbar not being toolbar

6966. By Cris Dywan on 2015-06-03

Always put extra actions on the headerbar's tail

[Danielle Foré (danrabbit)]

Everything working as expected here :D

review: Approve (ux, testing)

[Cody Garver (codygarver)]

I made some comments throughout the diff about code style inconsistencies

Be sure to update the translation template after you commit new string(s) to trunk

[lp:~midori/midori/headerBarSupport]

6967. By Cris Dywan on 2015-06-06

Fix spacing in lambdas

6968. By Cris Dywan on 2015-06-06

Only connect buttons to toolbar style

[Paweł Forysiuk (tuxator)]

review: Approve

=== modified file 'extensions/adblock/extension.vala'
--- extensions/adblock/extension.vala	2015-04-18 21:38:47 +0000
+++ extensions/adblock/extension.vala	2015-06-06 12:33:01 +0000
@@ -115,8 +115,6 @@
                 browser_removed (browser);
             app.add_browser.disconnect (browser_added);
             app.remove_browser.disconnect (browser_removed);
-            foreach (var button in status_icon.toggle_buttons)
-                button.destroy ();
         }
 
         void browser_added (Midori.Browser browser) {
@@ -125,9 +123,7 @@
             browser.add_tab.connect (tab_added);
             browser.remove_tab.connect (tab_removed);
 
-            var toggle_button = status_icon.add_button ();
-            browser.statusbar.pack_end (toggle_button, false, false, 3);
-            toggle_button.show ();
+            browser.add_action (status_icon);
         }
 
         void browser_removed (Midori.Browser browser) {
@@ -135,6 +131,7 @@
                 tab_removed (tab);
             browser.add_tab.disconnect (tab_added);
             browser.remove_tab.disconnect (tab_removed);
+            browser.remove_action (status_icon);
         }
 
         void tab_added (Midori.View view) {

=== modified file 'extensions/adblock/widgets.vala'
--- extensions/adblock/widgets.vala	2014-04-03 17:07:04 +0000
+++ extensions/adblock/widgets.vala	2015-06-06 12:33:01 +0000
@@ -13,99 +13,65 @@
 namespace Adblock {
 
 
-    public class StatusIcon {
+    public class StatusIcon : Midori.ContextAction  {
         Config config;
         SubscriptionManager manager;
         public State state;
         public bool debug_element_toggled;
-        public List<IconButton> toggle_buttons;
 
         public StatusIcon (Adblock.Config config, SubscriptionManager manager) {
+            GLib.Object (name: "AdblockStatusMenu");
+
             this.config = config;
             this.manager = manager;
             this.debug_element_toggled = false;
-        }
-
-        public void set_state (Adblock.State state) {
-            this.state = state;
-            update_buttons ();
-        }
-
-        public class IconButton : Gtk.Button {
-            Gtk.Image icon;
-
-            public IconButton () {
-                icon = new Gtk.Image ();
-                add (icon);
-                icon.show ();
-            }
-
-            public void set_status (string status) {
-                icon.set_from_file (Midori.Paths.get_res_filename ("adblock/%s.png".printf (status)));
-            }
-        }
-
-        public IconButton add_button () {
-            var button = new IconButton ();
-            button.set_status (config.enabled ? "enabled" : "disabled");
-            button.clicked.connect (icon_clicked);
-            button.destroy.connect (()=> { toggle_buttons.remove (button); });
-            toggle_buttons.append (button);
-            return button;
-        }
-
-        public void update_buttons () {
-            string state = "";
-            foreach (var toggle_button in toggle_buttons) {
-                if (this.state == State.BLOCKED) {
-                    toggle_button.set_status ("blocked");
-                    state = _("Blocking");
-                }
-                if (this.state == State.ENABLED) {
-                    toggle_button.set_status ("enabled");
-                    state = _("Enabled");
-                }
-                if (this.state == State.DISABLED) {
-                    toggle_button.set_status ("disabled");
-                    state = _("Disabled");
-                }
-                toggle_button.set_tooltip_text (_("Adblock state: %s").printf (state));
-            }
-        }
-
-        public void icon_clicked (Gtk.Button toggle_button) {
-            var menu = new Gtk.Menu ();
-
-            var menuitem = new Gtk.ImageMenuItem.with_label (_("Preferences"));
-            var image = new Gtk.Image.from_stock (Gtk.STOCK_PREFERENCES, Gtk.IconSize.MENU);
-            menuitem.always_show_image = true;
-            menuitem.set_image (image);
-            menuitem.activate.connect (() => {
+
+            var item = new Midori.ContextAction ("Preferences",
+                _("Preferences"), null, Gtk.STOCK_PREFERENCES);
+            item.activate.connect (() => {
                 manager.add_subscription (null);
             });
-            menu.append (menuitem);
-
-            var separator = new Gtk.SeparatorMenuItem ();
-            menu.append (separator);
-
-            var checkitem = new Gtk.CheckMenuItem.with_label (_("Disable"));
+            add (item);
+
+            add (null);
+
+            var checkitem = new Gtk.ToggleAction ("Disable", _("Disable"), null, null);
             checkitem.set_active (!config.enabled);
             checkitem.toggled.connect (() => {
                 config.enabled = !checkitem.active;
                 set_state (config.enabled ? Adblock.State.ENABLED : Adblock.State.DISABLED);
             });
-            menu.append (checkitem);
+            add (checkitem);
 
-            var hideritem = new Gtk.CheckMenuItem.with_label (_("Display hidden elements"));
+            var hideritem = new Gtk.ToggleAction ("HiddenElements",
+                _("Display hidden elements"), null, null);
             hideritem.set_active (debug_element_toggled);
             hideritem.toggled.connect (() => {
                 this.debug_element_toggled = hideritem.active;
             });
-            menu.append (hideritem);
-
-            menu.show_all ();
-            menu.attach_to_widget (toggle_button, null);
-            menu.popup (null, null, null, 1, Gtk.get_current_event_time ());
+            add (hideritem);
+            set_status (config.enabled ? "enabled" : "disabled");
+        }
+
+        void set_status (string status) {
+            gicon = new GLib.FileIcon (File.new_for_path (
+                Midori.Paths.get_res_filename ("adblock/%s.png".printf (status))));
+        }
+
+        public void set_state (Adblock.State state) {
+            this.state = state;
+
+            if (this.state == State.BLOCKED) {
+                set_status ("blocked");
+                tooltip = _("Blocking");
+            } else if (this.state == State.ENABLED) {
+                set_status ("enabled");
+                tooltip = _("Enabled");
+            } else if (this.state == State.DISABLED) {
+                set_status ("disabled");
+                tooltip = _("Disabled");
+            } else
+                assert_not_reached ();
         }
     }
 

=== modified file 'extensions/statusbar-features.c'
--- extensions/statusbar-features.c	2013-10-30 00:05:40 +0000
+++ extensions/statusbar-features.c	2015-06-06 12:33:01 +0000
@@ -153,19 +153,13 @@
         image = gtk_image_new_from_stock (STOCK_IMAGE, GTK_ICON_SIZE_MENU);
         gtk_button_set_image (GTK_BUTTON (button), image);
         gtk_widget_set_tooltip_text (button, _("Load images automatically"));
-        statusbar_features_toolbar_notify_toolbar_style_cb (toolbar, NULL, button);
-        g_signal_connect (toolbar, "notify::toolbar-style",
-            G_CALLBACK (statusbar_features_toolbar_notify_toolbar_style_cb), button);
     }
-    if (!strcmp (property, "enable-javascript"))
+    else if (!strcmp (property, "enable-javascript"))
     {
         g_object_set_data (G_OBJECT (button), "feature-label", _("Scripts"));
         image = gtk_image_new_from_stock (STOCK_SCRIPT, GTK_ICON_SIZE_MENU);
         gtk_button_set_image (GTK_BUTTON (button), image);
         gtk_widget_set_tooltip_text (button, _("Enable scripts"));
-        statusbar_features_toolbar_notify_toolbar_style_cb (toolbar, NULL, button);
-        g_signal_connect (toolbar, "notify::toolbar-style",
-            G_CALLBACK (statusbar_features_toolbar_notify_toolbar_style_cb), button);
     }
     else if (!strcmp (property, "enable-plugins"))
     {
@@ -175,6 +169,9 @@
         image = gtk_image_new_from_stock (MIDORI_STOCK_PLUGINS, GTK_ICON_SIZE_MENU);
         gtk_button_set_image (GTK_BUTTON (button), image);
         gtk_widget_set_tooltip_text (button, _("Enable Netscape plugins"));
+    }
+    if (GTK_IS_TOOLBAR (toolbar) && GTK_IS_BUTTON (button))
+    {
         statusbar_features_toolbar_notify_toolbar_style_cb (toolbar, NULL, button);
         g_signal_connect (toolbar, "notify::toolbar-style",
             G_CALLBACK (statusbar_features_toolbar_notify_toolbar_style_cb), button);

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2015-04-28 22:01:05 +0000
+++ midori/midori-browser.c	2015-06-06 12:33:01 +0000
@@ -61,7 +61,7 @@
 
 struct _MidoriBrowser
 {
-    GtkWindow parent_instance;
+    MidoriWindow parent_instance;
     GtkActionGroup* action_group;
     GtkWidget* menubar;
     GtkWidget* throbber;
@@ -102,7 +102,7 @@
     gboolean bookmarkbar_populate;
 };
 
-G_DEFINE_TYPE (MidoriBrowser, midori_browser, GTK_TYPE_WINDOW)
+G_DEFINE_TYPE (MidoriBrowser, midori_browser, MIDORI_TYPE_WINDOW)
 
 enum
 {
@@ -192,6 +192,12 @@
                                 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);
@@ -1710,10 +1716,6 @@
 }
 
 static void
-_midori_browser_set_toolbar_items (MidoriBrowser* browser,
-                                   const gchar*   items);
-
-static void
 midori_view_new_view_cb (GtkWidget*     view,
                          GtkWidget*     new_view,
                          MidoriNewView  where,
@@ -1735,7 +1737,8 @@
         sokoke_widget_set_visible (new_browser->bookmarkbar, FALSE);
         sokoke_widget_set_visible (new_browser->statusbar, FALSE);
         _action_set_visible (new_browser, "CompactMenu", FALSE);
-        _midori_browser_set_toolbar_items (new_browser, "Location");
+        _action_set_sensitive (new_browser, "Location", FALSE);
+        midori_window_set_actions (MIDORI_WINDOW (new_browser), "Location");
         sokoke_widget_set_visible (new_browser->panel, FALSE);
         midori_browser_add_tab (new_browser, new_view);
         midori_browser_set_current_tab (new_browser, new_view);
@@ -2463,7 +2466,7 @@
                                      "navigationbar",
                                      "Navigationbar",
                                      "The navigationbar",
-                                     GTK_TYPE_TOOLBAR,
+                                     GTK_TYPE_CONTAINER,
                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
     g_object_class_install_property (gobject_class,
@@ -3111,22 +3114,6 @@
     midori_findbar_continue (MIDORI_FINDBAR (browser->find), FALSE);
 }
 
-static void
-midori_browser_navigationbar_notify_style_cb (GObject*       object,
-                                              GParamSpec*    arg1,
-                                              MidoriBrowser* browser)
-{
-    MidoriToolbarStyle toolbar_style;
-
-    g_object_get (browser->settings, "toolbar-style", &toolbar_style, NULL);
-    _midori_browser_set_toolbar_style (browser, toolbar_style);
-}
-
-static gboolean
-midori_browser_toolbar_item_button_press_event_cb (GtkWidget*      toolitem,
-                                                   GdkEventButton* event,
-                                                   MidoriBrowser*  browser);
-
 /**
  * midori_browser_get_toolbar_actions:
  *
@@ -3176,7 +3163,8 @@
     MidoriContextAction* menu = midori_context_action_new ("ToolbarContextMenu", NULL, NULL, NULL);
     midori_context_action_add_action_group (menu, browser->action_group);
     midori_context_action_add_by_name (menu, "Menubar");
-    midori_context_action_add_by_name (menu, "Navigationbar");
+    if (GTK_IS_TOOLBAR (browser->navigationbar))
+        midori_context_action_add_by_name (menu, "Navigationbar");
     midori_context_action_add_by_name (menu, "Bookmarkbar");
     midori_context_action_add_by_name (menu, "Statusbar");
 
@@ -3460,7 +3448,7 @@
 }
 
 static gboolean
-midori_browser_has_native_menubar (void)
+midori_browser_has_native_menubar (MidoriBrowser* browser)
 {
     static const gchar* ubuntu_menuproxy = NULL;
     if (ubuntu_menuproxy == NULL)
@@ -3480,51 +3468,13 @@
                           MidoriBrowser*   browser)
 {
     gboolean active = gtk_toggle_action_get_active (menubar_action);
-    GtkAction* menu_action = _action_by_name (browser, "CompactMenu");
-    GString* toolbar_items;
-    GList* children;
-    gchar* items;
 
-    if (midori_browser_has_native_menubar ())
+    if (midori_browser_has_native_menubar (browser))
         active = FALSE;
-
-    toolbar_items = g_string_new (NULL);
-    children = gtk_container_get_children (GTK_CONTAINER (browser->navigationbar));
-    for (; children != NULL; children = g_list_next (children))
-    {
-        GtkAction* action = gtk_activatable_get_related_action (
-            GTK_ACTIVATABLE (children->data));
-        if (!action)
-            continue;
-        if (action == ((GtkAction*)menu_action))
-        {
-            if (active)
-            {
-                gtk_container_remove (GTK_CONTAINER (browser->navigationbar),
-                                      GTK_WIDGET (children->data));
-            }
-            continue;
-        }
-        else if (MIDORI_IS_PANED_ACTION (action))
-        {
-            MidoriPanedAction* paned_action = MIDORI_PANED_ACTION (action);
-            g_string_append_printf (toolbar_items, "%s,%s",
-                midori_paned_action_get_child1_name (paned_action),
-                midori_paned_action_get_child2_name (paned_action));
-        }
-        else
-            g_string_append (toolbar_items, gtk_action_get_name (action));
-        g_string_append_c (toolbar_items, ',');
-    }
-    g_list_free (children);
-
+    midori_window_set_show_menubar (MIDORI_WINDOW (browser), active);
     if (katze_object_get_boolean (browser->settings, "show-menubar") != active)
         g_object_set (browser->settings, "show-menubar", active, NULL);
 
-    items = g_string_free (toolbar_items, FALSE);
-    g_object_set (browser->settings, "toolbar-items", items, NULL);
-    g_free (items);
-
     sokoke_widget_set_visible (browser->menubar, active);
     g_object_set_data (G_OBJECT (browser), "midori-toolbars-visible",
         gtk_widget_get_visible (browser->menubar)
@@ -4396,6 +4346,26 @@
     midori_bookmarks_db_remove_item (browser->bookmarks, item);
 }
 
+static gboolean
+midori_browser_toolbar_context_menu_cb (GtkWidget*     toolbar,
+                                        GtkWidget*     widget,
+                                        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);
+}
+
 static void
 midori_browser_bookmark_popup (GtkWidget*      widget,
                                GdkEventButton* event,
@@ -5958,7 +5928,6 @@
     GtkWidget* homepage;
     GtkWidget* back;
     GtkWidget* forward;
-    GtkSettings* gtk_settings;
     GtkWidget* hpaned;
     GtkWidget* vpaned;
     GtkWidget* scrolled;
@@ -5990,12 +5959,14 @@
     #endif
     #endif
     vbox = gtk_vbox_new (FALSE, 0);
-    gtk_container_add (GTK_CONTAINER (browser), vbox);
-    gtk_widget_show (vbox);
+    /* gtk_container_add (GTK_CONTAINER (browser), vbox);
+    gtk_widget_show (vbox); */
+    midori_window_set_contents (MIDORI_WINDOW (browser), vbox);
 
     /* Let us see some ui manager magic */
     browser->action_group = gtk_action_group_new ("Browser");
     gtk_action_group_set_translation_domain (browser->action_group, GETTEXT_PACKAGE);
+    midori_window_add_action_group (MIDORI_WINDOW (browser), browser->action_group);
     midori_browser_add_actions (browser);
     ui_manager = gtk_ui_manager_new ();
     accel_group = gtk_ui_manager_get_accel_group (ui_manager);
@@ -6174,9 +6145,9 @@
 
     /* Create the menubar */
     browser->menubar = gtk_ui_manager_get_widget (ui_manager, "/menubar");
-    gtk_box_pack_start (GTK_BOX (vbox), browser->menubar, FALSE, FALSE, 0);
+    midori_window_add_toolbar (MIDORI_WINDOW (browser), browser->menubar);
     gtk_widget_hide (browser->menubar);
-    _action_set_visible (browser, "Menubar", !midori_browser_has_native_menubar ());
+    _action_set_visible (browser, "Menubar", !midori_browser_has_native_menubar (browser));
     g_signal_connect (browser->menubar, "button-press-event",
         G_CALLBACK (midori_browser_menu_button_press_event_cb), browser);
 
@@ -6235,30 +6206,18 @@
     _action_set_visible (browser, "UndoTabClose", browser->trash != NULL);
 
     /* Create the navigationbar */
-    browser->navigationbar = gtk_ui_manager_get_widget (
-        ui_manager, "/toolbar_navigation");
-    katze_widget_add_class (browser->navigationbar, "primary-toolbar");
-    /* FIXME: Settings should be connected with screen changes */
-    gtk_settings = gtk_widget_get_settings (GTK_WIDGET (browser));
-    if (gtk_settings)
-        g_signal_connect (gtk_settings, "notify::gtk-toolbar-style",
-            G_CALLBACK (midori_browser_navigationbar_notify_style_cb), browser);
-    gtk_toolbar_set_show_arrow (GTK_TOOLBAR (browser->navigationbar), TRUE);
-    g_object_set (_action_by_name (browser, "Back"), "is-important", TRUE, NULL);
-    gtk_widget_hide (browser->navigationbar);
-    g_signal_connect (browser->navigationbar, "popup-context-menu",
-        G_CALLBACK (midori_browser_toolbar_popup_context_menu_cb), browser);
-    gtk_box_pack_start (GTK_BOX (vbox), browser->navigationbar, FALSE, FALSE, 0);
+    browser->navigationbar = midori_window_get_toolbar (MIDORI_WINDOW (browser));
+    g_signal_connect (browser, "context-menu",
+        G_CALLBACK (midori_browser_toolbar_context_menu_cb), browser);
 
     /* Bookmarkbar */
     browser->bookmarkbar = gtk_toolbar_new ();
-    katze_widget_add_class (browser->bookmarkbar, "secondary-toolbar");
     gtk_widget_set_name (browser->bookmarkbar, "MidoriBookmarkbar");
     gtk_toolbar_set_icon_size (GTK_TOOLBAR (browser->bookmarkbar),
                                GTK_ICON_SIZE_MENU);
     gtk_toolbar_set_style (GTK_TOOLBAR (browser->bookmarkbar),
                            GTK_TOOLBAR_BOTH_HORIZ);
-    gtk_box_pack_start (GTK_BOX (vbox), browser->bookmarkbar, FALSE, FALSE, 0);
+    midori_window_add_toolbar (MIDORI_WINDOW (browser), browser->bookmarkbar);
     g_signal_connect (browser->bookmarkbar, "popup-context-menu",
         G_CALLBACK (midori_browser_toolbar_popup_context_menu_cb), browser);
 
@@ -6407,9 +6366,12 @@
             gtk_toolbar_style = GTK_TOOLBAR_BOTH_HORIZ;
         }
     }
-    gtk_toolbar_set_style (GTK_TOOLBAR (browser->navigationbar),
-                           gtk_toolbar_style);
-    gtk_toolbar_set_icon_size (GTK_TOOLBAR (browser->navigationbar), icon_size);
+    if (GTK_IS_TOOLBAR (browser->navigationbar))
+    {
+        gtk_toolbar_set_style (GTK_TOOLBAR (browser->navigationbar),
+                               gtk_toolbar_style);
+        gtk_toolbar_set_icon_size (GTK_TOOLBAR (browser->navigationbar), icon_size);
+    }
     midori_panel_set_toolbar_style (MIDORI_PANEL (browser->panel),
                                     gtk_toolbar_style);
 }
@@ -6489,201 +6451,6 @@
 #endif
 }
 
-static gboolean
-midori_browser_toolbar_item_button_press_event_cb (GtkWidget*      toolitem,
-                                                   GdkEventButton* event,
-                                                   MidoriBrowser*  browser)
-{
-    if (MIDORI_EVENT_NEW_TAB (event))
-    {
-        /* check if the middle-click was performed over reload button */
-        if (g_object_get_data (G_OBJECT (toolitem), "reload-middle-click"))
-        {
-            gtk_action_activate (_action_by_name (browser, "TabDuplicate"));
-        }
-
-        GtkWidget* parent = gtk_widget_get_parent (toolitem);
-        GtkAction* action = gtk_activatable_get_related_action (
-            GTK_ACTIVATABLE (parent));
-
-        g_object_set_data (G_OBJECT (action),
-                           "midori-middle-click",
-                           GINT_TO_POINTER (1));
-
-        return _action_navigation_activate (action, browser);
-    }
-    else if (MIDORI_EVENT_CONTEXT_MENU (event))
-    {
-        if (g_object_get_data (G_OBJECT (toolitem), "history-back"))
-        {
-            midori_browser_toolbar_popup_context_menu_history (
-                browser,
-                GTK_IS_BIN (toolitem) && gtk_bin_get_child (GTK_BIN (toolitem)) ?
-                gtk_widget_get_parent (toolitem) : toolitem,
-                TRUE, event->x, event->y);
-        }
-        else if (g_object_get_data (G_OBJECT (toolitem), "history-forward"))
-        {
-            midori_browser_toolbar_popup_context_menu_history (
-                browser,
-                GTK_IS_BIN (toolitem) && gtk_bin_get_child (GTK_BIN (toolitem)) ?
-                gtk_widget_get_parent (toolitem) : toolitem,
-                FALSE, event->x, event->y);
-        }
-        else
-        {
-            midori_browser_toolbar_popup_context_menu_cb (
-                GTK_IS_BIN (toolitem) && gtk_bin_get_child (GTK_BIN (toolitem)) ?
-                    gtk_widget_get_parent (toolitem) : toolitem,
-                event->x, event->y, event->button, browser);
-        }
-        return TRUE;
-    }
-    return FALSE;
-}
-
-static void
-_midori_browser_search_item_allocate_cb (GtkWidget* widget,
-                                         GdkRectangle* allocation,
-                                         gpointer user_data)
-{
-    MidoriBrowser* browser = MIDORI_BROWSER (user_data);
-    MidoriWebSettings* settings = browser->settings;
-    g_object_set (settings, "search-width", allocation->width, NULL);
-}
-
-static void
-_midori_browser_set_toolbar_items (MidoriBrowser* browser,
-                                   const gchar*   items)
-{
-    gchar** names;
-    gchar** name;
-    GtkAction* action;
-    GtkWidget* toolitem;
-    const char* token_location = g_intern_static_string ("Location");
-    const char* token_search = g_intern_static_string ("Search");
-    const char* token_dontcare = g_intern_static_string ("Dontcare");
-    const char* token_current = token_dontcare;
-    const char* token_last;
-
-    gtk_container_foreach (GTK_CONTAINER (browser->navigationbar),
-        (GtkCallback)gtk_widget_destroy, NULL);
-
-    names = g_strsplit (items ? items : "", ",", 0);
-    name = names;
-    for (; *name; ++name)
-    {
-        action = _action_by_name (browser, *name);
-        if (action && strstr (*name, "CompactMenu") == NULL)
-        {
-            token_last = token_current;
-
-            /* Decide, what kind of token (item) we got now */
-            if (name && !g_strcmp0 (*name, "Location"))
-                token_current = token_location;
-            else if (name && !g_strcmp0 (*name, "Search"))
-                token_current = token_search;
-            else
-                token_current = token_dontcare;
-
-            if ((token_current == token_location || token_current == token_search) &&
-                 (token_last == token_location || token_last == token_search))
-            {
-                GtkWidget* toolitem_first = gtk_action_create_tool_item (
-                    _action_by_name (browser, token_last));
-                GtkWidget* toolitem_second = gtk_action_create_tool_item (
-                    _action_by_name (browser, token_current));
-                MidoriPanedAction* paned_action = MIDORI_PANED_ACTION (
-                    _action_by_name (browser, "LocationSearch"));
-                MidoriWebSettings* midori_settings = browser->settings;
-                midori_paned_action_set_child1 (paned_action, toolitem_first, token_last,
-                    token_last == token_search ? FALSE : TRUE, TRUE);
-                midori_paned_action_set_child2 (paned_action, toolitem_second, token_current,
-                    token_current == token_search ? FALSE : TRUE, TRUE);
-                g_signal_connect (G_OBJECT (token_current == token_search ? toolitem_second : toolitem_first),
-                    "size-allocate", G_CALLBACK (_midori_browser_search_item_allocate_cb), (gpointer) browser);
-
-                gtk_widget_set_size_request (
-                    token_last == token_search ? toolitem_first : toolitem_second,
-                    katze_object_get_int ((gpointer) midori_settings,
-                    "search-width"),
-                    -1);
-
-                toolitem = gtk_action_create_tool_item (GTK_ACTION (paned_action));
-                token_current = token_dontcare;
-            }
-            else if (token_current == token_dontcare && token_last != token_dontcare)
-            {
-                /* There was a location or search item, but was not followed by
-                   the other one, that form a couple */
-                gtk_toolbar_insert (GTK_TOOLBAR (browser->navigationbar),
-                    GTK_TOOL_ITEM (gtk_action_create_tool_item (
-                    _action_by_name (browser, token_last))),
-                    -1);
-
-                toolitem = gtk_action_create_tool_item (action);
-            }
-            else if (token_current != token_dontcare && token_last == token_dontcare)
-                continue;
-            /* A "new tab" button is already part of the notebook */
-            else if (!strcmp (gtk_action_get_name (action), "TabNew"))
-                continue;
-            else
-                toolitem = gtk_action_create_tool_item (action);
-
-            if (gtk_bin_get_child (GTK_BIN (toolitem)))
-            {
-                if (!g_strcmp0 (*name, "Back"))
-                    g_object_set_data (G_OBJECT (gtk_bin_get_child (GTK_BIN (toolitem))),
-                        "history-back", (void*) 0xdeadbeef);
-                else if (g_str_has_suffix (*name, "Forward"))
-                    g_object_set_data (G_OBJECT (gtk_bin_get_child (GTK_BIN (toolitem))),
-                        "history-forward", (void*) 0xdeadbeef);
-                else if (g_strcmp0 (*name, "Reload"))
-                    g_object_set_data (G_OBJECT (gtk_bin_get_child (GTK_BIN (toolitem))),
-                        "reload-middle-click", (void*) 0xdeadbeef);
-
-                g_signal_connect (gtk_bin_get_child (GTK_BIN (toolitem)),
-                    "button-press-event",
-                    G_CALLBACK (midori_browser_toolbar_item_button_press_event_cb),
-                    browser);
-            }
-            else
-            {
-                gtk_tool_item_set_use_drag_window (GTK_TOOL_ITEM (toolitem), TRUE);
-                g_signal_connect (toolitem,
-                    "button-press-event",
-                    G_CALLBACK (midori_browser_toolbar_item_button_press_event_cb),
-                    browser);
-            }
-            gtk_toolbar_insert (GTK_TOOLBAR (browser->navigationbar),
-                                GTK_TOOL_ITEM (toolitem), -1);
-        }
-    }
-    g_strfreev (names);
-
-    /* There was a last item, which could have formed a couple, but
-       there is no item left, we add that last item to toolbar as is */
-    if (token_current != token_dontcare)
-    {
-        gtk_toolbar_insert (GTK_TOOLBAR (browser->navigationbar),
-            GTK_TOOL_ITEM (gtk_action_create_tool_item (
-            _action_by_name (browser, token_current))), -1);
-    }
-
-    if (!katze_object_get_boolean (browser->settings, "show-menubar"))
-    {
-        toolitem = gtk_action_create_tool_item (
-            GTK_ACTION (_action_by_name (browser, "CompactMenu")));
-        gtk_toolbar_insert (GTK_TOOLBAR (browser->navigationbar),
-                            GTK_TOOL_ITEM (toolitem), -1);
-        g_signal_connect (gtk_bin_get_child (GTK_BIN (toolitem)),
-            "button-press-event",
-            G_CALLBACK (midori_browser_toolbar_item_button_press_event_cb),
-            browser);
-    }
-}
-
 static void
 _midori_browser_update_settings (MidoriBrowser* browser)
 {
@@ -6758,7 +6525,7 @@
 
     _midori_browser_set_toolbar_style (browser, toolbar_style);
     _toggle_tabbar_smartly (browser, FALSE);
-    _midori_browser_set_toolbar_items (browser, toolbar_items);
+    midori_window_set_actions (MIDORI_WINDOW (browser), toolbar_items);
 
     if (browser->search_engines)
     {
@@ -6791,7 +6558,8 @@
                            GINT_TO_POINTER (last_panel_page));
 
     _action_set_active (browser, "Menubar", show_menubar);
-    _action_set_active (browser, "Navigationbar", browser->show_navigationbar);
+    if (GTK_IS_TOOLBAR (browser->navigationbar))
+        _action_set_active (browser, "Navigationbar", browser->show_navigationbar);
     _action_set_active (browser, "Bookmarkbar", show_bookmarkbar
                                              && browser->bookmarks != NULL);
     _action_set_active (browser, "Panel", show_panel);
@@ -6815,7 +6583,7 @@
     if (name == g_intern_string ("toolbar-style"))
         _midori_browser_set_toolbar_style (browser, g_value_get_enum (&value));
     else if (name == g_intern_string ("toolbar-items"))
-        _midori_browser_set_toolbar_items (browser, g_value_get_string (&value));
+        midori_window_set_actions (MIDORI_WINDOW (browser), g_value_get_string (&value));
     else if (name == g_intern_string ("compact-sidepanel"))
     {
         g_signal_handlers_block_by_func (browser->panel,
@@ -6837,7 +6605,8 @@
     else if (name == g_intern_string ("show-navigationbar"))
     {
         browser->show_navigationbar = g_value_get_boolean (&value);
-        _action_set_active (browser, "Navigationbar", g_value_get_boolean (&value));
+        if (GTK_IS_TOOLBAR (browser->navigationbar))
+            _action_set_active (browser, "Navigationbar", g_value_get_boolean (&value));
     }
     else if (name == g_intern_string ("show-bookmarkbar"))
     {

=== modified file 'midori/midori-browser.h'
--- midori/midori-browser.h	2013-03-26 23:09:09 +0000
+++ midori/midori-browser.h	2015-06-06 12:33:01 +0000
@@ -35,7 +35,7 @@
 
 struct _MidoriBrowserClass
 {
-    GtkWindowClass parent_class;
+    MidoriWindowClass parent_class;
 
     /* Signals */
     void

=== modified file 'midori/midori-contextaction.vala'
--- midori/midori-contextaction.vala	2014-03-29 21:28:08 +0000
+++ midori/midori-contextaction.vala	2015-06-06 12:33:01 +0000
@@ -92,6 +92,18 @@
         }
 #endif
 
+        Gtk.ToolButton toolitem;
+        public override unowned Gtk.Widget create_tool_item () {
+            toolitem = base.create_tool_item () as Gtk.ToolButton;
+            toolitem.clicked.connect (() => {
+                var popup = create_menu (null, false);
+                popup.show ();
+                popup.attach_to_widget (toolitem, null);
+                popup.popup (null, null, null, 1, Gtk.get_current_event_time ());
+            });
+            return toolitem;
+        }
+
         public new Gtk.Menu create_menu (Gtk.Menu? default_menu, bool accels) {
             var menu = default_menu ?? new Gtk.Menu ();
             foreach (var action in children) {

=== modified file 'midori/midori-frontend.c'
--- midori/midori-frontend.c	2015-03-23 11:33:24 +0000
+++ midori/midori-frontend.c	2015-06-06 12:33:01 +0000
@@ -74,11 +74,13 @@
     midori_browser_set_action_visible (browser, "CompactMenu", FALSE);
     midori_browser_set_action_visible (browser, "AddSpeedDial", FALSE);
     midori_browser_set_action_visible (browser, "Navigationbar", FALSE);
+    GtkActionGroup* action_group = midori_browser_get_action_group (browser);
+    GtkAction* action = gtk_action_group_get_action (action_group, "Location");
+    gtk_action_set_sensitive (action, FALSE);
 
     MidoriWebSettings* settings = midori_settings_new_full (NULL);
     g_object_set (settings,
                   "show-menubar", FALSE,
-                  "show-navigationbar", FALSE,
                   "toolbar-items", "Back,Forward,ReloadStop,Location,Homepage,Preferences",
                   "show-statusbar", FALSE,
                   "show-panel", FALSE,

=== modified file 'midori/midori-panedaction.vala'
--- midori/midori-panedaction.vala	2014-11-05 20:56:37 +0000
+++ midori/midori-panedaction.vala	2015-06-06 12:33:01 +0000
@@ -16,6 +16,10 @@
         Child child1 = new Child();
         Child child2 = new Child();
 
+        public PanedAction () {
+            GLib.Object (name: "LocationSearch");
+        }
+
         private struct Child {
             public Gtk.Widget widget;
             string name;

=== modified file 'midori/midori-preferences.c'
--- midori/midori-preferences.c	2015-03-23 11:33:24 +0000
+++ midori/midori-preferences.c	2015-06-06 12:33:01 +0000
@@ -415,6 +415,10 @@
 
     /* Page "Interface" */
     PAGE_NEW (GTK_STOCK_CONVERT, _("Browsing"));
+    gboolean has_toolbar = parent && MIDORI_IS_BROWSER (parent) && GTK_IS_TOOLBAR (katze_object_get_object (parent, "toolbar"));
+    #ifndef G_OS_WIN32
+    if (has_toolbar)
+    #endif
         FRAME_NEW (NULL);
     #ifdef G_OS_WIN32
     INDENTED_ADD (gtk_label_new (_("Theme:")));
@@ -449,9 +453,12 @@
     }
     g_free (theme_path);
     #endif
+    if (has_toolbar)
+    {
         INDENTED_ADD (gtk_label_new (_("Toolbar Style:")));
         button = katze_property_proxy (settings, "toolbar-style", NULL);
         SPANNED_ADD (button);
+    }
     FRAME_NEW (NULL);
     label = gtk_label_new (_("Open new pages in:"));
     INDENTED_ADD (label);

=== added file 'midori/midori-window.vala'
--- midori/midori-window.vala	1970-01-01 00:00:00 +0000
+++ midori/midori-window.vala	2015-06-06 12:33:01 +0000
@@ -0,0 +1,239 @@
+/*
+ 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 {
+    public class Window : Gtk.Window {
+        Gtk.Widget? _toolbar = null;
+        public Gtk.Widget? toolbar { get {
+            if (_toolbar == null) {
+#if HAVE_GTK3
+                if (strcmp (Environment.get_variable ("GTK_CSD"), "1") == 0) {
+                    var toolbar = new Gtk.HeaderBar ();
+                    toolbar.show_close_button = true;
+                    toolbar.show ();
+                    toolbar.get_style_context ().add_class ("midori-titlebar");
+                    _toolbar = toolbar;
+                    return _toolbar;
+                }
+#endif
+                var toolbar = new Gtk.Toolbar ();
+                toolbar.show_arrow = true;
+#if HAVE_GTK3
+                toolbar.get_style_context ().add_class ("primary-toolbar");
+                hide_titlebar_when_maximized = true;
+#endif
+                toolbar.popup_context_menu.connect ((x, y, button) => {
+                    return button == 3 && context_menu (toolbar); });
+                _toolbar = toolbar;
+            }
+            return _toolbar;
+        } }
+
+        public string actions { get; set; default = ""; }
+        string extra_actions { get; set; default = ""; }
+        List<Gtk.ActionGroup> action_groups;
+        public signal bool context_menu (Gtk.Widget widget, Gtk.Action? action=null);
+        Gtk.Box? box = null;
+        List<Gtk.Widget> toolbars;
+
+        Gtk.Widget? _contents = null;
+        public Gtk.Widget? contents { get {
+            return _contents;
+        } set {
+            if (_contents != null)
+                box.remove (_contents);
+            _contents = value;
+            _contents.show ();
+            if (box != null)
+                box.pack_end (_contents, true, true, 0);
+        } }
+
+        public void add_action_group (Gtk.ActionGroup action_group) {
+            action_groups.append (action_group);
+        }
+
+        public bool show_menubar { get; set; default = false; }
+
+        [CCode (type = "GtkWidget*")]
+        public Window () {
+        }
+
+        Gtk.ToolItem? get_tool_item (string name) {
+            /* Name is the empty string if actions has ,, or trailing , */
+            if (name == "")
+                return null;
+            /* Shown in the notebook, no need to include in the toolbar */
+            if (name == "TabNew")
+                return null;
+            foreach (var action_group in action_groups) {
+                var action = action_group.get_action (name);
+                if (action != null) {
+                    return create_tool_item (action);
+                }
+            }
+            warning ("Action %s not known to Window", name);
+            return null;
+        }
+
+        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")
+                bind_property ("show-menubar", toolitem, "visible");
+            return toolitem;
+        }
+
+        /**
+         * Adds an action to the (browser) window.
+         * Typically it will be displayed in the primary toolbar or headerbar.
+         *
+         * If @action is a ContextAction a menu will be displayed.
+         *
+         * Since: 0.6.0
+         **/
+        public void add_action (Gtk.Action action) {
+            action_groups.nth_data (0).add_action (action);
+            extra_actions += "," + action.name;
+            update_toolbar ();
+        }
+
+        /**
+         * Remove an action from the (browser) window.
+         *
+         * Since: 0.6.0
+         **/
+        public void remove_action (Gtk.Action action) {
+            action_groups.nth_data (0).remove_action (action);
+            extra_actions = extra_actions.replace ("," + action.name, "");
+            update_toolbar ();
+        }
+
+        void update_toolbar () {
+            var container = _toolbar as Gtk.Container;
+            foreach (var toolitem in container.get_children ())
+                container.remove (toolitem);
+
+            string[] names = actions.replace ("CompactMenu", extra_actions + ",CompactMenu").split (",");
+#if HAVE_GTK3
+            if (_toolbar is Gtk.HeaderBar) {
+                var headerbar = _toolbar as Gtk.HeaderBar;
+                List<Gtk.ToolItem> tail = new List<Gtk.ToolItem> ();
+                foreach (string name in names) {
+                    var toolitem = get_tool_item (name);
+                    if (toolitem == null)
+                        continue;
+                    var widget = toolitem.get_child ();
+                    if (widget is Gtk.Alignment)
+                        widget = (widget as Gtk.Bin).get_child ();
+                    if (name == "Location") {
+                        widget.set ("margin-top", 1, "margin-bottom", 1);
+                        (widget as Gtk.Entry).max_width_chars = 256;
+                        headerbar.custom_title = toolitem;
+                        headerbar.custom_title.set (
+                            "margin-start", 25, "margin-end", 25,
+                            "margin-top", 5, "margin-bottom", 5);
+                    } else if (name == "Search") {
+                        (widget as Gtk.Entry).width_chars = 12;
+                        tail.append (toolitem);
+                    } else if (actions.index_of (name) > actions.index_of ("Location"))
+                        tail.append (toolitem);
+                    else if (name in extra_actions)
+                        tail.append (toolitem);
+                    else
+                        headerbar.pack_start (toolitem);
+                }
+
+                /* Pack end appends, so we need to pack in reverse order */
+                tail.reverse ();
+                foreach (var toolitem in tail)
+                    headerbar.pack_end (toolitem);
+
+                set_titlebar (headerbar);
+                return;
+            }
+#endif
+
+            var toolbar = _toolbar as Gtk.Toolbar;
+            string? previous = null;
+            Gtk.ToolItem? toolitem_previous = null;
+            foreach (string name in names) {
+                var toolitem = get_tool_item (name);
+                if (toolitem == null)
+                    continue;
+                if ((name == "Location" || name == "Search")
+                 && (previous == "Location" || previous == "Search")) {
+                    toolitem_previous.ref ();
+                    toolbar.remove (toolitem_previous);
+                    var paned = new Midori.PanedAction ();
+                    paned.set_child1 (toolitem_previous, previous, previous != "Search", true);
+                    paned.set_child2 (toolitem, name, name != "Search", true);
+                    /* Midori.Settings.search-width on Midori.Browser.settings */
+                    Midori.Settings? settings = null;
+                    get ("settings", ref settings);
+                    var sizeable = name == "Search" ? toolitem : toolitem_previous;
+                    sizeable.size_allocate.connect ((allocation) => {
+                        settings.set ("search-width", allocation.width);
+                    });
+                    var requester = previous == "Search" ? toolitem_previous : toolitem;
+                    requester.set_size_request (settings.search_width, -1);
+                    toolitem = paned.create_tool_item () as Gtk.ToolItem;
+                    previous = null;
+                    toolitem_previous.unref ();
+                    toolitem_previous = null;
+                } else {
+                    previous = name;
+                    toolitem_previous = toolitem;
+                }
+                toolbar.insert (toolitem, -1);
+            }
+        }
+
+        public void add_toolbar (Gtk.Widget toolbar) {
+            if (toolbar is Gtk.Toolbar) {
+#if HAVE_GTK3
+                get_style_context ().add_class ("secondary-toolbar");
+#endif
+                (toolbar as Gtk.Toolbar).popup_context_menu.connect ((x, y, button) => {
+                    return button == 3 && context_menu (toolbar);
+                });
+            }
+            if (box == null)
+                toolbars.append (toolbar);
+            else
+                box.pack_start (toolbar, false, false);
+        }
+
+        construct {
+            box = new Gtk.VBox (false, 0);
+            box.show ();
+            add (box);
+            foreach (var toolbar in toolbars) {
+                if (toolbar is Gtk.MenuBar)
+                    box.pack_start (toolbar, false, false);
+            }
+            if (toolbar is Gtk.Toolbar)
+                box.pack_start (toolbar, false, false);
+            foreach (var toolbar in toolbars) {
+                if (!(toolbar is Gtk.MenuBar))
+                    box.pack_start (toolbar, false, false);
+            }
+            if (_contents != null)
+                box.pack_end (_contents, true, true, 0);
+            if (actions != "")
+                update_toolbar ();
+            notify["actions"].connect ((pspec) => { update_toolbar (); });
+        }
+    }
+}

=== modified file 'midori/midori.vapi'
--- midori/midori.vapi	2015-03-15 17:20:46 +0000
+++ midori/midori.vapi	2015-06-06 12:33:01 +0000
@@ -62,7 +62,7 @@
     }
 
     [CCode (cheader_filename = "midori/midori-browser.h")]
-    public class Browser : Gtk.Window {
+    public class Browser : Window {
         public Browser ();
         public unowned Gtk.Widget add_item (Katze.Item item);
         public unowned Gtk.Widget add_uri (string uri);

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2015-04-18 19:36:29 +0000
+++ po/POTFILES.in	2015-06-06 12:33:01 +0000
@@ -7,6 +7,7 @@
 midori/midori-array.c
 midori/midori-bookmarksdatabase.vala
 midori/midori-browser.c
+midori/midori-window.vala
 midori/midori-database.vala
 midori/midori-extension.c
 midori/midori-locationaction.c