Editing feed title in Feed Settings dialog

1 files changed, 16 insertions, 11 deletions

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;