codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Console] Improve interactive-mode preferences saving 

The bottom options for cancel/apply/ok where confusing for end-users as being checkboxes needing spacebar prepended to activate firstly, before return/enter to activate said previous selection, but changed now to omit. Also fixed not showing canceled options as sticking.

Co-authored-by: Calum Lind <calumlind+deluge@gmail.com>
Closes: https://github.com/deluge-torrent/deluge/pull/445
This commit is contained in:
Martin Hertz 2024-03-19 13:55:29 +01:00 committed by Calum Lind
parent d5af32802f
commit e1fa8d18ec
No known key found for this signature in database
GPG Key ID: 90597A687B836BA3
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
deluge/ui/console/modes/preferences/preferences.py
View File

@ -139,7 +139,13 @@ class Preferences(BaseMode, PopupsHandler):
] ]
self.action_input = SelectInput( self.action_input = SelectInput(
self, None, None, [_('Cancel'), _('Apply'), _('OK')], [0, 1, 2], 0 self,
None,
None,
[_('Cancel'), _('Apply'), _('OK')],
[0, 1, 2],
0,
require_select_action=False,
) )
def load_config(self): def load_config(self):
@ -308,16 +314,21 @@ class Preferences(BaseMode, PopupsHandler):
if didupdate: if didupdate:
self.parent_mode.on_config_changed() self.parent_mode.on_config_changed()
def _update_preferences(self, core_config): def _update_preferences(self, core_config, console_config=None):
self.core_config = core_config self.core_config = core_config
for pane in self.panes: for pane in self.panes:
pane.update_values(core_config) if isinstance(pane, InterfacePane) and console_config:
pane.update_values(console_config)
else:
pane.update_values(core_config)
def _actions_read(self, c): def _actions_read(self, c):
self.action_input.handle_read(c) self.action_input.handle_read(c)
if c in [curses.KEY_ENTER, util.KEY_ENTER2]: if c in [curses.KEY_ENTER, util.KEY_ENTER2]:
# take action # take action
if self.action_input.selected_index == 0: # Cancel if self.action_input.selected_index == 0: # Cancel
# Reload stored config for panes
self._update_preferences(self.core_config, self.console_config)
self.back_to_parent() self.back_to_parent()
elif self.action_input.selected_index == 1: # Apply elif self.action_input.selected_index == 1: # Apply
self._apply_prefs() self._apply_prefs()