Implement 'Open all in Tabs' for bookmark folders and history

midori/midori-browser.c

@@ -2434,7 +2434,7 @@ midori_browser_bookmark_popup_item (GtkWidget*     menu,
     if (!strcmp (stock_id, GTK_STOCK_EDIT))
         gtk_widget_set_sensitive (menuitem,
             KATZE_IS_ARRAY (item) || uri != NULL);
-    else if (strcmp (stock_id, GTK_STOCK_DELETE))
+    else if (!KATZE_IS_ARRAY (item) && strcmp (stock_id, GTK_STOCK_DELETE))
         gtk_widget_set_sensitive (menuitem, uri != NULL);
     g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item);
     g_signal_connect (menuitem, "activate", G_CALLBACK (callback), browser);
@@ -2465,14 +2465,30 @@ midori_browser_bookmark_open_in_tab_activate_cb (GtkWidget*     menuitem,
     guint n;
 
     item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem");
-    uri = katze_item_get_uri (item);
+    if (KATZE_IS_ARRAY (item))
+    {
+        KatzeItem* child;
+        guint i = 0;
 
-    if (uri && *uri)
+        while ((child = katze_array_get_nth_item (KATZE_ARRAY (item), i)))
+        {
+            if ((uri = katze_item_get_uri (child)) && *uri)
+            {
+                n = midori_browser_add_item (browser, child);
+                _midori_browser_set_current_page_smartly (browser, n);
+            }
+            i++;
+        }
+    }
+    else
+    {
+        if ((uri = katze_item_get_uri (item)) && *uri)
         {
             n = midori_browser_add_item (browser, item);
             _midori_browser_set_current_page_smartly (browser, n);
         }
     }
+}
 
 static void
 midori_browser_bookmark_open_in_window_activate_cb (GtkWidget*     menuitem,
@@ -2532,12 +2548,21 @@ midori_browser_bookmark_popup (GtkWidget*      widget,
     GtkWidget* menuitem;
 
     menu = gtk_menu_new ();
+    if (KATZE_IS_ARRAY (item))
+        midori_browser_bookmark_popup_item (menu,
+            STOCK_TAB_NEW, _("Open all in _Tabs"),
+            item, midori_browser_bookmark_open_in_tab_activate_cb, browser);
+    else
+    {
         midori_browser_bookmark_popup_item (menu, GTK_STOCK_OPEN, NULL,
             item, midori_browser_bookmark_open_activate_cb, browser);
-    midori_browser_bookmark_popup_item (menu, STOCK_TAB_NEW, _("Open in New _Tab"),
+        midori_browser_bookmark_popup_item (menu,
+            STOCK_TAB_NEW, _("Open in New _Tab"),
             item, midori_browser_bookmark_open_in_tab_activate_cb, browser);
-    midori_browser_bookmark_popup_item (menu, STOCK_WINDOW_NEW, _("Open in New _Window"),
+        midori_browser_bookmark_popup_item (menu,
+            STOCK_WINDOW_NEW, _("Open in New _Window"),
             item, midori_browser_bookmark_open_in_window_activate_cb, browser);
+    }
     menuitem = gtk_separator_menu_item_new ();
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
     gtk_widget_show (menuitem);

panels/midori-bookmarks.c

@@ -640,7 +640,7 @@ midori_bookmarks_popup_item (GtkWidget*       menu,
     if (!strcmp (stock_id, GTK_STOCK_EDIT))
         gtk_widget_set_sensitive (menuitem,
             KATZE_IS_ARRAY (item) || uri != NULL);
-    else if (strcmp (stock_id, GTK_STOCK_DELETE))
+    else if (!KATZE_IS_ARRAY (item) && strcmp (stock_id, GTK_STOCK_DELETE))
         gtk_widget_set_sensitive (menuitem, uri != NULL);
     g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item);
     g_signal_connect (menuitem, "activate", G_CALLBACK (callback), bookmarks);
@@ -674,9 +674,30 @@ midori_bookmarks_open_in_tab_activate_cb (GtkWidget*       menuitem,
     guint n;
 
     item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem");
-    uri = katze_item_get_uri (item);
+    if (KATZE_IS_ARRAY (item))
+    {
+        KatzeItem* child;
+        guint i = 0;
 
-    if (uri && *uri)
+        while ((child = katze_array_get_nth_item (KATZE_ARRAY (item), i)))
+        {
+            if ((uri = katze_item_get_uri (child)) && *uri)
+            {
+                GtkWidget* browser;
+                MidoriWebSettings* settings;
+
+                browser = gtk_widget_get_toplevel (GTK_WIDGET (bookmarks));
+                n = midori_browser_add_item (MIDORI_BROWSER (browser), child);
+                settings = katze_object_get_object (browser, "settings");
+                if (!katze_object_get_boolean (settings, "open-tabs-in-the-background"))
+                    midori_browser_set_current_page (MIDORI_BROWSER (browser), n);
+            }
+            i++;
+        }
+    }
+    else
+    {
+        if ((uri = katze_item_get_uri (item)) && *uri)
         {
             GtkWidget* browser;
             MidoriWebSettings* settings;
@@ -688,6 +709,7 @@ midori_bookmarks_open_in_tab_activate_cb (GtkWidget*       menuitem,
                 midori_browser_set_current_page (MIDORI_BROWSER (browser), n);
         }
     }
+}
 
 static void
 midori_bookmarks_open_in_window_activate_cb (GtkWidget*       menuitem,
@@ -749,12 +771,19 @@ midori_bookmarks_popup (GtkWidget*       widget,
     GtkWidget* menuitem;
 
     menu = gtk_menu_new ();
+    if (KATZE_IS_ARRAY (item))
+        midori_bookmarks_popup_item (menu,
+            STOCK_TAB_NEW, _("Open all in _Tabs"),
+            item, midori_bookmarks_open_in_tab_activate_cb, bookmarks);
+    else
+    {
         midori_bookmarks_popup_item (menu, GTK_STOCK_OPEN, NULL,
             item, midori_bookmarks_open_activate_cb, bookmarks);
         midori_bookmarks_popup_item (menu, STOCK_TAB_NEW, _("Open in New _Tab"),
             item, midori_bookmarks_open_in_tab_activate_cb, bookmarks);
         midori_bookmarks_popup_item (menu, STOCK_WINDOW_NEW, _("Open in New _Window"),
             item, midori_bookmarks_open_in_window_activate_cb, bookmarks);
+    }
     menuitem = gtk_separator_menu_item_new ();
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
     gtk_widget_show (menuitem);

panels/midori-history.c

@@ -674,7 +674,7 @@ midori_history_popup_item (GtkWidget*     menu,
     if (!strcmp (stock_id, GTK_STOCK_EDIT))
         gtk_widget_set_sensitive (menuitem,
             KATZE_IS_ARRAY (item) || uri != NULL);
-    else if (strcmp (stock_id, GTK_STOCK_DELETE))
+    else if (!KATZE_IS_ARRAY (item) && strcmp (stock_id, GTK_STOCK_DELETE))
         gtk_widget_set_sensitive (menuitem, uri != NULL);
     g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item);
     g_signal_connect (menuitem, "activate", G_CALLBACK (callback), history);
@@ -708,9 +708,30 @@ midori_history_open_in_tab_activate_cb (GtkWidget*     menuitem,
     guint n;
 
     item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem");
-    uri = katze_item_get_uri (item);
+    if (KATZE_IS_ARRAY (item))
+    {
+        KatzeItem* child;
+        guint i = 0;
 
-    if (uri && *uri)
+        while ((child = katze_array_get_nth_item (KATZE_ARRAY (item), i)))
+        {
+            if ((uri = katze_item_get_uri (child)) && *uri)
+            {
+                GtkWidget* browser;
+                MidoriWebSettings* settings;
+
+                browser = gtk_widget_get_toplevel (GTK_WIDGET (history));
+                n = midori_browser_add_item (MIDORI_BROWSER (browser), child);
+                settings = katze_object_get_object (browser, "settings");
+                if (!katze_object_get_boolean (settings, "open-tabs-in-the-background"))
+                    midori_browser_set_current_page (MIDORI_BROWSER (browser), n);
+            }
+            i++;
+        }
+    }
+    else
+    {
+        if ((uri = katze_item_get_uri (item)) && *uri)
         {
             GtkWidget* browser;
             MidoriWebSettings* settings;
@@ -722,6 +743,7 @@ midori_history_open_in_tab_activate_cb (GtkWidget*     menuitem,
                 midori_browser_set_current_page (MIDORI_BROWSER (browser), n);
         }
     }
+}
 
 static void
 midori_history_open_in_window_activate_cb (GtkWidget*     menuitem,
@@ -783,15 +805,21 @@ midori_history_popup (GtkWidget*      widget,
     GtkWidget* menuitem;
 
     menu = gtk_menu_new ();
+    if (KATZE_IS_ARRAY (item))
+        midori_history_popup_item (menu,
+            STOCK_TAB_NEW, _("Open all in _Tabs"),
+            item, midori_history_open_in_tab_activate_cb, history);
+    else
+    {
         midori_history_popup_item (menu, GTK_STOCK_OPEN, NULL,
             item, midori_history_open_activate_cb, history);
         midori_history_popup_item (menu, STOCK_TAB_NEW, _("Open in New _Tab"),
             item, midori_history_open_in_tab_activate_cb, history);
         midori_history_popup_item (menu, STOCK_WINDOW_NEW, _("Open in New _Window"),
             item, midori_history_open_in_window_activate_cb, history);
-    if (!KATZE_IS_ARRAY (item))
         midori_history_popup_item (menu, STOCK_BOOKMARK_ADD, NULL,
             item, midori_history_bookmark_activate_cb, history);
+    }
     menuitem = gtk_separator_menu_item_new ();
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
     gtk_widget_show (menuitem);