Merge lp:~midori/midori/clippyEditor into lp:midori

[Cris Dywan]

Move bookmark editor into clippy

This branch moves the bookmark editor into Clippy (and always uses a popover in all cases, no dialog, for consistency). The combo box created from the bookmarks database moves out of Browser into to BookmarksDb, which is where it should've been in the first place.

Unmerged revisions

7175. By Cris Dywan on 2017-11-27

Move bookmark editor into clippy

7174. By Cris Dywan on 2017-11-26

Move bookmarkbar into clippy extension

7173. By Cris Dywan on 2017-11-26

Drop pass-through-console flag

7172. By Cris Dywan on 2017-11-25

Unconditionally include WebKit2 headers

7171. By Cris Dywan on 2017-11-07

Drop non-WebKit2 website saving code path

7170. By Cris Dywan on 2017-11-06

Non-conditional skipping of non-WebKit2 extensions

7169. By Cris Dywan on 2017-11-06

Drop non-WebKit2/ non-libnotify code paths

=== modified file 'extensions/clippy.vala'
--- extensions/clippy.vala	2017-11-27 17:24:49 +0000
+++ extensions/clippy.vala	2017-11-27 17:24:49 +0000
@@ -10,6 +10,129 @@
 */
 
 namespace Bookmarks {
+    private class Editor : Gtk.Popover {
+        Midori.Browser browser;
+        bool new_bookmark;
+        bool is_folder;
+        Katze.Item bookmark;
+        Gtk.Button accept;
+        Gtk.Entry entry_title;
+        Gtk.Entry entry_uri;
+        Gtk.ComboBox combo_folder;
+        Gtk.CheckButton check_toolbar;
+
+        public Editor (Midori.Browser browser, bool new_bookmark, bool is_folder, Katze.Item? bookmark_or_parent, Gtk.Widget? relative_to) {
+            this.browser = browser;
+            this.new_bookmark = new_bookmark;
+            this.is_folder = is_folder;
+
+            this.relative_to = relative_to ?? browser.get_titlebar ();
+            set_border_width (12);
+            var content_area = new Gtk.Box (Gtk.Orientation.VERTICAL, 6);
+            add (content_area);
+            var actions = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
+            content_area.pack_end (actions, true, true, 0);
+            accept = new Gtk.Button.from_stock (new_bookmark ? Gtk.Stock.ADD : Gtk.Stock.SAVE);
+            actions.pack_end (accept, false, false, 0);
+            accept.clicked.connect (accepted);
+            accept.set_can_default (true);
+            set_default_widget (accept);
+
+            var description = new Gtk.Label (is_folder ?
+                _("Type a name for this folder, and choose where to keep it.") :
+                _("Type a name for this bookmark, and choose where to keep it."));
+            var vbox = new Gtk.Box (Gtk.Orientation.VERTICAL, 6);
+            vbox.pack_start (description, false, false, 6);
+            content_area.pack_start (vbox, false, false, 0);
+
+            if (new_bookmark) {
+                var view = browser.tab as Midori.View;
+                if (is_folder) {
+                    bookmark = new Katze.Array (typeof (Katze.Item));
+                } else {
+                    bookmark = new Katze.Item ();
+                    bookmark.uri = view.get_display_uri ();
+                }
+                bookmark.name = view.get_display_title ();
+                bookmark.set_meta_integer ("parentid", bookmark_or_parent != null
+                    ? bookmark_or_parent.get_meta_integer ("id") : 0);
+            } else {
+                bookmark = bookmark_or_parent;
+            }
+
+            entry_title = new Gtk.Entry ();
+            entry_title.activates_default = true;
+            entry_title.text = bookmark.name != null ? bookmark.name : "";
+            entry_title.changed.connect (title_changed);
+            title_changed ();
+            vbox.pack_start (entry_title, false, false, 0);
+
+            if (!is_folder) {
+                entry_uri = new Gtk.Entry ();
+                entry_uri.activates_default = true;
+                entry_uri.text = bookmark.uri;
+                vbox.pack_start (entry_uri, false, false, 0);
+            }
+
+            var bookmarks = browser.bookmarks as Midori.BookmarksDb;
+            combo_folder = bookmarks.folder_button_new (bookmark.get_meta_integer ("parentid"));
+            vbox.pack_start (combo_folder, false, false, 0);
+
+            var hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
+            vbox.pack_start (hbox, false, false, 0);
+            check_toolbar = new Gtk.CheckButton.with_mnemonic (_("Show in Bookmarks _Bar"));
+            check_toolbar.active = bookmark.get_meta_boolean ("toolbar");
+            hbox.pack_start (check_toolbar, false, false, 0);
+
+            if (new_bookmark && !is_folder) {
+                var label = new Gtk.Button.with_mnemonic (_("Add to _Speed Dial"));
+                label.clicked.connect (() => {
+                    var view = browser.tab as Midori.View;
+                    browser.speed_dial.add (view.get_display_uri (), view.get_display_title (), null);
+                    destroy ();
+                });
+                actions.pack_start (label, false, false, 0);
+
+                /* FIXME: There's no API for extending the bookmark dialog */
+                var action_group = browser.get_action_group ();
+                var action = action_group.get_action ("CreateLauncher");
+                if (action != null) {
+                    label = new Gtk.Button.with_mnemonic (action.label);
+                    label.clicked.connect (() => {
+                        action.activate ();
+                        destroy ();
+                    });
+                    actions.pack_start (label, false, false, 0);
+                }
+            }
+
+            content_area.show_all ();
+            show ();
+        }
+
+        void title_changed () {
+            accept.sensitive = entry_title.text != null && entry_title.text != "";
+        }
+
+        void accepted () {
+            bookmark.name = entry_title.text;
+            bookmark.set_meta_integer ("toolbar", check_toolbar.active ? 1 : 0);
+            if (!(bookmark is Katze.Array))
+                bookmark.uri = entry_uri.text;
+            Gtk.TreeIter iter;
+            int64 parent_id = -1;
+            if (combo_folder.get_active_iter (out iter))
+                combo_folder.model.get (iter, 1, out parent_id);
+            bookmark.set_meta_integer ("parentid", parent_id);
+            var bookmarks = browser.bookmarks as Midori.BookmarksDb;
+            if (new_bookmark)
+                bookmarks.add_item (bookmark);
+            else
+                bookmarks.update_item (bookmark);
+            destroy ();
+        }
+    }
+
     private class Toolbar : Gtk.Toolbar {
         Midori.Browser browser;
         bool populating;
@@ -120,15 +243,51 @@
         void browser_added (Midori.Browser browser) {
             browser.notify["bookmarks"].connect (bookmarks_changed);
             browser.notify_property ("bookmarks");
+
+            var action_group = browser.get_action_group ();
+            action_group.get_action ("BookmarkAdd").activate.connect ((action) => {
+                new Editor (browser, true, false, null,
+                            action.get_data<Gtk.Widget?> ("proxy") ?? get_proxy (action));
+            });
+            action_group.get_action ("BookmarkFolderAdd").activate.connect ((action) => {
+                new Editor (browser, true, true, null,
+                            action.get_data<Gtk.Widget?> ("proxy") ?? get_proxy (action));
+            });
+            action_group.get_action ("BookmarkEdit").activate.connect ((action) => {
+                new Editor (browser, false, false,
+                            action.get_data<Katze.Item> ("bookmark"),
+                            action.get_data<Gtk.Widget?> ("proxy"));
+            });
+            action_group.get_action ("BookmarkFolderEdit").activate.connect ((action) => {
+                new Editor (browser, false, true,
+                            action.get_data<Katze.Item> ("bookmark"),
+                            action.get_data<Gtk.Widget?> ("proxy"));
+            });
+        }
+
+        Gtk.Widget? get_proxy (Gtk.Action action) {
+            foreach (var proxy in action.get_proxies ()) {
+                if (proxy is Gtk.ToolItem)
+                    return proxy;
+            }
+            return null;
         }
 
         void bookmarks_changed (GLib.Object object, GLib.ParamSpec pspec) {
             var browser = object as Midori.Browser;
             var action_group = browser.get_action_group ();
-            var action = action_group.get_action ("Bookmarkbar") as Gtk.ToggleAction;
+            var action = action_group.get_action ("Bookmarkbar");
             action.visible = browser.parent == null && browser.bookmarks != null;
             if (action.visible)
                 browser.add_toolbar (new Toolbar (browser));
+            action = action_group.get_action ("BookmarkAdd");
+            action.visible = browser.bookmarks != null;
+            action = action_group.get_action ("BookmarkFolderAdd");
+            action.visible = browser.bookmarks != null;
+            action = action_group.get_action ("BookmarkEdit");
+            action.visible = browser.bookmarks != null;
+            action = action_group.get_action ("BookmarkFolderEdit");
+            action.visible = browser.bookmarks != null;
         }
 
         void activated (Midori.App app) {

=== modified file 'midori/midori-bookmarks-db.c'
--- midori/midori-bookmarks-db.c	2015-07-06 21:26:46 +0000
+++ midori/midori-bookmarks-db.c	2017-11-27 17:24:49 +0000
@@ -16,6 +16,7 @@
 #include "midori-array.h"
 #include "sokoke.h"
 #include "midori-core.h"
+#include "katze-cellrenderercomboboxtext.h"
 
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
@@ -1149,3 +1150,217 @@
 
     g_object_unref (array);
 }
+
+typedef struct _FolderEntry
+{
+    const gchar *title;
+    gint64 id;
+    gint64 parentid;
+} FolderEntry;
+
+static void
+midori_bookmark_folder_free_folder_entry (FolderEntry* folder)
+{
+    g_free ((gpointer)folder->title);
+}
+
+static gboolean
+midori_bookmark_folder_button_reach_parent (GtkTreeModel* model, GtkTreeIter *iter, gint64 parentid)
+{
+    do
+    {
+        gint64 id;
+
+        gtk_tree_model_get (model, iter, 1, &id, -1);
+
+        if (parentid == id)
+            return TRUE;
+
+        if (gtk_tree_model_iter_has_child (model, iter))
+        {
+            GtkTreeIter child;
+            gtk_tree_model_iter_children (model, &child, iter);
+            if (midori_bookmark_folder_button_reach_parent (model, &child, parentid))
+            {
+                *iter = child;
+                return TRUE;
+            }
+        }
+    }
+    while (gtk_tree_model_iter_next (model, iter));
+
+    return FALSE;
+}
+
+GtkWidget*
+midori_bookmarks_db_folder_button_new (MidoriBookmarksDb* array,
+                                       gint64      selected_parentid)
+{
+    GtkTreeStore* model;
+    GtkWidget* combo;
+    GtkCellRenderer* renderer;
+    guint n;
+    sqlite3* db;
+    sqlite3_stmt* statement;
+    gint result;
+    const gchar* sqlcmd = "SELECT title, id, parentid FROM bookmarks WHERE uri='' ORDER BY parentid, title ASC";
+    gint64 current_parentid;
+    GtkTreeIter tree_iter;
+    GtkTreeIter stock_parent_iter;
+    GtkTreeIter* parent_iter;
+    GList *folders = NULL;
+
+    db = g_object_get_data (G_OBJECT (array), "db");
+    g_return_val_if_fail (db != NULL, NULL);
+
+    /* folder combo box model content:
+    ** 0: title
+    ** 1: id
+    */
+    model = gtk_tree_store_new (2, G_TYPE_STRING, G_TYPE_INT64);
+    combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (model));
+
+    /* setup combo layout
+    ** 0: a folder icon
+    ** 1: the folder name
+     */
+
+    gtk_cell_layout_clear (GTK_CELL_LAYOUT (combo));
+
+    renderer = gtk_cell_renderer_pixbuf_new ();
+    g_object_set (G_OBJECT (renderer),
+        "stock-id", GTK_STOCK_DIRECTORY,
+        "stock-size", GTK_ICON_SIZE_MENU,
+        NULL);
+    gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, FALSE);
+
+    renderer = katze_cell_renderer_combobox_text_new ();
+    g_object_set (G_OBJECT (renderer),
+        "width-chars", 40,    /* FIXME: figure out a way to define an acceptable string length */
+        "ellipsize", PANGO_ELLIPSIZE_END,
+        "unfolded-text", _("Select [text]"),
+        NULL);
+    gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
+    gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), renderer, "text", 0);
+
+    /* read the folders list from the database */
+    /* FIXME: this should be a service of midori/midori-bookmarks-db */
+
+    if ((result = sqlite3_prepare_v2 (db, sqlcmd, -1, &statement, NULL)) == SQLITE_OK)
+    {
+        while ((result = sqlite3_step (statement)) == SQLITE_ROW)
+        {
+            FolderEntry* folder = g_new (FolderEntry, 1);
+
+            folder->title = g_strdup ((const gchar*)sqlite3_column_text (statement, 0));
+            folder->id = sqlite3_column_int64 (statement, 1);
+            folder->parentid = sqlite3_column_int64 (statement, 2);
+
+            folders = g_list_append (folders, folder);
+        }
+
+        sqlite3_clear_bindings (statement);
+        sqlite3_reset (statement);
+    }
+
+    /* populate the combo box */
+    /* FIXME: here we should have the root bookmark array's name and id, not hard encoded values */
+
+    gtk_tree_store_insert_with_values (model, &tree_iter, NULL, G_MAXINT,
+        0, _("Bookmarks"), 1, (gint64)-1, -1);
+    gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo), &tree_iter);
+
+    current_parentid = -1;
+    parent_iter = NULL;
+    n = 1;
+    while (g_list_first (folders))
+    {
+        gboolean something_done = FALSE;
+        GList* list_iter = g_list_first (folders);
+
+        do
+        {
+            FolderEntry* folder = list_iter->data;
+            const gchar* title = folder->title;
+            gint64 id = folder->id;
+            gint64 parentid = folder->parentid;
+
+            if (parentid != current_parentid)  /* optimize case of sub-folders of the same parent */
+            {
+                if (!parentid)
+                {
+                    /* folder's parent is the stree store root */
+
+                    current_parentid = -1;
+                    parent_iter = NULL;
+                }
+                else if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &tree_iter))
+                {
+                    if (midori_bookmark_folder_button_reach_parent (
+                            GTK_TREE_MODEL (model), &tree_iter, parentid))
+                    {
+                        /* folder's parent found in the tree store */
+
+                        current_parentid = parentid;
+                        stock_parent_iter = tree_iter;
+                        parent_iter = &stock_parent_iter;
+                    }
+                    else
+                    {
+                        /* folder's parent not found, skip it */
+
+                        list_iter = g_list_next (list_iter);
+                        continue;
+                    }
+                }
+                else
+                    g_assert_not_reached ();
+            }
+
+            /* insert folder in the tree store and remove it from the folders list */
+
+            gtk_tree_store_insert_with_values (model, &tree_iter, parent_iter, G_MAXINT,
+                0, title, 1, id, -1);
+
+            if (id == selected_parentid)
+                gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo), &tree_iter);
+
+            n++;
+
+            something_done = TRUE;
+
+            g_free ((gpointer)title);
+            folders = g_list_delete_link (folders, list_iter);
+
+            list_iter = g_list_first (folders);
+        }
+        while (list_iter);
+
+        if (!something_done)  /* avoid infinite loop in case of orphan folders */
+            break;
+    }
+
+    if (g_list_first (folders))
+    {
+        GList* iter;
+        g_printerr ("midori_bookmark_folder_button_new: orphan folder(s) detected in bookmarks db\n");
+
+        for (iter = g_list_first (folders) ; iter ; iter = g_list_next (iter))
+        {
+            FolderEntry* folder = iter->data;
+            const gchar* title = folder->title;
+            gint64 id = folder->id;
+            gint64 parentid = folder->parentid;
+
+            g_printerr ("  id=%" G_GINT64_FORMAT ", parentid=%" G_GINT64_FORMAT ", title=%s\n",
+                id, parentid, title);
+        }
+
+        g_list_free_full (folders, (GDestroyNotify)midori_bookmark_folder_free_folder_entry);
+    }
+
+    if (n < 2)
+        gtk_widget_set_sensitive (combo, FALSE);
+
+    return combo;
+}

