1 files changed, 65 insertions, 0 deletions

diff --git a/src/ui/util.c b/src/ui/util.c
index 0a9dde0c..ba6a2538 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -2181,6 +2181,14 @@ size_t findWidestLabel_MenuItem(const iMenuItem *items, size_t num) {
     return widestPos;
 }
 
+const char *widestLabel_MenuItemArray(const iArray *items) {
+    size_t index = findWidestLabel_MenuItem(constData_Array(items), size_Array(items));
+    if (index == iInvalidPos) {
+        return "";
+    }
+    return constValue_Array(items, index, iMenuItem).label;
+}
+
 iChar removeIconPrefix_String(iString *d) {
     if (isEmpty_String(d)) {
         return 0;
@@ -2772,6 +2780,35 @@ iWidget *makePreferences_Widget(void) {
     return dlg;
 }
 
+static iBool isBookmarkFolder_(void *context, const iBookmark *bm) {
+    iUnused(context);
+    return isFolder_Bookmark(bm);
+}
+
+static const iArray *makeBookmarkFolderItems_(void) {
+    iArray *folders = new_Array(sizeof(iMenuItem));
+    pushBack_Array(folders, &(iMenuItem){ "\u2014", 0, 0, "dlg.bookmark.setfolder arg:0" });
+    iConstForEach(
+        PtrArray,
+        i,
+        list_Bookmarks(bookmarks_App(), cmpTree_Bookmark, isBookmarkFolder_, NULL)) {
+        const iBookmark *bm = i.ptr;
+        iString *title = collect_String(copy_String(&bm->title));
+        for (const iBookmark *j = bm; j && j->parentId; ) {
+            j = get_Bookmarks(bookmarks_App(), j->parentId);
+            prependCStr_String(title, " > ");
+            prepend_String(title, &j->title);
+        }
+        pushBack_Array(
+            folders,
+            &(iMenuItem){ cstr_String(title),
+                          0,
+                          0,
+                          format_CStr("dlg.bookmark.setfolder arg:%u", id_Bookmark(bm)) });
+    }
+    return collect_Array(folders); 
+}
+
 iWidget *makeBookmarkEditor_Widget(void) {
     const iMenuItem actions[] = {
         { "${cancel}" },
@@ -2808,6 +2845,19 @@ iWidget *makeBookmarkEditor_Widget(void) {
     addDialogInputWithHeading_(headings, values, "${dlg.bookmark.title}", "bmed.title", iClob(inputs[0] = new_InputWidget(0)));
     addDialogInputWithHeading_(headings, values, "${dlg.bookmark.url}",   "bmed.url",   iClob(inputs[1] = new_InputWidget(0)));
     setUrlContent_InputWidget(inputs[1], iTrue);
+    /* Folder to add to. */ {
+        addChild_Widget(headings, iClob(makeHeading_Widget("${dlg.bookmark.folder}")));
+        const iArray *folderItems = makeBookmarkFolderItems_();
+        iLabelWidget *folderButton;
+        setId_Widget(addChildFlags_Widget(values,
+                                     iClob(folderButton = makeMenuButton_LabelWidget(
+                                               widestLabel_MenuItemArray(folderItems),
+                                               constData_Array(folderItems),
+                                               size_Array(folderItems))), alignLeft_WidgetFlag),
+                     "bmed.folder");
+        updateDropdownSelection_LabelWidget(
+            folderButton, format_CStr(" arg:%u", recentFolder_Bookmarks(bookmarks_App())));        
+    }
     addDialogInputWithHeading_(headings, values, "${dlg.bookmark.tags}",  "bmed.tags",  iClob(inputs[2] = new_InputWidget(0)));
     addDialogInputWithHeading_(headings, values, "${dlg.bookmark.icon}",  "bmed.icon",  iClob(inputs[3] = new_InputWidget(1)));
     /* Buttons for special tags. */
@@ -2830,12 +2880,23 @@ iWidget *makeBookmarkEditor_Widget(void) {
     return dlg;
 }
 
+void setBookmarkEditorFolder_Widget(iWidget *editor, uint32_t folderId) {
+    iLabelWidget *button = findChild_Widget(editor, "bmed.folder");
+    updateDropdownSelection_LabelWidget(button, format_CStr(" arg:%u", folderId));
+    setUserData_Object(button, get_Bookmarks(bookmarks_App(), folderId));    
+}
+
 static iBool handleBookmarkCreationCommands_SidebarWidget_(iWidget *editor, const char *cmd) {
+    if (equal_Command(cmd, "dlg.bookmark.setfolder")) {
+        setBookmarkEditorFolder_Widget(editor, arg_Command(cmd));
+        return iTrue;
+    }
     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"));
+            const iBookmark *folder = userData_Object(findChild_Widget(editor, "bmed.folder"));
             const iString *icon  = collect_String(trimmed_String(text_InputWidget(findChild_Widget(editor, "bmed.icon"))));
             const uint32_t id    = add_Bookmarks(bookmarks_App(), url, title, tags, first_String(icon));
             iBookmark *    bm    = get_Bookmarks(bookmarks_App(), id);
@@ -2851,6 +2912,10 @@ static iBool handleBookmarkCreationCommands_SidebarWidget_(iWidget *editor, cons
             if (isSelected_Widget(findChild_Widget(editor, "bmed.tag.linksplit"))) {
                 addTag_Bookmark(bm, linkSplit_BookmarkTag);
             }
+            bm->parentId = folder ? id_Bookmark(folder) : 0;
+            if (bm->parentId) {
+                setRecentFolder_Bookmarks(bookmarks_App(), bm->parentId);
+            }
             postCommandf_App("bookmarks.changed added:%zu", id);
         }
         setupSheetTransition_Mobile(editor, iFalse);