aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-05-06 22:06:29 +0200
committerLudovic Courtès <ludo@gnu.org>2019-05-06 23:21:33 +0200
commitd1e5f758e128a3c1042c98563c5b87b81b2f187a (patch)
treee88fadea8f0070f0c86c8624a340b875179aa792
parent7ae9979cff98d7c23fc8d19e54ae733ee1a7deb2 (diff)
downloadguix-d1e5f758e128a3c1042c98563c5b87b81b2f187a.tar
guix-d1e5f758e128a3c1042c98563c5b87b81b2f187a.tar.gz
installer: Shrink simple listboxes to their minimum height.
* gnu/installer/newt/partition.scm (run-partioning-page): Pass #:listbox-height. (run-scheme-page): Likewise. (run-device-page): Likewise. * gnu/installer/newt/network.scm (run-technology-page): Likewise. * gnu/installer/newt/ethernet.scm (run-ethernet-page): Likewise.
-rw-r--r--gnu/installer/newt/ethernet.scm1
-rw-r--r--gnu/installer/newt/network.scm1
-rw-r--r--gnu/installer/newt/partition.scm3
3 files changed, 5 insertions, 0 deletions
diff --git a/gnu/installer/newt/ethernet.scm b/gnu/installer/newt/ethernet.scm
index d1f357243b..0161888aea 100644
--- a/gnu/installer/newt/ethernet.scm
+++ b/gnu/installer/newt/ethernet.scm
@@ -72,6 +72,7 @@ connection is pending."
#:title (G_ "Ethernet connection")
#:listbox-items services
#:listbox-item->text ethernet-service->text
+ #:listbox-height (min (+ (length services) 2) 10)
#:button-text (G_ "Exit")
#:button-callback-procedure
(lambda _
diff --git a/gnu/installer/newt/network.scm b/gnu/installer/newt/network.scm
index cf27a8cca2..93fc19aecd 100644
--- a/gnu/installer/newt/network.scm
+++ b/gnu/installer/newt/network.scm
@@ -73,6 +73,7 @@ network device were found. Do you want to continue anyway?"))
#:title (G_ "Internet access")
#:listbox-items items
#:listbox-item->text technology->text
+ #:listbox-height (min (+ (length items) 2) 10)
#:button-text (G_ "Exit")
#:button-callback-procedure
(lambda _
diff --git a/gnu/installer/newt/partition.scm b/gnu/installer/newt/partition.scm
index 9e9c57e957..6de8d139cf 100644
--- a/gnu/installer/newt/partition.scm
+++ b/gnu/installer/newt/partition.scm
@@ -49,6 +49,7 @@
#:title (G_ "Partition scheme")
#:listbox-items items
#:listbox-item->text cdr
+ #:listbox-height 4
#:sort-listbox-items? #f ;keep the 'root' option first
#:button-text (G_ "Exit")
#:button-callback-procedure button-exit-action)))
@@ -78,6 +79,7 @@ DEVICES list."
#:title (G_ "Disk")
#:listbox-items (device-items)
#:listbox-item->text cdr
+ #:listbox-height 10
#:button-text (G_ "Exit")
#:button-callback-procedure button-exit-action))
(device (car result)))
@@ -732,6 +734,7 @@ by pressing the Exit button.~%~%")))
(result (run-listbox-selection-page
#:info-text (G_ "Please select a partitioning method.")
#:title (G_ "Partitioning method")
+ #:listbox-height (+ (length items) 2)
#:listbox-items items
#:listbox-item->text cdr
#:sort-listbox-items? #f