29 files changed, 111 insertions, 5 deletions

diff --git a/po/en.po b/po/en.po
index 80fee8ae..8204afec 100644
--- a/po/en.po
+++ b/po/en.po
@@ -1208,6 +1208,9 @@ msgstr "Title:"
 msgid "dlg.bookmark.url"
 msgstr "URL:"
 
+msgid "dlg.bookmark.folder"
+msgstr "Folder:"
+
 msgid "dlg.bookmark.tags"
 msgstr "Tags:"
 
diff --git a/res/about/version.gmi b/res/about/version.gmi
index 6b2e9a45..1dce0fec 100644
--- a/res/about/version.gmi
+++ b/res/about/version.gmi
@@ -9,6 +9,7 @@
 # 1.9
 
 New features:
+* Choose parent folder when creating or editing a bookmark.
 * macOS: Automatic updates using the Sparkle framework.
 * Windows: Automatic updates using the WinSparkle library.
 
@@ -17,7 +18,7 @@ Changes and enhancements:
 * The resource bundle (resources.lgr) is now a regular ZIP archive. This allows it to do double duty as a fontpack containing the built-in fonts. The archive contains a version number to avoid use of obsolete resources.
 
 Fixes:
-* Handling duplicate feed entries: if multiple entries in a feed have the same URL, only handle the first one.
+* Handling duplicate feed entries: if multiple entries in a feed have the same URL, only use the first one.
 
 ## 1.8.3
 * Fixed clicking on UI elements that are over the page top banner. The banner would always get clicked instead.
diff --git a/res/lang/cs.bin b/res/lang/cs.bin
index d0dcabcd..ae978667 100644
--- a/res/lang/cs.bin
+++ b/res/lang/cs.bin
diff --git a/res/lang/de.bin b/res/lang/de.bin
index e3ea2835..b1722d2b 100644
--- a/res/lang/de.bin
+++ b/res/lang/de.bin
diff --git a/res/lang/en.bin b/res/lang/en.bin
index 63a9d6c7..344dfa6a 100644
--- a/res/lang/en.bin
+++ b/res/lang/en.bin
diff --git a/res/lang/eo.bin b/res/lang/eo.bin
index a69a9f3f..2e902f76 100644
--- a/res/lang/eo.bin
+++ b/res/lang/eo.bin
diff --git a/res/lang/es.bin b/res/lang/es.bin
index edd37672..cd5c0811 100644
--- a/res/lang/es.bin
+++ b/res/lang/es.bin
diff --git a/res/lang/es_MX.bin b/res/lang/es_MX.bin
index ffb53cba..5cea30c9 100644
--- a/res/lang/es_MX.bin
+++ b/res/lang/es_MX.bin
diff --git a/res/lang/fi.bin b/res/lang/fi.bin
index fc83470b..3066e970 100644
--- a/res/lang/fi.bin
+++ b/res/lang/fi.bin
diff --git a/res/lang/fr.bin b/res/lang/fr.bin
index bda6f4f6..733db93c 100644
--- a/res/lang/fr.bin
+++ b/res/lang/fr.bin
diff --git a/res/lang/gl.bin b/res/lang/gl.bin
index 23d9e952..3f7fca1d 100644
--- a/res/lang/gl.bin
+++ b/res/lang/gl.bin
diff --git a/res/lang/hu.bin b/res/lang/hu.bin
index 1470aea2..95cb23a9 100644
--- a/res/lang/hu.bin
+++ b/res/lang/hu.bin
diff --git a/res/lang/ia.bin b/res/lang/ia.bin
index 9c4ba6b5..5307f916 100644
--- a/res/lang/ia.bin
+++ b/res/lang/ia.bin
diff --git a/res/lang/ie.bin b/res/lang/ie.bin
index 19687852..b89c350f 100644
--- a/res/lang/ie.bin
+++ b/res/lang/ie.bin
diff --git a/res/lang/isv.bin b/res/lang/isv.bin
index b501166c..3bd7acc2 100644
--- a/res/lang/isv.bin
+++ b/res/lang/isv.bin
diff --git a/res/lang/pl.bin b/res/lang/pl.bin
index f44d90fc..b51ae42b 100644
--- a/res/lang/pl.bin
+++ b/res/lang/pl.bin
diff --git a/res/lang/ru.bin b/res/lang/ru.bin
index 4febb613..a6df8daf 100644
--- a/res/lang/ru.bin
+++ b/res/lang/ru.bin
diff --git a/res/lang/sk.bin b/res/lang/sk.bin
index 402ab526..a7ea4b57 100644
--- a/res/lang/sk.bin
+++ b/res/lang/sk.bin
diff --git a/res/lang/sr.bin b/res/lang/sr.bin
index 12cc399f..644dc759 100644
--- a/res/lang/sr.bin
+++ b/res/lang/sr.bin
diff --git a/res/lang/tok.bin b/res/lang/tok.bin
index 9e36f8b0..1fa86a8d 100644
--- a/res/lang/tok.bin
+++ b/res/lang/tok.bin
diff --git a/res/lang/uk.bin b/res/lang/uk.bin
index 9e19b644..4eb7acf6 100644
--- a/res/lang/uk.bin
+++ b/res/lang/uk.bin
diff --git a/res/lang/zh_Hans.bin b/res/lang/zh_Hans.bin
index 7a59c620..10a91560 100644
--- a/res/lang/zh_Hans.bin
+++ b/res/lang/zh_Hans.bin
diff --git a/res/lang/zh_Hant.bin b/res/lang/zh_Hant.bin
index 76ac592a..1f4bc3de 100644
--- a/res/lang/zh_Hant.bin
+++ b/res/lang/zh_Hant.bin
diff --git a/src/app.c b/src/app.c
index abcf95da..374bab71 100644
--- a/src/app.c
+++ b/src/app.c
@@ -3004,6 +3004,7 @@ iBool handleCommand_App(const char *cmd) {
                 get_Bookmarks(d->bookmarks, id)->parentId = parentId;
             }
             postCommandf_App("bookmarks.changed added:%zu", id);
