Fix cycling through long menu

archlinux · Oct 1, 2024 · 34635c9 · 34635c9
1 parent fbfa833
commit 34635c9
Show file tree

Hide file tree

Showing 13 changed files with 117 additions and 77 deletions.
diff --git a/archinstall/default_profiles/desktops/hyprland.py b/archinstall/default_profiles/desktops/hyprland.py
@@ -65,7 +65,7 @@ def _ask_seat_access(self) -> None:
 			group,
 			header=header,
 			allow_skip=False,
-			frame=FrameProperties.minimal(str(_('Seat access'))),
+			frame=FrameProperties.min(str(_('Seat access'))),
 			alignment=Alignment.CENTER
 		).single()
 

diff --git a/archinstall/default_profiles/desktops/sway.py b/archinstall/default_profiles/desktops/sway.py
@@ -75,7 +75,7 @@ def _ask_seat_access(self) -> None:
 			group,
 			header=header,
 			allow_skip=False,
-			frame=FrameProperties.minimal(str(_('Seat access'))),
+			frame=FrameProperties.min(str(_('Seat access'))),
 			alignment=Alignment.CENTER
 		).single()
 

diff --git a/archinstall/lib/disk/encryption_menu.py b/archinstall/lib/disk/encryption_menu.py
@@ -229,7 +229,7 @@ def select_encryption_type(disk_config: DiskLayoutConfiguration, preset: Encrypt
 		allow_skip=True,
 		allow_reset=True,
 		alignment=Alignment.CENTER,
-		frame=FrameProperties.minimal(str(_('Encryption type')))
+		frame=FrameProperties.min(str(_('Encryption type')))
 	).single()
 
 	match result.type_:

diff --git a/archinstall/lib/disk/partitioning_menu.py b/archinstall/lib/disk/partitioning_menu.py
@@ -217,7 +217,7 @@ def _prompt_partition_fs_type(self, prompt: Optional[str] = None) -> FilesystemT
 			group,
 			header=prompt,
 			alignment=Alignment.CENTER,
-			frame=FrameProperties.minimal(str(_('Filesystem'))),
+			frame=FrameProperties.min(str(_('Filesystem'))),
 			allow_skip=False
 		).single()
 

diff --git a/archinstall/lib/interactions/disk_conf.py b/archinstall/lib/interactions/disk_conf.py
@@ -118,7 +118,7 @@ def select_disk_config(
 		group,
 		allow_skip=True,
 		alignment=Alignment.CENTER,
-		frame=FrameProperties.minimal(str(_('Disk configuration type'))),
+		frame=FrameProperties.min(str(_('Disk configuration type'))),
 		allow_reset=True
 	).single()
 
@@ -186,7 +186,7 @@ def select_lvm_config(
 		group,
 		allow_reset=True,
 		allow_skip=True,
-		frame=FrameProperties.minimal(str(_('LVM configuration type'))),
+		frame=FrameProperties.min(str(_('LVM configuration type'))),
 		alignment=Alignment.CENTER
 	).single()
 
@@ -236,7 +236,7 @@ def select_main_filesystem_format(advanced_options: bool = False) -> disk.Filesy
 	result = SelectMenu(
 		group,
 		alignment=Alignment.CENTER,
-		frame=FrameProperties.minimal('Filesystem'),
+		frame=FrameProperties.min('Filesystem'),
 		allow_skip=False
 	).single()
 

diff --git a/archinstall/lib/interactions/general_conf.py b/archinstall/lib/interactions/general_conf.py
@@ -79,7 +79,7 @@ def ask_for_a_timezone(preset: Optional[str] = None) -> Optional[str]:
 		group,
 		allow_reset=True,
 		allow_skip=True,
-		frame=FrameProperties.minimal(str(_('Timezone'))),
+		frame=FrameProperties.min(str(_('Timezone'))),
 		alignment=Alignment.CENTER,
 	).single()
 
@@ -103,7 +103,7 @@ def ask_for_audio_selection(preset: Optional[AudioConfiguration] = None) -> Opti
 		group,
 		allow_skip=True,
 		alignment=Alignment.CENTER,
-		frame=FrameProperties.minimal(str(_('Audio')))
+		frame=FrameProperties.min(str(_('Audio')))
 	).single()
 
 	match result.type_:
@@ -148,7 +148,7 @@ def select_archinstall_language(languages: List[Language], preset: Language) ->
 		allow_skip=True,
 		allow_reset=False,
 		alignment=Alignment.CENTER,
-		frame=FrameProperties.minimal(header=str(_('Select language')))
+		frame=FrameProperties.min(header=str(_('Select language')))
 	).single()
 
 	match result.type_:
@@ -270,7 +270,7 @@ def select_additional_repositories(preset: List[str]) -> List[str]:
 	result = SelectMenu(
 		group,
 		alignment=Alignment.CENTER,
-		frame=FrameProperties.minimal('Additional repositories'),
+		frame=FrameProperties.min('Additional repositories'),
 		allow_reset=True,
 		allow_skip=True
 	).multi()

