[bug#36132] Two installer UX tweaks

[bug#36132] Two installer UX tweaks

[Tobias Geerinckx-Rice]

[-- Attachment #1: Type: text/plain, Size: 121 bytes --]

Good morning,

Guix is already exceptional; let's adhere to common UI conventions 
where it helps.

Kind regards,

T G-R

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

[bug#36132] [PATCH 1/2] installer: Partition as the last step.

[Tobias Geerinckx-Rice]

Multiple users have been understandably displeased after finding out
that their network card was unsupported, and Internet access mandatory,
after having already formatted their partitions.

* gnu/installer.scm (installer-steps): Run the ‘partition’ step just
before the ‘final’ one.
---
 gnu/installer.scm | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/gnu/installer.scm b/gnu/installer.scm
index 1452c4dc7e..860c5a9a83 100644
--- a/gnu/installer.scm
+++ b/gnu/installer.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.
 ;;;
@@ -226,15 +227,6 @@ selected keymap."
                      (#$keymap-step current-installer)))
           (configuration-formatter keyboard-layout->configuration))
 
-         ;; Run a partitioning tool allowing the user to modify
-         ;; partition tables, partitions and their mount points.
-         (installer-step
-          (id 'partition)
-          (description (G_ "Partitioning"))
-          (compute (lambda _
-                     ((installer-partition-page current-installer))))
-          (configuration-formatter user-partitions->configuration))
-
          ;; Ask the user to input a hostname for the system.
          (installer-step
           (id 'hostname)
@@ -267,6 +259,17 @@ selected keymap."
                      ((installer-services-page current-installer))))
 	  (configuration-formatter system-services->configuration))
 
+         ;; Run a partitioning tool allowing the user to modify
+         ;; partition tables, partitions and their mount points.
+         ;; Do this last so the user has something to boot if any
+         ;; of the previous steps doesn't go as expected.
+         (installer-step
+          (id 'partition)
+          (description (G_ "Partitioning"))
+          (compute (lambda _
+                     ((installer-partition-page current-installer))))
+          (configuration-formatter user-partitions->configuration))
+
 	 (installer-step
           (id 'final)
           (description (G_ "Configuration file"))
-- 
2.21.0

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

[Tobias Geerinckx-Rice]

* 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

[bug#36132] [PATCH 1/2] installer: Partition as the last step.

[Ludovic Courtès]

Hi!,

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

> Multiple users have been understandably displeased after finding out
> that their network card was unsupported, and Internet access mandatory,
> after having already formatted their partitions.
>
> * gnu/installer.scm (installer-steps): Run the ‘partition’ step just
> before the ‘final’ one.

LGTM!  Please add “Fixes <http://bugs.gnu.org/35901>.” in the log.

Should we also move “Network selection” above “Hostname”?

Thanks,
Ludo’.

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

[Ludovic Courtès]

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’.

bug#36132: Two installer UX tweaks

[Tobias Geerinckx-Rice via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 178 bytes --]

Ludo' wrote:
> I think the argument should perhaps be 
> ‘input-visibility-checkbox?’

Done & pushed as 55c43108ac763c68f95cce3d32c60b8944b771f5 &c.

Thanks,

T G-R

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

[bug#35901] [bug#36132] [PATCH 1/2] installer: Partition as the last step.

[Tobias Geerinckx-Rice via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 460 bytes --]

Ludo',

Ludovic Courtès 写道：
> LGTM!  Please add “Fixes <http://bugs.gnu.org/35901>.” in the 
> log.

Oh, bugger.  This message got lost in my messy box (it floated 
back to the top when I closed the bug).  Sorry about that.

> Should we also move “Network selection” above “Hostname”?

Perhaps!  I'll fire up the installer again and see if anything new 
seems odd/out of place after these few months. 

Kind regards,

T G-R

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]