07/20: installer: Rename "Back" buttons to "Cancel".

[John Darrington]

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

commit 28b3724c985cd0f60bef749c4aafa0e259ca8bcf
Author: John Darrington <address@hidden>
Date:   Sat Jan 7 08:27:12 2017 +0100

    installer: Rename "Back" buttons to "Cancel".
    
    * gnu/system/installer/configure.scm: Replace "back" with "cancel".
    * gnu/system/installer/disks.scm: Replace "back" with "cancel".
    * gnu/system/installer/file-browser.scm: Replace "back" with "cancel".
    * gnu/system/installer/filesystems.scm: Replace "back" with "cancel".
    * gnu/system/installer/hostname.scm: Replace "back" with "cancel".
    * gnu/system/installer/install.scm: Replace "back" with "cancel".
    * gnu/system/installer/mount-point.scm: Replace "back" with "cancel".
    * gnu/system/installer/passphrase.scm: Replace "back" with "cancel".
    * gnu/system/installer/ping.scm: Replace "back" with "cancel".
    * gnu/system/installer/role.scm: Replace "back" with "cancel".
    * gnu/system/installer/time-zone.scm: Replace "back" with "cancel".
    * gnu/system/installer/wireless.scm: Replace "back" with "cancel".
---
 gnu/system/installer/configure.scm    |    4 ++--
 gnu/system/installer/disks.scm        |    5 ++---
 gnu/system/installer/file-browser.scm |    4 ++--
 gnu/system/installer/filesystems.scm  |    4 ++--
 gnu/system/installer/hostname.scm     |    4 ++--
 gnu/system/installer/install.scm      |    4 ++--
 gnu/system/installer/mount-point.scm  |    6 +++++-
 gnu/system/installer/passphrase.scm   |    4 ++--
 gnu/system/installer/ping.scm         |    9 ++++++---
 gnu/system/installer/role.scm         |    4 ++--
 gnu/system/installer/time-zone.scm    |    4 ++--
 gnu/system/installer/wireless.scm     |    4 ++--
 12 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/gnu/system/installer/configure.scm 
