From 9d2d9cb14bd505e25ae47a3d51725a320daa6f00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 3 May 2019 13:48:54 +0200 Subject: installer: Do not sort the guided partition schemes in the selection page. Previously, the "Everything is one partition" entry would come first in English but it would be second in French. This change keeps it the first choice regardless of the language. * gnu/installer/newt/partition.scm (run-scheme-page): Pass #:sort-listbox-items? to 'run-scheme-page'. --- gnu/installer/newt/partition.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/installer/newt') diff --git a/gnu/installer/newt/partition.scm b/gnu/installer/newt/partition.scm index 2b22ac85b4..3fb6c5079e 100644 --- a/gnu/installer/newt/partition.scm +++ b/gnu/installer/newt/partition.scm @@ -49,6 +49,7 @@ #:title (G_ "Partition scheme") #:listbox-items items #:listbox-item->text cdr + #:sort-listbox-items? #f ;keep the 'root' option first #:button-text (G_ "Exit") #:button-callback-procedure button-exit-action))) (car result))) -- cgit v1.2.3 From 28b26eca45ada3f8612d135f80c8dfd2e7fa0e81 Mon Sep 17 00:00:00 2001 From: Miguel Date: Fri, 26 Apr 2019 13:22:05 +0200 Subject: installer: Fix typo. * gnu/installer/newt/menu.scm (run-menu-page): Add missing space after period. Signed-off-by: Danny Milosavljevic --- gnu/installer/newt/menu.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/installer/newt') diff --git a/gnu/installer/newt/menu.scm b/gnu/installer/newt/menu.scm index 161266a94a..e153d3d756 100644 --- a/gnu/installer/newt/menu.scm +++ b/gnu/installer/newt/menu.scm @@ -32,7 +32,7 @@ process from." steps)) (run-listbox-selection-page - #:info-text (G_ "Choose where you want to resume the install.\ + #:info-text (G_ "Choose where you want to resume the install. \ You can also abort the installation by pressing the Abort button.") #:title (G_ "Installation menu") #:listbox-items (steps->items steps) -- cgit v1.2.3 From 04f4bdcd70345f96da68d04ac6467f0080b73318 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 6 May 2019 21:45:41 +0200 Subject: installer: Widen user dialog. * gnu/installer/newt/user.scm (run-user-add-page)[pad-label]: Increase 2nd argument to 25. [entry-width]: Increase to 35. --- gnu/installer/newt/user.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/installer/newt') diff --git a/gnu/installer/newt/user.scm b/gnu/installer/newt/user.scm index deab056e0c..ac07d26c8b 100644 --- a/gnu/installer/newt/user.scm +++ b/gnu/installer/newt/user.scm @@ -34,7 +34,7 @@ "Run a form to enter the user name, home directory, and password. Use NAME, REAL-NAME, and HOME-DIRECTORY as the initial values in the form." (define (pad-label label) - (string-pad-right label 20)) + (string-pad-right label 25)) (let* ((label-name (make-label -1 -1 (pad-label (G_ "Name")))) @@ -44,7 +44,7 @@ REAL-NAME, and HOME-DIRECTORY as the initial values in the form." (make-label -1 -1 (pad-label (G_ "Home directory")))) (label-password (make-label -1 -1 (pad-label (G_ "Password")))) - (entry-width 30) + (entry-width 35) (entry-name (make-entry -1 -1 entry-width #:initial-value name)) (entry-real-name (make-entry -1 -1 entry-width -- cgit v1.2.3 From 1d8da896be9629c7bc3d5d4e4e1028ccbab76506 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 6 May 2019 21:53:35 +0200 Subject: installer: Do not sort methods on the partitioning page. * gnu/installer/newt/partition.scm (run-partioning-page): Pass #:sort-listbox-items? #f so that methods always appear in the same order. --- gnu/installer/newt/partition.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/installer/newt') diff --git a/gnu/installer/newt/partition.scm b/gnu/installer/newt/partition.scm index 3fb6c5079e..9e9c57e957 100644 --- a/gnu/installer/newt/partition.scm +++ b/gnu/installer/newt/partition.scm @@ -734,6 +734,7 @@ by pressing the Exit button.~%~%"))) #:title (G_ "Partitioning method") #:listbox-items items #:listbox-item->text cdr + #:sort-listbox-items? #f #:button-text (G_ "Exit") #:button-callback-procedure button-exit-action)) (method (car result))) -- cgit v1.2.3 From d1e5f758e128a3c1042c98563c5b87b81b2f187a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 6 May 2019 22:06:29 +0200 Subject: installer: Shrink simple listboxes to their minimum height. * gnu/installer/newt/partition.scm (run-partioning-page): Pass #:listbox-height. (run-scheme-page): Likewise. (run-device-page): Likewise. * gnu/installer/newt/network.scm (run-technology-page): Likewise. * gnu/installer/newt/ethernet.scm (run-ethernet-page): Likewise. --- gnu/installer/newt/ethernet.scm | 1 + gnu/installer/newt/network.scm | 1 + gnu/installer/newt/partition.scm | 3 +++ 3 files changed, 5 insertions(+) (limited to 'gnu/installer/newt') diff --git a/gnu/installer/newt/ethernet.scm b/gnu/installer/newt/ethernet.scm index d1f357243b..0161888aea 100644 --- a/gnu/installer/newt/ethernet.scm +++ b/gnu/installer/newt/ethernet.scm @@ -72,6 +72,7 @@ connection is pending." #:title (G_ "Ethernet connection") #:listbox-items services #:listbox-item->text ethernet-service->text + #:listbox-height (min (+ (length services) 2) 10) #:button-text (G_ "Exit") #:button-callback-procedure (lambda _ diff --git a/gnu/installer/newt/network.scm b/gnu/installer/newt/network.scm index cf27a8cca2..93fc19aecd 100644 --- a/gnu/installer/newt/network.scm +++ b/gnu/installer/newt/network.scm @@ -73,6 +73,7 @@ network device were found. Do you want to continue anyway?")) #:title (G_ "Internet access") #:listbox-items items #:listbox-item->text technology->text + #:listbox-height (min (+ (length items) 2) 10) #:button-text (G_ "Exit") #:button-callback-procedure (lambda _ diff --git a/gnu/installer/newt/partition.scm b/gnu/installer/newt/partition.scm index 9e9c57e957..6de8d139cf 100644 --- a/gnu/installer/newt/partition.scm +++ b/gnu/installer/newt/partition.scm @@ -49,6 +49,7 @@ #:title (G_ "Partition scheme") #:listbox-items items #:listbox-item->text cdr + #:listbox-height 4 #:sort-listbox-items? #f ;keep the 'root' option first #:button-text (G_ "Exit") #:button-callback-procedure button-exit-action))) @@ -78,6 +79,7 @@ DEVICES list." #:title (G_ "Disk") #:listbox-items (device-items) #:listbox-item->text cdr + #:listbox-height 10 #:button-text (G_ "Exit") #:button-callback-procedure button-exit-action)) (device (car result))) @@ -732,6 +734,7 @@ by pressing the Exit button.~%~%"))) (result (run-listbox-selection-page #:info-text (G_ "Please select a partitioning method.") #:title (G_ "Partitioning method") + #:listbox-height (+ (length items) 2) #:listbox-items items #:listbox-item->text cdr #:sort-listbox-items? #f -- cgit v1.2.3 From 46c102ca5e76ffc1daa42edba439eee9fd0f102c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 6 May 2019 22:23:42 +0200 Subject: installer: Skip network selection dialogs when there is no choice. Previously, for a machine that only has wired networking, and only one such network, we'd have to go through two selection boxes. Now we just skip both. * gnu/installer/newt/ethernet.scm (run-ethernet-page): When 'ethernet-services' returns one element, return it directly without opening a listbox selection. * gnu/installer/newt/network.scm (run-technology-page): Likewise. --- gnu/installer/newt/ethernet.scm | 49 +++++++++++++++++++---------------- gnu/installer/newt/network.scm | 57 +++++++++++++++++++++++------------------ 2 files changed, 59 insertions(+), 47 deletions(-) (limited to 'gnu/installer/newt') diff --git a/gnu/installer/newt/ethernet.scm b/gnu/installer/newt/ethernet.scm index 0161888aea..ba5e222a37 100644 --- a/gnu/installer/newt/ethernet.scm +++ b/gnu/installer/newt/ethernet.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Mathieu Othacehe +;;; Copyright © 2019 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -23,6 +24,7 @@ #:use-module (gnu installer newt page) #:use-module (guix i18n) #:use-module (ice-9 format) + #:use-module (ice-9 match) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) #:use-module (newt) @@ -58,25 +60,28 @@ connection is pending." service)) (define (run-ethernet-page) - (let ((services (ethernet-services))) - (if (null? services) - (begin - (run-error-page - (G_ "No ethernet service available, please try again.") - (G_ "No service")) - (raise - (condition - (&installer-step-abort)))) - (run-listbox-selection-page - #:info-text (G_ "Please select an ethernet network.") - #:title (G_ "Ethernet connection") - #:listbox-items services - #:listbox-item->text ethernet-service->text - #:listbox-height (min (+ (length services) 2) 10) - #:button-text (G_ "Exit") - #:button-callback-procedure - (lambda _ - (raise - (condition - (&installer-step-abort)))) - #:listbox-callback-procedure connect-ethernet-service)))) + (match (ethernet-services) + (() + (run-error-page + (G_ "No ethernet service available, please try again.") + (G_ "No service")) + (raise + (condition + (&installer-step-abort)))) + ((service) + ;; Only one service is available so return it directly. + service) + ((services ...) + (run-listbox-selection-page + #:info-text (G_ "Please select an ethernet network.") + #:title (G_ "Ethernet connection") + #:listbox-items services + #:listbox-item->text ethernet-service->text + #:listbox-height (min (+ (length services) 2) 10) + #:button-text (G_ "Exit") + #:button-callback-procedure + (lambda _ + (raise + (condition + (&installer-step-abort)))) + #:listbox-callback-procedure connect-ethernet-service)))) diff --git a/gnu/installer/newt/network.scm b/gnu/installer/newt/network.scm index 93fc19aecd..0a938db103 100644 --- a/gnu/installer/newt/network.scm +++ b/gnu/installer/newt/network.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Mathieu Othacehe +;;; Copyright © 2019 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,6 +29,7 @@ #:use-module (srfi srfi-11) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) + #:use-module (ice-9 match) #:use-module (newt) #:export (run-network-page)) @@ -53,33 +55,38 @@ Internet and return the selected technology. For now, only technologies with (string=? type "wifi")))) (connman-technologies))) - (let ((items (technology-items))) - (if (null? items) - (case (choice-window - (G_ "Internet access") - (G_ "Continue") - (G_ "Exit") - (G_ "The install process requires Internet access but no \ + (match (technology-items) + (() + (case (choice-window + (G_ "Internet access") + (G_ "Continue") + (G_ "Exit") + (G_ "The install process requires Internet access but no \ network device were found. Do you want to continue anyway?")) - ((1) (raise - (condition - (&installer-step-break)))) - ((2) (raise - (condition - (&installer-step-abort))))) - (run-listbox-selection-page - #:info-text (G_ "The install process requires Internet access.\ + ((1) (raise + (condition + (&installer-step-break)))) + ((2) (raise + (condition + (&installer-step-abort)))))) + ((technology) + ;; Since there's only one technology available, skip the selection + ;; screen. + technology) + ((items ...) + (run-listbox-selection-page + #:info-text (G_ "The install process requires Internet access.\ Please select a network device.") - #:title (G_ "Internet access") - #:listbox-items items - #:listbox-item->text technology->text - #:listbox-height (min (+ (length items) 2) 10) - #:button-text (G_ "Exit") - #:button-callback-procedure - (lambda _ - (raise - (condition - (&installer-step-abort)))))))) + #:title (G_ "Internet access") + #:listbox-items items + #:listbox-item->text technology->text + #:listbox-height (min (+ (length items) 2) 10) + #:button-text (G_ "Exit") + #:button-callback-procedure + (lambda _ + (raise + (condition + (&installer-step-abort)))))))) (define (find-technology-by-type technologies type) "Find and return a technology with the given TYPE in TECHNOLOGIES list." -- cgit v1.2.3 From 445bd4d5e53d24f916ecbb62907d119da27e912b Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 5 May 2019 12:54:40 +0200 Subject: installer: Add password 'hide' checkbox. * gnu/installer/newt/page.scm (run-input-page)[input-hide-checkbox?]: New parameter adding a checkbox to toggle password hiding. By default, the checkbox is active and the password is hence hided. * gnu/installer/newt/partition.scm (prompt-luks-passwords): Enable the previous parameter on both password input pages. * gnu/installer/newt/user.scm (run-root-password-page): Enable the previous parameter, (confirm-password): ditto, (run-user-add-page): add a checkbox to toggle password hiding. --- gnu/installer/newt/page.scm | 34 +++++++++++++++++++++++++--------- gnu/installer/newt/partition.scm | 9 +++------ gnu/installer/newt/user.scm | 22 +++++++++++++++++++--- 3 files changed, 47 insertions(+), 18 deletions(-) (limited to 'gnu/installer/newt') diff --git a/gnu/installer/newt/page.scm b/gnu/installer/newt/page.scm index 3173d54737..07779b16fa 100644 --- a/gnu/installer/newt/page.scm +++ b/gnu/installer/newt/page.scm @@ -75,6 +75,7 @@ this page to TITLE." #:key (allow-empty-input? #f) (default-text #f) + (input-hide-checkbox? #f) (input-field-width 40) (input-flags 0)) "Run a page to prompt user for an input. The given TEXT will be displayed @@ -86,22 +87,37 @@ input box, such as FLAG-PASSWORD." (make-reflowed-textbox -1 -1 text input-field-width #:flags FLAG-BORDER)) - (grid (make-grid 1 3)) + (input-visible-cb + (make-checkbox -1 -1 (G_ "Hide") #\x "x ")) + (input-flags* (if input-hide-checkbox? + (logior FLAG-PASSWORD input-flags) + input-flags)) (input-entry (make-entry -1 -1 20 - #:flags input-flags)) + #:flags input-flags*)) (ok-button (make-button -1 -1 (G_ "OK"))) + (grid (vertically-stacked-grid + GRID-ELEMENT-COMPONENT text-box + GRID-ELEMENT-SUBGRID + (apply + horizontal-stacked-grid + GRID-ELEMENT-COMPONENT input-entry + `(,@(if input-hide-checkbox? + (list GRID-ELEMENT-COMPONENT input-visible-cb) + '()))) + GRID-ELEMENT-COMPONENT ok-button)) (form (make-form))) + (add-component-callback + input-visible-cb + (lambda (component) + (set-entry-flags input-entry + FLAG-PASSWORD + FLAG-ROLE-TOGGLE))) + (when default-text (set-entry-text input-entry default-text)) - (set-grid-field grid 0 0 GRID-ELEMENT-COMPONENT text-box) - (set-grid-field grid 0 1 GRID-ELEMENT-COMPONENT input-entry - #:pad-top 1) - (set-grid-field grid 0 2 GRID-ELEMENT-COMPONENT ok-button - #:pad-top 1) - - (add-components-to-form form text-box input-entry ok-button) + (add-form-to-grid grid form #t) (make-wrapped-grid-window grid title) (let ((error-page (lambda () (run-error-page (G_ "Please enter a non empty input.") diff --git a/gnu/installer/newt/partition.scm b/gnu/installer/newt/partition.scm index 6de8d139cf..5e9e63f156 100644 --- a/gnu/installer/newt/partition.scm +++ b/gnu/installer/newt/partition.scm @@ -155,21 +155,18 @@ USER-PARTITIONS list. Return this list with password fields filled-in." (file-name (user-partition-file-name user-part)) (password-page (lambda () - ;; Note: Don't use FLAG-PASSWORD here because this is the - ;; first bit of text that the user types in, so it's - ;; probably safer if they can see that the keyboard layout - ;; they chose is in effect. (run-input-page (format #f (G_ "Please enter the password for the \ encryption of partition ~a (label: ~a).") file-name crypt-label) - (G_ "Password required")))) + (G_ "Password required") + #:input-hide-checkbox? #t))) (password-confirm-page (lambda () (run-input-page (format #f (G_ "Please confirm the password for the \ encryption of partition ~a (label: ~a).") file-name crypt-label) (G_ "Password confirmation required") - #:input-flags FLAG-PASSWORD)))) + #:input-hide-checkbox? #t)))) (if crypt-label (let loop () (let ((password (password-page)) diff --git a/gnu/installer/newt/user.scm b/gnu/installer/newt/user.scm index ac07d26c8b..f866de54ce 100644 --- a/gnu/installer/newt/user.scm +++ b/gnu/installer/newt/user.scm @@ -51,9 +51,11 @@ REAL-NAME, and HOME-DIRECTORY as the initial values in the form." #:initial-value real-name)) (entry-home-directory (make-entry -1 -1 entry-width #:initial-value home-directory)) + (password-visible-cb + (make-checkbox -1 -1 (G_ "Hide") #\x "x ")) (entry-password (make-entry -1 -1 entry-width #:flags FLAG-PASSWORD)) - (entry-grid (make-grid 2 5)) + (entry-grid (make-grid 3 5)) (button-grid (make-grid 1 1)) (ok-button (make-button -1 -1 (G_ "OK"))) (grid (make-grid 1 2)) @@ -71,6 +73,12 @@ REAL-NAME, and HOME-DIRECTORY as the initial values in the form." (set-entry-grid-field 0 3 label-password) (set-entry-grid-field 1 3 entry-password) + (set-grid-field entry-grid + 2 3 + GRID-ELEMENT-COMPONENT + password-visible-cb + #:pad-left 1) + (set-grid-field button-grid 0 0 GRID-ELEMENT-COMPONENT ok-button) (add-component-callback @@ -83,11 +91,19 @@ REAL-NAME, and HOME-DIRECTORY as the initial values in the form." (set-entry-text entry-real-name (string-titlecase (entry-value entry-name)))))) + (add-component-callback + password-visible-cb + (lambda (component) + (set-entry-flags entry-password + FLAG-PASSWORD + FLAG-ROLE-TOGGLE))) + (add-components-to-form form label-name label-real-name label-home-directory label-password entry-name entry-real-name entry-home-directory entry-password + password-visible-cb ok-button) (make-wrapped-grid-window (vertically-stacked-grid @@ -136,7 +152,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-flags FLAG-PASSWORD)) + #:input-hide-checkbox? #t)) (if (string=? password confirmation) password @@ -153,7 +169,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-flags FLAG-PASSWORD)) + #:input-hide-checkbox? #t)) (confirm-password password run-root-password-page)) -- cgit v1.2.3 From 91936f153a6d1026350a1f58bf93f54d2ee3e1dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 7 May 2019 11:48:51 +0200 Subject: installer: "Exit" button in user page actually exits. Fixes . Reported by Florian Pelz . * gnu/installer/newt/user.scm (run-user-page): Add 'cond' clause for ARGUMENT = EXIT-BUTTON. --- gnu/installer/newt/user.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu/installer/newt') diff --git a/gnu/installer/newt/user.scm b/gnu/installer/newt/user.scm index f866de54ce..c797eb6a92 100644 --- a/gnu/installer/newt/user.scm +++ b/gnu/installer/newt/user.scm @@ -19,6 +19,7 @@ (define-module (gnu installer newt user) #:use-module (gnu installer user) + #:use-module ((gnu installer steps) #:select (&installer-step-abort)) #:use-module (gnu installer newt page) #:use-module (gnu installer newt utils) #:use-module (guix i18n) @@ -27,6 +28,8 @@ #:use-module (ice-9 receive) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-35) #:export (run-user-page)) (define* (run-user-add-page #:key (name "") (real-name "") @@ -247,7 +250,11 @@ administrator (\"root\").") (run-error-page (G_ "Please create at least one user.") (G_ "No user")) (run users)) - (reverse users))))) + (reverse users)) + ((components=? argument exit-button) + (raise + (condition + (&installer-step-abort))))))) (lambda () (destroy-form-and-pop form)))))) -- cgit v1.2.3 From fb98e430d4b8da58c0035726c2325699b0a3d763 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 9 May 2019 00:34:35 +0200 Subject: installer: Add missing 'G_' call. * gnu/installer/newt/user.scm (run-user-page): Add 'G_' call for "User creation". --- gnu/installer/newt/user.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/installer/newt') diff --git a/gnu/installer/newt/user.scm b/gnu/installer/newt/user.scm index c797eb6a92..13c20cd4d8 100644 --- a/gnu/installer/newt/user.scm +++ b/gnu/installer/newt/user.scm @@ -198,7 +198,7 @@ administrator (\"root\").") (list GRID-ELEMENT-COMPONENT del-button))))) (ok-button (make-button -1 -1 (G_ "OK"))) (exit-button (make-button -1 -1 (G_ "Exit"))) - (title "User creation") + (title (G_ "User creation")) (grid (vertically-stacked-grid GRID-ELEMENT-COMPONENT info-textbox -- cgit v1.2.3 From ef250707d3303d58ae00fe8f461701e7fa788d8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 14 May 2019 11:57:55 +0200 Subject: installer: Allow for arbitrary long passphrases and passwords. Fixes . Reported by sirmacik . * gnu/installer/newt/page.scm (run-input-page): Add FLAG-SCROLL to INPUT-FLAGS*. * gnu/installer/newt/user.scm (run-user-add-page): Add FLAG-SCROLL to ENTRY-PASSWORD. --- gnu/installer/newt/page.scm | 3 ++- gnu/installer/newt/user.scm | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/installer/newt') diff --git a/gnu/installer/newt/page.scm b/gnu/installer/newt/page.scm index 07779b16fa..6291549eb0 100644 --- a/gnu/installer/newt/page.scm +++ b/gnu/installer/newt/page.scm @@ -90,7 +90,8 @@ input box, such as FLAG-PASSWORD." (input-visible-cb (make-checkbox -1 -1 (G_ "Hide") #\x "x ")) (input-flags* (if input-hide-checkbox? - (logior FLAG-PASSWORD input-flags) + (logior FLAG-PASSWORD FLAG-SCROLL + input-flags) input-flags)) (input-entry (make-entry -1 -1 20 #:flags input-flags*)) diff --git a/gnu/installer/newt/user.scm b/gnu/installer/newt/user.scm index 13c20cd4d8..dab805198f 100644 --- a/gnu/installer/newt/user.scm +++ b/gnu/installer/newt/user.scm @@ -57,7 +57,8 @@ REAL-NAME, and HOME-DIRECTORY as the initial values in the form." (password-visible-cb (make-checkbox -1 -1 (G_ "Hide") #\x "x ")) (entry-password (make-entry -1 -1 entry-width - #:flags FLAG-PASSWORD)) + #:flags (logior FLAG-PASSWORD + FLAG-SCROLL))) (entry-grid (make-grid 3 5)) (button-grid (make-grid 1 1)) (ok-button (make-button -1 -1 (G_ "OK"))) -- cgit v1.2.3 From 2bfb3883b98c3a5562eeb8724f4b6be462aea670 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 4 May 2019 11:43:28 +0200 Subject: installer: Reflow run-file-textbox-page text. * gnu/installer/newt/page.scm (run-file-textbox-page): Reflow text. Signed-off-by: Danny Milosavljevic --- gnu/installer/newt/page.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu/installer/newt') diff --git a/gnu/installer/newt/page.scm b/gnu/installer/newt/page.scm index 6291549eb0..728721c08f 100644 --- a/gnu/installer/newt/page.scm +++ b/gnu/installer/newt/page.scm @@ -576,7 +576,12 @@ ITEMS when 'Ok' is pressed." '()))))) (form (make-form))) - (set-textbox-text file-textbox file-text) + (set-textbox-text file-textbox + (receive (_w _h text) + (reflow-text file-text + file-textbox-width + 0 0) + text)) (add-form-to-grid grid form #t) (make-wrapped-grid-window grid title) -- cgit v1.2.3 From 1a92f1ff1cc62f14b6b1b676af1474515058363e Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 14 May 2019 17:46:45 +0200 Subject: installer: Add fat16. * gnu/installer/newt/partition.scm (run-fs-type-page): Add fat16. --- gnu/installer/newt/partition.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/installer/newt') diff --git a/gnu/installer/newt/partition.scm b/gnu/installer/newt/partition.scm index 5e9e63f156..7f1fb4de15 100644 --- a/gnu/installer/newt/partition.scm +++ b/gnu/installer/newt/partition.scm @@ -120,7 +120,7 @@ Be careful, all data on the disk will be lost.") (run-listbox-selection-page #:info-text (G_ "Please select the file-system type for this partition.") #:title (G_ "File-system type") - #:listbox-items '(ext4 btrfs fat32 swap) + #:listbox-items '(ext4 btrfs fat16 fat32 swap) #:listbox-item->text user-fs-type-name #:sort-listbox-items? #f #:button-text (G_ "Exit") -- cgit v1.2.3 From 7d567af46b4e10ffafb1d0f76b524f5781460598 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 15 May 2019 00:47:18 +0200 Subject: installer: Mount ESP once only. Fixes . * gnu/installer/newt/partition.scm (run-partioning-page)[run-page]: Introduce 'initial-partitions' variable. Previously we'd call 'disk-partitions' after 'auto-partition' had done its job of creating new partitions, and thus its result would contain the just-created partitions. Consequently, 'create-special-user-partitions' would return the ESP partition we just created, and thus it would appear twice in the list. --- gnu/installer/newt/partition.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/installer/newt') diff --git a/gnu/installer/newt/partition.scm b/gnu/installer/newt/partition.scm index 7f1fb4de15..2960adcf06 100644 --- a/gnu/installer/newt/partition.scm +++ b/gnu/installer/newt/partition.scm @@ -751,11 +751,12 @@ by pressing the Exit button.~%~%"))) (disk (mklabel device label))) (disk-commit disk) disk))) + (initial-partitions (disk-partitions disk)) (scheme (symbol-append method '- (run-scheme-page))) (user-partitions (append (auto-partition disk #:scheme scheme) (create-special-user-partitions - (disk-partitions disk))))) + initial-partitions)))) (run-disk-page (list disk) user-partitions #:guided? #t))) ((eq? method 'manual) -- cgit v1.2.3 From 15374648193f813d036f377bb1e944c9bafd4636 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 15 May 2019 14:33:23 +0200 Subject: installer: Rename 'auto-partition' to 'auto-partition!'. This is a followup to 7d567af46b4e10ffafb1d0f76b524f5781460598. * gnu/installer/parted.scm (create-adjacent-partitions): Rename to... (create-adjacent-partitions!): ... this. Make private. (auto-partition): Rename to... (auto-partition!): ... this. * gnu/installer/newt/partition.scm (run-partioning-page): Adjust accordingly. --- gnu/installer/newt/partition.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/installer/newt') diff --git a/gnu/installer/newt/partition.scm b/gnu/installer/newt/partition.scm index 2960adcf06..abc8bdcc03 100644 --- a/gnu/installer/newt/partition.scm +++ b/gnu/installer/newt/partition.scm @@ -754,7 +754,7 @@ by pressing the Exit button.~%~%"))) (initial-partitions (disk-partitions disk)) (scheme (symbol-append method '- (run-scheme-page))) (user-partitions (append - (auto-partition disk #:scheme scheme) + (auto-partition! disk #:scheme scheme) (create-special-user-partitions initial-partitions)))) (run-disk-page (list disk) user-partitions -- cgit v1.2.3 From d68de958b60426798ed62797ff7c96c327a672ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 19 May 2019 11:58:36 +0200 Subject: installer: Fix Guile-Parted crash on i686. Fixes . This is a followup to 7d567af46b4e10ffafb1d0f76b524f5781460598. * gnu/installer/parted.scm (auto-partition!): Append ESP-PARTITION, when it is true, to the result of 'create-adjacent-partitions!'. * gnu/installer/newt/partition.scm (run-partioning-page): Remove 'initial-partitions' variable, and remove call to 'create-special-user-partitions'. Co-authored-by: Mathieu Othacehe --- gnu/installer/newt/partition.scm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'gnu/installer/newt') diff --git a/gnu/installer/newt/partition.scm b/gnu/installer/newt/partition.scm index abc8bdcc03..cd9d46316a 100644 --- a/gnu/installer/newt/partition.scm +++ b/gnu/installer/newt/partition.scm @@ -751,12 +751,8 @@ by pressing the Exit button.~%~%"))) (disk (mklabel device label))) (disk-commit disk) disk))) - (initial-partitions (disk-partitions disk)) (scheme (symbol-append method '- (run-scheme-page))) - (user-partitions (append - (auto-partition! disk #:scheme scheme) - (create-special-user-partitions - initial-partitions)))) + (user-partitions (auto-partition! disk #:scheme scheme))) (run-disk-page (list disk) user-partitions #:guided? #t))) ((eq? method 'manual) -- cgit v1.2.3