"Edit Feed..." opens Feed Settings

3 files changed, 64 insertions, 100 deletions

diff --git a/src/app.c b/src/app.c
index dd4d4ed2..77fbf430 100644
--- a/src/app.c
+++ b/src/app.c
@@ -990,49 +990,6 @@ static iBool handleIdentityCreationCommands_(iWidget *dlg, const char *cmd) {
     return iFalse;
 }
 
-static iBool handleFeedSettingCommands_(iWidget *dlg, const char *cmd) {
-    iApp *d = &app_;
-    if (equal_Command(cmd, "cancel")) {
-        destroy_Widget(dlg);
-        return iTrue;
-    }
-    if (equal_Command(cmd, "feedcfg.accept")) {
-        iString *feedTitle =
-            collect_String(copy_String(text_InputWidget(findChild_Widget(dlg, "feedcfg.title"))));
-        trim_String(feedTitle);
-        if (isEmpty_String(feedTitle)) {
-            return iTrue;
-        }
-        int id = argLabel_Command(cmd, "bmid");
-        const iBool headings = isSelected_Widget(findChild_Widget(dlg, "feedcfg.type.headings"));
-        const iString *tags = collectNewFormat_String("subscribed%s", headings ? " headings" : "");
-        if (!id) {
-            const size_t numSubs = numSubscribed_Feeds();
-            const iString *url   = url_DocumentWidget(document_App());
-            add_Bookmarks(d->bookmarks,
-                          url,
-                          feedTitle,
-                          tags,
-                          siteIcon_GmDocument(document_DocumentWidget(document_App())));
-            if (numSubs == 0) {
-                /* Auto-refresh after first addition. */
-                postCommand_App("feeds.refresh");
-            }
-        }
-        else {
-            iBookmark *bm = get_Bookmarks(d->bookmarks, id);
-            if (bm) {
-                set_String(&bm->title, feedTitle);
-                set_String(&bm->tags, tags);
-            }
-        }
-        postCommand_App("bookmarks.changed");
-        destroy_Widget(dlg);
-        return iTrue;
-    }
-    return iFalse;
-}
-
 iBool willUseProxy_App(const iRangecc scheme) {
     return schemeProxy_App(scheme) != NULL;
 }
