summary refs log tree commit diff
path: root/gnu/installer/newt/page.scm
diff options
context:
space:
mode:
authorMathieu Othacehe <m.othacehe@gmail.com>2018-12-05 19:50:17 +0900
committerLudovic Courtès <ludo@gnu.org>2019-01-17 14:04:25 +0100
commit7d812901daf0259d5d381199168d6d2994ce00ac (patch)
tree4d54612b3f8deae34814708a8d0615b7df1ed809 /gnu/installer/newt/page.scm
parent30cf5e04264e18b2fd0dcc73cbce2ef4324563e1 (diff)
downloadguix-7d812901daf0259d5d381199168d6d2994ce00ac.tar.gz
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.
Diffstat (limited to 'gnu/installer/newt/page.scm')
-rw-r--r--gnu/installer/newt/page.scm24
1 files changed, 12 insertions, 12 deletions
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))))))