[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: installer: Make exit button optional for run-file-textbox-page.
From: |
guix-commits |
Subject: |
01/02: installer: Make exit button optional for run-file-textbox-page. |
Date: |
Wed, 5 Dec 2018 21:13:53 -0500 (EST) |
mothacehe pushed a commit to branch wip-newt-installer
in repository guix.
commit c75eaf8e4d8790bad5f0abb9a3c274c6911cdabc
Author: Mathieu Othacehe <address@hidden>
Date: Thu Dec 6 11:00:43 2018 +0900
installer: Make exit button optional for run-file-textbox-page.
* gnu/installer/newt/page.scm (run-file-textbox-page)[exit-button?]: New
argument.
---
gnu/installer/newt/page.scm | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/gnu/installer/newt/page.scm b/gnu/installer/newt/page.scm
index c6577c8..c0d7547 100644
--- a/gnu/installer/newt/page.scm
+++ b/gnu/installer/newt/page.scm
@@ -480,6 +480,7 @@ ITEMS when 'Ok' is pressed."
(info-textbox-width 50)
(file-textbox-width 50)
(file-textbox-height 30)
+ (exit-button? #t)
(ok-button-callback-procedure
(const #t))
(exit-button-callback-procedure
@@ -500,9 +501,12 @@ ITEMS when 'Ok' is pressed."
GRID-ELEMENT-COMPONENT info-textbox
GRID-ELEMENT-COMPONENT file-textbox
GRID-ELEMENT-SUBGRID
- (horizontal-stacked-grid
+ (apply
+ horizontal-stacked-grid
GRID-ELEMENT-COMPONENT ok-button
- GRID-ELEMENT-COMPONENT exit-button)))
+ `(,@(if exit-button?
+ (list GRID-ELEMENT-COMPONENT exit-button)
+ '())))))
(form (make-form)))
(set-textbox-text file-textbox file-text)
@@ -519,7 +523,8 @@ ITEMS when 'Ok' is pressed."
(cond
((components=? argument ok-button)
(ok-button-callback-procedure))
- ((components=? argument exit-button)
+ ((and exit-button?
+ (components=? argument exit-button))
(exit-button-callback-procedure))))))
(lambda ()
(destroy-form-and-pop form))))))