=== modified file 'midori/midori-bookmarks-db.h'
--- midori/midori-bookmarks-db.h	2015-07-06 21:26:46 +0000
+++ midori/midori-bookmarks-db.h	2017-11-27 17:24:49 +0000
@@ -75,5 +75,9 @@
 midori_bookmarks_db_populate_folder (MidoriBookmarksDb* bookmarks,
     KatzeArray *folder);
 
+GtkWidget*
+midori_bookmarks_db_folder_button_new (MidoriBookmarksDb* bookmarks,
+                                       gint64      selected_parentid);
+
 #endif /* !__MIDORI_BOOKMARKS_DB_H__ */
 

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2017-11-27 17:24:49 +0000
+++ midori/midori-browser.c	2017-11-27 17:24:49 +0000
@@ -289,8 +289,6 @@
         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, "BookmarkFolderAdd", !midori_view_is_blank (view));
     _action_set_sensitive (browser, "MailTo", !midori_view_is_blank (view));
     _action_set_sensitive (browser, "SaveAs", midori_tab_can_save (MIDORI_TAB (view)));
     _action_set_sensitive (browser, "ZoomIn", midori_view_can_zoom_in (view));
@@ -818,220 +816,6 @@
     }
 }
 
-static gboolean
-midori_bookmark_folder_button_reach_parent (GtkTreeModel* model, GtkTreeIter *iter, gint64 parentid)
-{
-    do
-    {
-        gint64 id;
-
-        gtk_tree_model_get (model, iter, 1, &id, -1);
-
-        if (parentid == id)
-            return TRUE;
-
-        if (gtk_tree_model_iter_has_child (model, iter))
-        {
-            GtkTreeIter child;
-            gtk_tree_model_iter_children (model, &child, iter);
-            if (midori_bookmark_folder_button_reach_parent (model, &child, parentid))
-            {
-                *iter = child;
-                return TRUE;
-            }
-        }
-    }
-    while (gtk_tree_model_iter_next (model, iter));
-
-    return FALSE;
-}
-
-typedef struct _FolderEntry
-{
-    const gchar *title;
-    gint64 id;
-    gint64 parentid;
-} FolderEntry;
-
-static void
-midori_bookmark_folder_free_folder_entry (FolderEntry* folder)
-{
-    g_free ((gpointer)folder->title);
-}
-
-static GtkWidget*
-midori_bookmark_folder_button_new (MidoriBookmarksDb* array,
-                                   gint64      selected_parentid)
-{
-    GtkTreeStore* model;
-    GtkWidget* combo;
-    GtkCellRenderer* renderer;
-    guint n;
-    sqlite3* db;
-    sqlite3_stmt* statement;
-    gint result;
-    const gchar* sqlcmd = "SELECT title, id, parentid FROM bookmarks WHERE uri='' ORDER BY parentid, title ASC";
-    gint64 current_parentid;
-    GtkTreeIter tree_iter;
-    GtkTreeIter stock_parent_iter;
-    GtkTreeIter* parent_iter;
-    GList *folders = NULL;
-
-    db = g_object_get_data (G_OBJECT (array), "db");
-    g_return_val_if_fail (db != NULL, NULL);
-
-    /* folder combo box model content:
-    ** 0: title
-    ** 1: id
-    */
-    model = gtk_tree_store_new (2, G_TYPE_STRING, G_TYPE_INT64);
-    combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (model));
-
-    /* setup combo layout
-    ** 0: a folder icon
-    ** 1: the folder name
-     */
-
-    gtk_cell_layout_clear (GTK_CELL_LAYOUT (combo));
-
-    renderer = gtk_cell_renderer_pixbuf_new ();
-    g_object_set (G_OBJECT (renderer),
-        "stock-id", GTK_STOCK_DIRECTORY,
-        "stock-size", GTK_ICON_SIZE_MENU,
-        NULL);
-    gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, FALSE);
-
-    renderer = katze_cell_renderer_combobox_text_new ();
-    g_object_set (G_OBJECT (renderer),
-        "width-chars", 40,    /* FIXME: figure out a way to define an acceptable string length */
-        "ellipsize", PANGO_ELLIPSIZE_END,
-        "unfolded-text", _("Select [text]"),
-        NULL);
-    gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
-    gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), renderer, "text", 0);
-
-    /* read the folders list from the database */
-    /* FIXME: this should be a service of midori/midori-bookmarks-db */
-
-    if ((result = sqlite3_prepare_v2 (db, sqlcmd, -1, &statement, NULL)) == SQLITE_OK)
-    {
-        while ((result = sqlite3_step (statement)) == SQLITE_ROW)
-        {
-            FolderEntry* folder = g_new (FolderEntry, 1);
-
-            folder->title = g_strdup ((const gchar*)sqlite3_column_text (statement, 0));
-            folder->id = sqlite3_column_int64 (statement, 1);
-            folder->parentid = sqlite3_column_int64 (statement, 2);
-
-            folders = g_list_append (folders, folder);
-        }
-
-        sqlite3_clear_bindings (statement);
-        sqlite3_reset (statement);
-    }
-
-    /* populate the combo box */
-    /* FIXME: here we should have the root bookmark array's name and id, not hard encoded values */
-
-    gtk_tree_store_insert_with_values (model, &tree_iter, NULL, G_MAXINT,
-        0, _("Bookmarks"), 1, (gint64)-1, -1);
-    gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo), &tree_iter);
-
-    current_parentid = -1;
-    parent_iter = NULL;
-    n = 1;
-    while (g_list_first (folders))
-    {
-        gboolean something_done = FALSE;
-        GList* list_iter = g_list_first (folders);
-
-        do
-        {
-            FolderEntry* folder = list_iter->data;
-            const gchar* title = folder->title;
-            gint64 id = folder->id;
-            gint64 parentid = folder->parentid;
-
-            if (parentid != current_parentid)  /* optimize case of sub-folders of the same parent */
-            {
-                if (!parentid)
-                {
-                    /* folder's parent is the stree store root */
-
-                    current_parentid = -1;
-                    parent_iter = NULL;
-                }
-                else if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &tree_iter))
-                {
-                    if (midori_bookmark_folder_button_reach_parent (
-                            GTK_TREE_MODEL (model), &tree_iter, parentid))
-                    {
-                        /* folder's parent found in the tree store */
-
-                        current_parentid = parentid;
-                        stock_parent_iter = tree_iter;
-                        parent_iter = &stock_parent_iter;
-                    }
-                    else
-                    {
-                        /* folder's parent not found, skip it */
-
-                        list_iter = g_list_next (list_iter);
-                        continue;
-                    }
-                }
-                else
-                    g_assert_not_reached ();
-            }
-
-            /* insert folder in the tree store and remove it from the folders list */
-
-            gtk_tree_store_insert_with_values (model, &tree_iter, parent_iter, G_MAXINT,
-                0, title, 1, id, -1);
-
-            if (id == selected_parentid)
-                gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo), &tree_iter);
-
-            n++;
-
-            something_done = TRUE;
-
-            g_free ((gpointer)title);
-            folders = g_list_delete_link (folders, list_iter);
-
-            list_iter = g_list_first (folders);
-        }
-        while (list_iter);
-
-        if (!something_done)  /* avoid infinite loop in case of orphan folders */
-            break;
-    }
-
-    if (g_list_first (folders))
-    {
-        GList* iter;
-        g_printerr ("midori_bookmark_folder_button_new: orphan folder(s) detected in bookmarks db\n");
-
-        for (iter = g_list_first (folders) ; iter ; iter = g_list_next (iter))
-        {
-            FolderEntry* folder = iter->data;
-            const gchar* title = folder->title;
-            gint64 id = folder->id;
-            gint64 parentid = folder->parentid;
-
-            g_printerr ("  id=%" G_GINT64_FORMAT ", parentid=%" G_GINT64_FORMAT ", title=%s\n",
-                id, parentid, title);
-        }
-
-        g_list_free_full (folders, (GDestroyNotify)midori_bookmark_folder_free_folder_entry);
-    }
-
-    if (n < 2)
-        gtk_widget_set_sensitive (combo, FALSE);
-
-    return combo;
-}
-
 static gint64
 midori_bookmark_folder_button_get_active (GtkWidget* combo)
 {
@@ -1049,76 +833,6 @@
     return id;
 }
 
