diff options
Diffstat (limited to 'src/ui')
-rw-r--r-- | src/ui/documentwidget.c | 7 | ||||
-rw-r--r-- | src/ui/sidebarwidget.c | 111 |
2 files changed, 64 insertions, 54 deletions
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c index 7492d9bd..fdc0dd75 100644 --- a/src/ui/documentwidget.c +++ b/src/ui/documentwidget.c | |||
@@ -5128,7 +5128,12 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e | |||
5128 | }, | 5128 | }, |
5129 | 5); | 5129 | 5); |
5130 | if (deviceType_App() == phone_AppDeviceType) { | 5130 | if (deviceType_App() == phone_AppDeviceType) { |
5131 | removeN_Array(&items, size_Array(&items) - 2, iInvalidSize); | 5131 | /* Phones don't do windows or splits. */ |
5132 | removeN_Array(&items, size_Array(&items) - 3, iInvalidSize); | ||
5133 | } | ||
5134 | else if (deviceType_App() == tablet_AppDeviceType) { | ||
5135 | /* Tablets only do splits. */ | ||
5136 | removeN_Array(&items, size_Array(&items) - 3, 1); | ||
5132 | } | 5137 | } |
5133 | if (equalCase_Rangecc(scheme, "file")) { | 5138 | if (equalCase_Rangecc(scheme, "file")) { |
5134 | pushBack_Array(&items, &(iMenuItem){ "---" }); | 5139 | pushBack_Array(&items, &(iMenuItem){ "---" }); |
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c index 8f9e44c8..8a96961a 100644 --- a/src/ui/sidebarwidget.c +++ b/src/ui/sidebarwidget.c | |||
@@ -412,23 +412,25 @@ static void updateItemsWithFlags_SidebarWidget_(iSidebarWidget *d, iBool keepAct | |||
412 | setOutline_LabelWidget(child_Widget(d->actions, 1), d->feedsMode != all_FeedsMode); | 412 | setOutline_LabelWidget(child_Widget(d->actions, 1), d->feedsMode != all_FeedsMode); |
413 | setOutline_LabelWidget(child_Widget(d->actions, 2), d->feedsMode != unread_FeedsMode); | 413 | setOutline_LabelWidget(child_Widget(d->actions, 2), d->feedsMode != unread_FeedsMode); |
414 | } | 414 | } |
415 | d->menu = makeMenu_Widget( | 415 | const iMenuItem menuItems[] = { |
416 | as_Widget(d), | 416 | { openTab_Icon " ${menu.opentab}", 0, 0, "feed.entry.open newtab:1" }, |
417 | (iMenuItem[]){ { openTab_Icon " ${menu.opentab}", 0, 0, "feed.entry.open newtab:1" }, | 417 | { openTabBg_Icon " ${menu.opentab.background}", 0, 0, "feed.entry.open newtab:2" }, |
418 | { openTabBg_Icon " ${menu.opentab.background}", 0, 0, "feed.entry.open newtab:2" }, | 418 | #if defined (iPlatformDesktop) |
419 | { openWindow_Icon " ${menu.openwindow}", 0, 0, "feed.entry.open newwindow:1" }, | 419 | { openWindow_Icon " ${menu.openwindow}", 0, 0, "feed.entry.open newwindow:1" }, |
420 | { "---", 0, 0, NULL }, | 420 | #endif |
421 | { circle_Icon " ${feeds.entry.markread}", 0, 0, "feed.entry.toggleread" }, | 421 | { "---", 0, 0, NULL }, |
422 | { bookmark_Icon " ${feeds.entry.bookmark}", 0, 0, "feed.entry.bookmark" }, | 422 | { circle_Icon " ${feeds.entry.markread}", 0, 0, "feed.entry.toggleread" }, |
423 | { "${menu.copyurl}", 0, 0, "feed.entry.copy" }, | 423 | { bookmark_Icon " ${feeds.entry.bookmark}", 0, 0, "feed.entry.bookmark" }, |
424 | { "---", 0, 0, NULL }, | 424 | { "${menu.copyurl}", 0, 0, "feed.entry.copy" }, |
425 | { page_Icon " ${feeds.entry.openfeed}", 0, 0, "feed.entry.openfeed" }, | 425 | { "---", 0, 0, NULL }, |
426 | { edit_Icon " ${feeds.edit}", 0, 0, "feed.entry.edit" }, | 426 | { page_Icon " ${feeds.entry.openfeed}", 0, 0, "feed.entry.openfeed" }, |
427 | { whiteStar_Icon " " uiTextCaution_ColorEscape "${feeds.unsubscribe}", 0, 0, "feed.entry.unsubscribe" }, | 427 | { edit_Icon " ${feeds.edit}", 0, 0, "feed.entry.edit" }, |
428 | { "---", 0, 0, NULL }, | 428 | { whiteStar_Icon " " uiTextCaution_ColorEscape "${feeds.unsubscribe}", 0, 0, "feed.entry.unsubscribe" }, |
429 | { check_Icon " ${feeds.markallread}", SDLK_a, KMOD_SHIFT, "feeds.markallread" }, | 429 | { "---", 0, 0, NULL }, |
430 | { reload_Icon " ${feeds.refresh}", SDLK_r, KMOD_PRIMARY | KMOD_SHIFT, "feeds.refresh" } }, | 430 | { check_Icon " ${feeds.markallread}", SDLK_a, KMOD_SHIFT, "feeds.markallread" }, |
431 | 13); | 431 | { reload_Icon " ${feeds.refresh}", SDLK_r, KMOD_PRIMARY | KMOD_SHIFT, "feeds.refresh" } |
432 | }; | ||
433 | d->menu = makeMenu_Widget(as_Widget(d), menuItems, iElemCount(menuItems)); | ||
432 | d->modeMenu = makeMenu_Widget( | 434 | d->modeMenu = makeMenu_Widget( |
433 | as_Widget(d), | 435 | as_Widget(d), |
434 | (iMenuItem[]){ | 436 | (iMenuItem[]){ |
@@ -491,27 +493,29 @@ static void updateItemsWithFlags_SidebarWidget_(iSidebarWidget *d, iBool keepAct | |||
491 | addItem_ListWidget(d->list, item); | 493 | addItem_ListWidget(d->list, item); |
492 | iRelease(item); | 494 | iRelease(item); |
493 | } | 495 | } |
494 | d->menu = makeMenu_Widget( | 496 | const iMenuItem menuItems[] = { |
495 | as_Widget(d), | 497 | { openTab_Icon " ${menu.opentab}", 0, 0, "bookmark.open newtab:1" }, |
496 | (iMenuItem[]){ { openTab_Icon " ${menu.opentab}", 0, 0, "bookmark.open newtab:1" }, | 498 | { openTabBg_Icon " ${menu.opentab.background}", 0, 0, "bookmark.open newtab:2" }, |
497 | { openTabBg_Icon " ${menu.opentab.background}", 0, 0, "bookmark.open newtab:2" }, | 499 | #if defined (iPlatformDesktop) |
498 | { openWindow_Icon " ${menu.openwindow}", 0, 0, "bookmark.open newwindow:1" }, | 500 | { openWindow_Icon " ${menu.openwindow}", 0, 0, "bookmark.open newwindow:1" }, |
499 | { "---", 0, 0, NULL }, | 501 | #endif |
500 | { edit_Icon " ${menu.edit}", 0, 0, "bookmark.edit" }, | 502 | { "---", 0, 0, NULL }, |
501 | { copy_Icon " ${menu.dup}", 0, 0, "bookmark.dup" }, | 503 | { edit_Icon " ${menu.edit}", 0, 0, "bookmark.edit" }, |
502 | { "${menu.copyurl}", 0, 0, "bookmark.copy" }, | 504 | { copy_Icon " ${menu.dup}", 0, 0, "bookmark.dup" }, |
503 | { "---", 0, 0, NULL }, | 505 | { "${menu.copyurl}", 0, 0, "bookmark.copy" }, |
504 | { "", 0, 0, "bookmark.tag tag:subscribed" }, | 506 | { "---", 0, 0, NULL }, |
505 | { "", 0, 0, "bookmark.tag tag:homepage" }, | 507 | { "", 0, 0, "bookmark.tag tag:subscribed" }, |
506 | { "", 0, 0, "bookmark.tag tag:remotesource" }, | 508 | { "", 0, 0, "bookmark.tag tag:homepage" }, |
507 | { "---", 0, 0, NULL }, | 509 | { "", 0, 0, "bookmark.tag tag:remotesource" }, |
508 | { delete_Icon " " uiTextCaution_ColorEscape "${bookmark.delete}", 0, 0, "bookmark.delete" }, | 510 | { "---", 0, 0, NULL }, |
509 | { "---", 0, 0, NULL }, | 511 | { delete_Icon " " uiTextCaution_ColorEscape "${bookmark.delete}", 0, 0, "bookmark.delete" }, |
510 | { folder_Icon " ${menu.newfolder}", 0, 0, "bookmark.addfolder" }, | 512 | { "---", 0, 0, NULL }, |
511 | { upDownArrow_Icon " ${menu.sort.alpha}", 0, 0, "bookmark.sortfolder" }, | 513 | { folder_Icon " ${menu.newfolder}", 0, 0, "bookmark.addfolder" }, |
512 | { "---", 0, 0, NULL }, | 514 | { upDownArrow_Icon " ${menu.sort.alpha}", 0, 0, "bookmark.sortfolder" }, |
513 | { reload_Icon " ${bookmarks.reload}", 0, 0, "bookmarks.reload.remote" } }, | 515 | { "---", 0, 0, NULL }, |
514 | 18); | 516 | { reload_Icon " ${bookmarks.reload}", 0, 0, "bookmarks.reload.remote" } |
517 | }; | ||
518 | d->menu = makeMenu_Widget(as_Widget(d), menuItems, iElemCount(menuItems)); | ||
515 | d->modeMenu = makeMenu_Widget( | 519 | d->modeMenu = makeMenu_Widget( |
516 | as_Widget(d), | 520 | as_Widget(d), |
517 | (iMenuItem[]){ { bookmark_Icon " ${menu.page.bookmark}", SDLK_d, KMOD_PRIMARY, "bookmark.add" }, | 521 | (iMenuItem[]){ { bookmark_Icon " ${menu.page.bookmark}", SDLK_d, KMOD_PRIMARY, "bookmark.add" }, |
@@ -525,7 +529,7 @@ static void updateItemsWithFlags_SidebarWidget_(iSidebarWidget *d, iBool keepAct | |||
525 | addActionButton_SidebarWidget_(d, "${sidebar.action.bookmarks.newfolder}", | 529 | addActionButton_SidebarWidget_(d, "${sidebar.action.bookmarks.newfolder}", |
526 | "bookmarks.addfolder", !d->isEditing ? hidden_WidgetFlag : 0); | 530 | "bookmarks.addfolder", !d->isEditing ? hidden_WidgetFlag : 0); |
527 | addChildFlags_Widget(d->actions, iClob(new_Widget()), expand_WidgetFlag); | 531 | addChildFlags_Widget(d->actions, iClob(new_Widget()), expand_WidgetFlag); |
528 | iLabelWidget *btn = addActionButton_SidebarWidget_(d, | 532 | addActionButton_SidebarWidget_(d, |
529 | d->isEditing ? "${sidebar.close}" : "${sidebar.action.bookmarks.edit}", | 533 | d->isEditing ? "${sidebar.close}" : "${sidebar.action.bookmarks.edit}", |
530 | "sidebar.bookmarks.edit", 0); | 534 | "sidebar.bookmarks.edit", 0); |
531 | } | 535 | } |
@@ -573,20 +577,21 @@ static void updateItemsWithFlags_SidebarWidget_(iSidebarWidget *d, iBool keepAct | |||
573 | addItem_ListWidget(d->list, item); | 577 | addItem_ListWidget(d->list, item); |
574 | iRelease(item); | 578 | iRelease(item); |
575 | } | 579 | } |
576 | d->menu = makeMenu_Widget( | 580 | const iMenuItem menuItems[] = { |
577 | as_Widget(d), | 581 | { openTab_Icon " ${menu.opentab}", 0, 0, "history.open newtab:1" }, |
578 | (iMenuItem[]){ | 582 | { openTabBg_Icon " ${menu.opentab.background}", 0, 0, "history.open newtab:2" }, |
579 | { openTab_Icon " ${menu.opentab}", 0, 0, "history.open newtab:1" }, | 583 | #if defined (iPlatformDesktop) |
580 | { openTabBg_Icon " ${menu.opentab.background}", 0, 0, "history.open newtab:2" }, | 584 | { openWindow_Icon " ${menu.openwindow}", 0, 0, "history.open newwindow:1" }, |
581 | { openWindow_Icon " ${menu.openwindow}", 0, 0, "history.open newwindow:1" }, | 585 | #endif |
582 | { "---" }, | 586 | { "---" }, |
583 | { bookmark_Icon " ${sidebar.entry.bookmark}", 0, 0, "history.addbookmark" }, | 587 | { bookmark_Icon " ${sidebar.entry.bookmark}", 0, 0, "history.addbookmark" }, |
584 | { "${menu.copyurl}", 0, 0, "history.copy" }, | 588 | { "${menu.copyurl}", 0, 0, "history.copy" }, |
585 | { "---", 0, 0, NULL }, | 589 | { "---", 0, 0, NULL }, |
586 | { close_Icon " ${menu.forgeturl}", 0, 0, "history.delete" }, | 590 | { close_Icon " ${menu.forgeturl}", 0, 0, "history.delete" }, |
587 | { "---", 0, 0, NULL }, | 591 | { "---", 0, 0, NULL }, |
588 | { delete_Icon " " uiTextCaution_ColorEscape "${history.clear}", 0, 0, "history.clear confirm:1" }, | 592 | { delete_Icon " " uiTextCaution_ColorEscape "${history.clear}", 0, 0, "history.clear confirm:1" }, |
589 | }, 10); | 593 | }; |
594 | d->menu = makeMenu_Widget(as_Widget(d), menuItems, iElemCount(menuItems)); | ||
590 | d->modeMenu = makeMenu_Widget( | 595 | d->modeMenu = makeMenu_Widget( |
591 | as_Widget(d), | 596 | as_Widget(d), |
592 | (iMenuItem[]){ | 597 | (iMenuItem[]){ |