[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
62/68: installer: keymap: Put English layout and international variant a
From: |
guix-commits |
Subject: |
62/68: installer: keymap: Put English layout and international variant ahead. |
Date: |
Thu, 17 Jan 2019 08:05:21 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit cb614af01146d9d4be40e705f71db4efcbe684e7
Author: Mathieu Othacehe <address@hidden>
Date: Sat Jan 12 18:26:11 2019 +0100
installer: keymap: Put English layout and international variant ahead.
* gnu/installer/newt/keymap.scm (sort-layouts): New procedure,
(sort-variants): new procedure,
(run-keymap-page): use the two procedures above to sort layouts and
variants.
---
gnu/installer/newt/keymap.scm | 36 +++++++++++++++++++++++++++++++-----
1 file changed, 31 insertions(+), 5 deletions(-)
diff --git a/gnu/installer/newt/keymap.scm b/gnu/installer/newt/keymap.scm
index 55a0aa6..6211af2 100644
--- a/gnu/installer/newt/keymap.scm
+++ b/gnu/installer/newt/keymap.scm
@@ -24,6 +24,7 @@
#:use-module (guix records)
#:use-module (newt)
#:use-module (srfi srfi-1)
+ #:use-module (srfi srfi-26)
#:use-module (srfi srfi-34)
#:use-module (srfi srfi-35)
#:export (run-keymap-page))
@@ -35,6 +36,7 @@
#:info-text (G_ "Please choose your keyboard layout.")
#:listbox-items layouts
#:listbox-item->text layout->text
+ #:sort-listbox-items? #f
#:button-text (G_ "Exit")
#:button-callback-procedure
(lambda _
@@ -49,6 +51,7 @@
#:info-text (G_ "Please choose a variant for your keyboard layout.")
#:listbox-items variants
#:listbox-item->text variant->text
+ #:sort-listbox-items? #f
#:button-text (G_ "Back")
#:button-callback-procedure
(lambda _
@@ -56,6 +59,28 @@
(condition
(&installer-step-abort)))))))
+(define (sort-layouts layouts)
+ "Sort LAYOUTS list by putting the US layout ahead and return it."
+ (call-with-values
+ (lambda ()
+ (partition
+ (lambda (layout)
+ (let ((name (x11-keymap-layout-name layout)))
+ (string=? name "us")))
+ layouts))
+ (cut append <> <>)))
+
+(define (sort-variants variants)
+ "Sort VARIANTS list by putting the internation variant ahead and return it."
+ (call-with-values
+ (lambda ()
+ (partition
+ (lambda (variant)
+ (let ((name (x11-keymap-variant-name variant)))
+ (string=? name "altgr-intl")))
+ variants))
+ (cut append <> <>)))
+
(define* (run-keymap-page layouts)
"Run a page asking the user to select a keyboard layout and variant. LAYOUTS
is a list of supported X11-KEYMAP-LAYOUT. Return a list of two elements, the
@@ -67,7 +92,7 @@ names of the selected keyboard layout and variant."
(compute
(lambda _
(run-layout-page
- layouts
+ (sort-layouts layouts)
(lambda (layout)
(x11-keymap-layout-description layout))))))
;; Propose the user to select a variant among those supported by the
@@ -80,10 +105,11 @@ names of the selected keyboard layout and variant."
(variants (x11-keymap-layout-variants layout)))
;; Return #f if the layout does not have any variant.
(and (not (null? variants))
- (run-variant-page variants
- (lambda (variant)
- (x11-keymap-variant-description
- variant))))))))))
+ (run-variant-page
+ (sort-variants variants)
+ (lambda (variant)
+ (x11-keymap-variant-description
+ variant))))))))))
(define (format-result result)
(let ((layout (x11-keymap-layout-name
- 26/68: installer: Add hostname., (continued)
- 26/68: installer: Add hostname., guix-commits, 2019/01/17
- 10/68: guix: self: Do not install (gnu system install)., guix-commits, 2019/01/17
- 25/68: installer: Add services page., guix-commits, 2019/01/17
- 11/68: gnu: installer: Launch the installer as kmscon login-program., guix-commits, 2019/01/17
- 13/68: installer: Move everything to the build side., guix-commits, 2019/01/17
- 15/68: tests: Rename %test-encrypted-os to %test-encrypted-root-os., guix-commits, 2019/01/17
- 17/68: services: herd: Allow to pass arguments to start-service., guix-commits, 2019/01/17
- 19/68: gnu: Add guile-parted., guix-commits, 2019/01/17
- 16/68: build: syscalls: Add device-in-use?., guix-commits, 2019/01/17
- 18/68: gnu: guile-newt: Update to revision 4., guix-commits, 2019/01/17
- 62/68: installer: keymap: Put English layout and international variant ahead.,
guix-commits <=
- 12/68: installer: Rewrite welcome page., guix-commits, 2019/01/17
- 64/68: syscalls: 'device-in-use?' does not create a port., guix-commits, 2019/01/17
- 14/68: installer: Fix locale installation., guix-commits, 2019/01/17
- 68/68: installer: Fix manual partitioning., guix-commits, 2019/01/17
- 66/68: installer: Adjust messages on the final page., guix-commits, 2019/01/17
- 65/68: syscalls: 'device-in-use?' returns #f upon EINVAL., guix-commits, 2019/01/17
- 67/68: installer: "formating" → "formatting"., guix-commits, 2019/01/17
- 63/68: installer: partition: Add encryption password confirmation., guix-commits, 2019/01/17
- 03/68: services: kmscon: Remove virtual-terminal requirement., guix-commits, 2019/01/17
- 04/68: gnu: kmscon: Add runtime keymap update support., guix-commits, 2019/01/17