summaryrefslogtreecommitdiff
path: root/gnu/installer
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2019-06-08 05:04:36 +0200
committerTobias Geerinckx-Rice <me@tobias.gr>2019-08-26 15:56:32 +0200
commit55c43108ac763c68f95cce3d32c60b8944b771f5 (patch)
treef3ea0f5881a2aca7f17a2614a4389e9e9c09cc6a /gnu/installer
parentf27cb0f1dd5ba445e9fef982b0e8554c0af84aee (diff)
installer: Show, don't Hide.
* gnu/installer/newt/user.scm (run-user-add-page): Change the input visibility checkbox's text to ‘Show’, and default to unchecked. * gnu/installer/newt/page.scm (run-input-page): Likewise. Rename INPUT-HIDE-CHECKBOX? argument to INPUT-VISIBILITY-CHECKBOX?.
Diffstat (limited to 'gnu/installer')
-rw-r--r--gnu/installer/newt/page.scm9
-rw-r--r--gnu/installer/newt/user.scm7
2 files changed, 9 insertions, 7 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))