From 07a53bd512530d8f87e076263227216c467727bb Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 8 Apr 2020 10:16:25 +0200 Subject: 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 (): 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. --- gnu/installer.scm | 6 +++--- gnu/installer/newt.scm | 14 ++++++------ gnu/installer/newt/help.scm | 44 -------------------------------------- gnu/installer/newt/keymap.scm | 8 +++---- gnu/installer/newt/parameters.scm | 45 +++++++++++++++++++++++++++++++++++++++ gnu/installer/record.scm | 8 +++---- gnu/local.mk | 2 +- po/guix/POTFILES.in | 2 +- 8 files changed, 65 insertions(+), 64 deletions(-) delete mode 100644 gnu/installer/newt/help.scm create mode 100644 gnu/installer/newt/parameters.scm diff --git a/gnu/installer.scm b/gnu/installer.scm index 75c5a01570..6cd3995e51 100644 --- a/gnu/installer.scm +++ b/gnu/installer.scm @@ -198,11 +198,11 @@ (define (installer-steps) (timezone-data #~(string-append #$tzdata "/share/zoneinfo/zone.tab"))) #~(lambda (current-installer) - ((installer-help-menu current-installer) + ((installer-parameters-menu current-installer) (lambda () - ((installer-help-page current-installer) + ((installer-parameters-page current-installer) (lambda _ - (#$(compute-keymap-step 'help) + (#$(compute-keymap-step 'param) current-installer))))) (list ;; Ask the user to choose a locale among those supported by diff --git a/gnu/installer/newt.scm b/gnu/installer/newt.scm index 7ac015eaad..a24a152984 100644 --- a/gnu/installer/newt.scm +++ b/gnu/installer/newt.scm @@ -21,7 +21,7 @@ (define-module (gnu installer newt) #:use-module (gnu installer utils) #:use-module (gnu installer newt ethernet) #: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 keymap) #:use-module (gnu installer newt locale) @@ -47,7 +47,7 @@ (define (init) (clear-screen) (set-screen-size!) (push-help-line - (format #f (G_ "Press for help.")))) + (format #f (G_ "Press for installation parameters.")))) (define (exit) (newt-finish) @@ -112,11 +112,11 @@ (define (partition-page) (define (services-page) (run-services-page)) -(define (help-menu menu-proc) +(define (parameters-menu menu-proc) (newt-set-help-callback menu-proc)) -(define (help-page keyboard-layout-selection) - (run-help-page keyboard-layout-selection)) +(define (parameters-page keyboard-layout-selection) + (run-parameters-page keyboard-layout-selection)) (define newt-installer (installer @@ -135,5 +135,5 @@ (define newt-installer (partition-page partition-page) (services-page services-page) (welcome-page welcome-page) - (help-menu help-menu) - (help-page help-page))) + (parameters-menu parameters-menu) + (parameters-page parameters-page))) diff --git a/gnu/installer/newt/help.scm b/gnu/installer/newt/help.scm deleted file mode 100644 index a488f5fa2a..0000000000 --- a/gnu/installer/newt/help.scm +++ /dev/null @@ -1,44 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2020 Mathieu Othacehe -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu installer newt help) - #:use-module (gnu installer steps) - #:use-module (gnu installer newt page) - #:use-module (guix i18n) - #:use-module (ice-9 match) - #:use-module (newt) - #:export (run-help-page)) - -(define (run-help-page keyboard-layout-selection) - "Run a help page allowing to change the keyboard layout" - (let* ((items - (list - (cons (G_ "Change keyboard layout") keyboard-layout-selection))) - (result - (run-listbox-selection-page - #:info-text (G_ "This is the help menu, please choose an action.") - #:title (G_ "Installation help") - #:listbox-items items - #:listbox-item->text car - #:sort-listbox-items? #f - #:listbox-height 6 - #:button-text (G_ "Continue")))) - (match result - ((_ . proc) - (proc)) - (_ #f)))) diff --git a/gnu/installer/newt/keymap.scm b/gnu/installer/newt/keymap.scm index 0147a0b9d5..8625afaa03 100644 --- a/gnu/installer/newt/keymap.scm +++ b/gnu/installer/newt/keymap.scm @@ -39,21 +39,21 @@ (define (run-layout-page layouts layout->text context) #:title title #:info-text (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.")) (else (G_ "Please choose your keyboard layout. \ 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-item->text layout->text #:sort-listbox-items? #f #:button-text (case context - ((help) (G_ "Continue")) + ((param) (G_ "Continue")) (else (G_ "Exit"))) #:button-callback-procedure (case context - ((help) (const #t)) + ((param) (const #t)) (else (lambda _ (raise diff --git a/gnu/installer/newt/parameters.scm b/gnu/installer/newt/parameters.scm new file mode 100644 index 0000000000..4a34e94155 --- /dev/null +++ b/gnu/installer/newt/parameters.scm @@ -0,0 +1,45 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Mathieu Othacehe +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu installer newt parameters) + #:use-module (gnu installer steps) + #:use-module (gnu installer newt page) + #:use-module (guix i18n) + #:use-module (ice-9 match) + #:use-module (newt) + #:export (run-parameters-page)) + +(define (run-parameters-page keyboard-layout-selection) + "Run a parameters page allowing to change the keyboard layout" + (let* ((items + (list + (cons (G_ "Change keyboard layout") keyboard-layout-selection))) + (result + (run-listbox-selection-page + #:info-text (G_ "Please choose one of the following parameters or \ +press ‘Back’ to go back to the installation process.") + #:title (G_ "Installation parameters") + #:listbox-items items + #:listbox-item->text car + #:sort-listbox-items? #f + #:listbox-height 6 + #:button-text (G_ "Back")))) + (match result + ((_ . proc) + (proc)) + (_ #f)))) diff --git a/gnu/installer/record.scm b/gnu/installer/record.scm index 78acf50c63..7bc22e90e0 100644 --- a/gnu/installer/record.scm +++ b/gnu/installer/record.scm @@ -38,8 +38,8 @@ (define-module (gnu installer record) installer-partition-page installer-services-page installer-welcome-page - installer-help-menu - installer-help-page)) + installer-parameters-menu + installer-parameters-page)) ;;; @@ -85,6 +85,6 @@ (define-record-type* ;; procedure (logo) -> void (welcome-page installer-welcome-page) ;; procedure (menu-proc) -> void - (help-menu installer-help-menu) + (parameters-menu installer-parameters-menu) ;; procedure (keyboard-layout-selection) -> void - (help-page installer-help-page)) + (parameters-page installer-parameters-page)) diff --git a/gnu/local.mk b/gnu/local.mk index d177faf106..3757f7d6e1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -672,7 +672,7 @@ INSTALLER_MODULES = \ \ %D%/installer/newt/ethernet.scm \ %D%/installer/newt/final.scm \ - %D%/installer/newt/help.scm \ + %D%/installer/newt/parameters.scm \ %D%/installer/newt/hostname.scm \ %D%/installer/newt/keymap.scm \ %D%/installer/newt/locale.scm \ diff --git a/po/guix/POTFILES.in b/po/guix/POTFILES.in index 4cc4fe7b31..77332e7b17 100644 --- a/po/guix/POTFILES.in +++ b/po/guix/POTFILES.in @@ -16,7 +16,7 @@ gnu/installer/locale.scm gnu/installer/newt.scm gnu/installer/newt/ethernet.scm gnu/installer/newt/final.scm -gnu/installer/newt/help.scm +gnu/installer/newt/parameters.scm gnu/installer/newt/hostname.scm gnu/installer/newt/keymap.scm gnu/installer/newt/locale.scm -- cgit v1.2.3