Merge branch 'feat-remove-from-recents' of https://github.com/jpirnay/crosspoint-reader into mybuild
This commit is contained in:
@@ -261,6 +261,7 @@ STR_GO_HOME_BUTTON: "Go Home"
|
|||||||
STR_SYNC_PROGRESS: "Sync Progress"
|
STR_SYNC_PROGRESS: "Sync Progress"
|
||||||
STR_DELETE_CACHE: "Delete Book Cache"
|
STR_DELETE_CACHE: "Delete Book Cache"
|
||||||
STR_DELETE: "Delete"
|
STR_DELETE: "Delete"
|
||||||
|
STR_REMOVE: "Remove"
|
||||||
STR_DISPLAY_QR: "Show page as QR"
|
STR_DISPLAY_QR: "Show page as QR"
|
||||||
STR_CHAPTER_PREFIX: "Chapter: "
|
STR_CHAPTER_PREFIX: "Chapter: "
|
||||||
STR_PAGES_SEPARATOR: " pages | "
|
STR_PAGES_SEPARATOR: " pages | "
|
||||||
|
|||||||
@@ -80,7 +80,7 @@ void RecentBooksActivity::loop() {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
std::string heading = tr(STR_DELETE) + std::string("? ");
|
std::string heading = tr(STR_REMOVE) + std::string("? ");
|
||||||
startActivityForResult(std::make_unique<ConfirmationActivity>(renderer, mappedInput, heading, bookTitle), handler);
|
startActivityForResult(std::make_unique<ConfirmationActivity>(renderer, mappedInput, heading, bookTitle), handler);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -142,7 +142,8 @@ void RecentBooksActivity::render(RenderLock&&) {
|
|||||||
const bool hasInfo = !recentBooks.empty() && selectorIndex < recentBooks.size() &&
|
const bool hasInfo = !recentBooks.empty() && selectorIndex < recentBooks.size() &&
|
||||||
(FsHelpers::hasEpubExtension(recentBooks[selectorIndex].path) ||
|
(FsHelpers::hasEpubExtension(recentBooks[selectorIndex].path) ||
|
||||||
FsHelpers::hasXtcExtension(recentBooks[selectorIndex].path));
|
FsHelpers::hasXtcExtension(recentBooks[selectorIndex].path));
|
||||||
const auto labels = mappedInput.mapLabels(tr(STR_HOME), tr(STR_OPEN), tr(STR_DELETE), hasInfo ? tr(STR_INFO) : "");
|
const bool hasBooks = !recentBooks.empty();
|
||||||
|
const auto labels = mappedInput.mapLabels(tr(STR_HOME), hasBooks ? tr(STR_OPEN) : "", hasBooks ? tr(STR_REMOVE) : "", hasInfo ? tr(STR_INFO) : "");
|
||||||
|
|
||||||
GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
|
GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
|
||||||
// Side buttons (Up/Down) navigate; show their hints on the side
|
// Side buttons (Up/Down) navigate; show their hints on the side
|
||||||
|
|||||||
Reference in New Issue
Block a user