installer: Turn "Cancel" buttons into "Exit" buttons.

This change and previous ones were,
Suggested-by: Thorsten Wilms <t_w_@freenet.de>
here: https://lists.gnu.org/archive/html/guix-devel/2018-11/msg00330.html

gnu/installer/newt/ethernet.scm: Turn cancel into exit.
gnu/installer/newt/final.scm: Ditto.
gnu/installer/newt/keymap.scm: Ditto.
gnu/installer/newt/locale.scm: Ditto.
gnu/installer/newt/network.scm: Ditto.
gnu/installer/newt/page.scm: Ditto.
gnu/installer/newt/partition.scm: Ditto.
gnu/installer/newt/services.scm: Ditto.
gnu/installer/newt/timezone.scm: Ditto.
gnu/installer/newt/user.scm: Ditto.
gnu/installer/newt/wifi.scm: Ditto.

11 files changed, 42 insertions, 42 deletions

diff --git a/gnu/installer/newt/ethernet.scm b/gnu/installer/newt/ethernet.scm
index 2b02653777..d1f357243b 100644
--- a/gnu/installer/newt/ethernet.scm
+++ b/gnu/installer/newt/ethernet.scm
@@ -72,7 +72,7 @@ connection is pending."
          #:title (G_ "Ethernet connection")
          #:listbox-items services
          #:listbox-item->text ethernet-service->text
-         #:button-text (G_ "Cancel")
+         #:button-text (G_ "Exit")
          #:button-callback-procedure
          (lambda _
            (raise
diff --git a/gnu/installer/newt/final.scm b/gnu/installer/newt/final.scm
index 023777cc0a..81af949de1 100644
--- a/gnu/installer/newt/final.scm
+++ b/gnu/installer/newt/final.scm
@@ -42,7 +42,7 @@ new system will be created from this file when pression the Ok button.")
      #:info-textbox-width width
      #:file-textbox-width width
      #:file-textbox-height height
-     #:cancel-button-callback-procedure
+     #:exit-button-callback-procedure
      (lambda ()
        (raise
         (condition
diff --git a/gnu/installer/newt/keymap.scm b/gnu/installer/newt/keymap.scm
index 4bdae51340..9178a4341a 100644
--- a/gnu/installer/newt/keymap.scm
+++ b/gnu/installer/newt/keymap.scm
@@ -35,7 +35,7 @@
      #:info-text (G_ "Please choose your keyboard layout.")
      #:listbox-items layouts
      #:listbox-item->text layout->text
-     #:button-text (G_ "Cancel")
+     #:button-text (G_ "Exit")
      #:button-callback-procedure
      (lambda _
        (raise
diff --git a/gnu/installer/newt/locale.scm b/gnu/installer/newt/locale.scm
index 4de78f3330..4fa07df81e 100644
--- a/gnu/installer/newt/locale.scm
+++ b/gnu/installer/newt/locale.scm
@@ -45,7 +45,7 @@ installed system.")
      #:listbox-items languages
      #:listbox-item->text language->text
      #:sort-listbox-items? #f
-     #:button-text (G_ "Cancel")
+     #:button-text (G_ "Exit")
      #:button-callback-procedure
      (lambda _
        (raise
diff --git a/gnu/installer/newt/network.scm b/gnu/installer/newt/network.scm
index 4912959147..ee6af0674e 100644
--- a/gnu/installer/newt/network.scm
+++ b/gnu/installer/newt/network.scm
@@ -59,7 +59,7 @@ Internet and return the selected technology. For now, only technologies with
    #:title (G_ "Internet access")
    #:listbox-items (technology-items)
    #:listbox-item->text technology->text
-   #:button-text (G_ "Cancel")
+   #:button-text (G_ "Exit")
    #:button-callback-procedure
    (lambda _
      (raise
diff --git a/gnu/installer/newt/page.scm b/gnu/installer/newt/page.scm
index 10849b81eb..98cbbb9c05 100644
--- a/gnu/installer/newt/page.scm
+++ b/gnu/installer/newt/page.scm
@@ -404,12 +404,12 @@ error is raised if the MAX-SCALE-UPDATE limit is reached."
                                  (checkbox-tree-height 10)
                                  (ok-button-callback-procedure
                                   (const #t))
-                                 (cancel-button-callback-procedure
+                                 (exit-button-callback-procedure
                                   (const #t)))
   "Run a page allowing the user to select one or multiple items among ITEMS in
 a checkbox list. The page contains vertically stacked from the top to the
 bottom, an informative text set to INFO-TEXT, the checkbox list and two
-buttons, 'Ok' and 'Cancel'. The page title's is set to TITLE. ITEMS are
+buttons, 'Ok' and 'Exit'. The page title's is set to TITLE. ITEMS are
 converted to text using ITEM->TEXT before being displayed in the checkbox
 list.
 
@@ -417,7 +417,7 @@ INFO-TEXTBOX-WIDTH is the width of the textbox where INFO-TEXT will be
 displayed. CHECKBOX-TREE-HEIGHT is the height of the checkbox list.
 
 OK-BUTTON-CALLBACK-PROCEDURE is called when the 'Ok' button is pressed.
-CANCEL-BUTTON-CALLBACK-PROCEDURE is called when the 'Cancel' button is
+EXIT-BUTTON-CALLBACK-PROCEDURE is called when the 'Exit' button is
 pressed.
 
 This procedure returns the list of checked items in the checkbox list among
@@ -439,14 +439,14 @@ ITEMS when 'Ok' is pressed."
                                  info-textbox-width
                                  #:flags FLAG-BORDER))
          (ok-button (make-button -1 -1 (G_ "Ok")))
-         (cancel-button (make-button -1 -1 (G_ "Cancel")))
+         (exit-button (make-button -1 -1 (G_ "Exit")))
          (grid (vertically-stacked-grid
                 GRID-ELEMENT-COMPONENT info-textbox
                 GRID-ELEMENT-COMPONENT checkbox-tree
                 GRID-ELEMENT-SUBGRID
                 (horizontal-stacked-grid
                  GRID-ELEMENT-COMPONENT ok-button
-                 GRID-ELEMENT-COMPONENT cancel-button)))
+                 GRID-ELEMENT-COMPONENT exit-button)))
          (keys (fill-checkbox-tree checkbox-tree items))
          (form (make-form)))
 
@@ -468,8 +468,8 @@ ITEMS when 'Ok' is pressed."
                                           entries)))
                  (ok-button-callback-procedure)
                  current-items))
-              ((components=? argument cancel-button)
-               (cancel-button-callback-procedure))))))
+              ((components=? argument exit-button)
+               (exit-button-callback-procedure))))))
         (lambda ()
           (destroy-form-and-pop form))))))
 
