Merge lp:~midori/midori/redundantNewTab into lp:midori

[Cris Dywan]

Drop redundant TabNew from compact menu and put button in Tab Panel

[Paweł Forysiuk (tuxator)]

Code looks sensible and it seems to work ok.

review: Approve

[axlrose112 (axlrose112)]

i sill get a message CRITICAL **: midori_context_action_add: assertion 'self != NULL' failed

my code is:

void browser_added (Midori.Browser browser) {
    var action_group = browser.get_action_group ();
    var action = action_group.get_action ("CompactMenu") as Midori.ContextAction;
    var action1 = new Gtk.Action ("NotesCopySnippet", "Copy _snippet to notes", null, null);
    action.add(action1);
}

review: Approve (midori_context_action_add)

=== modified file 'extensions/tab-panel.c'
--- extensions/tab-panel.c	2013-06-21 23:18:01 +0000
+++ extensions/tab-panel.c	2014-03-03 23:41:19 +0000
@@ -289,20 +289,6 @@
 }
 
 static void
-tab_panel_toggle_toolbook (GtkWidget* toolbar)
-{
-        /* Hack to ensure correct toolbar visibility */
-        GtkWidget* toolbook = gtk_widget_get_parent (toolbar);
-        if (gtk_notebook_get_current_page (GTK_NOTEBOOK (toolbook))
-         == gtk_notebook_page_num (GTK_NOTEBOOK (toolbook), toolbar))
-        {
-            GList* items = gtk_container_get_children (GTK_CONTAINER (toolbar));
-            sokoke_widget_set_visible (toolbook, items != NULL);
-            g_list_free (items);
-        }
-}
-
-static void
 tab_panel_remove_view (MidoriBrowser* browser,
                        GtkWidget*     view,
                        gboolean       minimized)