-static void
-midori_browser_edit_bookmark_title_changed_cb (GtkEntry*      entry,
-                                               GtkWidget*     button)
-{
-    const gchar* title = gtk_entry_get_text (entry);
-    gtk_widget_set_sensitive (button,
-        title != NULL && title[0] != '\0');
-}
-
-static void
-midori_browser_edit_bookmark_response_cb (GtkWidget*     dialog,
-                                          gint           response,
-                                          MidoriBrowser* browser)
-{
-    if (response == GTK_RESPONSE_ACCEPT)
-    {
-        KatzeItem* bookmark = g_object_get_data (G_OBJECT (dialog), "bookmark");
-        GtkWidget* entry_title = g_object_get_data (G_OBJECT (dialog), "entry-title");
-        katze_item_set_name (bookmark,
-            gtk_entry_get_text (GTK_ENTRY (entry_title)));
-        GtkWidget* check_toolbar = g_object_get_data (G_OBJECT (dialog), "check-toolbar");
-        katze_item_set_meta_integer (bookmark, "toolbar",
-            gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_toolbar)));
-        GtkWidget* entry_uri = g_object_get_data (G_OBJECT (dialog), "entry-uri");
-        if (!KATZE_IS_ARRAY (bookmark))
-            katze_item_set_uri (bookmark,
-                gtk_entry_get_text (GTK_ENTRY (entry_uri)));
-
-        GtkWidget* combo_folder = g_object_get_data (G_OBJECT (dialog), "combo-folder");
-        gint64 selected = midori_bookmark_folder_button_get_active (combo_folder);
-        katze_item_set_meta_integer (bookmark, "parentid", selected);
-
-        gboolean new_bookmark = g_object_get_data (G_OBJECT (dialog), "new-bookmark") != NULL;
-        if (new_bookmark)
-            midori_bookmarks_db_add_item (browser->bookmarks, bookmark);
-        else
-            midori_bookmarks_db_update_item (browser->bookmarks, bookmark);
-    }
-    gtk_widget_destroy (dialog);
-}
-
-static void
-midori_browser_edit_bookmark_add_speed_dial_cb (GtkWidget* button,
-                                                KatzeItem* bookmark)
-{
-    MidoriBrowser* browser = midori_browser_get_for_widget (button);
-    midori_browser_add_speed_dial (browser);
-    GtkWidget* dialog = gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER);
-    midori_browser_edit_bookmark_response_cb (dialog, GTK_RESPONSE_DELETE_EVENT, browser);
-}
-
-static void
-midori_browser_edit_bookmark_create_launcher_cb (GtkWidget* button,
-                                                 KatzeItem* bookmark)
-{
-    MidoriBrowser* browser = midori_browser_get_for_widget (button);
-    GtkAction* action = g_object_get_data (G_OBJECT (button), "midori-action");
-    gtk_action_activate (action);
-    GtkWidget* dialog = gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER);
-    midori_browser_edit_bookmark_response_cb (dialog, GTK_RESPONSE_DELETE_EVENT, browser);
-}
-
-static void
-midori_browser_edit_bookmark_button_cb (GtkWidget*     button,
-                                        MidoriBrowser* browser)
-{
-    GtkWidget* dialog = gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER);
-    midori_browser_edit_bookmark_response_cb (dialog, GTK_RESPONSE_ACCEPT, browser);
-}
-
 /* Private function, used by MidoriBookmarks and MidoriHistory */
 /* static */ gboolean
 midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser,
