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

2 files changed, 149 insertions, 107 deletions

diff --git a/share/bootloaders/syslinux_common/install_gui.cfg b/share/bootloaders/syslinux_common/install_gui.cfg
index b568f64e8..9788fb26b 100644
--- a/share/bootloaders/syslinux_common/install_gui.cfg
+++ b/share/bootloaders/syslinux_common/install_gui.cfg
@@ -1,9 +1,15 @@
-label installgui
+label installstart
 	menu label Start ^installer
 	linux @KERNEL_GI@
 	initrd @INITRD_GI@
 	append vga=788 @APPEND_INSTALL@ --- quiet
 
+label installstartspeech
+	menu label Start installer with ^speech synthesis
+	linux @KERNEL_GI@
+	initrd @INITRD_GI@
+	append speakup.synth=soft vga=788 @APPEND_INSTALL@ --- quiet
+
 menu begin install
 	menu label ^Advanced install options
 	menu title Advanced install options
@@ -12,85 +18,112 @@ menu begin install
 		menu label ^Back..
 		menu exit
 
-	label installgui
-		menu label ^Graphical install
-		linux @KERNEL_GI@
-		initrd @INITRD_GI@
-		append vga=788 @APPEND_INSTALL@ --- quiet
-
-	label expertgui
-		menu label Graphical e^xpert install
-		linux @KERNEL_GI@
-		initrd @INITRD_GI@
-		append priority=low vga=788 @APPEND_INSTALL@
-
-	label rescuegui
-		menu label Graphical ^rescue mode
-		linux @KERNEL_GI@
-		initrd @INITRD_GI@
-		append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
-
-	label autogui
-		menu label Graphical ^automated install
-		linux @KERNEL_GI@
-		initrd @INITRD_GI@
-		append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
-
-	label install
-		menu label ^Install
-		linux @KERNEL_DI@
-		initrd @INITRD_DI@
-		append vga=788 @APPEND_INSTALL@ --- quiet
-
-	label expert
-		menu label Expert install
-		linux @KERNEL_DI@
-		initrd @INITRD_DI@
-		append priority=low vga=788 @APPEND_INSTALL@
-
-	label rescue
-		menu label Rescue mode
-		linux @KERNEL_DI@
-		initrd @INITRD_DI@
-		append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
-
-	label auto
-		menu label Automated install
-		linux @KERNEL_DI@
-		initrd @INITRD_DI@
-		append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
-
-	menu begin darkinstall
-		menu label Accessible ^dark contrast installer options
-		menu title Accessible dark contrast installer options
+	menu begin graphicalinstall
+		menu label ^Graphical installer
+		menu title Graphical installer
+		include stdmenu.cfg
+		label mainmenu
+			menu label ^Back..
+			menu exit
+
+		label installgui
+			menu label ^Install
+			linux @KERNEL_GI@
+			initrd @INITRD_GI@
+			append vga=788 @APPEND_INSTALL@ --- quiet
+
+		label expertgui
+			menu label E^xpert install
+			linux @KERNEL_GI@
+			initrd @INITRD_GI@
+			append priority=low vga=788 @APPEND_INSTALL@
+
+		label autogui
+			menu label ^Automated install
+			linux @KERNEL_GI@
+			initrd @INITRD_GI@
+			append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
+
+		label rescuegui
+			menu label ^Rescue mode
+			linux @KERNEL_GI@
+			initrd @INITRD_GI@
+			append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
+	menu end
+
+	menu begin textinstall
+		menu label ^Text installer
+		menu title Text installer
+		include stdmenu.cfg
+		label mainmenu
+			menu label ^Back..
+			menu exit
+
+		label install
+			menu label ^Install
+			linux @KERNEL_DI@
+			initrd @INITRD_DI@
+			append vga=788 @APPEND_INSTALL@ --- quiet
+
+		label expert
+			menu label E^xpert install
+			linux @KERNEL_DI@
+			initrd @INITRD_DI@
+			append priority=low vga=788 @APPEND_INSTALL@
+
+		label auto
+			menu label ^Automated install
+			linux @KERNEL_DI@
+			initrd @INITRD_DI@
+			append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
+
+		label rescue
+			menu label ^Rescue mode
+			linux @KERNEL_DI@
+			initrd @INITRD_DI@
+			append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
+	menu end
+
+	menu begin graphicalinstalldark
+		menu label Graphical installer with ^dark theme
+		menu title Graphical installer with dark theme
 		include stdmenu.cfg
 		label mainmenu
 			menu label ^Back..
 			menu exit
 
 		label darkinstallgui
