From: Tobias Geerinckx-Rice <me@tobias.gr>
To: 36132@debbugs.gnu.org
Subject: [bug#36132] [PATCH 2/2] installer: Show, don't Hide.
Date: Sat, 8 Jun 2019 06:47:29 +0200 [thread overview]
Message-ID: <20190608044729.14700-2-me@tobias.gr> (raw)
In-Reply-To: <20190608044729.14700-1-me@tobias.gr>
* 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-SHOW-CHECKBOX?.
---
gnu/installer/newt/page.scm | 9 +++++----
gnu/installer/newt/user.scm | 7 ++++---
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/gnu/installer/newt/page.scm b/gnu/installer/newt/page.scm
index 728721c08f..b061988336 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-show-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-show-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-show-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..3ef105fe81 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-show-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-show-checkbox? #t))
(confirm-password password run-root-password-page))
--
2.21.0
next prev parent reply other threads:[~2019-06-08 4:48 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-08 4:42 [bug#36132] Two installer UX tweaks Tobias Geerinckx-Rice
2019-06-08 4:47 ` [bug#36132] [PATCH 1/2] installer: Partition as the last step Tobias Geerinckx-Rice
2019-06-08 4:47 ` Tobias Geerinckx-Rice [this message]
2019-06-11 8:05 ` [bug#36132] [PATCH 2/2] installer: Show, don't Hide Ludovic Courtès
2019-06-11 8:02 ` [bug#36132] [PATCH 1/2] installer: Partition as the last step Ludovic Courtès
2019-08-26 14:23 ` [bug#35901] " Tobias Geerinckx-Rice via Guix-patches via
2019-08-26 14:00 ` bug#36132: Two installer UX tweaks Tobias Geerinckx-Rice via Guix-patches via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190608044729.14700-2-me@tobias.gr \
--to=me@tobias.gr \
--cc=36132@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.