[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/18: installer: New page to select language.
From: |
John Darrington |
Subject: |
07/18: installer: New page to select language. |
Date: |
Thu, 2 Feb 2017 18:13:04 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit 4ff86a2f57ee67391f2395398a2dd139c76ba526
Author: John Darrington <address@hidden>
Date: Mon Jan 30 20:27:14 2017 +0100
installer: New page to select language.
* gnu/system/installer/locale.scm: New module.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
* gnu/system/installer/guixsd-installer.scm (base-page-key-handler): Launch
new page
on f9.
---
gnu/local.mk | 1 +
gnu/system/installer/guixsd-installer.scm | 5 +-
gnu/system/installer/locale.scm | 137 +++++++++++++++++++++++++++++
3 files changed, 141 insertions(+), 2 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 05e729a..293580f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -452,6 +452,7 @@ GNU_SYSTEM_MODULES = \
%D%/system/installer/guixsd-installer.scm \
%D%/system/installer/disks.scm \
%D%/system/installer/format.scm \
+ %D%/system/installer/locale.scm \
%D%/system/installer/ping.scm \
%D%/system/installer/key-map.scm \
%D%/system/installer/role.scm \
diff --git a/gnu/system/installer/guixsd-installer.scm
b/gnu/system/installer/guixsd-installer.scm
index 3674944..b2af6cb 100644
--- a/gnu/system/installer/guixsd-installer.scm
+++ b/gnu/system/installer/guixsd-installer.scm
@@ -28,6 +28,7 @@
(gnu system installer configure)
(gnu system installer filesystems)
(gnu system installer hostname)
+ (gnu system installer locale)
(gnu system installer key-map)
(gnu system installer time-zone)
(gnu system installer role)
@@ -164,8 +165,8 @@
(system* "bash" "--rcfile" file-name))))
((eqv? ch (key-f 9))
- (setlocale LC_ALL "de_DE.UTF-8")
- )
+ (let ((p (make-locale-page page (gettext "Change locale"))))
+ (page-enter p)))
((eqv? ch (key-f 10))
(match (which "loadkeys")
diff --git a/gnu/system/installer/locale.scm b/gnu/system/installer/locale.scm
new file mode 100644
index 0000000..08de543
--- /dev/null
+++ b/gnu/system/installer/locale.scm
@@ -0,0 +1,137 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2017 John Darrington <address@hidden>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu system installer locale)
+ #:use-module (gnu system installer page)
+ #:use-module (gnu system installer misc)
+ #:use-module (gnu system installer utils)
+ #:use-module (gnu system locale)
+ #:use-module (gurses menu)
+ #:use-module (gurses buttons)
+ #:use-module (ncurses curses)
+ #:use-module (ice-9 format)
+ #:export (make-locale-page))
+
+(include "i18n.scm")
+
+(define my-buttons `((cancel ,(M_ "Canc_el") #t)))
+
+(define (make-locale-page parent title)
+ (make-page (page-surface parent)
+ title
+ locale-page-refresh
+ 0
+ locale-page-key-handler))
+
+(define (locale-page-refresh page)
+ (when (not (page-initialised? page))
+ (locale-page-init page)
+ (page-set-initialised! page #t))
+
+ (let ((win (page-datum page 'text-window))
+ (menu (page-datum page 'menu)))
+ (clear win)
+ (addstr win
+ (justify* (gettext "The following languages are available.")
+ (getmaxx win)))
+
+ (touchwin (outer (page-wwin page)))
+ (refresh* (outer (page-wwin page)))
+ (refresh* (inner (page-wwin page)))
+ (menu-redraw menu)
+ (menu-refresh menu)))
+
+(define (locale-page-key-handler page ch)
+ (let ((menu (page-datum page 'menu))
+ (nav (page-datum page 'navigation)))
+
+ (cond
+ ((eq? ch KEY_RIGHT)
+ (menu-set-active! menu #f)
+ (buttons-select-next nav))
+
+ ((eq? ch #\tab)
+ (cond
+ ((menu-active menu)
+ (menu-set-active! menu #f)
+ (buttons-select nav 0))
+
+ ((eqv? (buttons-selected nav) (1- (buttons-n-buttons nav)))
+ (menu-set-active! menu #t)
+ (buttons-unselect-all nav))
+
+ (else
+ (buttons-select-next nav))))
+
+ ((eq? ch KEY_LEFT)
+ (menu-set-active! menu #f)
+ (buttons-select-prev nav))
+
+ ((eq? ch KEY_UP)
+ (buttons-unselect-all nav)
+ (menu-set-active! menu #t))
+
+ ((and (eq? ch #\newline)
+ (menu-active menu))
+ (let ((locale (menu-get-current-item menu)))
+ (setlocale LC_ALL (locale-definition-name locale))
+ (page-leave)))
+
+ ((buttons-key-matches-symbol? nav ch 'cancel)
+ (page-leave)))
+
+ (std-menu-key-handler menu ch))
+
+ #f
+ )
+
+(define (locale-page-init p)
+ (let* ((s (page-surface p))
+ (frame (make-boxed-window #f
+ (- (getmaxy s) 4) (- (getmaxx s) 2)
+ 2 1
+ #:title (page-title p)))
+ (button-window (derwin (inner frame)
+ 3 (getmaxx (inner frame))
+ (- (getmaxy (inner frame)) 3) 0
+ #:panel #f))
+ (buttons (make-buttons my-buttons 1))
+
+ (text-window (derwin (inner frame)
+ 4
+ (getmaxx (inner frame))
+ 0 0 #:panel #f))
+
+ (menu-window (derwin (inner frame)
+ (- (getmaxy (inner frame)) 3 (getmaxy text-window))
+ (getmaxx (inner frame))
+ (getmaxy text-window) 0 #:panel #f))
+
+ (menu (make-menu %default-locale-definitions
+ #:disp-proc (lambda (d row)
+ (locale-definition-name d)))))
+
+ (push-cursor (page-cursor-visibility p))
+ (page-set-datum! p 'text-window text-window)
+ (page-set-wwin! p frame)
+ (page-set-datum! p 'menu menu)
+ (page-set-datum! p 'navigation buttons)
+ (menu-post menu menu-window)
+ (buttons-post buttons button-window)
+ (refresh* (outer frame))
+ (refresh* button-window)))
- 04/18: installer: Add optional arguments to addstr*., (continued)
- 04/18: installer: Add optional arguments to addstr*., John Darrington, 2017/02/02
- 02/18: installer: New gettext keyword M_., John Darrington, 2017/02/02
- 01/18: installer: Avoid wpa_supplicant's output causing screen damage., John Darrington, 2017/02/02
- 05/18: installer: Main page: Redisplay translatable strings upon refresh., John Darrington, 2017/02/02
- 09/18: installer: Correct placement of gettext call., John Darrington, 2017/02/02
- 08/18: installer: Replace 'file-browser' with 'key-map'., John Darrington, 2017/02/02
- 06/18: installer: Use _ instead of M_ for host-name-refresh., John Darrington, 2017/02/02
- 14/18: gurses: Cache the windows of buttons., John Darrington, 2017/02/02
- 16/18: installer: New procedure key-value-slurp., John Darrington, 2017/02/02
- 18/18: installer: Fix bug when changing languages., John Darrington, 2017/02/02
- 07/18: installer: New page to select language.,
John Darrington <=
- 10/18: installer: Fix i18n in dialogs., John Darrington, 2017/02/02
- 17/18: installer: Provide verbose description of locale., John Darrington, 2017/02/02
- 03/18: installer: New file i18n.scm., John Darrington, 2017/02/02
- 11/18: installer: New convenience procedures., John Darrington, 2017/02/02
- 13/18: gurses: Avoid one use of car/cdr., John Darrington, 2017/02/02
- 15/18: gurses: Use match instead of car., John Darrington, 2017/02/02
- 12/18: installer: Improve i18n in ping page., John Darrington, 2017/02/02