guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

157/197: installer: Replace 'file-browser' with 'key-map'.


From: Danny Milosavljevic
Subject: 157/197: installer: Replace 'file-browser' with 'key-map'.
Date: Mon, 3 Jul 2017 20:37:17 -0400 (EDT)

dannym pushed a commit to branch wip-installer-2
in repository guix.

commit 299f4955ef5244d21a89b7f36b382f63119e187a
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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]