diff --git a/archinstall/lib/interactions/network_menu.py b/archinstall/lib/interactions/network_menu.py
@@ -59,7 +59,7 @@ def _select_iface(self, data: List[Nic]) -> Optional[str]:
 		result = SelectMenu(
 			group,
 			alignment=Alignment.CENTER,
-			frame=FrameProperties.minimal(str(_('Interfaces'))),
+			frame=FrameProperties.min(str(_('Interfaces'))),
 			allow_skip=True
 		).single()
 
@@ -123,7 +123,7 @@ def _edit_iface(self, edit_nic: Nic) -> Nic:
 			header=header,
 			allow_skip=False,
 			alignment=Alignment.CENTER,
-			frame=FrameProperties.minimal(str(_('Modes')))
+			frame=FrameProperties.min(str(_('Modes')))
 		).single()
 
 		match result.type_:
@@ -177,7 +177,7 @@ def ask_to_configure_network(preset: Optional[NetworkConfiguration]) -> Optional
 	result = SelectMenu(
 		group,
 		alignment=Alignment.CENTER,
-		frame=FrameProperties.minimal(str(_('Network configuration'))),
+		frame=FrameProperties.min(str(_('Network configuration'))),
 		allow_reset=True,
 		allow_skip=True
 	).single()

diff --git a/archinstall/lib/interactions/system_conf.py b/archinstall/lib/interactions/system_conf.py
@@ -37,7 +37,7 @@ def select_kernel(preset: List[str] = []) -> List[str]:
 		allow_skip=True,
 		allow_reset=True,
 		alignment=Alignment.CENTER,
-		frame=FrameProperties.minimal(str(_('Kernel')))
+		frame=FrameProperties.min(str(_('Kernel')))
 	).multi()
 
 	match result.type_:
@@ -66,7 +66,7 @@ def ask_for_bootloader(preset: Optional[Bootloader]) -> Optional[Bootloader]:
 	result = SelectMenu(
 		group,
 		alignment=Alignment.CENTER,
-		frame=FrameProperties.minimal(str(_('Bootloader'))),
+		frame=FrameProperties.min(str(_('Bootloader'))),
 		allow_skip=True
 	).single()
 

diff --git a/archinstall/lib/locale/locale_menu.py b/archinstall/lib/locale/locale_menu.py
@@ -137,7 +137,7 @@ def select_locale_lang(preset: Optional[str] = None) -> Optional[str]:
 	result = SelectMenu(
 		group,
 		alignment=Alignment.CENTER,
-		frame=FrameProperties(str(_('Locale language'))),
+		frame=FrameProperties.min(str(_('Locale language'))),
 		allow_skip=True,
 	).single()
 
@@ -161,7 +161,7 @@ def select_locale_enc(preset: Optional[str] = None) -> Optional[str]:
 	result = SelectMenu(
 		group,
 		alignment=Alignment.CENTER,
-		frame=FrameProperties(str(_('Locale encoding'))),
+		frame=FrameProperties.min(str(_('Locale encoding'))),
 		allow_skip=True,
 	).single()
 
@@ -193,7 +193,7 @@ def select_kb_layout(preset: Optional[str] = None) -> Optional[str]:
 	result = SelectMenu(
 		group,
 		alignment=Alignment.CENTER,
-		frame=FrameProperties.minimal(str(_('Keyboard layout'))),
+		frame=FrameProperties.min(str(_('Keyboard layout'))),
 		allow_skip=True,
 	).single()
 

diff --git a/archinstall/lib/mirrors.py b/archinstall/lib/mirrors.py
@@ -322,7 +322,7 @@ def select_mirror_regions(preset: Dict[str, List[MirrorStatusEntryV3]]) -> Dict[
 	result = SelectMenu(
 		group,
 		alignment=Alignment.CENTER,
-		frame=FrameProperties.minimal(str(_('Mirror regions'))),
+		frame=FrameProperties.min(str(_('Mirror regions'))),
 		allow_reset=True,
 		allow_skip=True,
 	).multi()

diff --git a/archinstall/lib/profile/profile_menu.py b/archinstall/lib/profile/profile_menu.py
@@ -180,7 +180,7 @@ def select_greeter(
 		result = SelectMenu(
 			group,
 			allow_skip=True,
-			frame=FrameProperties.minimal(str(_('Greeter'))),
+			frame=FrameProperties.min(str(_('Greeter'))),
 			alignment=Alignment.CENTER
 		).single()
 
@@ -216,7 +216,7 @@ def select_profile(
 		allow_reset=allow_reset,
 		allow_skip=True,
 		alignment=Alignment.CENTER,
-		frame=FrameProperties.minimal(str(_('Main profile')))
+		frame=FrameProperties.min(str(_('Main profile')))
 	).single()
 
 	match result.type_: