[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
45/67: installer: Make exit button optional for run-file-textbox-page.
From: |
guix-commits |
Subject: |
45/67: installer: Make exit button optional for run-file-textbox-page. |
Date: |
Wed, 16 Jan 2019 19:00:42 -0500 (EST) |
civodul pushed a commit to branch wip-newt-installer
in repository guix.
commit 6dc08c5565c57f0e49eda709e45df517a4ff028f
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))))))
- 08/67: doc: Document the graphical installer., (continued)
- 08/67: doc: Document the graphical installer., guix-commits, 2019/01/16
- 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 <=
- 43/67: installer: partition: Differenciate Back button from Exit button., guix-commits, 2019/01/16
- 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