+            setRecentFolder_Bookmarks(d->bookmarks, id);
         }
         else {
             iWidget *dlg = makeValueInput_Widget(
diff --git a/src/bookmarks.c b/src/bookmarks.c
index 1a260f3a..d4b20162 100644
--- a/src/bookmarks.c
+++ b/src/bookmarks.c
@@ -96,7 +96,8 @@ struct Impl_Bookmarks {
     iMutex *  mtx;
     int       idEnum;
     iHash     bookmarks; /* bookmark ID is the hash key */
-    iPtrArray remoteRequests;
+    uint32_t  recentFolderId; /* recently interacted with */
+    iPtrArray remoteRequests;   
 };
 
 iDefineTypeConstruction(Bookmarks)
@@ -105,6 +106,7 @@ void init_Bookmarks(iBookmarks *d) {
     d->mtx = new_Mutex();
     d->idEnum = 0;
     init_Hash(&d->bookmarks);
+    d->recentFolderId = 0;
     init_PtrArray(&d->remoteRequests);
 }
 
@@ -232,6 +234,9 @@ static void handleKeyValue_BookmarkLoader_(void *context, const iString *table,
             bm->order = tv->value.int64;
         }
     }
+    else if (!cmp_String(key, "recentfolder") && tv->type == int64_TomlType) {
+        d->bookmarks->recentFolderId = tv->value.int64;
+    }
 }
 
 static void init_BookmarkLoader(iBookmarkLoader *d, iBookmarks *bookmarks) {
@@ -289,8 +294,10 @@ void save_Bookmarks(const iBookmarks *d, const char *dirPath) {
     lock_Mutex(d->mtx);
     iRegExp *remotePattern = iClob(new_RegExp("\\bremote\\b", caseSensitive_RegExpOption));
     iFile *f = newCStr_File(concatPath_CStr(dirPath, fileName_Bookmarks_));
-    if (open_File(f, writeOnly_FileMode | text_FileMode)) {
+    if (open_File(f, writeOnly_FileMode | text_FileMode)) {        
         iString *str = collectNew_String();
+        format_String(str, "recentfolder = %u\n\n", d->recentFolderId);
+        writeData_File(f, cstr_String(str), size_String(str));
         iConstForEach(Hash, i, &d->bookmarks) {
             const iBookmark *bm = (const iBookmark *) i.value;
             iRegExpMatch m;
@@ -299,6 +306,7 @@ void save_Bookmarks(const iBookmarks *d, const char *dirPath) {
                 /* Remote bookmarks are not saved. */
                 continue;
             }
+            iBeginCollect();
             format_String(str,
                           "[%d]\n"
                           "url = \"%s\"\n"
@@ -321,7 +329,8 @@ void save_Bookmarks(const iBookmarks *d, const char *dirPath) {
             }
             appendCStr_String(str, "\n");
             writeData_File(f, cstr_String(str), size_String(str));
-        }
+            iEndCollect();
+        }        
     }
     iRelease(f);
     unlock_Mutex(d->mtx);
@@ -399,6 +408,16 @@ iBool updateBookmarkIcon_Bookmarks(iBookmarks *d, const iString *url, iChar icon
     return changed;
 }
 
+void setRecentFolder_Bookmarks(iBookmarks *d, uint32_t folderId) {
+    iBookmark *bm = get_Bookmarks(d, folderId);
+    if (isFolder_Bookmark(bm)) {
+        d->recentFolderId = folderId;
+    }
+    else {
+        d->recentFolderId = 0;
+    }
+}
+
 iChar siteIcon_Bookmarks(const iBookmarks *d, const iString *url) {
     if (isEmpty_String(url)) {
         return 0;
@@ -466,6 +485,10 @@ uint32_t findUrl_Bookmarks(const iBookmarks *d, const iString *url) {
     return id_Bookmark(constFront_PtrArray(found));
 }
 
+uint32_t recentFolder_Bookmarks(const iBookmarks *d) {
+    return d->recentFolderId;
+}
+
 const iPtrArray *list_Bookmarks(const iBookmarks *d, iBookmarksCompareFunc cmp,
                                 iBookmarksFilterFunc filter, void *context) {
     lock_Mutex(d->mtx);
diff --git a/src/bookmarks.h b/src/bookmarks.h
index 87d7694d..6cb5c8a9 100644
--- a/src/bookmarks.h
+++ b/src/bookmarks.h
@@ -100,12 +100,14 @@ iBool       remove_Bookmarks            (iBookmarks *, uint32_t id);
 iBookmark * get_Bookmarks               (iBookmarks *, uint32_t id);
 void        reorder_Bookmarks           (iBookmarks *, uint32_t id, int newOrder);
 iBool       updateBookmarkIcon_Bookmarks(iBookmarks *, const iString *url, iChar icon);
+void        setRecentFolder_Bookmarks   (iBookmarks *, uint32_t folderId);
 void        sort_Bookmarks              (iBookmarks *, uint32_t parentId, iBookmarksCompareFunc cmp);
 void        fetchRemote_Bookmarks       (iBookmarks *);
 void        requestFinished_Bookmarks   (iBookmarks *, iGmRequest *req);
 
 iChar       siteIcon_Bookmarks          (const iBookmarks *, const iString *url);
 uint32_t    findUrl_Bookmarks           (const iBookmarks *, const iString *url); /* O(n) */
+uint32_t    recentFolder_Bookmarks      (const iBookmarks *);
 
 iBool   filterTagsRegExp_Bookmarks      (void *regExp, const iBookmark *);
 
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 3abfd498..5d627dda 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -893,6 +893,7 @@ static void itemClicked_SidebarWidget_(iSidebarWidget *d, iSidebarItem *item, si
             if (isEmpty_String(&item->url)) /* a folder */ {
                 if (contains_IntSet(d->closedFolders, item->id)) {
                     remove_IntSet(d->closedFolders, item->id);
+                    setRecentFolder_Bookmarks(bookmarks_App(), item->id);
                 }
                 else {
                     insert_IntSet(d->closedFolders, item->id);
@@ -990,6 +991,10 @@ void setWidth_SidebarWidget(iSidebarWidget *d, float widthAsGaps) {
 }
 
 iBool handleBookmarkEditorCommands_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")) {
         iAssert(startsWith_String(id_Widget(editor), "bmed."));
         iSidebarWidget *d = findWidget_App(cstr_String(id_Widget(editor)) + 5); /* bmed.sidebar */
@@ -1020,7 +1025,11 @@ iBool handleBookmarkEditorCommands_SidebarWidget_(iWidget *editor, const char *c
                                         isSelected_Widget(findChild_Widget(editor, "bmed.tag.remote")));
                 addOrRemoveTag_Bookmark(bm, linkSplit_BookmarkTag,
                                         isSelected_Widget(findChild_Widget(editor, "bmed.tag.linksplit")));
-            }            
+            }
+            const iBookmark *folder = userData_Object(findChild_Widget(editor, "bmed.folder"));
+            if (!folder || !hasParent_Bookmark(folder, id_Bookmark(bm))) {
+                bm->parentId = folder ? id_Bookmark(folder) : 0;
+            }
             postCommand_App("bookmarks.changed");
         }
         setupSheetTransition_Mobile(editor, iFalse);
@@ -1327,6 +1336,7 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                         setFlags_Widget(notNeeded[i], disabled_WidgetFlag, iTrue);
                     }
                 }
+                setBookmarkEditorFolder_Widget(dlg, bm ? bm->parentId : 0);
                 setCommandHandler_Widget(dlg, handleBookmarkEditorCommands_SidebarWidget_);
                 setFocus_Widget(findChild_Widget(dlg, "bmed.title"));
             }
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);
diff --git a/src/ui/util.h b/src/ui/util.h
index 52b3a692..81fb1cbd 100644
--- a/src/ui/util.h
+++ b/src/ui/util.h
@@ -311,6 +311,7 @@ iWidget *   makePreferences_Widget          (void);
 void        updatePreferencesLayout_Widget  (iWidget *prefs);
 
 iWidget *   makeBookmarkEditor_Widget   (void);
+void        setBookmarkEditorFolder_Widget(iWidget *editor, uint32_t folderId);
 iWidget *   makeBookmarkCreation_Widget (const iString *url, const iString *title, iChar icon);
 iWidget *   makeIdentityCreation_Widget (void);
 iWidget *   makeFeedSettings_Widget     (uint32_t bookmarkId);