|
|
|
|
local Device = require("device")
|
|
|
|
|
|
|
|
|
|
local order = {
|
|
|
|
|
["KOMenu:menu_buttons"] = {
|
|
|
|
|
"filemanager_settings",
|
|
|
|
|
"setting",
|
|
|
|
|
"tools",
|
|
|
|
|
"search",
|
|
|
|
|
"plus_menu",
|
|
|
|
|
"main",
|
|
|
|
|
},
|
|
|
|
|
filemanager_settings = {
|
|
|
|
|
"filemanager_display_mode",
|
|
|
|
|
"filebrowser_settings",
|
|
|
|
|
"----------------------------",
|
|
|
|
|
"sort_by",
|
|
|
|
|
"reverse_sorting",
|
|
|
|
|
"----------------------------",
|
|
|
|
|
"start_with",
|
|
|
|
|
},
|
|
|
|
|
setting = {
|
|
|
|
|
-- common settings
|
|
|
|
|
-- those that don't exist will simply be skipped during menu gen
|
|
|
|
|
"frontlight", -- if Device:hasFrontlight()
|
|
|
|
|
"night_mode",
|
|
|
|
|
"----------------------------",
|
|
|
|
|
"network",
|
|
|
|
|
"screen",
|
|
|
|
|
"----------------------------",
|
|
|
|
|
"taps_and_gestures",
|
|
|
|
|
"navigation",
|
|
|
|
|
"document",
|
|
|
|
|
"----------------------------",
|
|
|
|
|
"language",
|
|
|
|
|
"device",
|
|
|
|
|
-- end common settings
|
|
|
|
|
},
|
|
|
|
|
device = {
|
|
|
|
|
"keyboard_layout",
|
|
|
|
|
"time",
|
|
|
|
|
"device_status_alarm",
|
|
|
|
|
"charging_led", -- if Device:canToggleChargingLED()
|
|
|
|
|
"autostandby",
|
|
|
|
|
"autosuspend",
|
|
|
|
|
"autoshutdown",
|
|
|
|
|
"ignore_sleepcover",
|
|
|
|
|
"ignore_open_sleepcover",
|
|
|
|
|
"ignore_battery_optimizations",
|
|
|
|
|
"mass_storage_settings", -- if Device:canToggleMassStorage()
|
|
|
|
|
"file_ext_assoc",
|
|
|
|
|
"screenshot",
|
|
|
|
|
},
|
|
|
|
|
navigation = {
|
|
|
|
|
"back_to_exit",
|
|
|
|
|
"back_in_filemanager",
|
|
|
|
|
"back_in_reader",
|
|
|
|
|
"android_volume_keys",
|
|
|
|
|
"android_camera_key",
|
|
|
|
|
"android_haptic_feedback",
|
|
|
|
|
"android_back_button",
|
|
|
|
|
"----------------------------",
|
|
|
|
|
"opening_page_location_stack",
|
|
|
|
|
},
|
|
|
|
|
network = {
|
|
|
|
|
"network_wifi",
|
|
|
|
|
"network_proxy",
|
Various Wi-Fi QoL improvements (#6424)
* Revamped most actions that require an internet connection to a new/fixed backend that allows forwarding the initial action and running it automatically once connected. (i.e., it'll allow you to set "Action when Wi-Fi is off" to "turn_on", and whatch stuff connect and do what you wanted automatically without having to re-click anywhere instead of showing you a Wi-Fi prompt and then not doing anything without any other feedback).
* Speaking of, fixed the "turn_on" beforeWifi action to, well, actually work. It's no longer marked as experimental.
* Consistently use "Wi-Fi" everywhere.
* On Kobo/Cervantes/Sony, implemented a "Kill Wi-Fi connection when inactive" system that will automatically disconnect from Wi-Fi after sustained *network* inactivity (i.e., you can keep reading, it'll eventually turn off on its own). This should be smart and flexible enough not to murder Wi-Fi while you need it, while still not keeping it uselessly on and murdering your battery.
(i.e., enable that + turn Wi-Fi on when off and enjoy never having to bother about Wi-Fi ever again).
* Made sending `NetworkConnected` / `NetworkDisconnected` events consistent (they were only being sent... sometimes, which made relying on 'em somewhat problematic).
* restoreWifiAsync is now only run when really needed (i.e., we no longer stomp on an existing working connection just for the hell of it).
* We no longer attempt to kill a bogus non-existent Wi-Fi connection when going to suspend, we only do it when it's actually needed.
* Every method of enabling Wi-Fi will now properly tear down Wi-Fi on failure, instead of leaving it in an undefined state.
* Fixed an issue in the fancy crash screen on Kobo/reMarkable that could sometime lead to the log excerpt being missing.
* Worked-around a number of sneaky issues related to low-level Wi-Fi/DHCP/DNS handling on Kobo (see the lengthy comments [below](https://github.com/koreader/koreader/pull/6424#issuecomment-663881059) for details). Fix #6421
Incidentally, this should also fix the inconsistencies experienced re: Wi-Fi behavior in Nickel when toggling between KOReader and Nickel (use NM/KFMon, and run a current FW for best results).
* For developers, this involves various cleanups around NetworkMgr and NetworkListener. Documentation is in-line, above the concerned functions.
4 years ago
|
|
|
"network_powersave",
|
|
|
|
|
"network_restore",
|
|
|
|
|
"network_info",
|
|
|
|
|
"network_before_wifi_action",
|
Various Wi-Fi QoL improvements (#6424)
* Revamped most actions that require an internet connection to a new/fixed backend that allows forwarding the initial action and running it automatically once connected. (i.e., it'll allow you to set "Action when Wi-Fi is off" to "turn_on", and whatch stuff connect and do what you wanted automatically without having to re-click anywhere instead of showing you a Wi-Fi prompt and then not doing anything without any other feedback).
* Speaking of, fixed the "turn_on" beforeWifi action to, well, actually work. It's no longer marked as experimental.
* Consistently use "Wi-Fi" everywhere.
* On Kobo/Cervantes/Sony, implemented a "Kill Wi-Fi connection when inactive" system that will automatically disconnect from Wi-Fi after sustained *network* inactivity (i.e., you can keep reading, it'll eventually turn off on its own). This should be smart and flexible enough not to murder Wi-Fi while you need it, while still not keeping it uselessly on and murdering your battery.
(i.e., enable that + turn Wi-Fi on when off and enjoy never having to bother about Wi-Fi ever again).
* Made sending `NetworkConnected` / `NetworkDisconnected` events consistent (they were only being sent... sometimes, which made relying on 'em somewhat problematic).
* restoreWifiAsync is now only run when really needed (i.e., we no longer stomp on an existing working connection just for the hell of it).
* We no longer attempt to kill a bogus non-existent Wi-Fi connection when going to suspend, we only do it when it's actually needed.
* Every method of enabling Wi-Fi will now properly tear down Wi-Fi on failure, instead of leaving it in an undefined state.
* Fixed an issue in the fancy crash screen on Kobo/reMarkable that could sometime lead to the log excerpt being missing.
* Worked-around a number of sneaky issues related to low-level Wi-Fi/DHCP/DNS handling on Kobo (see the lengthy comments [below](https://github.com/koreader/koreader/pull/6424#issuecomment-663881059) for details). Fix #6421
Incidentally, this should also fix the inconsistencies experienced re: Wi-Fi behavior in Nickel when toggling between KOReader and Nickel (use NM/KFMon, and run a current FW for best results).
* For developers, this involves various cleanups around NetworkMgr and NetworkListener. Documentation is in-line, above the concerned functions.
4 years ago
|
|
|
"network_after_wifi_action",
|
|
|
|
|
"network_dismiss_scan",
|
|
|
|
|
"----------------------------",
|
|
|
|
|
"ssh",
|
|
|
|
|
},
|
|
|
|
|
screen = {
|
|
|
|
|
"screensaver",
|
|
|
|
|
"----------------------------",
|
|
|
|
|
"screen_rotation",
|
|
|
|
|
"----------------------------",
|
|
|
|
|
"screen_dpi",
|
|
|
|
|
"screen_eink_opt",
|
|
|
|
|
"autowarmth",
|
|
|
|
|
"color_rendering",
|
|
|
|
|
"----------------------------",
|
|
|
|
|
"screen_timeout",
|
|
|
|
|
"fullscreen",
|
|
|
|
|
"----------------------------",
|
|
|
|
|
"screen_notification",
|
|
|
|
|
},
|
|
|
|
|
taps_and_gestures = {
|
|
|
|
|
"gesture_manager",
|
|
|
|
|
"gesture_intervals",
|
|
|
|
|
"----------------------------",
|
|
|
|
|
"ignore_hold_corners",
|
|
|
|
|
"screen_disable_double_tab",
|
|
|
|
|
"----------------------------",
|
|
|
|
|
"menu_activate",
|
|
|
|
|
},
|
|
|
|
|
tools = {
|
|
|
|
|
"calibre",
|
|
|
|
|
"exporter",
|
|
|
|
|
"statistics",
|
|
|
|
|
"move_to_archive",
|
|
|
|
|
"cloud_storage",
|
|
|
|
|
"read_timer",
|
|
|
|
|
"wallabag",
|
|
|
|
|
"news_downloader",
|
|
|
|
|
"send2ebook",
|
|
|
|
|
"text_editor",
|
|
|
|
|
"profiles",
|
|
|
|
|
"qrclipboard",
|
|
|
|
|
"----------------------------",
|
|
|
|
|
"more_tools",
|
|
|
|
|
},
|
|
|
|
|
more_tools = {
|
|
|
|
|
"auto_frontlight",
|
|
|
|
|
"battery_statistics",
|
|
|
|
|
"book_shortcuts",
|
|
|
|
|
"synchronize_time",
|
|
|
|
|
"keep_alive",
|
|
|
|
|
"doc_setting_tweak",
|
|
|
|
|
"terminal",
|
|
|
|
|
"----------------------------",
|
|
|
|
|
"plugin_management",
|
|
|
|
|
"advanced_settings",
|
|
|
|
|
"developer_options",
|
|
|
|
|
},
|
|
|
|
|
search = {
|
|
|
|
|
"dictionary_lookup",
|
|
|
|
|
"dictionary_lookup_history",
|
|
|
|
|
"dictionary_settings",
|
|
|
|
|
"----------------------------",
|
|
|
|
|
"wikipedia_lookup",
|
|
|
|
|
"wikipedia_history",
|
|
|
|
|
"wikipedia_settings",
|
|
|
|
|
"----------------------------",
|
|
|
|
|
"find_book_in_calibre_catalog",
|
|
|
|
|
"find_file",
|
|
|
|
|
"----------------------------",
|
|
|
|
|
"opds",
|
|
|
|
|
},
|
|
|
|
|
main = {
|
|
|
|
|
"history",
|
|
|
|
|
"open_last_document",
|
|
|
|
|
"----------------------------",
|
|
|
|
|
"collections",
|
|
|
|
|
"----------------------------",
|
|
|
|
|
"mass_storage_actions", -- if Device:canToggleMassStorage()
|
|
|
|
|
"----------------------------",
|
|
|
|
|
"ota_update", -- if Device:hasOTAUpdates()
|
|
|
|
|
"help",
|
|
|
|
|
"----------------------------",
|
|
|
|
|
"exit_menu",
|
|
|
|
|
},
|
|
|
|
|
help = {
|
|
|
|
|
"quickstart_guide",
|
|
|
|
|
"----------------------------",
|
|
|
|
|
"report_bug",
|
|
|
|
|
"----------------------------",
|
|
|
|
|
"system_statistics", -- if enabled (Plugin)
|
|
|
|
|
"version",
|
|
|
|
|
"about",
|
|
|
|
|
},
|
|
|
|
|
plus_menu = {},
|
|
|
|
|
exit_menu = {
|
|
|
|
|
"restart_koreader", -- if Device:canRestart()
|
|
|
|
|
"----------------------------",
|
|
|
|
|
"sleep", -- if Device:canSuspend()
|
|
|
|
|
"poweroff", -- if Device:canPowerOff()
|
|
|
|
|
"reboot", -- if Device:canReboot()
|
|
|
|
|
"----------------------------",
|
|
|
|
|
"start_bq", -- if Device:isCervantes()
|
|
|
|
|
"exit",
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if not Device:hasExitOptions() then
|
|
|
|
|
order.exit_menu = nil
|
|
|
|
|
end
|
|
|
|
|
return order
|
