6 files changed, 64 insertions, 28 deletions

diff --git a/src/app.c b/src/app.c
index f0249fcf..fe96a1f6 100644
--- a/src/app.c
+++ b/src/app.c
@@ -668,11 +668,9 @@ iBool handleCommand_App(const char *cmd) {
     }
     else if (equal_Command(cmd, "bookmark.add")) {
         iDocumentWidget *doc = document_App();
-        add_Bookmarks(d->bookmarks, url_DocumentWidget(doc),
-                      bookmarkTitle_DocumentWidget(doc),
-                      collectNew_String(),
-                      siteIcon_GmDocument(document_DocumentWidget(doc)));
-        postCommand_App("bookmarks.changed");
+        makeBookmarkCreation_Widget(url_DocumentWidget(doc),
+                                    bookmarkTitle_DocumentWidget(doc),
+                                    siteIcon_GmDocument(document_DocumentWidget(doc)));
         return iTrue;
     }
     else if (equal_Command(cmd, "theme.set")) {
diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index 0e9c592f..d9842a40 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -333,6 +333,10 @@ void setTextCStr_LabelWidget(iLabelWidget *d, const char *text) {
     updateSize_LabelWidget(d);
 }
 
+const iString *label_LabelWidget(const iLabelWidget *d) {
+    return &d->label;
+}
+
 const iString *command_LabelWidget(const iLabelWidget *d) {
     return &d->command;
 }
diff --git a/src/ui/labelwidget.h b/src/ui/labelwidget.h
index ad1419ef..64f96aed 100644
--- a/src/ui/labelwidget.h
+++ b/src/ui/labelwidget.h
@@ -38,6 +38,7 @@ void    updateSize_LabelWidget      (iLabelWidget *);
 void    updateText_LabelWidget      (iLabelWidget *, const iString *text); /* not resized */
 void    updateTextCStr_LabelWidget  (iLabelWidget *, const char *text); /* not resized */
 
+const iString *label_LabelWidget    (const iLabelWidget *);
 const iString *command_LabelWidget  (const iLabelWidget *);
 
 iLocalDef iLabelWidget *newEmpty_LabelWidget(void) {
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 99768b13..a02294dc 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -416,17 +416,12 @@ iBool handleBookmarkEditorCommands_SidebarWidget_(iWidget *editor, const char *c
             const iString *title = text_InputWidget(findChild_Widget(editor, "bmed.title"));
             const iString *url   = text_InputWidget(findChild_Widget(editor, "bmed.url"));
             const iString *tags  = text_InputWidget(findChild_Widget(editor, "bmed.tags"));
-            if (!cmp_String(id_Widget(editor), "bmed.create")) {
-                add_Bookmarks(bookmarks_App(), url, title, tags, 0x1f310);
-            }
-            else {
-                const iSidebarItem *item = hoverItem_SidebarWidget_(d);
-                iAssert(item); /* hover item cannot have been changed */
-                iBookmark *bm = get_Bookmarks(bookmarks_App(), item->id);
-                set_String(&bm->title, title);
-                set_String(&bm->url, url);
-                set_String(&bm->tags, tags);
-            }
+            const iSidebarItem *item = hoverItem_SidebarWidget_(d);
+            iAssert(item); /* hover item cannot have been changed */
+            iBookmark *bm = get_Bookmarks(bookmarks_App(), item->id);
+            set_String(&bm->title, title);
+            set_String(&bm->url, url);
+            set_String(&bm->tags, tags);
             postCommand_App("bookmarks.changed");
         }
         setFlags_Widget(as_Widget(d), disabled_WidgetFlag, iFalse);
@@ -556,16 +551,10 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
         else if (equal_Command(cmd, "history.addbookmark")) {
             const iSidebarItem *item = hoverItem_SidebarWidget_(d);
             if (!isEmpty_String(&item->url)) {
-                iWidget *dlg = makeBookmarkEditor_Widget();
-                setId_Widget(dlg, "bmed.create");
-                setTextCStr_LabelWidget(findChild_Widget(dlg, "bmed.heading"),
-                                        uiHeading_ColorEscape "ADD BOOKMARK");
-                iUrl parts;
-                init_Url(&parts, &item->url);
-                setTextCStr_InputWidget(findChild_Widget(dlg, "bmed.title"),
-                                        cstr_Rangecc(parts.host));
-                setText_InputWidget(findChild_Widget(dlg, "bmed.url"), &item->url);
-                setCommandHandler_Widget(dlg, handleBookmarkEditorCommands_SidebarWidget_);
+                makeBookmarkCreation_Widget(
+                    &item->url,
+                    collect_String(newRange_String(urlHost_String(&item->url))),
+                    0x1f310 /* globe */);
             }
         }
         else if (equal_Command(cmd, "history.clear")) {
diff --git a/src/ui/util.c b/src/ui/util.c
index d8079383..753fd140 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -23,8 +23,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "util.h"
 
 #include "app.h"
+#include "bookmarks.h"
 #include "color.h"
 #include "command.h"
+#include "gmutil.h"
 #include "labelwidget.h"
 #include "inputwidget.h"
 #include "widget.h"
@@ -791,3 +793,42 @@ iWidget *makeBookmarkEditor_Widget(void) {
     centerSheet_Widget(dlg);
     return dlg;
 }
+
+static iBool handleBookmarkCreationCommands_SidebarWidget_(iWidget *editor, const char *cmd) {
+    if (equal_Command(cmd, "bmed.accept") || equal_Command(cmd, "cancel")) {
+        if (equal_Command(cmd, "bmed.accept")) {
+            const iString *title = text_InputWidget(findChild_Widget(editor, "bmed.title"));
+            const iString *url   = text_InputWidget(findChild_Widget(editor, "bmed.url"));
+            const iString *tags  = text_InputWidget(findChild_Widget(editor, "bmed.tags"));
+            add_Bookmarks(bookmarks_App(),
+                          url,
+                          title,
+                          tags,
+                          first_String(label_LabelWidget(findChild_Widget(editor, "bmed.icon"))));
+            postCommand_App("bookmarks.changed");
+        }
+        destroy_Widget(editor);
+        return iTrue;
+    }
+    return iFalse;
+}
+
+iWidget *makeBookmarkCreation_Widget(const iString *url, const iString *title, iChar icon) {
+    iWidget *dlg = makeBookmarkEditor_Widget();
+    setId_Widget(dlg, "bmed.create");
+    setTextCStr_LabelWidget(findChild_Widget(dlg, "bmed.heading"),
+                            uiHeading_ColorEscape "ADD BOOKMARK");
+    iUrl parts;
+    init_Url(&parts, url);
+    setTextCStr_InputWidget(findChild_Widget(dlg, "bmed.title"),
+                            title ? cstr_String(title) : cstr_Rangecc(parts.host));
+    setText_InputWidget(findChild_Widget(dlg, "bmed.url"), url);
+    setId_Widget(
+        addChildFlags_Widget(
+            dlg,
+            iClob(new_LabelWidget(cstrCollect_String(newUnicodeN_String(&icon, 1)), 0, 0, NULL)),
+            collapse_WidgetFlag | hidden_WidgetFlag | disabled_WidgetFlag),
+        "bmed.icon");
+    setCommandHandler_Widget(dlg, handleBookmarkCreationCommands_SidebarWidget_);
+    return dlg;
+}
diff --git a/src/ui/util.h b/src/ui/util.h
index 98bb187e..129053e5 100644
--- a/src/ui/util.h
+++ b/src/ui/util.h
@@ -22,6 +22,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #pragma once
 
+#include <the_Foundation/string.h>
 #include <the_Foundation/rect.h>
 #include <the_Foundation/vec2.h>
 #include <SDL_events.h>
@@ -142,5 +143,7 @@ void        updateValueInput_Widget (iWidget *, const char *title, const char *p
 void        makeMessage_Widget      (const char *title, const char *msg);
 iWidget *   makeQuestion_Widget     (const char *title, const char *msg,
                                      const char *labels[], const char *commands[], size_t count);
-iWidget *   makePreferences_Widget  (void);
-iWidget *   makeBookmarkEditor_Widget(void);
+
+iWidget *   makePreferences_Widget      (void);
+iWidget *   makeBookmarkEditor_Widget   (void);
+iWidget *   makeBookmarkCreation_Widget (const iString *url, const iString *title, iChar icon);