@@ -482,7 +482,7 @@ ITEMS when 'Ok' is pressed."
                                 (file-textbox-height 30)
                                 (ok-button-callback-procedure
                                  (const #t))
-                                (cancel-button-callback-procedure
+                                (exit-button-callback-procedure
                                  (const #t)))
   (let* ((info-textbox
           (make-reflowed-textbox -1 -1 info-text
@@ -495,14 +495,14 @@ ITEMS when 'Ok' is pressed."
                         file-textbox-height
                         (logior FLAG-SCROLL FLAG-BORDER)))
          (ok-button (make-button -1 -1 (G_ "Ok")))
-         (cancel-button (make-button -1 -1 (G_ "Cancel")))
+         (exit-button (make-button -1 -1 (G_ "Exit")))
          (grid (vertically-stacked-grid
                 GRID-ELEMENT-COMPONENT info-textbox
                 GRID-ELEMENT-COMPONENT file-textbox
                 GRID-ELEMENT-SUBGRID
                 (horizontal-stacked-grid
                  GRID-ELEMENT-COMPONENT ok-button
-                 GRID-ELEMENT-COMPONENT cancel-button)))
+                 GRID-ELEMENT-COMPONENT exit-button)))
          (form (make-form)))
 
     (set-textbox-text file-textbox file-text)
@@ -519,7 +519,7 @@ ITEMS when 'Ok' is pressed."
              (cond
               ((components=? argument ok-button)
                (ok-button-callback-procedure))
-              ((components=? argument cancel-button)
-               (cancel-button-callback-procedure))))))
+              ((components=? argument exit-button)
+               (exit-button-callback-procedure))))))
         (lambda ()
           (destroy-form-and-pop form))))))
