From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:49307) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZTH0-00045q-OV for guix-patches@gnu.org; Sat, 08 Jun 2019 00:48:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hZTGx-0000Yl-3X for guix-patches@gnu.org; Sat, 08 Jun 2019 00:48:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39171) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hZTGs-0000Wd-UQ for guix-patches@gnu.org; Sat, 08 Jun 2019 00:48:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hZTGs-0000jT-Rm for guix-patches@gnu.org; Sat, 08 Jun 2019 00:48:02 -0400 Subject: [bug#36132] [PATCH 2/2] installer: Show, don't Hide. Resent-Message-ID: From: Tobias Geerinckx-Rice Date: Sat, 8 Jun 2019 06:47:29 +0200 Message-Id: <20190608044729.14700-2-me@tobias.gr> In-Reply-To: <20190608044729.14700-1-me@tobias.gr> References: <87y32c663d.fsf@nckx> <20190608044729.14700-1-me@tobias.gr> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 36132@debbugs.gnu.org * 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 ;;; Copyright © 2019 Ludovic Courtès +;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; ;;; 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 ;;; Copyright © 2019 Ludovic Courtès +;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; ;;; 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