@@ -1127,144 +841,14 @@
                                          gboolean       is_folder,
                                          GtkWidget*     proxy)
 {
-    KatzeItem*   bookmark = bookmark_or_parent;
-    const gchar* title;
-    GtkWidget* dialog;
-    GtkWidget* accept;
-    GtkWidget* content_area;
-    GtkWidget* actions;
-    GtkWidget* view;
-    GtkWidget* vbox;
-    GtkWidget* hbox;
-    GtkWidget* label;
-    const gchar* value;
-    GtkWidget* entry_title;
-    GtkWidget* entry_uri;
-    GtkWidget* combo_folder;
-    GtkWidget* check_toolbar;
-    gboolean return_status = FALSE;
-
-    if (is_folder)
-        title = new_bookmark ? _("New Folder") : _("Edit Folder");
-    else
-        title = new_bookmark ? _("New Bookmark") : _("Edit Bookmark");
-    if (proxy != NULL)
-    {
-        dialog = gtk_popover_new (proxy);
-        content_area = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
-        gtk_container_add (GTK_CONTAINER (dialog), content_area);
-        actions = gtk_hbox_new (FALSE, 6);
-        gtk_box_pack_end (GTK_BOX (content_area), actions, TRUE, TRUE, 0);
-        accept = gtk_button_new_from_stock (new_bookmark ? GTK_STOCK_ADD : GTK_STOCK_SAVE);
-        gtk_box_pack_end (GTK_BOX (actions), accept, FALSE, FALSE, 0);
-        g_signal_connect (accept, "clicked", G_CALLBACK (midori_browser_edit_bookmark_button_cb), browser);
-    }
-    else
-    {
-        dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW (browser),
-            GTK_DIALOG_DESTROY_WITH_PARENT, NULL, NULL);
-        content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-        actions = gtk_hbox_new (FALSE, 0);
-        gtk_box_pack_end (GTK_BOX (content_area), actions, TRUE, TRUE, 0);
-        gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-            new_bookmark ? GTK_STOCK_ADD : GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL);
-        gtk_window_set_icon_name (GTK_WINDOW (dialog),
-            new_bookmark ? GTK_STOCK_ADD : GTK_STOCK_REMOVE);
-        gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
-        g_signal_connect (dialog, "response", G_CALLBACK (midori_browser_edit_bookmark_response_cb), browser);
-        accept = gtk_dialog_get_widget_for_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
-    }
-    gtk_container_set_border_width (GTK_CONTAINER (dialog), 12);
-
-    if (!is_folder)
-        label = gtk_label_new (_("Type a name for this bookmark, and choose where to keep it."));
-    else
-        label = gtk_label_new (_("Type a name for this folder, and choose where to keep it."));
-
-    vbox = gtk_vbox_new (FALSE, 6);
-    gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 6);
-    gtk_box_pack_start (GTK_BOX (content_area), vbox, FALSE, FALSE, 0);
-
-    if (new_bookmark)
-    {
-        view = midori_browser_get_current_tab (browser);
-        if (is_folder)
-        {
-            bookmark = (KatzeItem*)katze_array_new (KATZE_TYPE_ARRAY);
-            katze_item_set_name (bookmark,
-                midori_view_get_display_title (MIDORI_VIEW (view)));
-        }
-        else
-            bookmark = 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_meta_integer (
-            bookmark, "parentid",
-            (!bookmark_or_parent
-                ? 0
-                : katze_item_get_meta_integer (bookmark_or_parent, "id")));
-        g_object_set_data (G_OBJECT (dialog), "new-bookmark", bookmark);
-    }
-    g_object_set_data_full (G_OBJECT (dialog), "bookmark", bookmark, (GDestroyNotify)g_object_unref);
-
-    entry_title = gtk_entry_new ();
-    gtk_entry_set_activates_default (GTK_ENTRY (entry_title), TRUE);
-    value = katze_item_get_name (bookmark);
-    gtk_entry_set_text (GTK_ENTRY (entry_title), katze_str_non_null (value));
-    midori_browser_edit_bookmark_title_changed_cb (GTK_ENTRY (entry_title),
-                                                   accept);
-    g_signal_connect (entry_title, "changed",
-        G_CALLBACK (midori_browser_edit_bookmark_title_changed_cb), accept);
-    gtk_box_pack_start (GTK_BOX (vbox), entry_title, FALSE, FALSE, 0);
-    g_object_set_data (G_OBJECT (dialog), "entry-title", entry_title);
-
-    entry_uri = NULL;
-    if (!is_folder)
-    {
-        entry_uri = katze_uri_entry_new (accept);
-        gtk_entry_set_activates_default (GTK_ENTRY (entry_uri), TRUE);
-        gtk_entry_set_text (GTK_ENTRY (entry_uri), katze_item_get_uri (bookmark));
-        gtk_box_pack_start (GTK_BOX (vbox), entry_uri, FALSE, FALSE, 0);
-        g_object_set_data (G_OBJECT (dialog), "entry-uri", entry_uri);
-    }
-
-    combo_folder = midori_bookmark_folder_button_new (browser->bookmarks,
-        katze_item_get_meta_integer (bookmark, "parentid"));
-    gtk_box_pack_start (GTK_BOX (vbox), combo_folder, FALSE, FALSE, 0);
-    g_object_set_data (G_OBJECT (dialog), "combo-folder", combo_folder);
-
-    hbox = gtk_hbox_new (FALSE, 6);
-    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
-    check_toolbar = gtk_check_button_new_with_mnemonic (_("Show in Bookmarks _Bar"));
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_toolbar),
-        katze_item_get_meta_boolean (bookmark, "toolbar"));
-    gtk_box_pack_start (GTK_BOX (hbox), check_toolbar, FALSE, FALSE, 0);
-    g_object_set_data (G_OBJECT (dialog), "check-toolbar", check_toolbar);
-
-    if (new_bookmark && !is_folder)
-    {
-        label = gtk_button_new_with_mnemonic (_("Add to _Speed Dial"));
-        g_signal_connect (label, "clicked",
-            G_CALLBACK (midori_browser_edit_bookmark_add_speed_dial_cb), bookmark);
-        gtk_box_pack_start (GTK_BOX (actions), label, FALSE, FALSE, 0);
-
-        /* FIXME: There's no API for extending the bookmark dialog */
-        GtkAction* action = _action_by_name (browser, "CreateLauncher");
-        if (action != NULL)
-        {
-            label = gtk_button_new_with_mnemonic (gtk_action_get_label (action));
-            g_object_set_data (G_OBJECT (label), "midori-action", action);
-            g_signal_connect (label, "clicked",
-                G_CALLBACK (midori_browser_edit_bookmark_create_launcher_cb), bookmark);
-            gtk_box_pack_start (GTK_BOX (actions), label, FALSE, FALSE, 0);
-        }
-    }
-
-    gtk_widget_show_all (content_area);
-    gtk_widget_show (dialog);
-
-    return return_status;
+    GtkAction* action = _action_by_name (browser,
+        new_bookmark ?
+            (is_folder ? "BookmarkFolderAdd" : "BookmarkAdd") :
+            (is_folder ? "BookmarkFolderEdit" : "BookmarkEdit"));
+    g_object_set_data_full (G_OBJECT (action), "bookmark", bookmark_or_parent, (GDestroyNotify)g_object_unref);
+    g_object_set_data (G_OBJECT (action), "proxy", proxy);
+    gtk_action_activate (action);
+    return FALSE;
 }
 
 static gboolean