diff --git a/gnu/installer/newt/partition.scm b/gnu/installer/newt/partition.scm
index 806337a9cb..1d5e4538e4 100644
--- a/gnu/installer/newt/partition.scm
+++ b/gnu/installer/newt/partition.scm
@@ -32,7 +32,7 @@
   #:use-module (parted)
   #:export (run-partioning-page))
 
-(define (button-cancel-action)
+(define (button-exit-action)
   "Raise the &installer-step-abort condition."
   (raise
    (condition
@@ -48,8 +48,8 @@
                   #:title (G_ "Partition scheme")
                   #:listbox-items items
                   #:listbox-item->text cdr
-                  #:button-text (G_ "Cancel")
-                  #:button-callback-procedure button-cancel-action)))
+                  #:button-text (G_ "Exit")
+                  #:button-callback-procedure button-exit-action)))
     (car result)))
 
 (define (draw-formating-page)
@@ -71,8 +71,8 @@ DEVICES list."
                   #:title (G_ "Disk")
                   #:listbox-items (device-items)
                   #:listbox-item->text cdr
-                  #:button-text (G_ "Cancel")
-                  #:button-callback-procedure button-cancel-action))
+                  #:button-text (G_ "Exit")
+                  #:button-callback-procedure button-exit-action))
          (device (car result)))
     device))
 
@@ -84,7 +84,7 @@ Be careful, all data on the disk will be lost.")
    #:title (G_ "Partition table")
    #:listbox-items '("msdos" "gpt")
    #:listbox-item->text identity
-   #:button-text (G_ "Cancel")
+   #:button-text (G_ "Exit")
    #:button-callback-procedure button-callback))
 
 (define (run-type-page partition)
@@ -103,8 +103,8 @@ Be careful, all data on the disk will be lost.")
      #:listbox-items items
      #:listbox-item->text symbol->string
      #:sort-listbox-items? #f
-     #:button-text (G_ "Cancel")
-     #:button-callback-procedure button-cancel-action)))
+     #:button-text (G_ "Exit")
+     #:button-callback-procedure button-exit-action)))
 
 (define (run-fs-type-page)
   "Run a page asking the user to select a file-system type."
@@ -114,8 +114,8 @@ Be careful, all data on the disk will be lost.")
    #:listbox-items '(ext4 btrfs fat32 swap)
    #:listbox-item->text user-fs-type-name
    #:sort-listbox-items? #f
-   #:button-text (G_ "Cancel")
-   #:button-callback-procedure button-cancel-action))
+   #:button-text (G_ "Exit")
+   #:button-callback-procedure button-exit-action))
 
 (define (inform-can-create-partition? user-partition)
   "Return #t if it is possible to create USER-PARTITION. This is determined by
@@ -563,7 +563,7 @@ edit it."
                         path))
                (result (choice-window (G_ "Delete disk")
                                       (G_ "Ok")
-                                      (G_ "Cancel")
+                                      (G_ "Exit")
                                       info-text)))
           (case result
             ((1)
@@ -584,7 +584,7 @@ edit it."
                             number-str))
                    (result (choice-window (G_ "Delete partition")
                                           (G_ "Ok")
-                                          (G_ "Cancel")
+                                          (G_ "Exit")
                                           info-text)))
               (case result
                 ((1)
@@ -616,8 +616,8 @@ At least one partition must have its mounting point set to '/'.")
           #:allow-delete? #t
           #:button-text (G_ "Ok")
           #:button-callback-procedure button-ok-action
-          #:button2-text (G_ "Cancel")
-          #:button2-callback-procedure button-cancel-action
+          #:button2-text (G_ "Exit")
+          #:button2-callback-procedure button-exit-action
           #:listbox-callback-procedure listbox-action
           #:hotkey-callback-procedure hotkey-action)))
     (if (eq? result #t)
@@ -664,8 +664,8 @@ At least one partition must have its mounting point set to '/'.")
                     #:title (G_ "Partitioning method")
                     #:listbox-items items
                     #:listbox-item->text cdr
-                    #:button-text (G_ "Cancel")
-                    #:button-callback-procedure button-cancel-action))
+                    #:button-text (G_ "Exit")
+                    #:button-callback-procedure button-exit-action))
            (method (car result)))
       (case method
         ((entire)
@@ -674,7 +674,7 @@ At least one partition must have its mounting point set to '/'.")
                 (disk (if disk-type
                           (disk-new device)
                           (let* ((label (run-label-page
-                                         button-cancel-action))
+                                         button-exit-action))
                                  (disk (mklabel device label)))
                             (disk-commit disk)
                             disk)))
diff --git a/gnu/installer/newt/services.scm b/gnu/installer/newt/services.scm
index 80fac43dc8..6bcb6244ae 100644
--- a/gnu/installer/newt/services.scm
+++ b/gnu/installer/newt/services.scm
@@ -38,7 +38,7 @@ choose the one to use on the log-in screen with F1.")
    #:items %desktop-environments
    #:item->text desktop-environment-name
    #:checkbox-tree-height 5
-   #:cancel-button-callback-procedure
+   #:exit-button-callback-procedure
    (lambda ()
      (raise
       (condition
diff --git a/gnu/installer/newt/timezone.scm b/gnu/installer/newt/timezone.scm
index 874f4a0734..6c96ee55b1 100644
--- a/gnu/installer/newt/timezone.scm
+++ b/gnu/installer/newt/timezone.scm
@@ -60,7 +60,7 @@ returned."
          #:listbox-items timezones
          #:listbox-item->text identity
          #:button-text (if (null? path)
-                           (G_ "Cancel")
+                           (G_ "Exit")
                            (G_ "Back"))
          #:button-callback-procedure
          (if (null? path)
diff --git a/gnu/installer/newt/user.scm b/gnu/installer/newt/user.scm
index 8337d628ae..c043f53def 100644
--- a/gnu/installer/newt/user.scm
+++ b/gnu/installer/newt/user.scm
@@ -116,7 +116,7 @@
                      '()
                      (list GRID-ELEMENT-COMPONENT del-button)))))
            (ok-button (make-button -1 -1 (G_ "Ok")))
-           (cancel-button (make-button -1 -1 (G_ "Cancel")))
+           (exit-button (make-button -1 -1 (G_ "Exit")))
            (title "User creation")
            (grid
             (vertically-stacked-grid
@@ -126,7 +126,7 @@
                                    GRID-ELEMENT-SUBGRID listbox-button-grid)
              GRID-ELEMENT-SUBGRID (horizontal-stacked-grid
                                    GRID-ELEMENT-COMPONENT ok-button
-                                   GRID-ELEMENT-COMPONENT cancel-button)))
+                                   GRID-ELEMENT-COMPONENT exit-button)))
            (sorted-users (sort users (lambda (a b)
                                        (string<= (user-name a)
                                                  (user-name b)))))