b/gnu/system/installer/configure.scm
index c2a86ee..c952983 100644
--- a/gnu/system/installer/configure.scm
+++ b/gnu/system/installer/configure.scm
@@ -47,7 +47,7 @@
 
 
 (define my-buttons `((save ,(N_ "_Save") #t)
-                     (back ,(N_ "_Back") #t)))
+                     (cancel ,(N_ "Canc_el") #t)))
 
 
 ;; Kludge!  For testing.
@@ -96,7 +96,7 @@
       (buttons-unselect-all nav))
 
      
-     ((buttons-key-matches-symbol? nav ch 'back)
+     ((buttons-key-matches-symbol? nav ch 'cancel)
       ;; Close the menu and return 
       (page-leave))
 
diff --git a/gnu/system/installer/disks.scm b/gnu/system/installer/disks.scm
index ac1007f..1f3092b 100644
--- a/gnu/system/installer/disks.scm
+++ b/gnu/system/installer/disks.scm
@@ -27,8 +27,7 @@
   #:use-module (ice-9 format)
   #:export (make-disk-page))
 
-(define my-buttons `((continue ,(N_ "_Continue") #t)
-                    (back     ,(N_ "Go _Back") #t)))
+(define my-buttons `((continue ,(N_ "_Continue") #t)))
 
 (define (make-disk-page parent  title)
   (make-page (page-surface parent)
@@ -96,7 +95,7 @@
 
      ((buttons-key-matches-symbol? nav ch 'continue)
       (page-leave)))
-    
+
     (std-menu-key-handler menu ch))
 
   #f
diff --git a/gnu/system/installer/file-browser.scm 
b/gnu/system/installer/file-browser.scm
index 4e7f4f2..4cb2580 100644
--- a/gnu/system/installer/file-browser.scm
+++ b/gnu/system/installer/file-browser.scm
@@ -39,7 +39,7 @@
     page))
 
 
-(define my-buttons `((back  ,(N_ "_Back") #t)))
+(define my-buttons `((cancel  ,(N_ "Canc_el") #t)))
 
 (define (file-browser-page-key-handler page ch)
   (let ((nav  (page-datum page 'navigation))
@@ -55,7 +55,7 @@
        (else
        (buttons-select-next nav))))
 
-     ((buttons-key-matches-symbol? nav ch 'back)
+     ((buttons-key-matches-symbol? nav ch 'cancel)
 
       (page-leave))
 
diff --git a/gnu/system/installer/filesystems.scm 
b/gnu/system/installer/filesystems.scm
index 6dfa3cb..05d8310 100644
--- a/gnu/system/installer/filesystems.scm
+++ b/gnu/system/installer/filesystems.scm
@@ -106,7 +106,7 @@
 
 
 (define my-buttons `((continue ,(N_ "_Continue") #t)
-                    (back     ,(N_ "Go _Back") #t)))
+                    (cancel     ,(N_ "Canc_el") #t)))
 
 
 
@@ -187,7 +187,7 @@
        (page-set-datum! next 'device name)
         (page-enter next)))
 
-     ((buttons-key-matches-symbol? nav ch 'back)
+     ((buttons-key-matches-symbol? nav ch 'cancel)
       (page-leave))
 
 
diff --git a/gnu/system/installer/hostname.scm 
b/gnu/system/installer/hostname.scm
index 1c561c4..daafa7b 100644
--- a/gnu/system/installer/hostname.scm
+++ b/gnu/system/installer/hostname.scm
@@ -69,7 +69,7 @@
        (dev   (page-datum page 'device)))
 
     (cond
-     ((buttons-key-matches-symbol? nav ch 'back)
+     ((buttons-key-matches-symbol? nav ch 'cancel)
       (page-leave))
 
      ((select-key? ch)
@@ -109,7 +109,7 @@
       (form-enter form ch)))
     #f))
 
-(define my-buttons `((back ,(N_ "Back") #f)))
+(define my-buttons `((cancel ,(N_ "Cancel") #f)))
 
 (define (host-name-init p)
   (let* ((s (page-surface p))
diff --git a/gnu/system/installer/install.scm b/gnu/system/installer/install.scm
index 53d32a4..2023d7e 100644
--- a/gnu/system/installer/install.scm
+++ b/gnu/system/installer/install.scm
@@ -44,7 +44,7 @@
 
 (define my-buttons `((continue ,(N_ "_Continue") #t)
                      (reboot ,(N_ "_Reboot") #t)
-                     (back ,(N_ "_Back") #t)))
+                     (cancel ,(N_ "Canc_el") #t)))
 
 (define (install-page-key-handler page ch)
   (let ((nav  (page-datum page 'navigation))
@@ -69,7 +69,7 @@
       (buttons-unselect-all nav))
 
 
-     ((buttons-key-matches-symbol? nav ch 'back)
+     ((buttons-key-matches-symbol? nav ch 'cancel)
       ;; Close the menu and return
       (page-leave))
 
diff --git a/gnu/system/installer/mount-point.scm 
b/gnu/system/installer/mount-point.scm
index 5b922fe..f9757b1 100644
--- a/gnu/system/installer/mount-point.scm
+++ b/gnu/system/installer/mount-point.scm
@@ -92,6 +92,10 @@
             )))
     
     (cond
+     ((buttons-key-matches-symbol? nav ch 'cancel)
+      ;; Close the menu and return 
+      (page-leave))
+
      ((or (eq? ch KEY_RIGHT)
          (eq? ch #\tab))
       (form-set-enabled! form #f)
@@ -117,7 +121,7 @@
                     (check    ,(N_ "Check") #f)
                     (write    ,(N_ "Write") #f)
                     (recreate ,(N_ "(re)Create") #f)
-                    (back     ,(N_ "Go Back") #f)))
+                    (cancel     ,(N_ "Cancel") #f)))
 
 (define (mount-point-page-init p)
   (let* ((s (page-surface p))
diff --git a/gnu/system/installer/passphrase.scm 
b/gnu/system/installer/passphrase.scm
index 167719e..cd62a12 100644
--- a/gnu/system/installer/passphrase.scm
+++ b/gnu/system/installer/passphrase.scm
@@ -66,7 +66,7 @@
         (dev   (page-datum page 'device)))
 
     (cond
-     ((buttons-key-matches-symbol? nav ch 'back)
+     ((buttons-key-matches-symbol? nav ch 'cancel)
       (page-leave))
 
      ((eq? ch #\tab)
@@ -92,7 +92,7 @@
       (form-enter form ch)))
     #f))
 
-(define my-buttons `((back ,(N_ "Back") #f)))
+(define my-buttons `((cancel ,(N_ "Cancel") #f)))
 
 (define (passphrase-init p)
   (let* ((s (page-surface p))
diff --git a/gnu/system/installer/ping.scm b/gnu/system/installer/ping.scm
index e4bef7a..12301a5 100644
--- a/gnu/system/installer/ping.scm
+++ b/gnu/system/installer/ping.scm
@@ -47,13 +47,17 @@
 
 (define my-buttons `((test ,(N_ "_Test") #t)
                     (continue  ,(N_ "_Continue") #t)
-                    (back     ,(N_ "Go _Back") #t)))
+                    (cancel     ,(N_ "Canc_el") #t)))
 
 (define (ping-page-key-handler page ch)
   (let ((nav  (page-datum page 'navigation))
        (test-window  (page-datum page 'test-window)))
 
     (cond
+     ((buttons-key-matches-symbol? nav ch 'cancel)
+      ;; Close the menu and return 
+      (page-leave))
+
      ((eq? ch KEY_RIGHT)
       (buttons-select-next nav))
 
@@ -74,8 +78,7 @@
      ((buttons-key-matches-symbol? nav ch 'continue)
 
       (delwin (page-datum page 'test-window))
-      (page-leave)
-      )
+      (page-leave))
 
      ((buttons-key-matches-symbol? nav ch 'test)
       (let* ()
diff --git a/gnu/system/installer/role.scm b/gnu/system/installer/role.scm
index 6391642..6f99762 100644
--- a/gnu/system/installer/role.scm
+++ b/gnu/system/installer/role.scm
@@ -53,7 +53,7 @@
             role-page-key-handler))
 
 
-(define my-buttons `((back ,(N_ "_Back") #t)))
+(define my-buttons `((cancel ,(N_ "Canc_el") #t)))
 
 (define (role-page-key-handler page ch)
   (let ((menu (page-datum page 'menu))
@@ -91,7 +91,7 @@
       
       (page-leave))
 
-     ((buttons-key-matches-symbol? nav ch 'back)
+     ((buttons-key-matches-symbol? nav ch 'cancel)
       (page-leave)))
 
     (std-menu-key-handler menu ch))
diff --git a/gnu/system/installer/time-zone.scm 
b/gnu/system/installer/time-zone.scm
index 59ff2d6..a6130c9 100644
--- a/gnu/system/installer/time-zone.scm
+++ b/gnu/system/installer/time-zone.scm
@@ -39,7 +39,7 @@
     page))
 
 
-(define my-buttons `((back  ,(N_ "_Back") #t)))
+(define my-buttons `((cancel  ,(N_ "Canc_el") #t)))
 
 (define (time-zone-page-key-handler page ch)
   (let ((nav  (page-datum page 'navigation))
@@ -55,7 +55,7 @@
        (else
        (buttons-select-next nav))))
 
-     ((buttons-key-matches-symbol? nav ch 'back)
+     ((buttons-key-matches-symbol? nav ch 'cancel)
       (page-leave))
 
      ((and (eqv? ch #\newline)
diff --git a/gnu/system/installer/wireless.scm 
b/gnu/system/installer/wireless.scm
index 271a6ff..cf3ba49 100644
--- a/gnu/system/installer/wireless.scm
+++ b/gnu/system/installer/wireless.scm
@@ -45,7 +45,7 @@
     page))
 
 
-(define my-buttons `((back ,(N_ "_Back") #t)))
+(define my-buttons `((cancel ,(N_ "Canc_el") #t)))
 
 (define (wireless-page-key-handler page ch)
   (let ((nav  (page-datum page 'navigation))
@@ -70,7 +70,7 @@
      ((eq? ch KEY_UP)
       (buttons-unselect-all nav))
 
-     ((buttons-key-matches-symbol? nav ch 'back)
+     ((buttons-key-matches-symbol? nav ch 'cancel)
       (page-leave))
 
      ((select-key? ch)