@@ -4276,25 +3860,6 @@
 }
 
 static void
-_action_bookmark_add_activate (GtkAction*     action,
-                               MidoriBrowser* browser)
-{
-    GtkWidget* proxy = NULL;
-    GSList* proxies = gtk_action_get_proxies (action);
-    for (; proxies != NULL; proxies = g_slist_next (proxies))
-    if (GTK_IS_TOOL_ITEM (proxies->data))
-    {
-        proxy = proxies->data;
-        break;
-    }
-
-    if (g_str_equal (gtk_action_get_name (action), "BookmarkFolderAdd"))
-        midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, TRUE, proxy);
-    else
-        midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, FALSE, proxy);
-}
-
-static void
 _action_bookmarks_import_activate (GtkAction*     action,
                                    MidoriBrowser* browser)
 {
@@ -4423,7 +3988,7 @@
     gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);
     gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, TRUE, 0);
 
-    combobox_folder = midori_bookmark_folder_button_new (browser->bookmarks, 0);
+    combobox_folder = midori_bookmarks_db_folder_button_new (browser->bookmarks, 0);
     gtk_box_pack_start (GTK_BOX (content_area), combobox_folder, FALSE, TRUE, 0);
     gtk_widget_show_all (content_area);
 
@@ -5198,10 +4763,16 @@
 
     { "BookmarkAdd", STOCK_BOOKMARK_ADD,
         NULL, "<Ctrl>d",
-        N_("Add a new bookmark"), G_CALLBACK (_action_bookmark_add_activate) },
+        N_("Add a new bookmark"), NULL },
     { "BookmarkFolderAdd", NULL,
         N_("Add a new _folder"), "",
-        NULL, G_CALLBACK (_action_bookmark_add_activate) },
+        NULL, NULL },
+    { "BookmarkEdit", NULL,
+        "Edit an existing bookmark", "",
+        NULL, NULL },
+    { "BookmarkFolderEdit", NULL,
+        "Edit an existing folder", "",
+        NULL, NULL },
     { "BookmarksImport", NULL,
         N_("_Import bookmarks…"), "",
         NULL, G_CALLBACK (_action_bookmarks_import_activate) },