-			menu label ^Graphical install
+			menu label ^Install
 			linux @KERNEL_GI@
 			initrd @INITRD_GI@
 			append vga=788 theme=dark @APPEND_INSTALL@ --- quiet
 
 		label darkexpertgui
-			menu label Graphical e^xpert install
+			menu label E^xpert install
 			linux @KERNEL_GI@
 			initrd @INITRD_GI@
 			append priority=low vga=788 theme=dark @APPEND_INSTALL@
 
-		label darkrescuegui
-			menu label Graphical ^rescue mode
+		label darkautogui
+			menu label ^Automated install
 			linux @KERNEL_GI@
 			initrd @INITRD_GI@
-			append rescue/enable=true vga=788 theme=dark @APPEND_INSTALL@ --- quiet
+			append auto=true priority=critical vga=788 theme=dark @APPEND_INSTALL@ --- quiet
 
-		label darkautogui
-			menu label Graphical ^automated install
+		label darkrescuegui
+			menu label ^Rescue mode
 			linux @KERNEL_GI@
 			initrd @INITRD_GI@
-			append auto=true priority=critical vga=788 theme=dark @APPEND_INSTALL@ --- quiet
+			append rescue/enable=true vga=788 theme=dark @APPEND_INSTALL@ --- quiet
+	menu end
+
+	menu begin textinstalldark
+		menu label Text installer with dar^k theme
+		menu title Text installer with dark theme
+		include stdmenu.cfg
+		label mainmenu
+			menu label ^Back..
+			menu exit
 
 		label darkinstall
 			menu label ^Install
@@ -99,54 +132,54 @@ menu begin install
 			append vga=788 theme=dark @APPEND_INSTALL@ --- quiet
 
 		label darkexpert
-			menu label Expert install
+			menu label E^xpert install
 			linux @KERNEL_DI@
 			initrd @INITRD_DI@
 			append priority=low vga=788 theme=dark @APPEND_INSTALL@
 
-		label darkrescue
-			menu label Rescue mode
+		label darkauto
+			menu label ^Automated install
 			linux @KERNEL_DI@
 			initrd @INITRD_DI@
-			append rescue/enable=true vga=788 theme=dark @APPEND_INSTALL@ --- quiet
+			append auto=true priority=critical vga=788 theme=dark @APPEND_INSTALL@ --- quiet
 
-		label darkauto
-			menu label Automated install
+		label darkrescue
+			menu label ^Rescue mode
 			linux @KERNEL_DI@
 			initrd @INITRD_DI@
-			append auto=true priority=critical vga=788 theme=dark @APPEND_INSTALL@ --- quiet
+			append rescue/enable=true vga=788 theme=dark @APPEND_INSTALL@ --- quiet
 	menu end
 
 	menu begin speechinstall
-		menu label ^Speech-enabled install options
-		menu title Speech-enabled install options
+		menu label Installer with ^speech synthesis
+		menu title Installer with speech synthesis
 		include stdmenu.cfg
 		label mainmenu
 			menu label ^Back..
 			menu exit
 
 		label installspeechsynth
-			menu label Install with ^speech synthesis
+			menu label ^Install
 			linux @KERNEL_GI@
 			initrd @INITRD_GI@
 			append speakup.synth=soft vga=788 @APPEND_INSTALL@ --- quiet
 
 		label expertguispeech
-			menu label E^xpert speech install
+			menu label E^xpert install
 			linux @KERNEL_GI@
 			initrd @INITRD_GI@
 			append speakup.synth=soft priority=low vga=788 @APPEND_INSTALL@
 
