[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: installer: page: Improve status reporting.
From: |
Danny Milosavljevic |
Subject: |
01/01: installer: page: Improve status reporting. |
Date: |
Tue, 4 Jul 2017 16:18:12 -0400 (EDT) |
dannym pushed a commit to branch wip-installer-2
in repository guix.
commit 721603340ff9031f65504e159643b9b093a73673
Author: Danny Milosavljevic <address@hidden>
Date: Tue Jul 4 22:16:47 2017 +0200
installer: page: Improve status reporting.
* gnu/system/installer/page.scm (page-default-key-handler): Improve status
reporting.
---
gnu/system/installer/page.scm | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/gnu/system/installer/page.scm b/gnu/system/installer/page.scm
index 55a9d70..aa0690a 100644
--- a/gnu/system/installer/page.scm
+++ b/gnu/system/installer/page.scm
@@ -90,7 +90,8 @@ If a form is used it's assumed that the menu is not used and
vice versa."
(if form
(form-set-enabled! form #f))
(if nav
- (buttons-select-next nav)))
+ (buttons-select-next nav))
+ 'handled)
((eq? ch KEY_LEFT)
(if menu
@@ -98,30 +99,35 @@ If a form is used it's assumed that the menu is not used
and vice versa."
(if form
(form-set-enabled! form #f))
(if nav
- (buttons-select-prev nav)))
+ (buttons-select-prev nav))
+ 'handled)
((eq? ch #\tab)
(cond
((and menu (menu-active menu))
(menu-set-active! menu #f)
(if nav
- (buttons-select nav 0)))
+ (buttons-select nav 0))
+ 'handled)
((and form (form-enabled? form))
(form-set-enabled! form #f)
(if nav
- (buttons-select nav 0)))
+ (buttons-select nav 0))
+ 'handled)
((and nav (eqv? (buttons-selected nav) (1- (buttons-n-buttons nav))))
(if menu
(menu-set-active! menu #t)
(if form
(form-set-enabled! form #t)))
- (buttons-unselect-all nav))
+ (buttons-unselect-all nav)
+ 'handled)
(else
(if nav
- (buttons-select-next nav)))))
+ (buttons-select-next nav))
+ 'handled)))
((select-key? ch)
(page-activate-focused-item page))
@@ -135,7 +141,8 @@ If a form is used it's assumed that the menu is not used
and vice versa."
(if menu
(menu-set-active! menu #t)
(if form
- (form-set-enabled! form #t))))
+ (form-set-enabled! form #t)))
+ 'handled)
((eq? ch KEY_DOWN)
(if nav
@@ -143,7 +150,8 @@ If a form is used it's assumed that the menu is not used
and vice versa."
(if menu
(menu-set-active! menu #t)
(if form
- (form-set-enabled! form #t))))
+ (form-set-enabled! form #t)))
+ 'handled)
((and nav (buttons-fetch-by-key nav ch))
(buttons-select-by-symbol nav (buttons-fetch-by-key nav ch))