Add firmware update options to submenu
This commit is contained in:
@@ -156,8 +156,13 @@ STR_DST_UNKNOWN: "DST: unknown"
|
|||||||
STR_REFRESH_FREQ: "Refresh Frequency"
|
STR_REFRESH_FREQ: "Refresh Frequency"
|
||||||
STR_REFRESH_AFTER_IMAGE_PAGES: "Refresh after image pages"
|
STR_REFRESH_AFTER_IMAGE_PAGES: "Refresh after image pages"
|
||||||
STR_KOREADER_SYNC: "KOReader Sync"
|
STR_KOREADER_SYNC: "KOReader Sync"
|
||||||
|
|
||||||
|
STR_SYSTEM_UPDATE: "System Update"
|
||||||
|
STR_SYSTEM_UPDATE_TYPE1: "CrossPoint++ Updates"
|
||||||
STR_CHECK_UPDATES: "Check for updates"
|
STR_CHECK_UPDATES: "Check for updates"
|
||||||
|
STR_SYSTEM_UPDATE_TYPE2: "Alternative Firmware Updates"
|
||||||
STR_INCLUDE_BETA_UPDATES: "Include beta updates"
|
STR_INCLUDE_BETA_UPDATES: "Include beta updates"
|
||||||
|
|
||||||
STR_LANGUAGE: "Language"
|
STR_LANGUAGE: "Language"
|
||||||
STR_CLEAR_READING_CACHE: "Clear Reading Cache"
|
STR_CLEAR_READING_CACHE: "Clear Reading Cache"
|
||||||
STR_USERNAME: "Username"
|
STR_USERNAME: "Username"
|
||||||
|
|||||||
@@ -154,16 +154,21 @@ void SettingsActivity::onEnter() {
|
|||||||
addToMoved(systemSettings, lastSystemSub,
|
addToMoved(systemSettings, lastSystemSub,
|
||||||
std::move(SettingInfo::Action(StrId::STR_CLEAR_READING_CACHE, SettingAction::ClearCache)
|
std::move(SettingInfo::Action(StrId::STR_CLEAR_READING_CACHE, SettingAction::ClearCache)
|
||||||
.withSubcategory(StrId::STR_MENU_SYS_SYSTEM)));
|
.withSubcategory(StrId::STR_MENU_SYS_SYSTEM)));
|
||||||
|
|
||||||
|
addToMoved(systemSettings, lastSystemSub,
|
||||||
|
std::move(SettingInfo::Separator(StrId::STR_SYSTEM_UPDATE_TYPE1).withSubmenu(StrId::STR_SYSTEM_UPDATE)));
|
||||||
addToMoved(systemSettings, lastSystemSub,
|
addToMoved(systemSettings, lastSystemSub,
|
||||||
std::move(SettingInfo::Action(StrId::STR_CHECK_UPDATES, SettingAction::CheckForUpdates)
|
std::move(SettingInfo::Action(StrId::STR_CHECK_UPDATES, SettingAction::CheckForUpdates)
|
||||||
.withSubcategory(StrId::STR_MENU_SYS_SYSTEM)));
|
.withSubmenu(StrId::STR_SYSTEM_UPDATE)));
|
||||||
if (sawIncludeBetaUpdates) {
|
if (sawIncludeBetaUpdates) {
|
||||||
addToMoved(systemSettings, lastSystemSub,
|
addToMoved(systemSettings, lastSystemSub,
|
||||||
std::move(includeBetaUpdatesSetting.withSubcategory(StrId::STR_MENU_SYS_SYSTEM)));
|
std::move(includeBetaUpdatesSetting.withSubmenu(StrId::STR_SYSTEM_UPDATE)));
|
||||||
}
|
}
|
||||||
|
addToMoved(systemSettings, lastSystemSub,
|
||||||
|
std::move(SettingInfo::Separator(StrId::STR_SYSTEM_UPDATE_TYPE2).withSubmenu(StrId::STR_SYSTEM_UPDATE)));
|
||||||
addToMoved(systemSettings, lastSystemSub,
|
addToMoved(systemSettings, lastSystemSub,
|
||||||
std::move(SettingInfo::Action(StrId::STR_SD_FIRMWARE_UPDATE, SettingAction::SdFirmwareUpdate)
|
std::move(SettingInfo::Action(StrId::STR_SD_FIRMWARE_UPDATE, SettingAction::SdFirmwareUpdate)
|
||||||
.withSubcategory(StrId::STR_MENU_SYS_SYSTEM)));
|
.withSubmenu(StrId::STR_SYSTEM_UPDATE)));
|
||||||
addToMoved(systemSettings, lastSystemSub,
|
addToMoved(systemSettings, lastSystemSub,
|
||||||
std::move(SettingInfo::Action(StrId::STR_SYSTEM_INFO, SettingAction::SystemInfo)
|
std::move(SettingInfo::Action(StrId::STR_SYSTEM_INFO, SettingAction::SystemInfo)
|
||||||
.withSubcategory(StrId::STR_MENU_SYS_SYSTEM)));
|
.withSubcategory(StrId::STR_MENU_SYS_SYSTEM)));
|
||||||
|
|||||||
Reference in New Issue
Block a user