[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/26: installer: Add an explanatory text to the main page.
From: |
John Darrington |
Subject: |
06/26: installer: Add an explanatory text to the main page. |
Date: |
Sun, 22 Jan 2017 12:09:24 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit f748a8bb91deecc80bed3d7a98849cc4e9b21c72
Author: John Darrington <address@hidden>
Date: Tue Jan 17 08:06:46 2017 +0100
installer: Add an explanatory text to the main page.
* gnu/system/installer/guixsd-installer.scm (main-page-init): Add
a text box and some text for it.
---
gnu/system/installer/guixsd-installer.scm | 41 ++++++++++++++++++-----------
1 file changed, 25 insertions(+), 16 deletions(-)
diff --git a/gnu/system/installer/guixsd-installer.scm
b/gnu/system/installer/guixsd-installer.scm
index cb930be..0d5c320 100644
--- a/gnu/system/installer/guixsd-installer.scm
+++ b/gnu/system/installer/guixsd-installer.scm
@@ -222,32 +222,41 @@ tail of the list."
(define (main-page-init page)
(let* ((frame (make-boxed-window (page-surface page) (lines) (cols) 0 0
#:title (page-title page)))
- (background (inner frame)))
+ (background (inner frame))
- (let ((win (derwin background (- (getmaxy background) 3)
- (- (getmaxx background) 2) 0 1 #:panel #f))
- (main-menu (make-menu main-options
- #:disp-proc (lambda (datum row)
- (format #f "~a"
- (task-title (cdr
datum)))))))
- (page-set-wwin! page frame)
- (page-set-datum! page 'menu main-menu)
- (menu-post main-menu win))
+ (text-window (derwin background 4 (getmaxx background)
+ 0 0))
+
+ (win (derwin background (- (getmaxy background) (getmaxy text-window)
3)
+ (- (getmaxx background) 2) (getmaxy text-window) 1
#:panel #f))
+
+ (main-menu (make-menu main-options
+ #:disp-proc (lambda (datum row)
+ (format #f "~a"
+ (task-title (cdr
datum)))))))
+
+ (addstr* text-window (format #f
+ (gettext
+ "To start the complete installation process, choose ~s. Alternatively,
you may run each step individually for a slower, more controlled experience.")
installation-menu-title))
+
+ (page-set-wwin! page frame)
+ (page-set-datum! page 'menu main-menu)
+ (menu-post main-menu win)
(push-cursor (page-cursor-visibility page))
;; Do the key action labels
(let ((ypos (1- (getmaxy background)))
- (str0 (gettext "Get a Shell <F1>"))
- (str1 (gettext "Language <F9>"))
- (str2 (gettext "Keyboard <F10>")))
+ (str0 (gettext "Get a Shell <F1>"))
+ (str1 (gettext "Language <F9>"))
+ (str2 (gettext "Keyboard <F10>")))
(addstr background str0 #:y ypos #:x 0)
(addstr background str1 #:y ypos #:x
- (truncate (/ (- (getmaxx background)
- (string-length str1)) 2)))
+ (truncate (/ (- (getmaxx background)
+ (string-length str1)) 2)))
(addstr background str2 #:y ypos #:x
- (- (getmaxx background) (string-length str2))))))
+ (- (getmaxx background) (string-length str2))))))
(define (main-page-refresh page)
- 14/26: installer: Distinguish between Wifi encryption methods., (continued)
- 14/26: installer: Distinguish between Wifi encryption methods., John Darrington, 2017/01/22
- 01/26: installer: Extend the 'file-system' concept to include swap spaces., John Darrington, 2017/01/22
- 21/26: installer: Do not assume the root file system is of type "ext4"., John Darrington, 2017/01/22
- 17/26: installer: Note which types of file system are supported., John Darrington, 2017/01/22
- 25/26: installer: Emphasise that writing filesystems destroys existing data., John Darrington, 2017/01/22
- 05/26: installer: Fix bug where the selected item of main page was not indicated., John Darrington, 2017/01/22
- 08/26: gurses: form: Use match instead of car, cdr etc., John Darrington, 2017/01/22
- 03/26: installer: Do not allow the creation of invalid file-system specificaitons., John Darrington, 2017/01/22
- 15/26: gurses: Allow menu update to work for panel windows., John Darrington, 2017/01/22
- 18/26: gurses: Populate the choices box in forms., John Darrington, 2017/01/22
- 06/26: installer: Add an explanatory text to the main page.,
John Darrington <=
- 22/26: installer: mount-points page: Enlarge the forms window., John Darrington, 2017/01/22
- 13/26: installer: Remove unnecessary "begin"., John Darrington, 2017/01/22
- 24/26: installer: Remove redundant list of file system types., John Darrington, 2017/01/22
- 20/26: gurses: Populate dropdown boxes in forms using a menu., John Darrington, 2017/01/22
- 12/26: installer: Fix bug in config generation., John Darrington, 2017/01/22
- 26/26: doc: Remove the text which mentions there is no graphical installer., John Darrington, 2017/01/22
- 19/26: installer: Add a popup window for forms which have multiple choice fields., John Darrington, 2017/01/22
- 16/26: gurses: Mini refactor., John Darrington, 2017/01/22
- 09/26: installer: Explicitly set the #:panel parameter for window creation procedures., John Darrington, 2017/01/22
- 11/26: installer: New procedure refresh*., John Darrington, 2017/01/22