SidebarWidget: Redesigned Feeds action toolbar

The action toolbar now has a button for marking all as read, and keyboard shortcuts for switching between Unread and All modes.

25 files changed, 25 insertions, 8 deletions

diff --git a/po/en.po b/po/en.po
index 8204afec..5066c847 100644
--- a/po/en.po
+++ b/po/en.po
@@ -406,6 +406,9 @@ msgstr "Identities"
 msgid "sidebar.outline"
 msgstr "Outline"
 
+msgid "sidebar.action.show"
+msgstr "Show:"
+
 msgid "sidebar.action.feeds.showall"
 msgstr "All"
 
diff --git a/res/lang/cs.bin b/res/lang/cs.bin
index ae978667..13a06323 100644
--- a/res/lang/cs.bin
+++ b/res/lang/cs.bin
diff --git a/res/lang/de.bin b/res/lang/de.bin
index b1722d2b..55b390ce 100644
--- a/res/lang/de.bin
+++ b/res/lang/de.bin
diff --git a/res/lang/en.bin b/res/lang/en.bin
index 344dfa6a..1c7dfcba 100644
--- a/res/lang/en.bin
+++ b/res/lang/en.bin
diff --git a/res/lang/eo.bin b/res/lang/eo.bin
index 2e902f76..52235451 100644
--- a/res/lang/eo.bin
+++ b/res/lang/eo.bin
diff --git a/res/lang/es.bin b/res/lang/es.bin
index cd5c0811..b793d5b9 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 5cea30c9..06d38e55 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 3066e970..27ad7ba6 100644
--- a/res/lang/fi.bin
+++ b/res/lang/fi.bin
diff --git a/res/lang/fr.bin b/res/lang/fr.bin
index 733db93c..141df204 100644
--- a/res/lang/fr.bin
+++ b/res/lang/fr.bin
diff --git a/res/lang/gl.bin b/res/lang/gl.bin
index 3f7fca1d..b30684ab 100644
--- a/res/lang/gl.bin
+++ b/res/lang/gl.bin
diff --git a/res/lang/hu.bin b/res/lang/hu.bin
index 95cb23a9..9d100d45 100644
--- a/res/lang/hu.bin
+++ b/res/lang/hu.bin
diff --git a/res/lang/ia.bin b/res/lang/ia.bin
index 5307f916..ef621e77 100644
--- a/res/lang/ia.bin
+++ b/res/lang/ia.bin
diff --git a/res/lang/ie.bin b/res/lang/ie.bin
index b89c350f..64e6b7bf 100644
--- a/res/lang/ie.bin
+++ b/res/lang/ie.bin
diff --git a/res/lang/isv.bin b/res/lang/isv.bin
index 3bd7acc2..b9e88984 100644
--- a/res/lang/isv.bin
+++ b/res/lang/isv.bin
diff --git a/res/lang/pl.bin b/res/lang/pl.bin
index b51ae42b..c58632ba 100644
--- a/res/lang/pl.bin
+++ b/res/lang/pl.bin
diff --git a/res/lang/ru.bin b/res/lang/ru.bin
index a6df8daf..b0128aae 100644
--- a/res/lang/ru.bin
+++ b/res/lang/ru.bin
diff --git a/res/lang/sk.bin b/res/lang/sk.bin
index a7ea4b57..714e0d4f 100644
--- a/res/lang/sk.bin
+++ b/res/lang/sk.bin
diff --git a/res/lang/sr.bin b/res/lang/sr.bin
index 644dc759..7729cf9d 100644
--- a/res/lang/sr.bin
+++ b/res/lang/sr.bin
diff --git a/res/lang/tok.bin b/res/lang/tok.bin
index 1fa86a8d..ff7538b0 100644
--- a/res/lang/tok.bin
+++ b/res/lang/tok.bin
diff --git a/res/lang/uk.bin b/res/lang/uk.bin
index 4eb7acf6..a17c7aaa 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 10a91560..66dbe965 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 1f4bc3de..69d0afe2 100644
--- a/res/lang/zh_Hant.bin
+++ b/res/lang/zh_Hant.bin
diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index daca05d1..46bdc890 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -421,7 +421,7 @@ static void draw_LabelWidget_(const iLabelWidget *d) {
     else {
         drawCenteredOutline_Text(
             d->font,
-            adjusted_Rect(bounds, add_I2(zero_I2(), init_I2(iconPad, 0)), neg_I2(zero_I2())),
+            adjusted_Rect(bounds, init_I2(iconPad * 1.5f, 0), init_I2(-iconPad, 0)),
             d->flags.alignVisual,
             d->flags.drawAsOutline ? fg : none_ColorId,
             d->flags.drawAsOutline ? d->widget.bgColor : fg,
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 5d627dda..581a7bb2 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -346,10 +346,24 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
                 }
             }
             /* Actions. */ {
-                addActionButton_SidebarWidget_(d, "${sidebar.action.feeds.showall}", "feeds.mode arg:0",
-                                               d->feedsMode == all_FeedsMode ? selected_WidgetFlag : 0);
-                addActionButton_SidebarWidget_(d, "${sidebar.action.feeds.showunread}", "feeds.mode arg:1",
-                                               d->feedsMode == unread_FeedsMode ? selected_WidgetFlag : 0);
+                addActionButton_SidebarWidget_(
+                    d, check_Icon " ${feeds.markallread}", "feeds.markallread", expand_WidgetFlag);
+                addChild_Widget(d->actions, iClob(new_LabelWidget("${sidebar.action.show}", NULL)));
+                const iMenuItem items[] = {
+                    { "${sidebar.action.feeds.showall}",    SDLK_u, KMOD_SHIFT, "feeds.mode arg:0" },
+                    { "${sidebar.action.feeds.showunread}", SDLK_u, 0, "feeds.mode arg:1" },
+                };
+                iWidget *dropButton = addChild_Widget(
+                    d->actions,
+                    iClob(makeMenuButton_LabelWidget(items[d->feedsMode].label, items, 2)));
+                setFixedSize_Widget(
+                    dropButton,
+                    init_I2(measure_Text(
+                                default_FontId,
+                                translateCStr_Lang(items[findWidestLabel_MenuItem(items, 2)].label))
+                                    .advance.x +
+                                6 * gap_UI,
+                            -1));
             }
             d->menu = makeMenu_Widget(
                 as_Widget(d),
@@ -995,7 +1009,7 @@ iBool handleBookmarkEditorCommands_SidebarWidget_(iWidget *editor, const char *c
         setBookmarkEditorFolder_Widget(editor, arg_Command(cmd));
         return iTrue;
     }
-    if (equal_Command(cmd, "bmed.accept") || equal_Command(cmd, "cancel")) {
+    if (equal_Command(cmd, "bmed.accept") || equal_Command(cmd, "bmed.cancel")) {
         iAssert(startsWith_String(id_Widget(editor), "bmed."));
         iSidebarWidget *d = findWidget_App(cstr_String(id_Widget(editor)) + 5); /* bmed.sidebar */
         if (equal_Command(cmd, "bmed.accept")) {
diff --git a/src/ui/util.c b/src/ui/util.c
index ba6a2538..e718631d 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -2811,7 +2811,7 @@ static const iArray *makeBookmarkFolderItems_(void) {
 
 iWidget *makeBookmarkEditor_Widget(void) {
     const iMenuItem actions[] = {
-        { "${cancel}" },
+        { "${cancel}", 0, 0, "bmed.cancel" },
         { uiTextCaution_ColorEscape "${dlg.bookmark.save}", SDLK_RETURN, KMOD_PRIMARY, "bmed.accept" }
     };
     if (isUsingPanelLayout_Mobile()) {
@@ -2891,7 +2891,7 @@ static iBool handleBookmarkCreationCommands_SidebarWidget_(iWidget *editor, cons
         setBookmarkEditorFolder_Widget(editor, arg_Command(cmd));
         return iTrue;
     }
-    if (equal_Command(cmd, "bmed.accept") || equal_Command(cmd, "cancel")) {
+    if (equal_Command(cmd, "bmed.accept") || equal_Command(cmd, "bmed.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"));