diff --git a/gnu/installer/newt/wifi.scm b/gnu/installer/newt/wifi.scm
index de443345f6..c744e826a9 100644
--- a/gnu/installer/newt/wifi.scm
+++ b/gnu/installer/newt/wifi.scm
@@ -198,7 +198,7 @@ force a wifi scan."
           (make-reflowed-textbox -1 -1 info-text
                                  (info-textbox-width)
                                  #:flags FLAG-BORDER))
-         (cancel-button (make-button -1 -1 (G_ "Cancel")))
+         (exit-button (make-button -1 -1 (G_ "Exit")))
          (scan-button (make-button -1 -1 (G_ "Scan")))
          (services (wifi-services))
          (service-items '()))
@@ -211,12 +211,12 @@ force a wifi scan."
     (set-grid-field middle-grid 1 0 GRID-ELEMENT-COMPONENT scan-button
                     #:anchor ANCHOR-TOP
                     #:pad-left 2)
-    (set-grid-field buttons-grid 0 0 GRID-ELEMENT-COMPONENT cancel-button)
+    (set-grid-field buttons-grid 0 0 GRID-ELEMENT-COMPONENT exit-button)
 
     (add-components-to-form form
                             info-textbox
                             listbox scan-button
-                            cancel-button)
+                            exit-button)
     (make-wrapped-grid-window
      (basic-window-grid info-textbox middle-grid buttons-grid)
      (G_ "Wifi"))
@@ -231,7 +231,7 @@ force a wifi scan."
              ((components=? argument scan-button)
               (run-wifi-scan-page)
               (run-wifi-page))
-             ((components=? argument cancel-button)
+             ((components=? argument exit-button)
               (raise
                (condition
                 (&installer-step-abort))))