diff options
Diffstat (limited to 'src/ui/sidebarwidget.c')
-rw-r--r-- | src/ui/sidebarwidget.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c index abeeb2b9..2a6b68e2 100644 --- a/src/ui/sidebarwidget.c +++ b/src/ui/sidebarwidget.c | |||
@@ -197,13 +197,13 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) { | |||
197 | } | 197 | } |
198 | d->menu = makeMenu_Widget( | 198 | d->menu = makeMenu_Widget( |
199 | as_Widget(d), | 199 | as_Widget(d), |
200 | (iMenuItem[]){ { open_Icon " Open Entry in New Tab", 0, 0, "feed.entry.opentab" }, | 200 | (iMenuItem[]){ { openTab_Icon " Open Entry in New Tab", 0, 0, "feed.entry.opentab" }, |
201 | { "Mark as Read", 0, 0, "feed.entry.toggleread" }, | 201 | { circle_Icon " Mark as Read", 0, 0, "feed.entry.toggleread" }, |
202 | { pin_Icon " Add Bookmark...", 0, 0, "feed.entry.bookmark" }, | 202 | { pin_Icon " Add Bookmark...", 0, 0, "feed.entry.bookmark" }, |
203 | { "---", 0, 0, NULL }, | 203 | { "---", 0, 0, NULL }, |
204 | { "Open Feed Page", 0, 0, "feed.entry.openfeed" }, | 204 | { page_Icon " Open Feed Page", 0, 0, "feed.entry.openfeed" }, |
205 | { edit_Icon " Edit Feed...", 0, 0, "feed.entry.edit" }, | 205 | { edit_Icon " Edit Feed...", 0, 0, "feed.entry.edit" }, |
206 | { star_Icon " " uiTextCaution_ColorEscape "Unsubscribe...", 0, 0, "feed.entry.unsubscribe" }, | 206 | { whiteStar_Icon " " uiTextCaution_ColorEscape "Unsubscribe...", 0, 0, "feed.entry.unsubscribe" }, |
207 | { "---", 0, 0, NULL }, | 207 | { "---", 0, 0, NULL }, |
208 | { check_Icon " Mark All as Read", SDLK_a, KMOD_SHIFT, "feeds.markallread" }, | 208 | { check_Icon " Mark All as Read", SDLK_a, KMOD_SHIFT, "feeds.markallread" }, |
209 | { reload_Icon " Refresh Feeds", SDLK_r, KMOD_PRIMARY | KMOD_SHIFT, "feeds.refresh" } }, | 209 | { reload_Icon " Refresh Feeds", SDLK_r, KMOD_PRIMARY | KMOD_SHIFT, "feeds.refresh" } }, |
@@ -256,8 +256,8 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) { | |||
256 | } | 256 | } |
257 | d->menu = makeMenu_Widget( | 257 | d->menu = makeMenu_Widget( |
258 | as_Widget(d), | 258 | as_Widget(d), |
259 | (iMenuItem[]){ { open_Icon " Open in New Tab", 0, 0, "bookmark.open newtab:1" }, | 259 | (iMenuItem[]){ { openTab_Icon " Open in New Tab", 0, 0, "bookmark.open newtab:1" }, |
260 | { "Open in Background Tab", 0, 0, "bookmark.open newtab:2" }, | 260 | { openTabBg_Icon " Open in Background Tab", 0, 0, "bookmark.open newtab:2" }, |
261 | { "---", 0, 0, NULL }, | 261 | { "---", 0, 0, NULL }, |
262 | { edit_Icon " Edit...", 0, 0, "bookmark.edit" }, | 262 | { edit_Icon " Edit...", 0, 0, "bookmark.edit" }, |
263 | { copy_Icon " Duplicate...", 0, 0, "bookmark.dup" }, | 263 | { copy_Icon " Duplicate...", 0, 0, "bookmark.dup" }, |
@@ -319,7 +319,7 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) { | |||
319 | { "Copy URL", 0, 0, "history.copy" }, | 319 | { "Copy URL", 0, 0, "history.copy" }, |
320 | { pin_Icon " Add Bookmark...", 0, 0, "history.addbookmark" }, | 320 | { pin_Icon " Add Bookmark...", 0, 0, "history.addbookmark" }, |
321 | { "---", 0, 0, NULL }, | 321 | { "---", 0, 0, NULL }, |
322 | { "Forget URL", 0, 0, "history.delete" }, | 322 | { close_Icon " Forget URL", 0, 0, "history.delete" }, |
323 | { "---", 0, 0, NULL }, | 323 | { "---", 0, 0, NULL }, |
324 | { delete_Icon " " uiTextCaution_ColorEscape "Clear History...", 0, 0, "history.clear confirm:1" }, | 324 | { delete_Icon " " uiTextCaution_ColorEscape "Clear History...", 0, 0, "history.clear confirm:1" }, |
325 | }, 6); | 325 | }, 6); |
@@ -454,7 +454,7 @@ static const char *normalModeLabels_[max_SidebarMode] = { | |||
454 | star_Icon " Feeds", | 454 | star_Icon " Feeds", |
455 | clock_Icon " History", | 455 | clock_Icon " History", |
456 | person_Icon " Identities", | 456 | person_Icon " Identities", |
457 | "\U0001f5b9 Outline", | 457 | page_Icon " Outline", |
458 | }; | 458 | }; |
459 | 459 | ||
460 | static const char *tightModeLabels_[max_SidebarMode] = { | 460 | static const char *tightModeLabels_[max_SidebarMode] = { |
@@ -462,7 +462,7 @@ static const char *tightModeLabels_[max_SidebarMode] = { | |||
462 | star_Icon, | 462 | star_Icon, |
463 | clock_Icon, | 463 | clock_Icon, |
464 | person_Icon, | 464 | person_Icon, |
465 | "\U0001f5b9", | 465 | page_Icon, |
466 | }; | 466 | }; |
467 | 467 | ||
468 | const char *icon_SidebarMode(enum iSidebarMode mode) { | 468 | const char *icon_SidebarMode(enum iSidebarMode mode) { |
@@ -1187,8 +1187,11 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev) | |||
1187 | } | 1187 | } |
1188 | else if (d->mode == feeds_SidebarMode && d->contextItem) { | 1188 | else if (d->mode == feeds_SidebarMode && d->contextItem) { |
1189 | iLabelWidget *menuItem = findMenuItem_Widget(d->menu, "feed.entry.toggleread"); | 1189 | iLabelWidget *menuItem = findMenuItem_Widget(d->menu, "feed.entry.toggleread"); |
1190 | const iBool isRead = d->contextItem->indent == 0; | 1190 | const iBool isRead = d->contextItem->indent == 0; |
1191 | setTextCStr_LabelWidget(menuItem, isRead ? "Mark as Unread" : "Mark as Read"); | 1191 | setTextCStr_LabelWidget(menuItem, |
1192 | isRead ? circle_Icon " Mark as Unread" | ||
1193 | : circleWhite_Icon " Mark as Read"); | ||
1194 | checkIcon_LabelWidget(menuItem); | ||
1192 | } | 1195 | } |
1193 | else if (d->mode == identities_SidebarMode) { | 1196 | else if (d->mode == identities_SidebarMode) { |
1194 | const iGmIdentity *ident = constHoverIdentity_SidebarWidget_(d); | 1197 | const iGmIdentity *ident = constHoverIdentity_SidebarWidget_(d); |