diff --git a/README.md b/README.md index 8cf4aee7..4597ecfa 100644 --- a/README.md +++ b/README.md @@ -94,7 +94,7 @@ Usage: `./install.sh [OPTIONS...]` -s, --size [default|180|220|240|260|280] Set Nautilus sidebar minimum width. Default is 200px - -i, --icon [standard|simple|gnome|ubuntu|tux|arch|manjaro|fedora|debian|void|opensuse|popos|mxlinux|zorin] + -i, --icon [apple|simple|gnome|ubuntu|tux|arch|manjaro|fedora|debian|void|opensuse|popos|mxlinux|zorin] Set 'Activities' icon. Default is 'standard' -b, --background [default|blank|IMAGE_PATH] diff --git a/install.sh b/install.sh index 63782abe..4972e048 100755 --- a/install.sh +++ b/install.sh @@ -39,7 +39,6 @@ usage() { helpify "-l, --libadwaita" "" "Install theme into gtk4.0 config for libadwaita" "Default is dark version" 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 "--default, --defaultactivities" "" "Set gnome-shell panel activities button style to system default" "Default is Apple icon" helpify "--round, --roundedmaxwindow" "" "Set maximized window to rounded" "Default is square" helpify "--right, --rightplacement" "" "Set Nautilus title button placement to right" "Default is left" helpify "--black, --blackfont" "" "Set panel font color to black" "Default is white" @@ -79,8 +78,6 @@ while [[ $# -gt 0 ]]; do interactive='true'; shift ;; --normal|--normalshowapps) showapps_normal="true"; shift ;; - --default|--defaultactivities) - default_activities="true"; shift ;; --right|--rightplacement) right_placement="true"; shift ;; --round|--roundedmaxwindow) @@ -105,6 +102,7 @@ while [[ $# -gt 0 ]]; do -n|--name) check_param "${1}" "${1}" "${2}" "must" "must" "not-at-all" && shift 2 || shift ;; -i|--icon) + activities_icon="true"; check_param "${1}" "${1}" "${2}" "must" "must" "must" && shift 2 || shift ;; -s|--size) check_param "${1}" "${1}" "${2}" "optional" "optional" "optional" && shift 2 || shift ;; diff --git a/shell/lib-core.sh b/shell/lib-core.sh index bbbcbbeb..fa749c23 100755 --- a/shell/lib-core.sh +++ b/shell/lib-core.sh @@ -92,7 +92,7 @@ COLOR_VARIANTS=('Light' 'Dark') OPACITY_VARIANTS=('normal' 'solid') ALT_VARIANTS=('normal' 'alt') THEME_VARIANTS=('default' 'blue' 'purple' 'pink' 'red' 'orange' 'yellow' 'green' 'grey') -ICON_VARIANTS=('standard' 'simple' 'gnome' 'ubuntu' 'tux' 'arch' 'manjaro' 'fedora' 'debian' 'void' 'opensuse' 'popos' 'mxlinux' 'zorin' 'budgie' 'gentoo') +ICON_VARIANTS=('apple' 'simple' 'gnome' 'ubuntu' 'tux' 'arch' 'manjaro' 'fedora' 'debian' 'void' 'opensuse' 'popos' 'mxlinux' 'zorin' 'budgie' 'gentoo') SIDEBAR_SIZE_VARIANTS=('default' '180' '220' '240' '260' '280') PANEL_OPACITY_VARIANTS=('default' '30' '45' '60' '75') PANEL_SIZE_VARIANTS=('default' 'smaller' 'bigger') diff --git a/shell/lib-install.sh b/shell/lib-install.sh index 48f0abbb..1477e4d6 100755 --- a/shell/lib-install.sh +++ b/shell/lib-install.sh @@ -955,9 +955,9 @@ customize_theme() { fi # Change gnome-shell panel activities button style - if [[ "${default_activities}" == 'true' ]]; then + if [[ "${activities_icon}" == 'true' ]]; then prompt -s "Changing gnome-shell panel activities button style ...\n" - sed $SED_OPT "/\$activities/s/apple/normal/" "${THEME_SRC_DIR}/sass/_theme-options-temp.scss" + sed $SED_OPT "/\$activities/s/default/icon/" "${THEME_SRC_DIR}/sass/_theme-options-temp.scss" fi # Change panel font color diff --git a/src/assets/gnome-shell/activities-black/activities.svg b/src/assets/gnome-shell/activities-black/activities-apple.svg similarity index 100% rename from src/assets/gnome-shell/activities-black/activities.svg rename to src/assets/gnome-shell/activities-black/activities-apple.svg diff --git a/src/assets/gnome-shell/activities/activities.svg b/src/assets/gnome-shell/activities/activities-apple.svg similarity index 100% rename from src/assets/gnome-shell/activities/activities.svg rename to src/assets/gnome-shell/activities/activities-apple.svg diff --git a/src/sass/_theme-options.scss b/src/sass/_theme-options.scss index 0db10c17..58f918d5 100644 --- a/src/sass/_theme-options.scss +++ b/src/sass/_theme-options.scss @@ -30,7 +30,7 @@ $panel_font: 'white'; $panel_size: 'default'; // Panel Activities button style -$activities: 'apple'; +$activities: 'default'; // Monterey style $monterey: 'false'; diff --git a/src/sass/gnome-shell/common/_panel.scss b/src/sass/gnome-shell/common/_panel.scss index 11116e04..fdb81d97 100644 --- a/src/sass/gnome-shell/common/_panel.scss +++ b/src/sass/gnome-shell/common/_panel.scss @@ -258,7 +258,7 @@ $panel_height: $menuitem_size; background-gradient-direction: none; border: none; - @if $activities == 'apple' { + @if $activities == 'icon' { @extend %apple_activites; } @else { @extend %normal_activites;