diff options
author | Mark H Weaver <mhw@netris.org> | 2019-08-29 17:19:18 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2019-08-29 17:19:18 -0400 |
commit | 0481289cbccba2646bf654f0ae49ac9c45602d5d (patch) | |
tree | cbe1351e2751e9d22c4c8add02991a3e6674f26a /gnu/installer/newt | |
parent | c55fae452032aa4b1b63406983e9abdf70adc957 (diff) | |
parent | 9fbf4d2a52d4d3e01059f3432bb3f78182b5a822 (diff) | |
download | guix-patches-0481289cbccba2646bf654f0ae49ac9c45602d5d.tar guix-patches-0481289cbccba2646bf654f0ae49ac9c45602d5d.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/installer/newt')
-rw-r--r-- | gnu/installer/newt/page.scm | 9 | ||||
-rw-r--r-- | gnu/installer/newt/user.scm | 7 | ||||
-rw-r--r-- | gnu/installer/newt/wifi.scm | 4 |
3 files changed, 12 insertions, 8 deletions
diff --git a/gnu/installer/newt/page.scm b/gnu/installer/newt/page.scm index 728721c08f..630efde9cc 100644 --- a/gnu/installer/newt/page.scm +++ b/gnu/installer/newt/page.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -75,7 +76,7 @@ this page to TITLE." #:key (allow-empty-input? #f) (default-text #f) - (input-hide-checkbox? #f) + (input-visibility-checkbox? #f) (input-field-width 40) (input-flags 0)) "Run a page to prompt user for an input. The given TEXT will be displayed @@ -88,8 +89,8 @@ input box, such as FLAG-PASSWORD." input-field-width #:flags FLAG-BORDER)) (input-visible-cb - (make-checkbox -1 -1 (G_ "Hide") #\x "x ")) - (input-flags* (if input-hide-checkbox? + (make-checkbox -1 -1 (G_ "Show") #\space "x ")) + (input-flags* (if input-visibility-checkbox? (logior FLAG-PASSWORD FLAG-SCROLL input-flags) input-flags)) @@ -102,7 +103,7 @@ input box, such as FLAG-PASSWORD." (apply horizontal-stacked-grid GRID-ELEMENT-COMPONENT input-entry - `(,@(if input-hide-checkbox? + `(,@(if input-visibility-checkbox? (list GRID-ELEMENT-COMPONENT input-visible-cb) '()))) GRID-ELEMENT-COMPONENT ok-button)) diff --git a/gnu/installer/newt/user.scm b/gnu/installer/newt/user.scm index dab805198f..b747886c55 100644 --- a/gnu/installer/newt/user.scm +++ b/gnu/installer/newt/user.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -55,7 +56,7 @@ REAL-NAME, and HOME-DIRECTORY as the initial values in the form." (entry-home-directory (make-entry -1 -1 entry-width #:initial-value home-directory)) (password-visible-cb - (make-checkbox -1 -1 (G_ "Hide") #\x "x ")) + (make-checkbox -1 -1 (G_ "Show") #\space "x ")) (entry-password (make-entry -1 -1 entry-width #:flags (logior FLAG-PASSWORD FLAG-SCROLL))) @@ -156,7 +157,7 @@ a thunk, if the confirmation doesn't match PASSWORD, and return its result." (run-input-page (G_ "Please confirm the password.") (G_ "Password confirmation required") #:allow-empty-input? #t - #:input-hide-checkbox? #t)) + #:input-visibility-checkbox? #t)) (if (string=? password confirmation) password @@ -173,7 +174,7 @@ a thunk, if the confirmation doesn't match PASSWORD, and return its result." (run-input-page (G_ "Please choose a password for the system \ administrator (\"root\").") (G_ "System administrator password") - #:input-hide-checkbox? #t)) + #:input-visibility-checkbox? #t)) (confirm-password password run-root-password-page)) diff --git a/gnu/installer/newt/wifi.scm b/gnu/installer/newt/wifi.scm index 1cb2ef2df3..3fd5756b99 100644 --- a/gnu/installer/newt/wifi.scm +++ b/gnu/installer/newt/wifi.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2019 Meiyo Peng <meiyo@riseup.net> +;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -88,7 +89,8 @@ nmc_wifi_strength_bars." (define (run-wifi-password-page) "Run a page prompting user for a password and return it." (run-input-page (G_ "Please enter the wifi password.") - (G_ "Password required"))) + (G_ "Password required") + #:input-visibility-checkbox? #t)) (define (run-wrong-password-page service-name) "Run a page to inform user of a wrong password input." |