Merge lp:~midori/midori/bookmarkall into lp:midori

[Cris Dywan]

Add 'Bookmark All Tabs' context menu item

[Cris Dywan (kalikiana)]

I updated Patrick's patch against the latest trunk. This isn't my patch so I'm not making any promises to work on this further and I haven't done more than a very rough test run. The branch is in the project folder so somebody can pick it up.

[Cris Dywan (kalikiana)]

Any interest in this at all? Otherwise I'll be removing it from the Needs Review state.

[André Stösel (ivaldi)]

I'm just wondering if "tabs2one" would be a better solution for this...

[André Auzi (aauzi)]

This could use the bookmark folder creation dialog, couldn'it?

It would benefit from parent folder selection, as firefox does.

Unmerged revisions

6182. By Patrick Haugen on 2013-05-30

Add 'Bookmark All Tabs' context menu item

=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2013-05-29 09:20:28 +0000
+++ midori/midori-view.c	2013-05-30 12:45:42 +0000
@@ -4840,6 +4840,69 @@
     midori_browser_close_tab (midori_browser_get_for_widget (view), view);
 }
 
+static void
+midori_view_tab_label_menu_bookmark_all_tabs_cb (GtkWidget* menuitem,
+                                                 GtkWidget* view)
+{
+    MidoriBrowser* browser = midori_browser_get_for_widget (view); 
+    KatzeArray* bookmarks = katze_object_get_object (browser, "bookmarks");
+    GtkWidget* dialog;
+    GtkWidget* content_area;
+    GtkWidget* vbox;
+    GtkWidget* label;
+    GtkWidget* entry; 
+    gint result;
+    KatzeItem* folder = NULL;
+
+    dialog = gtk_dialog_new_with_buttons (_("New Folder"),
+                                          GTK_WINDOW (browser),
+                                          GTK_DIALOG_MODAL,
+                                          GTK_STOCK_ADD, GTK_RESPONSE_ACCEPT,
+                                          GTK_STOCK_CLOSE, GTK_RESPONSE_REJECT, NULL);
+    content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+    gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_ADD);
+    gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
+    gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
+    gtk_container_set_border_width (GTK_CONTAINER (content_area), 5);
+
+    vbox = gtk_vbox_new (FALSE, 12);
+    label = gtk_label_new (_("Enter the name for the new folder:"));
+    gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+    entry = gtk_entry_new ();
+    gtk_entry_set_max_length(GTK_ENTRY (entry), 20);
+    gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
+    gtk_box_pack_end (GTK_BOX (vbox), entry, TRUE, TRUE, 0);
+    gtk_container_add (GTK_CONTAINER (content_area), vbox);
+    gtk_widget_show_all (content_area);
+
+    result = gtk_dialog_run (GTK_DIALOG (dialog));
+
+    if (result == GTK_RESPONSE_ACCEPT)
+    {
+        if (gtk_entry_get_text (GTK_ENTRY (entry)))
+        {
+            folder = g_object_new (KATZE_TYPE_ITEM, "name", 
+                                   gtk_entry_get_text (GTK_ENTRY (entry)),
+                                   NULL);
+            g_signal_emit_by_name (bookmarks, "add-item", folder);
+        }
+        GList* tabs = midori_browser_get_tabs (browser);
+        for (; tabs; tabs = g_list_next (tabs))
+        {
+            MidoriView* view = tabs->data;
+            KatzeItem* item = g_object_new (KATZE_TYPE_ITEM,
+                "uri", midori_view_get_display_uri (MIDORI_VIEW (view)),
+                "name", midori_view_get_display_title (MIDORI_VIEW (view)),
+                NULL);
+            katze_item_set_parent (item, folder);
+            g_signal_emit_by_name (bookmarks, "add-item", item);
+        }
+        g_list_free (tabs);
+    }
+    gtk_widget_destroy (dialog);
+    g_object_unref (bookmarks);
+}
+
 /**
  * midori_view_get_tab_menu:
  * @view: a #MidoriView
@@ -4880,6 +4943,10 @@
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
     g_signal_connect (menuitem, "activate",
         G_CALLBACK (midori_view_tab_label_menu_window_new_cb), view);
+    menuitem = gtk_menu_item_new_with_mnemonic (_("_Bookmark All Tabs"));
+    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
+    g_signal_connect (menuitem, "activate",
+        G_CALLBACK (midori_view_tab_label_menu_bookmark_all_tabs_cb), view);
     menuitem = gtk_menu_item_new_with_mnemonic (_("_Duplicate Tab"));
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
     g_signal_connect (menuitem, "activate",