[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
110/197: installer: Add an explanatory text to the main page.
From: |
Danny Milosavljevic |
Subject: |
110/197: installer: Add an explanatory text to the main page. |
Date: |
Mon, 3 Jul 2017 20:37:09 -0400 (EDT) |
dannym pushed a commit to branch wip-installer-2
in repository guix.
commit c00aea621dd592607ed56fa4cc45ea8690147c53
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)
- 151/197: installer: Avoid wpa_supplicant's output causing screen damage., (continued)
- 151/197: installer: Avoid wpa_supplicant's output causing screen damage., Danny Milosavljevic, 2017/07/03
- 99/197: installer: Exit the format page after all partitions are successfully formatted., Danny Milosavljevic, 2017/07/03
- 101/197: installer: Replace one usage of car with match., Danny Milosavljevic, 2017/07/03
- 109/197: installer: Fix bug where the selected item of main page was not indicated., Danny Milosavljevic, 2017/07/03
- 104/197: installer: Support btrfs, Danny Milosavljevic, 2017/07/03
- 111/197: gurses: Change highlighting from bold to inverse., Danny Milosavljevic, 2017/07/03
- 108/197: installer: Do not add file systems which are invalid., Danny Milosavljevic, 2017/07/03
- 164/197: gurses: Use match instead of car., Danny Milosavljevic, 2017/07/03
- 170/197: installer: Remove unused procedure., Danny Milosavljevic, 2017/07/03
- 152/197: installer: New file i18n.scm., Danny Milosavljevic, 2017/07/03
- 110/197: installer: Add an explanatory text to the main page.,
Danny Milosavljevic <=
- 120/197: gurses: Mini refactor., Danny Milosavljevic, 2017/07/03
- 124/197: gurses: Populate dropdown boxes in forms using a menu., Danny Milosavljevic, 2017/07/03
- 131/197: gurses: Use inverse instead of underline for field value area., Danny Milosavljevic, 2017/07/03
- 133/197: installer: Change livery., Danny Milosavljevic, 2017/07/03
- 146/197: gurses: Use match instead of car/cdr in line-split., Danny Milosavljevic, 2017/07/03
- 147/197: gurses: In paragraph-format avoid use of car and cdr., Danny Milosavljevic, 2017/07/03
- 144/197: gurses: Avoid one more use of car and cdr., Danny Milosavljevic, 2017/07/03
- 143/197: gurses: Add predicate to test if a complex char is blank., Danny Milosavljevic, 2017/07/03
- 149/197: gurses: Add new procedure "word-endings"., Danny Milosavljevic, 2017/07/03
- 155/197: installer: Use _ instead of M_ for host-name-refresh., Danny Milosavljevic, 2017/07/03