[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: installer: Rename *-focused-item to *-selected-item.
|
From: |
Danny Milosavljevic |
|
Subject: |
01/01: installer: Rename *-focused-item to *-selected-item. |
|
Date: |
Fri, 7 Jul 2017 01:52:28 -0400 (EDT) |
dannym pushed a commit to branch wip-installer-2
in repository guix.
commit 598fcfab63a4d7058a2037ddeef4d7d6e7ad09b1
Author: Danny Milosavljevic <address@hidden>
Date: Fri Jul 7 07:33:52 2017 +0200
installer: Rename *-focused-item to *-selected-item.
* gnu/system/installer/configure.scm (configure-page-activate-focused-item):
Rename to...
(configure-page-activate-selected-item): ...this.
(make-configure-page): Use it here.
* gnu/system/installer/disks.scm (disk-page-activate-focused-item):
Rename to...
(disk-page-activate-selected-item): ...this.
(make-disk-page): Use it here.
* gnu/system/installer/mount-point.scm
(mount-point-page-activate-focused-item): Rename to...
(mount-point-page-activate-selected-item): ...this.
* gnu/system/installer/filesystems.scm
(filesystem-page-activate-focused-item): Rename to...
(filesystem-page-activate-selected-item): ...this.
Use mount-point-page-activate-selected-item.
(make-filesystem-page): Use it here.
* gnu/system/installer/format.scm (format-page-activate-focused-item):
Rename to...
(format-page-activate-selected-item): ...this.
(make-format-page): Use it here.
* gnu/system/installer/guixsd-installer.scm
(main-page-activate-focused-item):
Rename to...
(main-page-activate-selected-item): ...this.
(guixsd-installer): Use it here.
* gnu/system/installer/key-map.scm (key-map-activate-focused-item): Rename
to...
(key-map-activate-selected-item): ...this.
(make-key-map): Use it here.
* gnu/system/installer/locale.scm (locale-page-activate-focused-item):
Rename
to...
(locale-page-activate-selected-item): ...this.
(make-locale-page): Use it here.
* gnu/system/installer/ping.scm (ping-page-activate-focused-item): Rename
to...
(ping-page-activate-selected-item): ...this. Export it.
* gnu/system/installer/network.scm (network-page-activate-focused-item):
Rename to...
(network-page-activate-selected-item): ...this. Use
ping-page-activate-selected-item.
(make-network-page): Use it here.
* gnu/system/installer/page.scm (page-activate-focused-item): Rename to...
(page-activate-selected-item): ...this.
(page-default-mouse-handler): Use it here.
(page-default-key-handler): Use it here.
* gnu/system/installer/role.scm (role-page-activate-focused-item): Rename
to...
(role-page-activate-selected-item): ...this.
(make-role-page): Use it here.
* gnu/system/installer/time-zone.scm (time-zone-activate-focused-item):
Rename to...
(time-zone-activate-selected-item): ...this.
(make-tz-browser): Use it here.
* gnu/system/installer/user-edit.scm (user-edit-activate-focused-item):
Rename to...
(user-edit-activate-selected-item): ...this.
(make-user-edit-page): Use it here.
* gnu/system/installer/users.scm (users-page-activate-focused-item):
Rename to...
(user-edit-activate-selected-item): ...this.
(make-users-page): Use it here.
* gnu/system/installer/wireless.scm (wireless-page-activate-focused-item):
Rename to...
(wireless-page-activate-selected-item): ...this.
(make-wireless-page): Use it here.
---
gnu/system/installer/configure.scm | 4 ++--
gnu/system/installer/disks.scm | 6 +++---
gnu/system/installer/filesystems.scm | 6 +++---
gnu/system/installer/format.scm | 4 ++--
gnu/system/installer/guixsd-installer.scm | 4 ++--
gnu/system/installer/key-map.scm | 4 ++--
gnu/system/installer/locale.scm | 4 ++--
gnu/system/installer/mount-point.scm | 4 ++--
gnu/system/installer/network.scm | 6 +++---
gnu/system/installer/page.scm | 8 ++++----
gnu/system/installer/ping.scm | 4 ++--
gnu/system/installer/role.scm | 4 ++--
gnu/system/installer/time-zone.scm | 5 +++--
gnu/system/installer/user-edit.scm | 4 ++--
gnu/system/installer/users.scm | 4 ++--
gnu/system/installer/wireless.scm | 4 ++--
16 files changed, 38 insertions(+), 37 deletions(-)
diff --git a/gnu/system/installer/configure.scm
b/gnu/system/installer/configure.scm
index d1390c2..29296a8 100644
--- a/gnu/system/installer/configure.scm
+++ b/gnu/system/installer/configure.scm
@@ -45,7 +45,7 @@
title
configure-page-refresh
0
- #:activator configure-page-activate-focused-item)))
+ #:activator configure-page-activate-selected-item)))
page))
@@ -75,7 +75,7 @@
""
"/tmp"))
-(define (configure-page-activate-focused-item page)
+(define (configure-page-activate-selected-item page)
(let ((nav (page-datum page 'navigation))
(test-window (page-datum page 'test-window)))
(match (buttons-selected-symbol nav)
diff --git a/gnu/system/installer/disks.scm b/gnu/system/installer/disks.scm
index 095046f..e2c67ff 100644
--- a/gnu/system/installer/disks.scm
+++ b/gnu/system/installer/disks.scm
@@ -31,12 +31,12 @@
(define my-buttons `((continue ,(M_ "_Continue") #t)))
-(define (make-disk-page parent title)
+(define (make-disk-page parent title)
(make-page (page-surface parent)
title
disk-page-refresh
0
- #:activator disk-page-activate-focused-item))
+ #:activator disk-page-activate-selected-item))
(define (disk-page-refresh page)
(when (not (page-initialised? page))
@@ -57,7 +57,7 @@
(menu-redraw menu)
(menu-refresh menu)))
-(define (disk-page-activate-focused-item page)
+(define (disk-page-activate-selected-item page)
(let ((menu (page-datum page 'menu)))
(cond
((menu-active menu)
diff --git a/gnu/system/installer/filesystems.scm
b/gnu/system/installer/filesystems.scm
index a557c71..9770467 100644
--- a/gnu/system/installer/filesystems.scm
+++ b/gnu/system/installer/filesystems.scm
@@ -131,7 +131,7 @@
title
filesystem-page-refresh
0
- #:activator filesystem-page-activate-focused-item))
+ #:activator filesystem-page-activate-selected-item))
(define my-buttons `((continue ,(M_ "_Continue") #t)
(cancel ,(M_ "Canc_el") #t)))
@@ -179,7 +179,7 @@
(error (format #f "~s is not a partition" p)))
p)))
-(define (filesystem-page-activate-focused-item page)
+(define (filesystem-page-activate-selected-item page)
(let* ((menu (page-datum page 'menu)))
(cond
((menu-active menu)
@@ -190,7 +190,7 @@
(gettext "Choose the mount point for device
~s") name)
mount-point-refresh
1
- #:activator
mount-point-page-activate-focused-item)))
+ #:activator
mount-point-page-activate-selected-item)))
(page-set-datum! next 'device name)
(page-enter next)
'handled))
diff --git a/gnu/system/installer/format.scm b/gnu/system/installer/format.scm
index ef99fd7..bc409da 100644
--- a/gnu/system/installer/format.scm
+++ b/gnu/system/installer/format.scm
@@ -65,13 +65,13 @@ match those uuids read from the respective partitions"
title
format-page-refresh
0
- #:activator format-page-activate-focused-item)))
+ #:activator format-page-activate-selected-item)))
page))
(define my-buttons `((format ,(M_ "_Format") #t)
(cancel ,(M_ "Canc_el") #t)))
-(define (format-page-activate-focused-item page)
+(define (format-page-activate-selected-item page)
(let ((nav (page-datum page 'navigation))
(config-window (page-datum page 'config-window)))
(match (buttons-selected-symbol nav)
diff --git a/gnu/system/installer/guixsd-installer.scm
b/gnu/system/installer/guixsd-installer.scm
index f08d489..463d2a3 100644
--- a/gnu/system/installer/guixsd-installer.scm
+++ b/gnu/system/installer/guixsd-installer.scm
@@ -212,7 +212,7 @@
(do-task task-name page))))
task-name-list))
-(define (main-page-activate-focused-item page)
+(define (main-page-activate-selected-item page)
(let* ((main-menu (page-datum page 'menu))
(item (menu-get-current-item main-menu)))
(do-task (car item) page)
@@ -320,7 +320,7 @@
(let ((page (make-page
stdscr (gettext "GuixSD Installer")
main-page-refresh 0
- #:activator main-page-activate-focused-item)))
+ #:activator main-page-activate-selected-item)))
(page-enter page)
(page-push #f)
(let loop ((ch (getch stdscr)))
diff --git a/gnu/system/installer/key-map.scm b/gnu/system/installer/key-map.scm
index 4b97a8d..e42da40 100644
--- a/gnu/system/installer/key-map.scm
+++ b/gnu/system/installer/key-map.scm
@@ -35,14 +35,14 @@
(gettext "Keyboard Mapping")
key-map-page-refresh
0
- #:activator key-map-page-activate-focused-item)))
+ #:activator key-map-page-activate-selected-item)))
(page-set-datum! page 'directory directory)
page))
(define my-buttons `((cancel ,(M_ "Canc_el") #t)))
-(define (key-map-page-activate-focused-item page)
+(define (key-map-page-activate-selected-item page)
(let* ((menu (page-datum page 'menu))
(i (menu-get-current-item menu))
(directory (page-datum page 'directory))
diff --git a/gnu/system/installer/locale.scm b/gnu/system/installer/locale.scm
index da0da7a..fbb5766 100644
--- a/gnu/system/installer/locale.scm
+++ b/gnu/system/installer/locale.scm
@@ -36,7 +36,7 @@
title
locale-page-refresh
0
- #:activator locale-page-activate-focused-item))
+ #:activator locale-page-activate-selected-item))
(define (locale-page-refresh page)
(when (not (page-initialised? page))
@@ -56,7 +56,7 @@
(menu-redraw menu)
(menu-refresh menu)))
-(define (locale-page-activate-focused-item page)
+(define (locale-page-activate-selected-item page)
(let* ((menu (page-datum page 'menu))
(locale (menu-get-current-item menu)))
(cond
diff --git a/gnu/system/installer/mount-point.scm
b/gnu/system/installer/mount-point.scm
index 9788a3a..0be8817 100644
--- a/gnu/system/installer/mount-point.scm
+++ b/gnu/system/installer/mount-point.scm
@@ -28,7 +28,7 @@
#:use-module (ice-9 match)
#:export (mount-point-refresh)
- #:export (mount-point-page-activate-focused-item))
+ #:export (mount-point-page-activate-selected-item))
(include "i18n.scm")
@@ -45,7 +45,7 @@
(refresh* (outer (page-wwin page)))
(refresh* (form-window form))))
-(define (mount-point-page-activate-focused-item page)
+(define (mount-point-page-activate-selected-item page)
(let ((form (page-datum page 'form))
(nav (page-datum page 'navigation))
(dev (page-datum page 'device)))
diff --git a/gnu/system/installer/network.scm b/gnu/system/installer/network.scm
index 17cafbe..6c7981c 100644
--- a/gnu/system/installer/network.scm
+++ b/gnu/system/installer/network.scm
@@ -47,7 +47,7 @@
title
network-page-refresh
0
- #:activator network-page-activate-focused-item))
+ #:activator network-page-activate-selected-item))
(define (interfaces)
(map (lambda (ifce)
@@ -98,7 +98,7 @@
(define my-buttons `((continue ,(M_ "_Continue") #t)
(test ,(M_ "_Test") #t)))
-(define (network-page-activate-focused-item page)
+(define (network-page-activate-selected-item page)
(let* ((menu (page-datum page 'menu))
(nav (page-datum page 'navigation))
(item (menu-get-current-item menu))
@@ -122,7 +122,7 @@
"Ping"
ping-page-refresh
0
- #:activator ping-page-activate-focused-item)))
+ #:activator
ping-page-activate-selected-item)))
(page-enter next)))
('continue
;; Cancel the timer
diff --git a/gnu/system/installer/page.scm b/gnu/system/installer/page.scm
index 63955ee..f24e430 100644
--- a/gnu/system/installer/page.scm
+++ b/gnu/system/installer/page.scm
@@ -56,7 +56,7 @@
(wwin page-wwin page-set-wwin!)
(data page-data page-set-data!))
-(define (page-activate-focused-item page)
+(define (page-activate-selected-item page)
((page-datum page 'activator) page))
(define (page-default-mouse-handler page device-id x y z button-state)
@@ -75,7 +75,7 @@
button-status)
status)))
(if (eq? status 'activated)
- (page-activate-focused-item page))
+ (page-activate-selected-item page))
status))
(define (page-default-key-handler page ch)
@@ -135,7 +135,7 @@ If a form is used it's assumed that the menu is not used
and vice versa."
'handled)))
((select-key? ch)
- (page-activate-focused-item page))
+ (page-activate-selected-item page))
((and menu (menu-active menu) (not (eq? 'ignored (std-menu-key-handler
menu ch))))
'handled)
@@ -169,7 +169,7 @@ If a form is used it's assumed that the menu is not used
and vice versa."
(menu-set-active! menu #f)
(if form
(form-set-enabled! form #f)))
- (page-activate-focused-item page))
+ (page-activate-selected-item page))
(else
'ignored))))
diff --git a/gnu/system/installer/ping.scm b/gnu/system/installer/ping.scm
index 36e92d1..122bd7b 100644
--- a/gnu/system/installer/ping.scm
+++ b/gnu/system/installer/ping.scm
@@ -30,7 +30,7 @@
#:export (substitute-is-reachable?)
#:export (ping-page-refresh)
- #:export (ping-page-activate-focused-item))
+ #:export (ping-page-activate-selected-item))
(include "i18n.scm")
@@ -51,7 +51,7 @@
(continue ,(M_ "_Continue") #t)
(cancel ,(M_ "Canc_el") #t)))
-(define (ping-page-activate-focused-item page)
+(define (ping-page-activate-selected-item page)
(let ((nav (page-datum page 'navigation))
(test-window (page-datum page 'test-window)))
(match (buttons-selected-symbol nav)
diff --git a/gnu/system/installer/role.scm b/gnu/system/installer/role.scm
index 54423ec..0c6c904 100644
--- a/gnu/system/installer/role.scm
+++ b/gnu/system/installer/role.scm
@@ -51,11 +51,11 @@
title
role-page-refresh
0
- #:activator role-page-activate-focused-item))
+ #:activator role-page-activate-selected-item))
(define my-buttons `((cancel ,(M_ "Canc_el") #t)))
-(define (role-page-activate-focused-item page)
+(define (role-page-activate-selected-item page)
(let ((menu (page-datum page 'menu)))
(cond
((menu-active menu)
diff --git a/gnu/system/installer/time-zone.scm
b/gnu/system/installer/time-zone.scm
index 00bda6e..6c0bd8f 100644
--- a/gnu/system/installer/time-zone.scm
+++ b/gnu/system/installer/time-zone.scm
@@ -35,17 +35,18 @@
(gettext "Time Zone")
time-zone-page-refresh
0
- #:activator time-zone-page-activate-focused-item)))
+ #:activator time-zone-page-activate-selected-item)))
(page-set-datum! page 'directory directory)
page))
(define my-buttons `((cancel ,(M_ "Canc_el") #t)))
-(define (time-zone-page-activate-focused-item page)
+(define (time-zone-page-activate-selected-item page)
(let* ((menu (page-datum page 'menu)))
(cond
((menu-active menu)
+ (time-zone-page-refresh page)
(let* ((i (menu-get-current-item menu))
(directory (page-datum page 'directory))
(new-dir (string-append directory "/" i))
diff --git a/gnu/system/installer/user-edit.scm
b/gnu/system/installer/user-edit.scm
index dff1295..d0d13c1 100644
--- a/gnu/system/installer/user-edit.scm
+++ b/gnu/system/installer/user-edit.scm
@@ -41,7 +41,7 @@
title
user-edit-refresh
1
- #:activator user-edit-page-activate-focused-item)))
+ #:activator user-edit-page-activate-selected-item)))
(page-set-datum! page 'account account)
(page-set-datum! page 'parent parent)
page))
@@ -55,7 +55,7 @@
(refresh* (outer (page-wwin page)))
(refresh* (form-window form))))
-(define (user-edit-page-activate-focused-item page)
+(define (user-edit-page-activate-selected-item page)
(let ((form (page-datum page 'form))
(nav (page-datum page 'navigation))
(parent (page-datum page 'parent))
diff --git a/gnu/system/installer/users.scm b/gnu/system/installer/users.scm
index 9bd386c..2b95b76 100644
--- a/gnu/system/installer/users.scm
+++ b/gnu/system/installer/users.scm
@@ -40,13 +40,13 @@
title
users-page-refresh
0
- #:activator users-page-activate-focused-item))
+ #:activator users-page-activate-selected-item))
(define my-buttons `((add ,(M_ "_Add") #t)
(delete ,(M_ "_Delete") #t)
(continue ,(M_ "_Continue") #t)))
-(define (users-page-activate-focused-item page)
+(define (users-page-activate-selected-item page)
(let ((menu (page-datum page 'menu))
(nav (page-datum page 'navigation)))
(cond
diff --git a/gnu/system/installer/wireless.scm
b/gnu/system/installer/wireless.scm
index 1c0ec92..bae9291 100644
--- a/gnu/system/installer/wireless.scm
+++ b/gnu/system/installer/wireless.scm
@@ -42,7 +42,7 @@
title
wireless-page-refresh
0
- #:activator wireless-page-activate-focused-item)))
+ #:activator wireless-page-activate-selected-item)))
(page-set-datum! page 'ifce interface)
page))
@@ -50,7 +50,7 @@
(define my-buttons `((cancel ,(M_ "Canc_el") #t)))
-(define (wireless-page-activate-focused-item page)
+(define (wireless-page-activate-selected-item page)
(let ((nav (page-datum page 'navigation))
(menu (page-datum page 'menu))
(test-window (page-datum page 'test-window)))