[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/18: installer: Replace 'file-browser' with 'key-map'.
From: |
John Darrington |
Subject: |
08/18: installer: Replace 'file-browser' with 'key-map'. |
Date: |
Thu, 2 Feb 2017 18:13:05 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit da40d3b776483946d3f441929680e2ca513f3ce5
Author: John Darrington <address@hidden>
Date: Tue Jan 31 07:39:04 2017 +0100
installer: Replace 'file-browser' with 'key-map'.
* gnu/system/installer/guixsd-installer.scm: file-browser --> key-map.
* gnu/system/installer/key-map.scm: file-browser --> key-map.
---
gnu/system/installer/guixsd-installer.scm | 2 +-
gnu/system/installer/key-map.scm | 20 ++++++++++----------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/gnu/system/installer/guixsd-installer.scm
b/gnu/system/installer/guixsd-installer.scm
index b2af6cb..c84e099 100644
--- a/gnu/system/installer/guixsd-installer.scm
+++ b/gnu/system/installer/guixsd-installer.scm
@@ -174,7 +174,7 @@
(loadkeys-directory
(let* ((keymap-directory
(string-append (dirname loadkeys-directory)
"/../share/keymaps"))
- (p (make-file-browser
+ (p (make-key-map
page keymap-directory)))
(page-enter p)))))))
diff --git a/gnu/system/installer/key-map.scm b/gnu/system/installer/key-map.scm
index 4ad975f..f6d6304 100644
--- a/gnu/system/installer/key-map.scm
+++ b/gnu/system/installer/key-map.scm
@@ -24,23 +24,23 @@
#:use-module (gurses buttons)
#:use-module (ncurses curses)
- #:export (make-file-browser))
+ #:export (make-key-map))
(include "i18n.scm")
-(define* (make-file-browser parent directory)
+(define* (make-key-map parent directory)
(let ((page (make-page (page-surface parent)
- (gettext "File Browser")
- file-browser-page-refresh
+ (gettext "Keyboard Mapping")
+ key-map-page-refresh
0
- file-browser-page-key-handler)))
+ key-map-page-key-handler)))
(page-set-datum! page 'directory directory)
page))
(define my-buttons `((cancel ,(M_ "Canc_el") #t)))
-(define (file-browser-page-key-handler page ch)
+(define (key-map-page-key-handler page ch)
(let ((nav (page-datum page 'navigation))
(menu (page-datum page 'menu))
(directory (page-datum page 'directory)))
@@ -63,7 +63,7 @@
(let* ((i (menu-get-current-item menu))
(new-dir (string-append directory "/" i)))
(if (eq? 'directory (stat:type (stat new-dir)))
- (let ((p (make-file-browser
+ (let ((p (make-key-map
page new-dir)))
;; Don't go back to the current page!
(set! page-stack (cdr page-stack))
@@ -77,16 +77,16 @@
#f))
-(define (file-browser-page-refresh page)
+(define (key-map-page-refresh page)
(when (not (page-initialised? page))
- (file-browser-page-init page)
+ (key-map-page-init page)
(page-set-initialised! page #t))
(touchwin (outer (page-wwin page)))
(refresh* (outer (page-wwin page)))
(refresh* (inner (page-wwin page)))
(menu-refresh (page-datum page 'menu)))
-(define (file-browser-page-init p)
+(define (key-map-page-init p)
(let* ((s (page-surface p))
(frame (make-boxed-window #f
(- (getmaxy s) 5) (- (getmaxx s) 2)
- branch wip-installer updated (9ff399e -> 688f4f7), John Darrington, 2017/02/02
- 04/18: installer: Add optional arguments to addstr*., John Darrington, 2017/02/02
- 02/18: installer: New gettext keyword M_., John Darrington, 2017/02/02
- 01/18: installer: Avoid wpa_supplicant's output causing screen damage., John Darrington, 2017/02/02
- 05/18: installer: Main page: Redisplay translatable strings upon refresh., John Darrington, 2017/02/02
- 09/18: installer: Correct placement of gettext call., John Darrington, 2017/02/02
- 08/18: installer: Replace 'file-browser' with 'key-map'.,
John Darrington <=
- 06/18: installer: Use _ instead of M_ for host-name-refresh., John Darrington, 2017/02/02
- 14/18: gurses: Cache the windows of buttons., John Darrington, 2017/02/02
- 16/18: installer: New procedure key-value-slurp., John Darrington, 2017/02/02
- 18/18: installer: Fix bug when changing languages., John Darrington, 2017/02/02
- 07/18: installer: New page to select language., John Darrington, 2017/02/02
- 10/18: installer: Fix i18n in dialogs., John Darrington, 2017/02/02
- 17/18: installer: Provide verbose description of locale., John Darrington, 2017/02/02
- 03/18: installer: New file i18n.scm., John Darrington, 2017/02/02
- 11/18: installer: New convenience procedures., John Darrington, 2017/02/02
- 13/18: gurses: Avoid one use of car/cdr., John Darrington, 2017/02/02