[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/05: installer: partition: Differenciate Back button from Exit button.
From: |
guix-commits |
Subject: |
04/05: installer: partition: Differenciate Back button from Exit button. |
Date: |
Wed, 5 Dec 2018 08:12:04 -0500 (EST) |
mothacehe pushed a commit to branch wip-newt-installer
in repository guix.
commit 1a384d7df8e538a07dbef9d1e4973c87ffe24500
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)