diff mbox series

[bug#36132,2/2] installer: Show, don't Hide.

Message ID 20190608044729.14700-2-me@tobias.gr
State Accepted
Headers show
Series [bug#36132,1/2] installer: Partition as the last step. | expand

Checks

Context Check Description
cbaines/applying patch success Successfully applied

Commit Message

Tobias Geerinckx-Rice June 8, 2019, 4:47 a.m. UTC 
* 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(-)

Comments

Ludovic Courtès June 11, 2019, 8:05 a.m. UTC | #1 
Hi,

Tobias Geerinckx-Rice <me@tobias.gr> skribis:

> * 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?.

I think the argument should perhaps be ‘input-visibility-checkbox?’,
otherwise I find it a bit unclear (both before and after the patch
actually.)

Other than that LGTM, thank you!

Ludo’.
diff mbox series

Patch

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))