diff --git a/archinstall/lib/disk/partitioning_menu.py b/archinstall/lib/disk/partitioning_menu.py index 094c7806..84a62915 100644 --- a/archinstall/lib/disk/partitioning_menu.py +++ b/archinstall/lib/disk/partitioning_menu.py @@ -509,7 +509,7 @@ class PartitioningList(ListManager[DiskSegment]): title = str(_('Size (default: {}): ')).format(max_size.format_highest()) - result = EditMenu[str]( + result = EditMenu( title, header=f'{prompt}\b', allow_skip=True, diff --git a/archinstall/lib/disk/subvolume_menu.py b/archinstall/lib/disk/subvolume_menu.py index 1dfb8928..f56e8538 100644 --- a/archinstall/lib/disk/subvolume_menu.py +++ b/archinstall/lib/disk/subvolume_menu.py @@ -41,7 +41,7 @@ class SubvolumeMenu(ListManager[SubvolumeModification]): return str(selection.name) def _add_subvolume(self, preset: SubvolumeModification | None = None) -> SubvolumeModification | None: - result = EditMenu[str]( + result = EditMenu( str(_('Subvolume name')), alignment=Alignment.CENTER, allow_skip=True, diff --git a/archinstall/lib/interactions/general_conf.py b/archinstall/lib/interactions/general_conf.py index 6a5d470a..ec1183d3 100644 --- a/archinstall/lib/interactions/general_conf.py +++ b/archinstall/lib/interactions/general_conf.py @@ -61,7 +61,7 @@ def ask_ntp(preset: bool = True) -> bool: def ask_hostname(preset: str | None = None) -> str | None: - result = EditMenu[str]( + result = EditMenu( str(_('Hostname')), alignment=Alignment.CENTER, allow_skip=True, @@ -255,7 +255,7 @@ def add_number_of_parallel_downloads(preset: int | None = None) -> int | None: return str(_('Invalid download number')) - result = EditMenu[str]( + result = EditMenu( str(_('Number downloads')), header=header, allow_skip=True, diff --git a/archinstall/lib/interactions/manage_users_conf.py b/archinstall/lib/interactions/manage_users_conf.py index 8d9073d2..dbe3aed4 100644 --- a/archinstall/lib/interactions/manage_users_conf.py +++ b/archinstall/lib/interactions/manage_users_conf.py @@ -70,7 +70,7 @@ class UserList(ListManager[User]): return str(_("The username you entered is invalid")) def _add_user(self) -> User | None: - editResult = EditMenu[str]( + editResult = EditMenu( str(_('Username')), allow_skip=True, validator=self._check_for_correct_username diff --git a/archinstall/lib/interactions/network_menu.py b/archinstall/lib/interactions/network_menu.py index 10385e7f..ec50e5f1 100644 --- a/archinstall/lib/interactions/network_menu.py +++ b/archinstall/lib/interactions/network_menu.py @@ -106,7 +106,7 @@ class ManualNetworkConfig(ListManager[Nic]): except ValueError: return str(_('You need to enter a valid IP in IP-config mode')) - result = EditMenu[str]( + result = EditMenu( title, header=header, validator=validator, diff --git a/archinstall/lib/mirrors.py b/archinstall/lib/mirrors.py index 3fd2f106..5e2d4c1d 100644 --- a/archinstall/lib/mirrors.py +++ b/archinstall/lib/mirrors.py @@ -74,7 +74,7 @@ class CustomMirrorRepositoriesList(ListManager[CustomRepository]): return data def _add_custom_repository(self, preset: CustomRepository | None = None) -> CustomRepository | None: - edit_result = EditMenu[str]( + edit_result = EditMenu( str(_('Repository name')), alignment=Alignment.CENTER, allow_skip=True, @@ -91,7 +91,7 @@ class CustomMirrorRepositoriesList(ListManager[CustomRepository]): header = f'{_("Name")}: {name}' - edit_result = EditMenu[str]( + edit_result = EditMenu( str(_('Url')), header=header, alignment=Alignment.CENTER, @@ -196,7 +196,7 @@ class CustomMirrorServersList(ListManager[CustomServer]): return data def _add_custom_server(self, preset: CustomServer | None = None) -> CustomServer | None: - edit_result = EditMenu[str]( + edit_result = EditMenu( str(_('Server url')), alignment=Alignment.CENTER, allow_skip=True, diff --git a/archinstall/lib/utils/util.py b/archinstall/lib/utils/util.py index 54825476..9a6f5a86 100644 --- a/archinstall/lib/utils/util.py +++ b/archinstall/lib/utils/util.py @@ -31,7 +31,7 @@ def get_password( elif header is not None: user_hdr = header - result = EditMenu[str]( + result = EditMenu( text, header=user_hdr, alignment=Alignment.CENTER, @@ -53,7 +53,7 @@ def get_password( else: confirmation_header = f'{_("Password")}: {password.hidden()}\n' - result = EditMenu[str]( + result = EditMenu( str(_('Confirm password')), header=confirmation_header, alignment=Alignment.CENTER, @@ -87,7 +87,7 @@ def prompt_dir( else: validate_func = None - result = EditMenu[str]( + result = EditMenu( text, header=header, alignment=Alignment.CENTER, diff --git a/archinstall/tui/curses_menu.py b/archinstall/tui/curses_menu.py index d6c6be53..7cc63507 100644 --- a/archinstall/tui/curses_menu.py +++ b/archinstall/tui/curses_menu.py @@ -455,7 +455,7 @@ class Viewport(AbstractViewport): self._main_win.refresh() -class EditMenu[ValueT](AbstractCurses[ValueT]): +class EditMenu(AbstractCurses[str]): def __init__( self, title: str, @@ -504,7 +504,7 @@ class EditMenu[ValueT](AbstractCurses[ValueT]): self._init_viewports() - self._last_state: Result[ValueT] | None = None + self._last_state: Result[str] | None = None self._help_active = False self._real_input = default_text or "" @@ -534,7 +534,7 @@ class EditMenu[ValueT](AbstractCurses[ValueT]): y_offset += 3 self._info_vp = Viewport(self._max_width, 1, 0, y_offset, alignment=self._alignment) - def input(self) -> Result[ValueT]: + def input(self) -> Result[str]: result = Tui.run(self) assert not result.has_item() or isinstance(result.text(), str) @@ -591,7 +591,7 @@ class EditMenu[ValueT](AbstractCurses[ValueT]): self._input_vp.edit(default_text=self._default_text) @override - def kickoff(self, win: curses.window) -> Result[ValueT]: + def kickoff(self, win: curses.window) -> Result[str]: try: self._draw() except KeyboardInterrupt: