bootloaders: reorganise installer menu entries

per layout from MR #199 discussion.

under "Advanced install options" we have:
  - Graphical installer
  - Text installer
  - Graphical installer with dark theme
  - Text installer with dark theme
  - Installer with speech synthesis

under each of these we have a set of:
  - Install
  - Expert install
  - Automated install
  - Rescue mode

note that the 'automated' entries are moved up before the 'rescue' entries.

for hotkeys, the four entries above have hotkeys of 'i', 'x', 'a', and 'r'
respectively. ('x' is used instead of 'e' to avoid clash with standard
grub hotkey). this means that some entries that previous had no hotkeys
due to the flat list now have them. the other big difference is the main
graphical install entry going from 'g' to 'i' for consistency and the main
speech synth entry going from 's' to 'i' for the same reason.

furthermore, in the level above we have 'g' for normal graphical, 't' for
normal text install, 's' for speech synth, 'd' for graphical dark mode,
and 'k' for text dark mode.

the text-only sets are identical to the graphical ones except only for
dropping the graphical groups, simplifying maintenance, bringing clarity
to users of images (who may not have even made the image) that the set is
text-only, and keeping consistent hotkeys between graphical and text-only.

a 'start installer with speech synthesis' entry shortcut has been placed
at the top menu level alongside the 'start installer' shortcut.

Gbp-Dch: Short

3 files changed, 94 insertions, 69 deletions

diff --git a/share/bootloaders/grub-pc/install_gui.cfg b/share/bootloaders/grub-pc/install_gui.cfg
index dd8888b32..61be681ca 100644
--- a/share/bootloaders/grub-pc/install_gui.cfg
+++ b/share/bootloaders/grub-pc/install_gui.cfg
@@ -1,109 +1,124 @@
-menuentry 'Graphical install' --hotkey=g {
-	linux	@KERNEL_GI@ vga=788 @APPEND_INSTALL@ --- quiet
-	initrd	@INITRD_GI@
-}
+submenu 'Graphical installer ...' --hotkey=g {
 
-menuentry 'Graphical expert install' --hotkey=x {
-	linux	@KERNEL_GI@ priority=low vga=788 @APPEND_INSTALL@
-	initrd	@INITRD_GI@
-}
+	source /boot/grub/theme.cfg
 
-menuentry 'Graphical rescue mode' --hotkey=r {
-	linux	@KERNEL_GI@ rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
-	initrd	@INITRD_GI@
-}
+	menuentry 'Install' --hotkey=i {
+		linux	@KERNEL_GI@ vga=788 @APPEND_INSTALL@ --- quiet
+		initrd	@INITRD_GI@
+	}
 
-menuentry 'Graphical automated install' --hotkey=a {
-	linux	@KERNEL_GI@ auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
-	initrd	@INITRD_GI@
-}
+	menuentry 'Expert install' --hotkey=x {
+		linux	@KERNEL_GI@ priority=low vga=788 @APPEND_INSTALL@
+		initrd	@INITRD_GI@
+	}
 
-menuentry 'Install' --hotkey=i {
-	linux	@KERNEL_DI@ vga=788 @APPEND_INSTALL@ --- quiet
-	initrd	@INITRD_DI@
-}
+	menuentry 'Automated install' --hotkey=a {
+		linux	@KERNEL_GI@ auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
+		initrd	@INITRD_GI@
+	}
 
-menuentry 'Expert install' {
-	linux	@KERNEL_DI@ priority=low vga=788 @APPEND_INSTALL@
-	initrd	@INITRD_DI@
+	menuentry 'Rescue mode' --hotkey=r {
+		linux	@KERNEL_GI@ rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
+		initrd	@INITRD_GI@
+	}
 }
 
-menuentry 'Rescue mode' {
-	linux	@KERNEL_DI@ rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
-	initrd	@INITRD_DI@
-}
+submenu 'Text installer ...' --hotkey=t {
+
+	source /boot/grub/theme.cfg
+
+	menuentry 'Install' --hotkey=i {
+		linux	@KERNEL_DI@ vga=788 @APPEND_INSTALL@ --- quiet
+		initrd	@INITRD_DI@
+	}
+
+	menuentry 'Expert install' --hotkey=x {
+		linux	@KERNEL_DI@ priority=low vga=788 @APPEND_INSTALL@
+		initrd	@INITRD_DI@
+	}
+
+	menuentry 'Automated install' --hotkey=a {
+		linux	@KERNEL_DI@ auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
+		initrd	@INITRD_DI@
+	}
 
-menuentry 'Automated install' {
-	linux	@KERNEL_DI@ auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
-	initrd	@INITRD_DI@
+	menuentry 'Rescue mode' --hotkey=r {
+		linux	@KERNEL_DI@ rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
+		initrd	@INITRD_DI@
+	}
 }
 
-submenu 'Accessible dark contrast installer options ...' --hotkey=d {
+submenu 'Graphical installer with dark theme ...' --hotkey=d {
 
 	source /boot/grub/theme.cfg
 
-	menuentry 'Graphical install' --hotkey=g {
+	menuentry 'Install' --hotkey=i {
 		linux	@KERNEL_GI@ vga=788 theme=dark @APPEND_INSTALL@ --- quiet
 		initrd	@INITRD_GI@
 	}
 
-	menuentry 'Graphical expert install' --hotkey=x {
+	menuentry 'Expert install' --hotkey=x {
 		linux	@KERNEL_GI@ priority=low vga=788 theme=dark @APPEND_INSTALL@
 		initrd	@INITRD_GI@
 	}
 
-	menuentry 'Graphical rescue mode' --hotkey=r {
-		linux	@KERNEL_GI@ rescue/enable=true vga=788 theme=dark @APPEND_INSTALL@ --- quiet
+	menuentry 'Automated install' --hotkey=a {
+		linux	@KERNEL_GI@ auto=true priority=critical vga=788 theme=dark @APPEND_INSTALL@ --- quiet
 		initrd	@INITRD_GI@
 	}
 
-	menuentry 'Graphical automated install' --hotkey=a {
-		linux	@KERNEL_GI@ auto=true priority=critical vga=788 theme=dark @APPEND_INSTALL@ --- quiet
+	menuentry 'Rescue mode' --hotkey=r {
+		linux	@KERNEL_GI@ rescue/enable=true vga=788 theme=dark @APPEND_INSTALL@ --- quiet
 		initrd	@INITRD_GI@
 	}
+}
+
+submenu 'Text installer with dark theme ...' --hotkey=k {
+
+	source /boot/grub/theme.cfg
 
 	menuentry 'Install' --hotkey=i {
 		linux	@KERNEL_DI@ vga=788 theme=dark @APPEND_INSTALL@ --- quiet
 		initrd	@INITRD_DI@
 	}
 
-	menuentry 'Expert install' {
+	menuentry 'Expert install' --hotkey=x {
 		linux	@KERNEL_DI@ priority=low vga=788 theme=dark @APPEND_INSTALL@
 		initrd	@INITRD_DI@
 	}
 
-	menuentry 'Rescue mode' {
-		linux	@KERNEL_DI@ rescue/enable=true vga=788 theme=dark @APPEND_INSTALL@ --- quiet
+	menuentry 'Automated install' --hotkey=a {
+		linux	@KERNEL_DI@ auto=true priority=critical vga=788 theme=dark @APPEND_INSTALL@ --- quiet
 		initrd	@INITRD_DI@
 	}
 
-	menuentry 'Automated install' {
-		linux	@KERNEL_DI@ auto=true priority=critical vga=788 theme=dark @APPEND_INSTALL@ --- quiet
+	menuentry 'Rescue mode' --hotkey=r {
+		linux	@KERNEL_DI@ rescue/enable=true vga=788 theme=dark @APPEND_INSTALL@ --- quiet
 		initrd	@INITRD_DI@
 	}
 }
 
-submenu 'Speech-enabled install options ...' --hotkey=s {
+submenu 'Installer with speech synthesis ...' --hotkey=s {
 
 	source /boot/grub/theme.cfg
 
-	menuentry 'Install with speech synthesis' --hotkey=s {
+	menuentry 'Install' --hotkey=i {
 		linux	@KERNEL_GI@ speakup.synth=soft vga=788 @APPEND_INSTALL@ --- quiet
 		initrd	@INITRD_GI@
 	}
 
-	menuentry 'Expert speech install' --hotkey=x {
+	menuentry 'Expert install' --hotkey=x {
 		linux	@KERNEL_GI@ speakup.synth=soft priority=low vga=788 @APPEND_INSTALL@
 		initrd	@INITRD_GI@
 	}
 
-	menuentry 'Rescue speech mode' --hotkey=r {
-		linux	@KERNEL_GI@ speakup.synth=soft rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
+	menuentry 'Automated install' --hotkey=a {
+		linux	@KERNEL_GI@ speakup.synth=soft auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
 		initrd	@INITRD_GI@
 	}
 
-	menuentry 'Automated speech install' --hotkey=a {
-		linux	@KERNEL_GI@ speakup.synth=soft auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
+	menuentry 'Rescue mode' --hotkey=r {
+		linux	@KERNEL_GI@ speakup.synth=soft rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
 		initrd	@INITRD_GI@
 	}
 }
diff --git a/share/bootloaders/grub-pc/install_start_gui.cfg b/share/bootloaders/grub-pc/install_start_gui.cfg
index 94c61b367..92dde1713 100644
--- a/share/bootloaders/grub-pc/install_start_gui.cfg
+++ b/share/bootloaders/grub-pc/install_start_gui.cfg
@@ -2,3 +2,8 @@ menuentry 'Start installer' --hotkey=i {
 	linux	@KERNEL_GI@ vga=788 @APPEND_INSTALL@ --- quiet
 	initrd	@INITRD_GI@
 }
+
+menuentry 'Start installer with speech synthesis' --hotkey=s {
+	linux	@KERNEL_GI@ speakup.synth=soft vga=788 @APPEND_INSTALL@ --- quiet
+	initrd	@INITRD_GI@
+}
diff --git a/share/bootloaders/grub-pc/install_text.cfg b/share/bootloaders/grub-pc/install_text.cfg
index 1c113b806..dc6b22270 100644
--- a/share/bootloaders/grub-pc/install_text.cfg
+++ b/share/bootloaders/grub-pc/install_text.cfg
@@ -1,24 +1,29 @@
-menuentry 'Install' --hotkey=i {
-	linux	@KERNEL_DI@ vga=788 @APPEND_INSTALL@ --- quiet
-	initrd	@INITRD_DI@
-}
+submenu 'Text installer ...' --hotkey=t {
 
-menuentry 'Expert install' --hotkey=x {
-	linux	@KERNEL_DI@ priority=low vga=788 @APPEND_INSTALL@
-	initrd	@INITRD_DI@
-}
+	source /boot/grub/theme.cfg
 
-menuentry 'Rescue mode' --hotkey=r {
-	linux	@KERNEL_DI@ rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
-	initrd	@INITRD_DI@
-}
+	menuentry 'Install' --hotkey=i {
+		linux	@KERNEL_DI@ vga=788 @APPEND_INSTALL@ --- quiet
+		initrd	@INITRD_DI@
+	}
+
+	menuentry 'Expert install' --hotkey=x {
+		linux	@KERNEL_DI@ priority=low vga=788 @APPEND_INSTALL@
+		initrd	@INITRD_DI@
+	}
+
+	menuentry 'Automated install' --hotkey=a {
+		linux	@KERNEL_DI@ auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
+		initrd	@INITRD_DI@
+	}
 
-menuentry 'Automated install' --hotkey=a {
-	linux	@KERNEL_DI@ auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
-	initrd	@INITRD_DI@
+	menuentry 'Rescue mode' --hotkey=r {
+		linux	@KERNEL_DI@ rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
+		initrd	@INITRD_DI@
+	}
 }
 
-submenu 'Accessible dark contrast installer options ...' --hotkey=d {
+submenu 'Text installer with dark theme ...' --hotkey=k {
 
 	source /boot/grub/theme.cfg
 
@@ -32,13 +37,13 @@ submenu 'Accessible dark contrast installer options ...' --hotkey=d {
 		initrd	@INITRD_DI@
 	}
 
-	menuentry 'Rescue mode' --hotkey=r {
-		linux	@KERNEL_DI@ rescue/enable=true vga=788 theme=dark @APPEND_INSTALL@ --- quiet
+	menuentry 'Automated install' --hotkey=a {
+		linux	@KERNEL_DI@ auto=true priority=critical vga=788 theme=dark @APPEND_INSTALL@ --- quiet
 		initrd	@INITRD_DI@
 	}
 
-	menuentry 'Automated install' --hotkey=a {
-		linux	@KERNEL_DI@ auto=true priority=critical vga=788 theme=dark @APPEND_INSTALL@ --- quiet
+	menuentry 'Rescue mode' --hotkey=r {
+		linux	@KERNEL_DI@ rescue/enable=true vga=788 theme=dark @APPEND_INSTALL@ --- quiet
 		initrd	@INITRD_DI@
 	}
 }