-		label rescueguispeech
-			menu label ^Rescue speech mode
+		label autoguispeech
+			menu label ^Automated install
 			linux @KERNEL_GI@
 			initrd @INITRD_GI@
-			append speakup.synth=soft rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
+			append speakup.synth=soft auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
 
-		label autoguispeech
-			menu label ^Automated speech install
+		label rescueguispeech
+			menu label ^Rescue mode
 			linux @KERNEL_GI@
 			initrd @INITRD_GI@
-			append speakup.synth=soft auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
+			append speakup.synth=soft rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
 	menu end
 menu end
diff --git a/share/bootloaders/syslinux_common/install_text.cfg b/share/bootloaders/syslinux_common/install_text.cfg
index cf2e17cb5..1d16f8a11 100644
--- a/share/bootloaders/syslinux_common/install_text.cfg
+++ b/share/bootloaders/syslinux_common/install_text.cfg
@@ -1,4 +1,4 @@
-label installgui
+label installstart
 	menu label Start ^installer
 	linux @KERNEL_DI@
 	initrd @INITRD_DI@
@@ -12,33 +12,42 @@ menu begin install
 		menu label ^Back..
 		menu exit
 
-	label install
-		menu label ^Install
-		linux @KERNEL_DI@
-		initrd @INITRD_DI@
-		append vga=788 @APPEND_INSTALL@ --- quiet
+	menu begin textinstall
+		menu label ^Text installer
+		menu title Text installer
+		include stdmenu.cfg
+		label mainmenu
+			menu label ^Back..
+			menu exit
 
-	label expert
-		menu label E^xpert install
-		linux @KERNEL_DI@
-		initrd @INITRD_DI@
-		append priority=low vga=788 @APPEND_INSTALL@
+		label install
+			menu label ^Install
+			linux @KERNEL_DI@
+			initrd @INITRD_DI@
+			append vga=788 @APPEND_INSTALL@ --- quiet
 
-	label rescue
-		menu label ^Rescue mode
-		linux @KERNEL_DI@
-		initrd @INITRD_DI@
-		append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
+		label expert
+			menu label E^xpert install
+			linux @KERNEL_DI@
+			initrd @INITRD_DI@
+			append priority=low vga=788 @APPEND_INSTALL@
 
-	label auto
-		menu label ^Automated install
-		linux @KERNEL_DI@
-		initrd @INITRD_DI@
-		append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
+		label auto
+			menu label ^Automated install
+			linux @KERNEL_DI@
+			initrd @INITRD_DI@
+			append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
+
+		label rescue
+			menu label ^Rescue mode
+			linux @KERNEL_DI@
+			initrd @INITRD_DI@
+			append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
+	menu end
 
-	menu begin darkinstall
-		menu label Accessible ^dark contrast installer options
-		menu title Accessible dark contrast installer options
+	menu begin textinstalldark
+		menu label Text installer with dar^k theme
+		menu title Text installer with dark theme
 		include stdmenu.cfg
 		label mainmenu
 			menu label ^Back..
@@ -56,16 +65,16 @@ menu begin install
 			initrd @INITRD_DI@
 			append priority=low vga=788 theme=dark @APPEND_INSTALL@
 
-		label darkrescue
-			menu label ^Rescue mode
-			linux @KERNEL_DI@
-			initrd @INITRD_DI@
-			append rescue/enable=true vga=788 theme=dark @APPEND_INSTALL@ --- quiet
-
 		label darkauto
 			menu label ^Automated install
 			linux @KERNEL_DI@
 			initrd @INITRD_DI@
 			append auto=true priority=critical vga=788 theme=dark @APPEND_INSTALL@ --- quiet
+
+		label darkrescue
+			menu label ^Rescue mode
+			linux @KERNEL_DI@
+			initrd @INITRD_DI@
+			append rescue/enable=true vga=788 theme=dark @APPEND_INSTALL@ --- quiet
 	menu end
 menu end