From 014b59bf1da62fd7e2795d1d88ccf415589e076d Mon Sep 17 00:00:00 2001 From: Vince Date: Sat, 15 May 2021 08:14:04 +0800 Subject: [PATCH] Fixed #242 --- install.sh | 5 ++++- lib-install.sh | 36 ++++++++++++++++++++---------------- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/install.sh b/install.sh index ffe2e4a..0116f60 100755 --- a/install.sh +++ b/install.sh @@ -34,7 +34,8 @@ usage() { helpify "-s, --size" "[$(IFS='|'; echo "${SIDEBAR_SIZE_VARIANTS[*]}")]" "Set Nautilus sidebar minimum width" "Default is 200px" helpify "-i, --icon" "[$(IFS='|'; echo "${ICON_VARIANTS[*]}")]" "Set 'Activities' icon" "Default is 'standard'" helpify "-b, --background" "[default|blank|IMAGE_PATH]" "Set gnome-shell background image" "Default is BigSur-like wallpaper" - helpify "-N, --nautilus-style" "[$(IFS='|'; echo "${NAUTILUS_STYLE_VARIANTS[*]}")]" "Set Nautilus style" "Default is BigSur-like style" + helpify "-HD, --highdefinition" "" "Set to High Definition size" "Default is laptop size" + helpify "--normal, --normalshowapps" "" "Set gnome-shell show apps button style to normal" "Default is bigsur" helpify "--round, --roundedmaxwindow" "" "Set maximized window to rounded" "Default is square" helpify "--right, --rightplacement" "" "Set Nautilus titlebutton placement style to right" "Default is left" helpify "--normal, --normalshowapps" "" "Set gnome-shell show apps button style to normal" "Default is bigsur" @@ -71,6 +72,8 @@ while [[ $# -gt 0 ]]; do right_placement="true"; shift ;; --round|--roundedmaxwindow) max_round="true"; shift ;; + -HD|--highdefinition) + compact="false"; shift ;; -h|--help) need_help="true"; shift ;; # Parameters that require value, single use diff --git a/lib-install.sh b/lib-install.sh index 547a1c6..d167ac1 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -555,18 +555,18 @@ gtk_base() { cp -rf "${THEME_SRC_DIR}/sass/_gtk-base"{".scss","-temp.scss"} # Theme base options - sed $SED_OPT "/\$laptop/s/false/${compact}/" "${THEME_SRC_DIR}/sass/_gtk-base-temp.scss" + sed $SED_OPT "/\$laptop/s/false/${compact}/" "${THEME_SRC_DIR}/sass/_gtk-base-temp.scss" if [[ "${opacity}" == 'solid' ]]; then - sed $SED_OPT "/\$trans/s/true/false/" "${THEME_SRC_DIR}/sass/_gtk-base-temp.scss" + sed $SED_OPT "/\$trans/s/true/false/" "${THEME_SRC_DIR}/sass/_gtk-base-temp.scss" fi if [[ "${color}" == 'light' && ${opacity} == 'solid' ]]; then - sed $SED_OPT "/\$black/s/false/true/" "${THEME_SRC_DIR}/sass/_gtk-base-temp.scss" + sed $SED_OPT "/\$black/s/false/true/" "${THEME_SRC_DIR}/sass/_gtk-base-temp.scss" fi if [[ "${theme}" != '' ]]; then - sed $SED_OPT "/\$theme/s/default/${theme}/" "${THEME_SRC_DIR}/sass/_gtk-base-temp.scss" + sed $SED_OPT "/\$theme/s/default/${theme}/" "${THEME_SRC_DIR}/sass/_gtk-base-temp.scss" fi } @@ -580,38 +580,42 @@ customize_theme() { # Change gnome-shell panel transparency if [[ "${panel_opacity}" != 'default' ]]; then - prompt -w "Changing panel transparency ..." - sed $SED_OPT "/\$panel_opacity/s/0.15/0.${panel_opacity}/" "${THEME_SRC_DIR}/sass/_theme-options-temp.scss" + prompt -s "Changing panel transparency ..." + sed $SED_OPT "/\$panel_opacity/s/0.15/0.${panel_opacity}/" "${THEME_SRC_DIR}/sass/_theme-options-temp.scss" fi # Change gnome-shell show apps button style if [[ "${showapps_normal}" == 'true' ]]; then - prompt -w "Changing gnome-shell show apps button style ..." - sed $SED_OPT "/\$showapps_button/s/bigsur/normal/" "${THEME_SRC_DIR}/sass/_theme-options-temp.scss" + prompt -s "Changing gnome-shell show apps button style ..." + sed $SED_OPT "/\$showapps_button/s/bigsur/normal/" "${THEME_SRC_DIR}/sass/_theme-options-temp.scss" fi # Change Nautilus sidarbar size if [[ "${sidebar_size}" != 'default' ]]; then - prompt -w "Changing Nautilus sidebar size ..." - sed $SED_OPT "/\$sidebar_size/s/200px/${sidebar_size}px/" "${THEME_SRC_DIR}/sass/_theme-options-temp.scss" + prompt -s "Changing Nautilus sidebar size ..." + sed $SED_OPT "/\$sidebar_size/s/200px/${sidebar_size}px/" "${THEME_SRC_DIR}/sass/_theme-options-temp.scss" fi # Change Nautilus style if [[ "${nautilus_style}" != 'stable' ]]; then - prompt -w "Changing Nautilus style ..." - sed $SED_OPT "/\$nautilus_style/s/stable/${nautilus_style}/" "${THEME_SRC_DIR}/sass/_theme-options-temp.scss" + prompt -s "Changing Nautilus style ..." + sed $SED_OPT "/\$nautilus_style/s/stable/${nautilus_style}/" "${THEME_SRC_DIR}/sass/_theme-options-temp.scss" fi # Change Nautilus titlebutton placement style if [[ "${right_placement}" == 'true' ]]; then - prompt -w "Changing Nautilus titlebutton placement style ..." - sed $SED_OPT "/\$placement/s/left/right/" "${THEME_SRC_DIR}/sass/_theme-options-temp.scss" + prompt -s "Changing Nautilus titlebutton placement style ..." + sed $SED_OPT "/\$placement/s/left/right/" "${THEME_SRC_DIR}/sass/_theme-options-temp.scss" fi # Change maximized window radius if [[ "${max_round}" == 'true' ]]; then - prompt -w "Changing maximized window style ..." - sed $SED_OPT "/\$max_window_style/s/square/round/" "${THEME_SRC_DIR}/sass/_theme-options-temp.scss" + prompt -s "Changing maximized window style ..." + sed $SED_OPT "/\$max_window_style/s/square/round/" "${THEME_SRC_DIR}/sass/_theme-options-temp.scss" + fi + + if [[ "${compact}" == 'false' ]]; then + prompt -s "Changing Definition mode to HD (Bigger font, Bigger size) ..." fi }