@@ -5984,8 +5555,10 @@
     _action_set_visible (browser, "LastSession", FALSE);
 
     _action_set_visible (browser, "Bookmarks", browser->bookmarks != NULL);
-    _action_set_visible (browser, "BookmarkAdd", browser->bookmarks != NULL);
-    _action_set_visible (browser, "BookmarkFolderAdd", browser->bookmarks != NULL);
+    _action_set_visible (browser, "BookmarkAdd", FALSE);
+    _action_set_visible (browser, "BookmarkFolderAdd", FALSE);
+    _action_set_visible (browser, "BookmarkEdit", FALSE);
+    _action_set_visible (browser, "BookmarkFolderEdit", FALSE);
     _action_set_visible (browser, "BookmarksImport", browser->bookmarks != NULL);
     _action_set_visible (browser, "BookmarksExport", browser->bookmarks != NULL);
     _action_set_visible (browser, "Bookmarkbar", FALSE);
@@ -6427,8 +6000,6 @@
         for (; proxies; proxies = g_slist_next (proxies))
             gtk_widget_show (proxies->data);
     }
-    _action_set_visible (browser, "BookmarkAdd", bookmarks != NULL);
-    _action_set_visible (browser, "BookmarkFolderAdd", bookmarks != NULL);
     _action_set_visible (browser, "BookmarksImport", bookmarks != NULL);
     _action_set_visible (browser, "BookmarksExport", bookmarks != NULL);
 