@@ -310,9 +296,7 @@
     if (minimized)
     {
         GtkToolItem* toolitem = tab_panel_get_toolitem_for_view (view);
-        GtkWidget* toolbar = tab_panel_get_toolbar_for_browser (browser);
         gtk_widget_destroy (GTK_WIDGET (toolitem));
-        tab_panel_toggle_toolbook (toolbar);
     }
     else
     {
@@ -443,7 +427,6 @@
         g_object_set_data (G_OBJECT (view), "tab-panel-ext-toolitem", toolitem);
         gtk_widget_show (GTK_WIDGET (toolitem));
         gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
-        tab_panel_toggle_toolbook (toolbar);
         g_signal_connect (toolitem, "clicked",
             G_CALLBACK (tab_panel_toolitem_clicked_cb), view);
         g_signal_connect (gtk_bin_get_child (GTK_BIN (toolitem)), "button-press-event",
@@ -574,6 +557,16 @@
 
     toolbar = gtk_toolbar_new ();
     g_object_set_data (G_OBJECT (browser), "tab-panel-ext-toolbar", toolbar);
+    gtk_widget_show (toolbar);
+
+    GtkActionGroup* actions = midori_browser_get_action_group (browser);
+    GtkAction* action = gtk_action_group_get_action (actions, "TabNew");
+    GtkWidget* toolitem = gtk_action_create_tool_item (action);
+    gtk_toolbar_insert (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (toolitem), -1);
+
+    action = gtk_action_group_get_action (actions, "Separator");
+    toolitem = gtk_action_create_tool_item (action);
+    gtk_toolbar_insert (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (toolitem), -1);
 
     /*
     TODO: Implement optional thumbnail images
 
=== modified file 'extensions/toolbar-editor.c'
--- extensions/toolbar-editor.c	2013-06-02 02:20:41 +0000
+++ extensions/toolbar-editor.c	2014-03-03 23:41:19 +0000
@@ -112,12 +112,8 @@
 	name = items;
 	while (*name != NULL)
 	{
-		#ifdef HAVE_GRANITE
 		/* A "new tab" button is already part of the notebook */
 		if (*name[0] != '\0' && strcmp (*name, "TabNew"))
-		#else
-		if (*name[0] != '\0')
-		#endif
 			list = g_slist_append(list, g_strdup(*name));
 		name++;
 	}
 
=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2014-03-02 20:30:34 +0000
+++ midori/midori-browser.c	2014-03-03 23:41:19 +0000
@@ -3226,7 +3226,6 @@
 {
     MidoriContextAction* menu = midori_context_action_new ("CompactMenu", NULL, NULL, NULL);
     midori_context_action_add_action_group (menu, browser->action_group);
-    midori_context_action_add_by_name (menu, "TabNew");
     midori_context_action_add_by_name (menu, "WindowNew");
     midori_context_action_add_by_name (menu, "PrivateBrowsing");
     midori_context_action_add (menu, NULL);
 
=== modified file 'midori/midori-notebook.vala'
--- midori/midori-notebook.vala	2013-12-05 00:24:34 +0000
+++ midori/midori-notebook.vala	2014-03-03 23:41:19 +0000
@@ -335,6 +335,48 @@
             resize (size.width);
         }
 
+        /* Since: 0.5.8 */
+        public ContextAction get_tab_context_action (Midori.Tab tab) {
+            var menu = new Midori.ContextAction ("TabContextMenu", null, null, null);
+            tab_context_menu (tab, menu);
+            var action_window = new Midori.ContextAction ("TabWindowNew", _("Open in New _Window"), null, "window-new");
+            action_window.activate.connect (()=>{
+                tab_detached (tab, 128, 128);
+            });
+            menu.add (action_window);
+            var action_minimize = new Midori.ContextAction ("TabMinimize", tab.minimized ? _("Show Tab _Label") : _("Show Tab _Icon Only"), null, null);
+            action_minimize.activate.connect (()=>{
+                tab.minimized = !tab.minimized;
+            });
+            menu.add (action_minimize);
+            var action_right = new Midori.ContextAction ("TabCloseRight", ngettext ("Close Tab to the R_ight", "Close Tabs to the R_ight", count - 1), null, null);
+            action_right.sensitive = count > 1;
+            action_right.activate.connect (()=>{
+                bool found_tab = false;
+                foreach (var child in notebook.get_children ()) {
+                    if (found_tab)
+                        child.destroy ();
+                    else
+                        found_tab = child == tab;
+                }
+            });
+            menu.add (action_right);
+            var action_other = new Midori.ContextAction ("TabCloseOther", ngettext ("Close Ot_her Tab", "Close Ot_her Tabs", count - 1), null, null);
+            action_other.sensitive = count > 1;
+            action_other.activate.connect (()=>{
+                foreach (var child in notebook.get_children ())
+                    if (child != tab)
+                        child.destroy ();
+            });
+            menu.add (action_other);
+            var action_close = new Midori.ContextAction ("TabClose", null, null, Gtk.STOCK_CLOSE);
+            action_close.activate.connect (()=>{
+                tab.destroy ();
+            });
+            menu.add (action_close);
+            return menu;
+         }
+
         bool tab_button_pressed (Gtk.Widget label, Gdk.EventButton event) {
             Tally tally = label as Tally;
             if (event.button == 1) {
@@ -343,43 +385,7 @@
             } else if (event.button == 2)
                 tally.tab.destroy ();
             else if (event.button == 3) {
-                var menu = new Midori.ContextAction ("TabContextMenu", null, null, null);
-                tab_context_menu (tally.tab, menu);
-                var action_window = new Midori.ContextAction ("TabWindowNew", _("Open in New _Window"), null, "window-new");
-                action_window.activate.connect (()=>{
-                    tab_detached (tally.tab, 128, 128);
-                });
-                menu.add (action_window);
-                var action_minimize = new Midori.ContextAction ("TabMinimize", tally.tab.minimized ? _("Show Tab _Label") : _("Show Tab _Icon Only"), null, null);
-                action_minimize.activate.connect (()=>{
-                    tally.tab.minimized = !tally.tab.minimized;
-                });
-                menu.add (action_minimize);
-                var action_right = new Midori.ContextAction ("TabCloseRight", ngettext ("Close Tab to the R_ight", "Close Tabs to the R_ight", count - 1), null, null);
-                action_right.sensitive = count > 1;
-                action_right.activate.connect (()=>{
-                    bool found_tab = false;
-                    foreach (var child in notebook.get_children ()) {
-                        if (found_tab)
-                            child.destroy ();
-                        else
-                            found_tab = child == tally.tab;
-                    }
-                });
-                menu.add (action_right);
-                var action_other = new Midori.ContextAction ("TabCloseOther", ngettext ("Close Ot_her Tab", "Close Ot_her Tabs", count - 1), null, null);
-                action_other.sensitive = count > 1;
-                action_other.activate.connect (()=>{
-                    foreach (var child in notebook.get_children ())
-                        if (child != tally.tab)
-                            child.destroy ();
-                });
-                menu.add (action_other);
-                var action_close = new Midori.ContextAction ("TabClose", null, null, Gtk.STOCK_CLOSE);
-                action_close.activate.connect (()=>{
-                    tally.tab.destroy ();
-                });
-                menu.add (action_close);
+                var menu = get_tab_context_action (tally.tab);
                 var popup = menu.create_menu (null, false);
                 popup.show ();
                 popup.attach_to_widget (this, null);
 
=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2014-02-22 22:35:42 +0000
+++ midori/midori-view.c	2014-03-03 23:41:19 +0000
@@ -4295,7 +4295,11 @@
 {
     g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL);
 
-    return gtk_menu_new ();
+    GtkWidget* notebook = gtk_widget_get_parent (gtk_widget_get_parent (GTK_WIDGET (view)));
+    MidoriContextAction* context_action = midori_notebook_get_tab_context_action (MIDORI_NOTEBOOK (notebook), MIDORI_TAB (view));
+    GtkMenu* menu = midori_context_action_create_menu (context_action, NULL, FALSE);
+    g_object_unref (context_action);
+    return GTK_WIDGET (menu);
 }
 
 /**