4 files changed, 34 insertions, 17 deletions

diff --git a/src/app.c b/src/app.c
index 3daf7c03..610403f0 100644
--- a/src/app.c
+++ b/src/app.c
@@ -912,6 +912,12 @@ static iBool handleFeedSettingCommands_(iWidget *dlg, const char *cmd) {
         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" : "");
@@ -920,7 +926,7 @@ static iBool handleFeedSettingCommands_(iWidget *dlg, const char *cmd) {
             const iString *url   = url_DocumentWidget(document_App());
             add_Bookmarks(d->bookmarks,
                           url,
-                          bookmarkTitle_DocumentWidget(document_App()),
+                          feedTitle,
                           tags,
                           siteIcon_GmDocument(document_DocumentWidget(document_App())));
             if (numSubs == 0) {
@@ -931,6 +937,7 @@ static iBool handleFeedSettingCommands_(iWidget *dlg, const char *cmd) {
         else {
             iBookmark *bm = get_Bookmarks(d->bookmarks, id);
             if (bm) {
+                set_String(&bm->title, feedTitle);
                 set_String(&bm->tags, tags);
             }
         }
@@ -1288,11 +1295,8 @@ iBool handleCommand_App(const char *cmd) {
         uint32_t         id  = findUrl_Bookmarks(d->bookmarks, url);
         const iBookmark *bm  = id ? get_Bookmarks(d->bookmarks, id) : NULL;
         iWidget *        dlg = makeFeedSettings_Widget(id);
-        setText_LabelWidget(findChild_Widget(dlg, "feedcfg.title"),
-                            collectNewFormat_String(
-                                uiHeading_ColorEscape "%s",
-                                bm ? cstr_String(&bm->title)
-                                   : cstr_String(bookmarkTitle_DocumentWidget(document_App()))));
+        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"),
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 96440feb..3f952411 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -3021,6 +3021,13 @@ const iGmDocument *document_DocumentWidget(const iDocumentWidget *d) {
     return d->doc;
 }
 
+const iString *feedTitle_DocumentWidget(const iDocumentWidget *d) {
+    if (!isEmpty_String(title_GmDocument(d->doc))) {
+        return title_GmDocument(d->doc);
+    }
+    return bookmarkTitle_DocumentWidget(d);
+}
+
 const iString *bookmarkTitle_DocumentWidget(const iDocumentWidget *d) {
     iStringArray *title = iClob(new_StringArray());
     if (!isEmpty_String(title_GmDocument(d->doc))) {
diff --git a/src/ui/documentwidget.h b/src/ui/documentwidget.h
index 5a3125af..55c0a6ed 100644
--- a/src/ui/documentwidget.h
+++ b/src/ui/documentwidget.h
@@ -41,6 +41,7 @@ const iString *     url_DocumentWidget              (const iDocumentWidget *);
 iBool               isRequestOngoing_DocumentWidget (const iDocumentWidget *);
 const iGmDocument * document_DocumentWidget         (const iDocumentWidget *);
 const iString *     bookmarkTitle_DocumentWidget    (const iDocumentWidget *);
+const iString *     feedTitle_DocumentWidget        (const iDocumentWidget *);
 
 void    setUrl_DocumentWidget           (iDocumentWidget *, const iString *url);
 void    setUrlFromCache_DocumentWidget  (iDocumentWidget *, const iString *url, iBool isFromCache);
diff --git a/src/ui/util.c b/src/ui/util.c
index d5bddda9..d9997004 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1249,7 +1249,9 @@ iWidget *makeFeedSettings_Widget(uint32_t bookmarkId) {
     iWidget *dlg = makeSheet_Widget("feedcfg");
     setId_Widget(addChildFlags_Widget(
                      dlg,
-                     iClob(new_LabelWidget(uiHeading_ColorEscape "FEED SETTINGS", NULL)),
+                     iClob(new_LabelWidget(bookmarkId ? uiHeading_ColorEscape "FEED SETTINGS"
+                                                      : uiHeading_ColorEscape "SUBSCRIBE TO PAGE",
+                                           NULL)),
                      frameless_WidgetFlag),
                  "feedcfg.heading");
     iWidget *page = new_Widget();
@@ -1259,27 +1261,30 @@ iWidget *makeFeedSettings_Widget(uint32_t bookmarkId) {
         page, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);
     iWidget *values = addChildFlags_Widget(
         page, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);
-    addChild_Widget(headings, iClob(makeHeading_Widget("Feed title:")));
-    setId_Widget(
-        addChildFlags_Widget(values, iClob(new_LabelWidget("", NULL)), frameless_WidgetFlag),
-        "feedcfg.title");
+    addChild_Widget(headings, iClob(makeHeading_Widget("Title:")));
+    iInputWidget *input = new_InputWidget(0);
+    setId_Widget(addChild_Widget(values, iClob(input)), "feedcfg.title");
     addChild_Widget(headings, iClob(makeHeading_Widget("Entry type:")));
     iWidget *types = new_Widget(); {
-        addRadioButton_(types, "feedcfg.type.gemini", "YYYY-MM-DD", "feedcfg.type arg:0");
+        addRadioButton_(types, "feedcfg.type.gemini", "YYYY-MM-DD Links", "feedcfg.type arg:0");
         addRadioButton_(types, "feedcfg.type.headings", "New Headings", "feedcfg.type arg:1");
     }
     addChildFlags_Widget(values, iClob(types), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
     iWidget *div = new_Widget(); {
         setFlags_Widget(div, arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag, iTrue);
         addChild_Widget(div, iClob(newKeyMods_LabelWidget("Cancel", SDLK_ESCAPE, 0, "cancel")));
-        setId_Widget(addChild_Widget(
-            div,
-            iClob(newKeyMods_LabelWidget(
-                uiTextCaution_ColorEscape "Save Settings", SDLK_RETURN, KMOD_PRIMARY,
-                             format_CStr("feedcfg.accept bmid:%d", bookmarkId)))),
+        setId_Widget(addChild_Widget(div,
+                                     iClob(newKeyMods_LabelWidget(
+                                         bookmarkId ? uiTextCaution_ColorEscape "Save Settings"
+                                                    : uiTextCaution_ColorEscape "Subscribe",
+                                         SDLK_RETURN,
+                                         KMOD_PRIMARY,
+                                         format_CStr("feedcfg.accept bmid:%d", bookmarkId)))),
                      "feedcfg.save");
     }
     addChild_Widget(dlg, iClob(div));
+    arrange_Widget(dlg);
+    as_Widget(input)->rect.size.x = 100 * gap_UI - headings->rect.size.x;
     addChild_Widget(get_Window()->root, iClob(dlg));
     centerSheet_Widget(dlg);
     return dlg;