summary refs log tree commit diff
path: root/gnu/installer/newt
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/installer/newt')
-rw-r--r--gnu/installer/newt/keymap.scm33
-rw-r--r--gnu/installer/newt/page.scm4
-rw-r--r--gnu/installer/newt/parameters.scm57
-rw-r--r--gnu/installer/newt/user.scm4
4 files changed, 84 insertions, 14 deletions
diff --git a/gnu/installer/newt/keymap.scm b/gnu/installer/newt/keymap.scm
index 2908ba7f0e..8625afaa03 100644
--- a/gnu/installer/newt/keymap.scm
+++ b/gnu/installer/newt/keymap.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
+;;; Copyright © 2018, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -33,20 +33,32 @@
   #:export (run-keymap-page
             keyboard-layout->configuration))
 
-(define (run-layout-page layouts layout->text)
+(define (run-layout-page layouts layout->text context)
   (let ((title (G_ "Layout")))
     (run-listbox-selection-page
      #:title title
-     #:info-text (G_ "Please choose your keyboard layout.")
+     #:info-text
+     (case context
+       ((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 parameters menu.")))
      #:listbox-items layouts
      #:listbox-item->text layout->text
      #:sort-listbox-items? #f
-     #:button-text (G_ "Exit")
+     #:button-text
+     (case context
+       ((param) (G_ "Continue"))
+       (else (G_ "Exit")))
      #:button-callback-procedure
-     (lambda _
-       (raise
-        (condition
-         (&installer-step-abort)))))))
+     (case context
+       ((param) (const #t))
+       (else
+        (lambda _
+          (raise
+           (condition
+            (&installer-step-abort)))))))))
 
 (define (run-variant-page variants variant->text)
   (let ((title (G_ "Variant")))
@@ -100,7 +112,7 @@
          variants))
     (cut append <> <>)))
 
-(define* (run-keymap-page layouts)
+(define* (run-keymap-page layouts #:key (context #f))
   "Run a page asking the user to select a keyboard layout and variant. LAYOUTS
 is a list of supported X11-KEYMAP-LAYOUT. Return a list of two elements, the
 names of the selected keyboard layout and variant."
@@ -114,7 +126,8 @@ names of the selected keyboard layout and variant."
           (sort-layouts layouts)
           (lambda (layout)
             (gettext (x11-keymap-layout-description layout)
-                     "xkeyboard-config"))))))
+                     "xkeyboard-config"))
+          context))))
      ;; Propose the user to select a variant among those supported by the
      ;; previously selected layout.
      (installer-step
diff --git a/gnu/installer/newt/page.scm b/gnu/installer/newt/page.scm
index 9031c7d4ba..1d6b9979b4 100644
--- a/gnu/installer/newt/page.scm
+++ b/gnu/installer/newt/page.scm
@@ -231,7 +231,7 @@ input box, such as FLAG-PASSWORD."
 
     (add-component-callback
      input-visible-cb
-     (lambda (component)
+     (lambda ()
        (set-entry-flags input-entry
                         FLAG-PASSWORD
                         FLAG-ROLE-TOGGLE)))
@@ -486,7 +486,7 @@ the current listbox item has to be selected by key."
       ;; do nothing.
       (add-component-callback
        listbox
-       (lambda (component)
+       (lambda ()
          (let* ((current-key (current-listbox-entry listbox))
                 (listbox-keys (map car keys))
                 (last-key (last-listbox-key))
diff --git a/gnu/installer/newt/parameters.scm b/gnu/installer/newt/parameters.scm
new file mode 100644
index 0000000000..95112b5780
--- /dev/null
+++ b/gnu/installer/newt/parameters.scm
@@ -0,0 +1,57 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
+;;;
+;;; 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 <http://www.gnu.org/licenses/>.
+
+(define-module (gnu installer newt parameters)
+  #:use-module (gnu installer proxy)
+  #: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-proxy-page)
+  (define proxy
+    (run-input-page (G_ "Please enter the HTTP proxy URL. If you enter an \
+empty string, proxy usage will be disabled.")
+                    (G_ "HTTP proxy configuration")
+                    #:allow-empty-input? #t))
+  (if (string=? proxy "")
+      (clear-http-proxy)
+      (set-http-proxy proxy)))
+
+(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)
+           (cons (G_ "Configure HTTP proxy") run-proxy-page)))
+         (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/newt/user.scm b/gnu/installer/newt/user.scm
index ad711d665a..58bb86bf96 100644
--- a/gnu/installer/newt/user.scm
+++ b/gnu/installer/newt/user.scm
@@ -89,7 +89,7 @@ REAL-NAME, and HOME-DIRECTORY as the initial values in the form."
 
     (add-component-callback
      entry-name
-     (lambda (component)
+     (lambda ()
        (set-entry-text entry-home-directory
                        (string-append "/home/" (entry-value entry-name)))
 
@@ -99,7 +99,7 @@ REAL-NAME, and HOME-DIRECTORY as the initial values in the form."
 
     (add-component-callback
      password-visible-cb
-     (lambda (component)
+     (lambda ()
        (set-entry-flags entry-password
                         FLAG-PASSWORD
                         FLAG-ROLE-TOGGLE)))
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-26 10:35:34 +0000