mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 05:48:07 -05:00
installer: Turn help menu into parameters menu.
* gnu/local.mk (INSTALLER_MODULES): Rename help.scm into parameters.scm. * po/guix/POTFILES.in: Ditto. * gnu/installer/record.scm (<installer>): Rename help-menu into parameter-menu and help-page into parameters-page. * gnu/installer/newt/parameters.scm: Renamed from help.scm. Update information messages. * gnu/installer/newt.scm: Update accordingly. * gnu/installer/newt/keymap.scm: Ditto.
This commit is contained in:
parent
6e2f7dc5e2
commit
07a53bd512
7 changed files with 28 additions and 27 deletions
|
@ -198,11 +198,11 @@ (define (installer-steps)
|
||||||
(timezone-data #~(string-append #$tzdata
|
(timezone-data #~(string-append #$tzdata
|
||||||
"/share/zoneinfo/zone.tab")))
|
"/share/zoneinfo/zone.tab")))
|
||||||
#~(lambda (current-installer)
|
#~(lambda (current-installer)
|
||||||
((installer-help-menu current-installer)
|
((installer-parameters-menu current-installer)
|
||||||
(lambda ()
|
(lambda ()
|
||||||
((installer-help-page current-installer)
|
((installer-parameters-page current-installer)
|
||||||
(lambda _
|
(lambda _
|
||||||
(#$(compute-keymap-step 'help)
|
(#$(compute-keymap-step 'param)
|
||||||
current-installer)))))
|
current-installer)))))
|
||||||
(list
|
(list
|
||||||
;; Ask the user to choose a locale among those supported by
|
;; Ask the user to choose a locale among those supported by
|
||||||
|
|
|
@ -21,7 +21,7 @@ (define-module (gnu installer newt)
|
||||||
#:use-module (gnu installer utils)
|
#:use-module (gnu installer utils)
|
||||||
#:use-module (gnu installer newt ethernet)
|
#:use-module (gnu installer newt ethernet)
|
||||||
#:use-module (gnu installer newt final)
|
#:use-module (gnu installer newt final)
|
||||||
#:use-module (gnu installer newt help)
|
#:use-module (gnu installer newt parameters)
|
||||||
#:use-module (gnu installer newt hostname)
|
#:use-module (gnu installer newt hostname)
|
||||||
#:use-module (gnu installer newt keymap)
|
#:use-module (gnu installer newt keymap)
|
||||||
#:use-module (gnu installer newt locale)
|
#:use-module (gnu installer newt locale)
|
||||||
|
@ -47,7 +47,7 @@ (define (init)
|
||||||
(clear-screen)
|
(clear-screen)
|
||||||
(set-screen-size!)
|
(set-screen-size!)
|
||||||
(push-help-line
|
(push-help-line
|
||||||
(format #f (G_ "Press <F1> for help."))))
|
(format #f (G_ "Press <F1> for installation parameters."))))
|
||||||
|
|
||||||
(define (exit)
|
(define (exit)
|
||||||
(newt-finish)
|
(newt-finish)
|
||||||
|
@ -112,11 +112,11 @@ (define (partition-page)
|
||||||
(define (services-page)
|
(define (services-page)
|
||||||
(run-services-page))
|
(run-services-page))
|
||||||
|
|
||||||
(define (help-menu menu-proc)
|
(define (parameters-menu menu-proc)
|
||||||
(newt-set-help-callback menu-proc))
|
(newt-set-help-callback menu-proc))
|
||||||
|
|
||||||
(define (help-page keyboard-layout-selection)
|
(define (parameters-page keyboard-layout-selection)
|
||||||
(run-help-page keyboard-layout-selection))
|
(run-parameters-page keyboard-layout-selection))
|
||||||
|
|
||||||
(define newt-installer
|
(define newt-installer
|
||||||
(installer
|
(installer
|
||||||
|
@ -135,5 +135,5 @@ (define newt-installer
|
||||||
(partition-page partition-page)
|
(partition-page partition-page)
|
||||||
(services-page services-page)
|
(services-page services-page)
|
||||||
(welcome-page welcome-page)
|
(welcome-page welcome-page)
|
||||||
(help-menu help-menu)
|
(parameters-menu parameters-menu)
|
||||||
(help-page help-page)))
|
(parameters-page parameters-page)))
|
||||||
|
|
|
@ -39,21 +39,21 @@ (define (run-layout-page layouts layout->text context)
|
||||||
#:title title
|
#:title title
|
||||||
#:info-text
|
#:info-text
|
||||||
(case context
|
(case context
|
||||||
((help) (G_ "Please choose your keyboard layout. \
|
((param) (G_ "Please choose your keyboard layout. \
|
||||||
It will only be used during the installation process."))
|
It will only be used during the installation process."))
|
||||||
(else (G_ "Please choose your keyboard layout. \
|
(else (G_ "Please choose your keyboard layout. \
|
||||||
It will be used during the install process, and for the installed system. \
|
It will be used during the install process, and for the installed system. \
|
||||||
You can switch to different layout at any time from the help menu.")))
|
You can switch to different layout at any time from the parameters menu.")))
|
||||||
#:listbox-items layouts
|
#:listbox-items layouts
|
||||||
#:listbox-item->text layout->text
|
#:listbox-item->text layout->text
|
||||||
#:sort-listbox-items? #f
|
#:sort-listbox-items? #f
|
||||||
#:button-text
|
#:button-text
|
||||||
(case context
|
(case context
|
||||||
((help) (G_ "Continue"))
|
((param) (G_ "Continue"))
|
||||||
(else (G_ "Exit")))
|
(else (G_ "Exit")))
|
||||||
#:button-callback-procedure
|
#:button-callback-procedure
|
||||||
(case context
|
(case context
|
||||||
((help) (const #t))
|
((param) (const #t))
|
||||||
(else
|
(else
|
||||||
(lambda _
|
(lambda _
|
||||||
(raise
|
(raise
|
||||||
|
|
|
@ -16,28 +16,29 @@
|
||||||
;;; You should have received a copy of the GNU General Public License
|
;;; You should have received a copy of the GNU General Public License
|
||||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
(define-module (gnu installer newt help)
|
(define-module (gnu installer newt parameters)
|
||||||
#:use-module (gnu installer steps)
|
#:use-module (gnu installer steps)
|
||||||
#:use-module (gnu installer newt page)
|
#:use-module (gnu installer newt page)
|
||||||
#:use-module (guix i18n)
|
#:use-module (guix i18n)
|
||||||
#:use-module (ice-9 match)
|
#:use-module (ice-9 match)
|
||||||
#:use-module (newt)
|
#:use-module (newt)
|
||||||
#:export (run-help-page))
|
#:export (run-parameters-page))
|
||||||
|
|
||||||
(define (run-help-page keyboard-layout-selection)
|
(define (run-parameters-page keyboard-layout-selection)
|
||||||
"Run a help page allowing to change the keyboard layout"
|
"Run a parameters page allowing to change the keyboard layout"
|
||||||
(let* ((items
|
(let* ((items
|
||||||
(list
|
(list
|
||||||
(cons (G_ "Change keyboard layout") keyboard-layout-selection)))
|
(cons (G_ "Change keyboard layout") keyboard-layout-selection)))
|
||||||
(result
|
(result
|
||||||
(run-listbox-selection-page
|
(run-listbox-selection-page
|
||||||
#:info-text (G_ "This is the help menu, please choose an action.")
|
#:info-text (G_ "Please choose one of the following parameters or \
|
||||||
#:title (G_ "Installation help")
|
press ‘Back’ to go back to the installation process.")
|
||||||
|
#:title (G_ "Installation parameters")
|
||||||
#:listbox-items items
|
#:listbox-items items
|
||||||
#:listbox-item->text car
|
#:listbox-item->text car
|
||||||
#:sort-listbox-items? #f
|
#:sort-listbox-items? #f
|
||||||
#:listbox-height 6
|
#:listbox-height 6
|
||||||
#:button-text (G_ "Continue"))))
|
#:button-text (G_ "Back"))))
|
||||||
(match result
|
(match result
|
||||||
((_ . proc)
|
((_ . proc)
|
||||||
(proc))
|
(proc))
|
|
@ -38,8 +38,8 @@ (define-module (gnu installer record)
|
||||||
installer-partition-page
|
installer-partition-page
|
||||||
installer-services-page
|
installer-services-page
|
||||||
installer-welcome-page
|
installer-welcome-page
|
||||||
installer-help-menu
|
installer-parameters-menu
|
||||||
installer-help-page))
|
installer-parameters-page))
|
||||||
|
|
||||||
|
|
||||||
;;;
|
;;;
|
||||||
|
@ -85,6 +85,6 @@ (define-record-type* <installer>
|
||||||
;; procedure (logo) -> void
|
;; procedure (logo) -> void
|
||||||
(welcome-page installer-welcome-page)
|
(welcome-page installer-welcome-page)
|
||||||
;; procedure (menu-proc) -> void
|
;; procedure (menu-proc) -> void
|
||||||
(help-menu installer-help-menu)
|
(parameters-menu installer-parameters-menu)
|
||||||
;; procedure (keyboard-layout-selection) -> void
|
;; procedure (keyboard-layout-selection) -> void
|
||||||
(help-page installer-help-page))
|
(parameters-page installer-parameters-page))
|
||||||
|
|
|
@ -672,7 +672,7 @@ INSTALLER_MODULES = \
|
||||||
\
|
\
|
||||||
%D%/installer/newt/ethernet.scm \
|
%D%/installer/newt/ethernet.scm \
|
||||||
%D%/installer/newt/final.scm \
|
%D%/installer/newt/final.scm \
|
||||||
%D%/installer/newt/help.scm \
|
%D%/installer/newt/parameters.scm \
|
||||||
%D%/installer/newt/hostname.scm \
|
%D%/installer/newt/hostname.scm \
|
||||||
%D%/installer/newt/keymap.scm \
|
%D%/installer/newt/keymap.scm \
|
||||||
%D%/installer/newt/locale.scm \
|
%D%/installer/newt/locale.scm \
|
||||||
|
|
|
@ -16,7 +16,7 @@ gnu/installer/locale.scm
|
||||||
gnu/installer/newt.scm
|
gnu/installer/newt.scm
|
||||||
gnu/installer/newt/ethernet.scm
|
gnu/installer/newt/ethernet.scm
|
||||||
gnu/installer/newt/final.scm
|
gnu/installer/newt/final.scm
|
||||||
gnu/installer/newt/help.scm
|
gnu/installer/newt/parameters.scm
|
||||||
gnu/installer/newt/hostname.scm
|
gnu/installer/newt/hostname.scm
|
||||||
gnu/installer/newt/keymap.scm
|
gnu/installer/newt/keymap.scm
|
||||||
gnu/installer/newt/locale.scm
|
gnu/installer/newt/locale.scm
|
||||||
|
|
Loading…
Reference in a new issue