From 43f89d8cc153f7b0d0527b9e648d63e95e1ea354 Mon Sep 17 00:00:00 2001 From: Chrysostomus Date: Sun, 2 Sep 2018 14:13:22 +0300 Subject: [PATCH] Fix menu proportions for english translation --- lib/util-base.sh | 4 ++-- lib/util-desktop.sh | 4 ++-- lib/util-disk.sh | 10 +++++----- lib/util-menu.sh | 20 ++++++++++---------- lib/util.sh | 12 ++++++------ 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/lib/util-base.sh b/lib/util-base.sh index 2ae3183..998d963 100644 --- a/lib/util-base.sh +++ b/lib/util-base.sh @@ -310,7 +310,7 @@ uefi_bootloader() { #Ensure again that efivarfs is mounted [[ -z $(mount | grep /sys/firmware/efi/efivars) ]] && mount -t efivarfs efivarfs /sys/firmware/efi/efivars - DIALOG " $_InstUefiBtTitle " --menu "\n$_bootloaderInfo\n " 0 0 3 \ + DIALOG " $_InstUefiBtTitle " --menu "\n$_bootloaderInfo\n " 23 60 3 \ "1" "grub" \ "2" "refind" \ "3" "systemd-boot" 2>/tmp/.bootloader @@ -674,9 +674,9 @@ recheck_luks() { # Function will not allow incorrect UUID type for installed system. generate_fstab() { DIALOG " $_ConfBseFstab " --menu "\n$_FstabBody\n " 0 0 4 \ + "fstabgen -U -p" "$_FstabDevUUID" \ "fstabgen -p" "$_FstabDevName" \ "fstabgen -L -p" "$_FstabDevLabel" \ - "fstabgen -U -p" "$_FstabDevUUID" \ "fstabgen -t PARTUUID -p" "$_FstabDevPtUUID" 2>${ANSWER} if [[ $(cat ${ANSWER}) != "" ]]; then diff --git a/lib/util-desktop.sh b/lib/util-desktop.sh index 5e42222..fabdc14 100644 --- a/lib/util-desktop.sh +++ b/lib/util-desktop.sh @@ -255,7 +255,7 @@ install_desktop() { declare -i loopmenu=1 while ((loopmenu)); do # Choose kernel and possibly base-devel - DIALOG " $_InstBseTitle " --checklist "\n$_InstStandBseBody$_UseSpaceBar\n " 0 0 13 \ + DIALOG " $_InstBseTitle " --checklist "\n$_InstStandBseBody$_UseSpaceBar\n " 0 0 12 \ "yaourt + base-devel" "-" off \ $(cat /tmp/.available_kernels | awk '$0=$0" - off"') 2>${PACKAGES} || { loopmenu=0; return 0; } if [[ ! $(grep "linux" ${PACKAGES}) ]]; then @@ -407,7 +407,7 @@ choose_mjr_desk() { echo "" > /tmp/.desktop # DE/WM Menu - DIALOG " $_InstDETitle " --radiolist "\n$_InstManDEBody\n\n$_UseSpaceBar\n " 0 0 12 \ + DIALOG " $_InstDETitle " --radiolist "\n$_InstManDEBody\n\n$_UseSpaceBar\n " 0 0 15 \ $(echo $PROFILES/{manjaro,community}/* | xargs -n1 | cut -f7 -d'/' | grep -vE "netinstall|architect" | awk '$0=$0" - off"') 2> /tmp/.desktop # If something has been selected, install diff --git a/lib/util-disk.sh b/lib/util-disk.sh index 0df1855..492f8cb 100644 --- a/lib/util-disk.sh +++ b/lib/util-disk.sh @@ -34,7 +34,7 @@ select_device() { DEVICE="${DEVICE} ${i}" done - DIALOG " $_DevSelTitle " --menu "\n$_DevSelBody\n " 0 0 4 ${DEVICE} 2>${ANSWER} || return 1 + DIALOG " $_DevSelTitle " --menu "\n$_DevSelBody\n " 20 60 4 ${DEVICE} 2>${ANSWER} || return 1 DEVICE=$(cat ${ANSWER}) } @@ -487,7 +487,7 @@ luks_menu() { declare -i loopmenu=1 while ((loopmenu)); do LUKS_OPT="" - DIALOG " $_PrepLUKS " --menu "\n$_LuksMenuBody\n$_LuksMenuBody2\n$_LuksMenuBody3\n " 0 0 4 \ + DIALOG " $_PrepLUKS " --menu "\n$_LuksMenuBody\n$_LuksMenuBody2\n$_LuksMenuBody3\n " 25 60 4 \ "$_LuksOpen" "cryptsetup open --type luks" \ "$_LuksEncrypt" "cryptsetup -q luksFormat" \ "$_LuksEncryptAdv" "cryptsetup -q -s -c luksFormat" \ @@ -616,7 +616,7 @@ lvm_menu() { sleep 1 lvm_detect - DIALOG " $_PrepLVM $_PrepLVM2 " --menu "\n$_LvmMenu\n " 0 0 4 \ + DIALOG " $_PrepLVM $_PrepLVM2 " --menu "\n$_LvmMenu\n " 22 60 4 \ "$_LvmCreateVG" "vgcreate -f, lvcreate -L -n" \ "$_LvmDelVG" "vgremove -f" \ "$_LvMDelAll" "lvrmeove, vgremove, pvremove -f" \ @@ -924,7 +924,7 @@ make_esp() { } mount_partitions() { # Warn users that they CAN mount partitions without formatting them! - DIALOG " $_PrepMntPart " --msgbox "\n$_WarnMount1 '$_FSSkip' $_WarnMount2\n " 0 0 + DIALOG " $_PrepMntPart " --msgbox "\n$_WarnMount1 '$_FSSkip' $_WarnMount2\n " 15 65 # LVM Detection. If detected, activate. lvm_detect @@ -1168,4 +1168,4 @@ mount_existing_subvols() { # Mount the subvolume mount -o "${fs_opts},subvol=$subvol" "$(cat /tmp/.root_partition)" /mnt"$(cat /tmp/.mountp)" done -} \ No newline at end of file +} diff --git a/lib/util-menu.sh b/lib/util-menu.sh index a8cc863..36ece0d 100644 --- a/lib/util-menu.sh +++ b/lib/util-menu.sh @@ -20,7 +20,7 @@ main_menu() { fi DIALOG " $_MMTitle " --default-item ${HIGHLIGHT} \ - --menu "\n$_MMNewBody\n " 0 0 6 \ + --menu "\n$_MMNewBody\n " 20 60 6 \ "1" "$_PrepMenuTitle|>" \ "2" "$_InstDsMenuTitle|>" \ "3" "$_InstCrMenuTitle|>" \ @@ -94,7 +94,7 @@ install_desktop_system_menu() { declare -i loopmenu=1 while ((loopmenu)); do submenu 7 - DIALOG " $_InstDsMenuTitle " --default-item ${HIGHLIGHT_SUB} --menu "\n$_MMBody\n$_InstDsMenuBody\n " 0 0 7 \ + DIALOG " $_InstDsMenuTitle " --default-item ${HIGHLIGHT_SUB} --menu "\n$_MMBody\n$_InstDsMenuBody\n " 22 60 7 \ "1" "$_InstDEStable|>" \ "2" "$_InstBootldr|>" \ "3" "$_ConfBseMenuTitle|>" \ @@ -132,7 +132,7 @@ install_custom_menu() { declare -i loopmenu=1 while ((loopmenu)); do submenu 9 - DIALOG " $_InstCsMenuTitle " --default-item ${HIGHLIGHT_SUB} --menu "\n$_InstCsMenuBody\n " 0 0 9 \ + DIALOG " $_InstCsMenuTitle " --default-item ${HIGHLIGHT_SUB} --menu "\n$_InstCsMenuBody\n " 22 60 9 \ "1" "$_InstBse" \ "2" "$_InstDE|>" \ "3" "$_InstBootldr|>" \ @@ -176,7 +176,7 @@ system_rescue_menu() { declare -i loopmenu=1 while ((loopmenu)); do submenu 8 - DIALOG " $_SysRescTitle " --default-item ${HIGHLIGHT_SUB} --menu "\n$_SysRescBody\n " 0 0 10 \ + DIALOG " $_SysRescTitle " --default-item ${HIGHLIGHT_SUB} --menu "\n$_SysRescBody\n " 24 60 10 \ "1" "$_InstDrvTitle|>" \ "2" "$_InstBootldr|>" \ "3" "$_ConfBseMenuTitle" \ @@ -224,12 +224,12 @@ prep_menu() { declare -i loopmenu=1 while ((loopmenu)); do submenu 9 - DIALOG " $_PrepMenuTitle " --default-item ${HIGHLIGHT_SUB} --menu "\n$_PrepMenuBody\n " 0 0 10 \ + DIALOG " $_PrepMenuTitle " --default-item ${HIGHLIGHT_SUB} --menu "\n$_PrepMenuBody\n " 20 60 10 \ "1" "$_VCKeymapTitle" \ "2" "$_DevShowOpt" \ - "3" "$_PrepPartDisk" \ - "4" "$_PrepLUKS" \ - "5" "$_PrepLVM $_PrepLVM2" \ + "3" "$_PrepPartDisk|>" \ + "4" "$_PrepLUKS|>" \ + "5" "$_PrepLVM $_PrepLVM2|>" \ "6" "$_PrepMntPart" \ "7" "$_PrepMirror|>" \ "8" "$_PrepPacKey" \ @@ -369,7 +369,7 @@ config_cli_base_menu() { declare -i loopmenu=1 while ((loopmenu)); do ssubmenu 7 - DIALOG " $_ConfBseMenuTitle " --default-item ${HIGHLIGHT_SSUB} --menu "\n$_ConfBseBody\n " 0 0 7 \ + DIALOG " $_ConfBseMenuTitle " --default-item ${HIGHLIGHT_SSUB} --menu "\n$_ConfBseBody\n " 22 60 7 \ "1" "$_ConfBseFstab" \ "2" "$_ConfBseHost" \ "3" "$_ConfBseSysLoc" \ @@ -562,4 +562,4 @@ logs_menu() { ;; esac done -} \ No newline at end of file +} diff --git a/lib/util.sh b/lib/util.sh index 1df976d..a875d0a 100644 --- a/lib/util.sh +++ b/lib/util.sh @@ -240,7 +240,7 @@ set_language() { fi # Generate locale and set language - DIALOG " $_Config " --infobox "\n$_ApplySet\n " 0 0 + DIALOG " $_Config " --infobox "\n$_ApplySet\n " 6 40 sed -i "s/#${CURR_LOCALE}/${CURR_LOCALE}/" /etc/locale.gen locale-gen >/dev/null 2>$ERR export LANG=${CURR_LOCALE} @@ -403,7 +403,7 @@ configure_mirrorlist() { declare -i loopmenu=1 while ((loopmenu)); do ssubmenu 4 - DIALOG " $_MirrorlistTitle " --default-item ${HIGHLIGHT_SSUB} --menu "\n$_MirrorlistBody\n " 0 0 4 \ + DIALOG " $_MirrorlistTitle " --default-item ${HIGHLIGHT_SSUB} --menu "\n$_MirrorlistBody\n " 25 60 4 \ "1" "$_MirrorPacman" \ "2" "$_MirrorConfig" \ "3" "$_MirrorRankTitle" \ @@ -568,7 +568,7 @@ final_check() { exit_done() { if [[ $(lsblk -o MOUNTPOINT | grep ${MOUNTPOINT} 2>/dev/null) != "" ]]; then final_check - dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --yesno "$(printf "\n$_CloseInstBody\n$(cat ${CHECKLIST})\n ")" 0 0 + dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --yesno "$(printf "\n$_CloseInstBody\n$(cat ${CHECKLIST})\n ")" 20 40 if [[ $? -eq 0 ]]; then check_for_error "exit installer." dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --yesno "\n$_LogInfo ${TARGLOG}\n " 0 0 @@ -582,7 +582,7 @@ exit_done() { [[ menu_opt == "advanced" ]] && main_menu_full || main_menu fi else - dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --yesno "\n$_CloseInstBody\n " 0 0 + dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --yesno "\n$_CloseInstBody\n " 10 40 if [[ $? -eq 0 ]]; then umount_partitions clear @@ -595,7 +595,7 @@ exit_done() { set_cache() { - DIALOG " $_HostCache " --yesno "\n$_HostCacheBody\n " 0 0 + DIALOG " $_HostCache " --yesno "\n$_HostCacheBody\n " 15 40 if [[ $? -eq 0 ]]; then hostcache=true cachepath="/var/cache/pacman/pkg/" @@ -603,4 +603,4 @@ set_cache() hostcache=false cachepath="/mnt/var/cache/pacman/pkg/" fi -} \ No newline at end of file +}