@@ -1403,57 +1360,8 @@ iBool handleCommand_App(const char *cmd) {
         if (isEmpty_String(url)) {
             return iTrue;
         }
-        uint32_t         id  = findUrl_Bookmarks(d->bookmarks, url);
-        const iBookmark *bm  = id ? get_Bookmarks(d->bookmarks, id) : NULL;
-        iWidget *        dlg = makeFeedSettings_Widget(id);
-        setText_InputWidget(findChild_Widget(dlg, "feedcfg.title"),
-                            bm ? &bm->title : feedTitle_DocumentWidget(document_App()));
-        setFlags_Widget(findChild_Widget(dlg,
-                                         hasTag_Bookmark(bm, "headings") ? "feedcfg.type.headings"
-                                                                         : "feedcfg.type.gemini"),
-                        selected_WidgetFlag,
-                        iTrue);
-        setCommandHandler_Widget(dlg, handleFeedSettingCommands_);
+        makeFeedSettings_Widget(findUrl_Bookmarks(d->bookmarks, url));
         return iTrue;
-#if 0
-        const size_t numSubs = numSubscribed_Feeds();
-        if (!isEmpty_String(url)) {
-            iBool wasCreated = iFalse;
-            uint32_t id = findUrl_Bookmarks(d->bookmarks, url);
-            if (!id) {
-                add_Bookmarks(d->bookmarks,
-                              url,
-                              bookmarkTitle_DocumentWidget(document_App()),
-                              collectNewCStr_String("subscribed"),
-                              siteIcon_GmDocument(document_DocumentWidget(document_App())));
-                wasCreated = iTrue;
-            }
-
-            if (numSubs == 0 && !cmp_String(tag, "subscribed")) {
-                postCommand_App("feeds.refresh");
-            }
-        }
-#endif
-#if 0
-        const iString *tag = string_Command(cmd, "tag");
-        const iString *url = url_DocumentWidget(document_App());
-        const size_t numSubs = numSubscribed_Feeds();
-        if (!isEmpty_String(url)) {
-            uint32_t id = findUrl_Bookmarks(d->bookmarks, url);
-            if (id) {
-                addTag_Bookmark(get_Bookmarks(d->bookmarks, id), cstr_String(tag));
-            }
-            else {
-                add_Bookmarks(d->bookmarks, url, bookmarkTitle_DocumentWidget(document_App()),
-                              tag, siteIcon_GmDocument(document_DocumentWidget(document_App())));
-            }
-            postCommand_App("bookmarks.changed");
-            if (numSubs == 0 && !cmp_String(tag, "subscribed")) {
-                postCommand_App("feeds.refresh");
-            }
-        }
-        return iTrue;
-#endif
     }
     else if (equal_Command(cmd, "bookmarks.changed")) {
         save_Bookmarks(d->bookmarks, dataDir_App_);
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index f08490a4..ff4be073 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -800,13 +800,7 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                     }
                     if (isCommand_Widget(w, ev, "feed.entry.edit")) {
                         setFlags_Widget(w, disabled_WidgetFlag, iTrue);
-                        iWidget *dlg = makeBookmarkEditor_Widget();
-                        setId_Widget(dlg, format_CStr("bmed.%s", cstr_String(id_Widget(w))));
-                        setText_InputWidget(findChild_Widget(dlg, "bmed.title"), &feedBookmark->title);
-                        setText_InputWidget(findChild_Widget(dlg, "bmed.url"), &feedBookmark->url);
-                        setText_InputWidget(findChild_Widget(dlg, "bmed.tags"), &feedBookmark->tags);
-                        setCommandHandler_Widget(dlg, handleBookmarkEditorCommands_SidebarWidget_);
-                        setFocus_Widget(findChild_Widget(dlg, "bmed.title"));
+                        makeFeedSettings_Widget(id_Bookmark(feedBookmark));
                         return iTrue;
                     }
                     if (isCommand_Widget(w, ev, "feed.entry.unsubscribe")) {
diff --git a/src/ui/util.c b/src/ui/util.c
index 855f0fb3..9bd40e80 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -26,7 +26,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "bookmarks.h"
 #include "color.h"
 #include "command.h"
+#include "documentwidget.h"
 #include "gmutil.h"
+#include "feeds.h"
 #include "labelwidget.h"
 #include "inputwidget.h"
 #include "bindingswidget.h"
@@ -1249,6 +1251,55 @@ iWidget *makeBookmarkCreation_Widget(const iString *url, const iString *title, i
     return dlg;
 }
 
+
+static iBool handleFeedSettingCommands_(iWidget *dlg, const char *cmd) {
+    if (equal_Command(cmd, "cancel")) {
+        destroy_Widget(dlg);
+        /* Sidebars are disabled when a dialog is opened. */
+        setFlags_Widget(findWidget_App("sidebar"), disabled_WidgetFlag, iFalse);
+        setFlags_Widget(findWidget_App("sidebar2"), disabled_WidgetFlag, iFalse);
+        return iTrue;
+    }
+    if (equal_Command(cmd, "feedcfg.accept")) {
+        iString *feedTitle =
+            collect_String(copy_String(text_InputWidget(findChild_Widget(dlg, "feedcfg.title"))));
+        trim_String(feedTitle);
+        if (isEmpty_String(feedTitle)) {
+            return iTrue;
+        }
+        int id = argLabel_Command(cmd, "bmid");
+        const iBool headings = isSelected_Widget(findChild_Widget(dlg, "feedcfg.type.headings"));
+        const iString *tags = collectNewFormat_String("subscribed%s", headings ? " headings" : "");
+        if (!id) {
+            const size_t numSubs = numSubscribed_Feeds();
+            const iString *url   = url_DocumentWidget(document_App());
+            add_Bookmarks(bookmarks_App(),
+                          url,
+                          feedTitle,
+                          tags,
+                          siteIcon_GmDocument(document_DocumentWidget(document_App())));
+            if (numSubs == 0) {
+                /* Auto-refresh after first addition. */
+                postCommand_App("feeds.refresh");
+            }
+        }
+        else {
+            iBookmark *bm = get_Bookmarks(bookmarks_App(), id);
+            if (bm) {
+                set_String(&bm->title, feedTitle);
+                set_String(&bm->tags, tags);
+            }
+        }
+        postCommand_App("bookmarks.changed");
+        destroy_Widget(dlg);
+        /* Sidebars are disabled when a dialog is opened. */
+        setFlags_Widget(findWidget_App("sidebar"), disabled_WidgetFlag, iFalse);
+        setFlags_Widget(findWidget_App("sidebar2"), disabled_WidgetFlag, iFalse);
+        return iTrue;
+    }
+    return iFalse;
+}
+
 iWidget *makeFeedSettings_Widget(uint32_t bookmarkId) {
     iWidget *dlg = makeSheet_Widget("feedcfg");
     setId_Widget(addChildFlags_Widget(
@@ -1291,6 +1342,17 @@ iWidget *makeFeedSettings_Widget(uint32_t bookmarkId) {
     as_Widget(input)->rect.size.x = 100 * gap_UI - headings->rect.size.x;
     addChild_Widget(get_Window()->root, iClob(dlg));
     centerSheet_Widget(dlg);
+    /* Initialize. */ {
+        const iBookmark *bm  = bookmarkId ? get_Bookmarks(bookmarks_App(), bookmarkId) : NULL;
+        setText_InputWidget(findChild_Widget(dlg, "feedcfg.title"),
+                            bm ? &bm->title : feedTitle_DocumentWidget(document_App()));
+        setFlags_Widget(findChild_Widget(dlg,
+                                         hasTag_Bookmark(bm, "headings") ? "feedcfg.type.headings"
+                                                                         : "feedcfg.type.gemini"),
+                        selected_WidgetFlag,
+                        iTrue);
+        setCommandHandler_Widget(dlg, handleFeedSettingCommands_);
+    }
     return dlg;
 }