=== modified file 'midori/midori.vapi'
--- midori/midori.vapi	2017-11-27 17:24:49 +0000
+++ midori/midori.vapi	2017-11-27 17:24:49 +0000
@@ -24,7 +24,11 @@
 
     [CCode (type_id = "TYPE_MIDORI_BOOKMARKS_DB", cheader_filename = "midori/midori-bookmarks-db.h")]
     public class BookmarksDb : Katze.Array {
+        public void add_item (Katze.Item item);
+        public void update_item (Katze.Item item);
+        public void remove_item (Katze.Item item);
         public Katze.Array? query_recursive (string fields, string condition, string? value, bool recursive);
+        public unowned Gtk.ComboBox folder_button_new (int64 parent_id);
     }
 
     [CCode (cheader_filename = "midori/midori-array.h")]
@@ -109,6 +113,8 @@
         public Katze.Array? history { owned get; set; }
         [NoAccessorMethod]
         public bool show_tabs { get; set; }
+        [NoAccessorMethod]
+        public Midori.SpeedDial? speed_dial { owned get; set; }
 
         public signal Browser new_window (Browser? browser);
         [HasEmitter]

=== modified file 'panels/midori-bookmarks.c'
--- panels/midori-bookmarks.c	2015-08-10 00:31:37 +0000
+++ panels/midori-bookmarks.c	2017-11-27 17:24:49 +0000
@@ -605,7 +605,7 @@
 
         browser = midori_browser_get_for_widget (bookmarks->treeview);
         midori_browser_edit_bookmark_dialog_new (
-            browser, item, FALSE, KATZE_ITEM_IS_FOLDER (item), NULL);
+            browser, item, FALSE, KATZE_ITEM_IS_FOLDER (item), bookmarks->treeview);
 
         g_object_unref (item);
     }

=== modified file 'panels/midori-history.c'
--- panels/midori-history.c	2015-08-10 00:11:32 +0000
+++ panels/midori-history.c	2017-11-27 17:24:49 +0000
@@ -326,7 +326,7 @@
     GtkTreeIter iter;
     KatzeItem* item = NULL;
 
-    GtkWidget* proxy = GTK_IS_TOOL_ITEM (menuitem) ? menuitem : NULL;
+    GtkWidget* proxy = GTK_IS_TOOL_ITEM (menuitem) ? menuitem : history->treeview;
     MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (history));
     if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (history->treeview),
                                            &model, &iter))