[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
46/68: installer: Make exit button optional for run-file-textbox-page.
From: |
guix-commits |
Subject: |
46/68: installer: Make exit button optional for run-file-textbox-page. |
Date: |
Thu, 17 Jan 2019 08:05:18 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 3d0f6a055c366a5414c35262bb4b31c0f602fcd3
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))))))
- 38/68: installer: locale: Make clear that the point is to select a glibc locale., (continued)
- 38/68: installer: locale: Make clear that the point is to select a glibc locale., guix-commits, 2019/01/17
- 37/68: installer: Reorder partitionment step., guix-commits, 2019/01/17
- 39/68: installer: locale: Set English as the default language., guix-commits, 2019/01/17
- 36/68: installer: Fix compute calls., guix-commits, 2019/01/17
- 40/68: installer: Turn "Cancel" buttons into "Exit" buttons., guix-commits, 2019/01/17
- 41/68: installer: keymap: Do not fail on non-kmscon terminals., guix-commits, 2019/01/17
- 54/68: file-systems: Add read-luks-partition-uuid., guix-commits, 2019/01/17
- 60/68: installer: welcome: Put "Graphical installer" ahead., guix-commits, 2019/01/17
- 45/68: installer: Make sure every sentence is dot terminated., guix-commits, 2019/01/17
- 42/68: installer: keymap: Fix keymap selection of layouts with not variant., guix-commits, 2019/01/17
- 46/68: installer: Make exit button optional for run-file-textbox-page.,
guix-commits <=
- 48/68: installer: partition: Precise when using Manual/Guided partionment., guix-commits, 2019/01/17
- 61/68: installer: Remove debug popup., guix-commits, 2019/01/17
- 56/68: installer: Various renamings., guix-commits, 2019/01/17
- 52/68: installer: partionment: Add encryption support., guix-commits, 2019/01/17
- 27/68: installer: Add new pages., guix-commits, 2019/01/17
- 57/68: installer: Various renamins follow-up., guix-commits, 2019/01/17
- 44/68: installer: partition: Differenciate Back button from Exit button., guix-commits, 2019/01/17
- 28/68: installer: Redirect to TTY3 root shell for unguided install., guix-commits, 2019/01/17
- 58/68: installer: parted: Do not call BLKRRPART on loop devices., guix-commits, 2019/01/17
- 53/68: installer: Clear screen upon exit., guix-commits, 2019/01/17