Feeds: Manual refresh

2 files changed, 27 insertions, 10 deletions

diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 3fdfe190..3bd0f229 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -690,6 +690,9 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                  (d->mode == history_SidebarMode || d->mode == feeds_SidebarMode)) {
             updateItems_SidebarWidget_(d);
         }
+        else if (equal_Command(cmd, "feeds.update.finished") && d->mode == feeds_SidebarMode) {
+            updateItems_SidebarWidget_(d);
+        }
         else if (equal_Command(cmd, "bookmarks.changed") && d->mode == bookmarks_SidebarMode) {
             updateItems_SidebarWidget_(d);
         }
diff --git a/src/ui/window.c b/src/ui/window.c
index 6e046bdc..b4b8fff6 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -159,8 +159,9 @@ static const iMenuItem viewMenuItems_[] = {
 static iMenuItem bookmarksMenuItems_[] = {
     { "Bookmark This Page...", SDLK_d, KMOD_PRIMARY, "bookmark.add" },
     { "---", 0, 0, NULL },
-    { "Subscribe as Feed", 0, 0, "bookmark.addtag tag:subscribed" },
+    { "Subscribe to This Page", 0, 0, "bookmark.addtag tag:subscribed" },
     { "---", 0, 0, NULL },
+    { "Show Feed Entries", 0, 0, "open url:about:feeds" },
     { "Refresh Feeds", SDLK_r, KMOD_PRIMARY | KMOD_SHIFT, "feeds.refresh" },
 };
 
@@ -401,16 +402,29 @@ static void setupUserInterface_Window(iWindow *d) {
             setNotifyEdits_InputWidget(url, iTrue);
             setTextCStr_InputWidget(url, "gemini://");
             addChildFlags_Widget(navBar, iClob(url), expand_WidgetFlag);
-            /* Download progress indicator is inside the input field, but hidden normally. */
             setPadding_Widget(as_Widget(url),0, 0, gap_UI * 1, 0);
-            iLabelWidget *progress = new_LabelWidget(uiTextCaution_ColorEscape "00.000 MB", NULL);
-            setId_Widget(as_Widget(progress), "document.progress");
-            setAlignVisually_LabelWidget(progress, iTrue);
-            shrink_Rect(&as_Widget(progress)->rect, init_I2(0, gap_UI));
-            addChildFlags_Widget(as_Widget(url),
-                                 iClob(progress),
-                                 moveToParentRightEdge_WidgetFlag);
-            setBackgroundColor_Widget(as_Widget(progress), uiBackground_ColorId);
+            /* Feeds refresh indicator is inside the input field. */ {
+                iLabelWidget *fprog = new_LabelWidget(uiTextCaution_ColorEscape
+                                                      "\u2605 Refreshing Feeds...", NULL);
+                setId_Widget(as_Widget(fprog), "feeds.progress");
+                setBackgroundColor_Widget(as_Widget(fprog), uiBackground_ColorId);
+                setAlignVisually_LabelWidget(fprog, iTrue);
+                shrink_Rect(&as_Widget(fprog)->rect, init_I2(0, gap_UI));
+                addChildFlags_Widget(as_Widget(url),
+                                     iClob(fprog),
+                                     moveToParentRightEdge_WidgetFlag | hidden_WidgetFlag);
+            }
+            /* Download progress indicator is also inside the input field, but hidden normally.
+               TODO: It shouldn't overlap the feeds indicator... */ {
+                iLabelWidget *progress = new_LabelWidget(uiTextCaution_ColorEscape "00.000 MB", NULL);
+                setId_Widget(as_Widget(progress), "document.progress");
+                setBackgroundColor_Widget(as_Widget(progress), uiBackground_ColorId);
+                setAlignVisually_LabelWidget(progress, iTrue);
+                shrink_Rect(&as_Widget(progress)->rect, init_I2(0, gap_UI));
+                addChildFlags_Widget(as_Widget(url),
+                                     iClob(progress),
+                                     moveToParentRightEdge_WidgetFlag);
+            }
         }
         setId_Widget(addChild_Widget(
                          navBar, iClob(newIcon_LabelWidget(reloadCStr_, 0, 0, "navigate.reload"))),