[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
43/67: installer: partition: Differenciate Back button from Exit button.
From: |
guix-commits |
Subject: |
43/67: installer: partition: Differenciate Back button from Exit button. |
Date: |
Wed, 16 Jan 2019 19:00:42 -0500 (EST) |
civodul pushed a commit to branch wip-newt-installer
in repository guix.
commit d94d5d25da46a758882b1854e68271eab0b143ce
Author: Mathieu Othacehe <address@hidden>
Date: Wed Dec 5 22:00:15 2018 +0900
installer: partition: Differenciate Back button from Exit button.
* gnu/installer/newt/partition.scm (run-label-page): Pass the button text as
an argument,
(run-disk-page): Call run-label-page with the appropriate button text.
---
gnu/installer/newt/partition.scm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/gnu/installer/newt/partition.scm b/gnu/installer/newt/partition.scm
index 1d5e453..04d6192 100644
--- a/gnu/installer/newt/partition.scm
+++ b/gnu/installer/newt/partition.scm
@@ -76,7 +76,7 @@ DEVICES list."
(device (car result)))
device))
-(define (run-label-page button-callback)
+(define (run-label-page button-text button-callback)
"Run a page asking the user to select a partition table label."
(run-listbox-selection-page
#:info-text (G_ "Select a new partition table type. \
@@ -84,7 +84,7 @@ Be careful, all data on the disk will be lost.")
#:title (G_ "Partition table")
#:listbox-items '("msdos" "gpt")
#:listbox-item->text identity
- #:button-text (G_ "Exit")
+ #:button-text button-text
#:button-callback-procedure button-callback))
(define (run-type-page partition)
@@ -519,7 +519,7 @@ edit it."
(let ((item (car listbox-item)))
(cond
((disk? item)
- (let ((label (run-label-page (const #f))))
+ (let ((label (run-label-page (G_ "Back") (const #f))))
(if label
(let* ((device (disk-device item))
(new-disk (mklabel device label))
@@ -674,6 +674,7 @@ At least one partition must have its mounting point set to
'/'.")
(disk (if disk-type
(disk-new device)
(let* ((label (run-label-page
+ (G_ "Exit")
button-exit-action))
(disk (mklabel device label)))
(disk-commit disk)
- 03/67: gnu: kmscon: Add runtime keymap update support., (continued)
- 03/67: gnu: kmscon: Add runtime keymap update support., guix-commits, 2019/01/16
- 27/67: installer: Redirect to TTY3 root shell for unguided install., guix-commits, 2019/01/16
- 13/67: installer: Fix locale installation., guix-commits, 2019/01/16
- 29/67: installer: Fix comments., guix-commits, 2019/01/16
- 25/67: installer: Add hostname., guix-commits, 2019/01/16
- 32/67: installer: Reorder POTFILES.in, guix-commits, 2019/01/16
- 38/67: installer: locale: Set English as the default language., guix-commits, 2019/01/16
- 34/67: installer: Remove group selection in user page., guix-commits, 2019/01/16
- 40/67: installer: keymap: Do not fail on non-kmscon terminals., guix-commits, 2019/01/16
- 45/67: installer: Make exit button optional for run-file-textbox-page., guix-commits, 2019/01/16
- 43/67: installer: partition: Differenciate Back button from Exit button.,
guix-commits <=
- 48/67: installer: menu: Fix typo., guix-commits, 2019/01/16
- 52/67: installer: Clear screen upon exit., guix-commits, 2019/01/16
- 44/67: installer: Make sure every sentence is dot terminated., guix-commits, 2019/01/16
- 47/67: installer: partition: Precise when using Manual/Guided partionment., guix-commits, 2019/01/16
- 65/67: installer: Adjust messages on the final page., guix-commits, 2019/01/16
- 66/67: installer: "formating" → "formatting"., guix-commits, 2019/01/16
- 12/67: installer: Move everything to the build side., guix-commits, 2019/01/16
- 39/67: installer: Turn "Cancel" buttons into "Exit" buttons., guix-commits, 2019/01/16
- 23/67: installer: Do not ask for keyboard model., guix-commits, 2019/01/16
- 62/67: installer: partition: Add encryption password confirmation., guix-commits, 2019/01/16