[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
34/67: installer: Remove group selection in user page.
From: |
guix-commits |
Subject: |
34/67: installer: Remove group selection in user page. |
Date: |
Wed, 16 Jan 2019 19:00:41 -0500 (EST) |
civodul pushed a commit to branch wip-newt-installer
in repository guix.
commit b4087351822957e1047d047b84d74f509a168dbf
Author: Mathieu Othacehe <address@hidden>
Date: Wed Dec 5 14:48:38 2018 +0900
installer: Remove group selection in user page.
Assume that the user's group is always "users".
* gnu/installer/newt/user.scm (run-user-add-page): Remove group fields,
(run-user-page): ditto.
---
gnu/installer/newt/user.scm | 36 +++++++++++++++---------------------
1 file changed, 15 insertions(+), 21 deletions(-)
diff --git a/gnu/installer/newt/user.scm b/gnu/installer/newt/user.scm
index f342caa..8337d62 100644
--- a/gnu/installer/newt/user.scm
+++ b/gnu/installer/newt/user.scm
@@ -17,6 +17,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu installer newt user)
+ #:use-module (gnu installer user)
#:use-module (gnu installer newt page)
#:use-module (gnu installer newt utils)
#:use-module (guix i18n)
@@ -33,16 +34,12 @@
(let* ((label-name
(make-label -1 -1 (pad-label (G_ "Name"))))
- (label-group
- (make-label -1 -1 (pad-label (G_ "Group"))))
(label-home-directory
(make-label -1 -1 (pad-label (G_ "Home directory"))))
(entry-width 30)
(entry-name (make-entry -1 -1 entry-width))
- (entry-group (make-entry -1 -1 entry-width
- #:initial-value "users"))
(entry-home-directory (make-entry -1 -1 entry-width))
- (entry-grid (make-grid 2 3))
+ (entry-grid (make-grid 2 2))
(button-grid (make-grid 1 1))
(ok-button (make-button -1 -1 (G_ "Ok")))
(grid (make-grid 1 2))
@@ -53,10 +50,8 @@
(set-entry-grid-field 0 0 label-name)
(set-entry-grid-field 1 0 entry-name)
- (set-entry-grid-field 0 1 label-group)
- (set-entry-grid-field 1 1 entry-group)
- (set-entry-grid-field 0 2 label-home-directory)
- (set-entry-grid-field 1 2 entry-home-directory)
+ (set-entry-grid-field 0 1 label-home-directory)
+ (set-entry-grid-field 1 1 entry-home-directory)
(set-grid-field button-grid 0 0 GRID-ELEMENT-COMPONENT ok-button)
@@ -67,8 +62,8 @@
(string-append "/home/" (entry-value entry-name)))))
(add-components-to-form form
- label-name label-group label-home-directory
- entry-name entry-group entry-home-directory
+ label-name label-home-directory
+ entry-name entry-home-directory
ok-button)
(make-wrapped-grid-window (vertically-stacked-grid
@@ -88,17 +83,15 @@
(cond
((components=? argument ok-button)
(let ((name (entry-value entry-name))
- (group (entry-value entry-group))
(home-directory (entry-value entry-home-directory)))
(if (or (string=? name "")
- (string=? group "")
(string=? home-directory ""))
(begin
(error-page)
(run-user-add-page))
- `((name . ,name)
- (group . ,group)
- (home-directory . ,home-directory))))))))
+ (user
+ (name name)
+ (home-directory home-directory))))))))
(lambda ()
(destroy-form-and-pop form)))))))
@@ -124,7 +117,7 @@
(list GRID-ELEMENT-COMPONENT del-button)))))
(ok-button (make-button -1 -1 (G_ "Ok")))
(cancel-button (make-button -1 -1 (G_ "Cancel")))
- (title "User selection")
+ (title "User creation")
(grid
(vertically-stacked-grid
GRID-ELEMENT-COMPONENT info-textbox
@@ -135,13 +128,13 @@
GRID-ELEMENT-COMPONENT ok-button
GRID-ELEMENT-COMPONENT cancel-button)))
(sorted-users (sort users (lambda (a b)
- (string<= (assoc-ref a 'name)
- (assoc-ref b 'name)))))
+ (string<= (user-name a)
+ (user-name b)))))
(listbox-elements
(map
(lambda (user)
`((key . ,(append-entry-to-listbox listbox
- (assoc-ref user 'name)))
+ (user-name user)))
(user . ,user)))
sorted-users))
(form (make-form)))
@@ -175,7 +168,8 @@
(when (null? users)
(run-error-page (G_ "Please create at least one user.")
(G_ "No user"))
- (run users))))))
+ (run users))
+ users))))
(lambda ()
(destroy-form-and-pop form))))))
(run '()))
- 22/67: installer: Add configuration formatter., (continued)
- 22/67: installer: Add configuration formatter., guix-commits, 2019/01/16
- 57/67: installer: parted: Do not call BLKRRPART on loop devices., guix-commits, 2019/01/16
- 08/67: doc: Document the graphical installer., guix-commits, 2019/01/16
- 03/67: gnu: kmscon: Add runtime keymap update support., guix-commits, 2019/01/16
- 27/67: installer: Redirect to TTY3 root shell for unguided install., guix-commits, 2019/01/16
- 13/67: installer: Fix locale installation., guix-commits, 2019/01/16
- 29/67: installer: Fix comments., guix-commits, 2019/01/16
- 25/67: installer: Add hostname., guix-commits, 2019/01/16
- 32/67: installer: Reorder POTFILES.in, guix-commits, 2019/01/16
- 38/67: installer: locale: Set English as the default language., guix-commits, 2019/01/16
- 34/67: installer: Remove group selection in user page.,
guix-commits <=
- 40/67: installer: keymap: Do not fail on non-kmscon terminals., guix-commits, 2019/01/16
- 45/67: installer: Make exit button optional for run-file-textbox-page., guix-commits, 2019/01/16
- 43/67: installer: partition: Differenciate Back button from Exit button., guix-commits, 2019/01/16
- 48/67: installer: menu: Fix typo., guix-commits, 2019/01/16
- 52/67: installer: Clear screen upon exit., guix-commits, 2019/01/16
- 44/67: installer: Make sure every sentence is dot terminated., guix-commits, 2019/01/16
- 47/67: installer: partition: Precise when using Manual/Guided partionment., guix-commits, 2019/01/16
- 65/67: installer: Adjust messages on the final page., guix-commits, 2019/01/16
- 66/67: installer: "formating" → "formatting"., guix-commits, 2019/01/16
- 12/67: installer: Move everything to the build side., guix-commits, 2019/01/16