mirror of
https://github.com/vinceliuice/WhiteSur-gtk-theme.git
synced 2025-06-05 23:13:19 +00:00
Fixed #1114
This commit is contained in:
vinceliuice
parent
e4a9ba7153
commit
47c2615e7a
@ -163,7 +163,7 @@ else
|
||||
|
||||
remove_themes; customize_theme; avoid_variant_duplicates;
|
||||
|
||||
prompt -w "Installing '${name}${colorscheme}' themes in '${dest}'...\n";
|
||||
prompt -w "Installing '${name}${colorscheme}' '${themes[*]}' themes in '${dest}'...\n";
|
||||
|
||||
prompt -t "--->>> GTK | GNOME Shell | Cinnamon | Metacity | XFWM | Plank <<<---"
|
||||
prompt -i "Color variants : $( IFS=';'; echo "${colors[*]}" )"
|
||||
|
||||
@ -30,6 +30,16 @@ pakitheme_gtk3() {
|
||||
|
||||
if [[ -n "$theme_path" ]]; then
|
||||
prompt -i "Converting theme: $FLATPAK_THEME... \n"
|
||||
elif [[ "${theme}" == '' ]]; then
|
||||
prompt -e "Find other variant themes but could not locate deafult theme! \n"
|
||||
prompt -s "Run this with right options! >>> \n"
|
||||
prompt -i "-o, --opacity [$(IFS='|'; echo "${OPACITY_VARIANTS[*]}")]"
|
||||
prompt -i "-c, --color [$(IFS='|'; echo "${COLOR_VARIANTS[*]}")]"
|
||||
prompt -i "-a, --alt [$(IFS='|'; echo "${ALT_VARIANTS[*]}")|all]"
|
||||
prompt -i "-t, --theme [$(IFS='|'; echo "${THEME_VARIANTS[*]}")|all]"
|
||||
prompt -i "..."
|
||||
echo
|
||||
exit 0
|
||||
else
|
||||
prompt -e "Could not locate theme... install theme first! \n"
|
||||
exit 0
|
||||
@ -43,7 +53,7 @@ pakitheme_gtk3() {
|
||||
rm -rf "$build_dir"
|
||||
mkdir -p "$build_dir/files"
|
||||
|
||||
cp -a "$theme_path/gtk-3.0/"* "$build_dir/files"
|
||||
cp -a "$theme_path/gtk-3.0/"{gtk.css,gtk-dark.css,gtk.gresource} "$build_dir/files"
|
||||
|
||||
mkdir -p "$build_dir/files/share/appdata"
|
||||
cat >"$build_dir/files/share/appdata/$gtk3_app_id.appdata.xml" <<EOF
|
||||
|
||||
@ -347,26 +347,6 @@ install_beggy() {
|
||||
esac
|
||||
}
|
||||
|
||||
install_xfwmy() {
|
||||
local color="$(destify ${1})"
|
||||
|
||||
local TARGET_DIR="${dest}/${name}${color}${colorscheme}"
|
||||
local HDPI_TARGET_DIR="${dest}/${name}${color}${colorscheme}-hdpi"
|
||||
local XHDPI_TARGET_DIR="${dest}/${name}${color}${colorscheme}-xhdpi"
|
||||
|
||||
mkdir -p "${TARGET_DIR}/xfwm4"
|
||||
cp -r "${THEME_SRC_DIR}/assets/xfwm4/assets${color}${colorscheme}/"*".png" "${TARGET_DIR}/xfwm4"
|
||||
cp -r "${THEME_SRC_DIR}/main/xfwm4/themerc${color}" "${TARGET_DIR}/xfwm4/themerc"
|
||||
|
||||
mkdir -p "${HDPI_TARGET_DIR}/xfwm4"
|
||||
cp -r "${THEME_SRC_DIR}/assets/xfwm4/assets${color}${colorscheme}-hdpi/"*".png" "${HDPI_TARGET_DIR}/xfwm4"
|
||||
cp -r "${THEME_SRC_DIR}/main/xfwm4/themerc${color}" "${HDPI_TARGET_DIR}/xfwm4/themerc"
|
||||
|
||||
mkdir -p "${XHDPI_TARGET_DIR}/xfwm4"
|
||||
cp -r "${THEME_SRC_DIR}/assets/xfwm4/assets${color}${colorscheme}-xhdpi/"*".png" "${XHDPI_TARGET_DIR}/xfwm4"
|
||||
cp -r "${THEME_SRC_DIR}/main/xfwm4/themerc${color}" "${XHDPI_TARGET_DIR}/xfwm4/themerc"
|
||||
}
|
||||
|
||||
install_shelly() {
|
||||
local color="$(destify ${1})"
|
||||
local opacity="$(destify ${2})"
|
||||
@ -489,6 +469,21 @@ install_theemy() {
|
||||
cp -r "${THEME_SRC_DIR}/assets/gtk-2.0/assets-common${color}${colorscheme}" "${TARGET_DIR}/gtk-2.0/assets"
|
||||
cp -r "${THEME_SRC_DIR}/assets/gtk-2.0/assets${color}${theme}${colorscheme}/"*".png" "${TARGET_DIR}/gtk-2.0/assets"
|
||||
|
||||
local HDPI_TARGET_DIR="${TARGET_DIR}-hdpi"
|
||||
local XHDPI_TARGET_DIR="${TARGET_DIR}-xhdpi"
|
||||
|
||||
mkdir -p "${TARGET_DIR}/xfwm4"
|
||||
cp -r "${THEME_SRC_DIR}/assets/xfwm4/assets${color}${colorscheme}/"*".png" "${TARGET_DIR}/xfwm4"
|
||||
cp -r "${THEME_SRC_DIR}/main/xfwm4/themerc${color}" "${TARGET_DIR}/xfwm4/themerc"
|
||||
|
||||
mkdir -p "${HDPI_TARGET_DIR}/xfwm4"
|
||||
cp -r "${THEME_SRC_DIR}/assets/xfwm4/assets${color}${colorscheme}-hdpi/"*".png" "${HDPI_TARGET_DIR}/xfwm4"
|
||||
cp -r "${THEME_SRC_DIR}/main/xfwm4/themerc${color}" "${HDPI_TARGET_DIR}/xfwm4/themerc"
|
||||
|
||||
mkdir -p "${XHDPI_TARGET_DIR}/xfwm4"
|
||||
cp -r "${THEME_SRC_DIR}/assets/xfwm4/assets${color}${colorscheme}-xhdpi/"*".png" "${XHDPI_TARGET_DIR}/xfwm4"
|
||||
cp -r "${THEME_SRC_DIR}/main/xfwm4/themerc${color}" "${XHDPI_TARGET_DIR}/xfwm4/themerc"
|
||||
|
||||
mkdir -p "${TARGET_DIR}/metacity-1"
|
||||
cp -r "${THEME_SRC_DIR}/main/metacity-1/metacity-theme${color}.xml" "${TARGET_DIR}/metacity-1/metacity-theme-1.xml"
|
||||
cp -r "${THEME_SRC_DIR}/main/metacity-1/metacity-theme-3.xml" "${TARGET_DIR}/metacity-1"
|
||||
@ -541,8 +536,7 @@ install_libadwaita() {
|
||||
opacity="${opacities[0]}"
|
||||
color="${colors[1]}"
|
||||
|
||||
gtk_base "${opacities[0]}" "${themes[0]}"
|
||||
config_gtk4 "${colors}" "${alts}"
|
||||
gtk_base && config_gtk4 "${colors}" "${alts}"
|
||||
}
|
||||
|
||||
remove_libadwaita() {
|
||||
@ -574,10 +568,9 @@ install_themes() {
|
||||
for alt in "${alts[@]}"; do
|
||||
for theme in "${themes[@]}"; do
|
||||
for color in "${colors[@]}"; do
|
||||
gtk_base "${opacity}" "${theme}" "${compact}"
|
||||
gtk_base
|
||||
install_theemy "${color}" "${opacity}" "${alt}" "${theme}"
|
||||
install_shelly "${color}" "${opacity}" "${alt}" "${theme}" "${icon}"
|
||||
install_xfwmy "${color}"
|
||||
done
|
||||
done
|
||||
done
|
||||
@ -621,7 +614,7 @@ install_gdm_theme() {
|
||||
# Let's go!
|
||||
install_theme_deps
|
||||
rm -rf "${WHITESUR_GS_DIR}"; install_beggy
|
||||
gtk_base "${colors[0]}" "${opacities[0]}" "${themes[0]}"
|
||||
gtk_base
|
||||
|
||||
if check_theme_file "${COMMON_CSS_FILE}"; then # CSS-based theme
|
||||
install_shelly "${colors[0]}" "${opacities[0]}" "${alts[0]}" "${themes[0]}" "${icon}" "${WHITESUR_GS_DIR}"
|
||||
@ -790,7 +783,7 @@ fix_dash_to_dock() {
|
||||
}
|
||||
|
||||
install_dash_to_dock_theme() {
|
||||
gtk_base "${colors[0]}" "${opacities[0]}" "${themes[0]}"
|
||||
gtk_base
|
||||
|
||||
if [[ -d "${DASH_TO_DOCK_DIR_HOME}" ]]; then
|
||||
backup_file "${DASH_TO_DOCK_DIR_HOME}/stylesheet.css" "udo"
|
||||
|
||||
@ -2,5 +2,5 @@
|
||||
<defs>
|
||||
<style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#363636; } .ColorScheme-Text { color:#363636; }</style>
|
||||
</defs>
|
||||
<path d="m7.5 0a7.5 7.5 0 0 0-7.5 7.5 7.5 7.5 0 0 0 7.5 7.5 7.5 7.5 0 0 0 7.5-7.5 7.5 7.5 0 0 0-7.5-7.5zm0 1a6.5 6.5 0 0 1 6.5 6.5 6.5 6.5 0 0 1-6.5 6.5 6.5 6.5 0 0 1-6.5-6.5 6.5 6.5 0 0 1 6.5-6.5zm0 3c-0.277 0-0.5 0.223-0.5 0.5v4.793l-1.2676-1.2676c-0.19587-0.19587-0.51116-0.19587-0.70703 0s-0.19587 0.51116 0 0.70703l2.1211 2.1211c0.047012 0.047012 0.10324 0.084075 0.16602 0.10938 0.12034 0.048967 0.25466 0.048967 0.375 0 0.062778-0.0253 0.119-0.062363 0.16602-0.10938l2.1211-2.1211c0.19587-0.19587 0.19587-0.51116 0-0.70703s-0.51116-0.19587-0.70703 0l-1.2676 1.2676v-4.793c0-0.277-0.223-0.5-0.5-0.5z" style="fill:currentColor" class="ColorScheme-Text"/>
|
||||
<path class="ColorScheme-Text" d="m8 3.4391e-7c-4.4183-2.687e-7 -8 3.5817-8 8-5.6569e-8 4.4183 3.5817 8 8 8 4.4183 0 8-3.5817 8-8 0-4.4183-3.5817-8-8-8zm-2e-7 1c3.866 0 7 3.134 7 7 1e-6 3.866-3.134 7-7 7-3.866 0-7-3.134-7-7 1e-8 -3.866 3.134-7 7-7zm3e-7 3c-0.277-4e-7 -0.5 0.223-0.5 0.5l2e-7 5.3163-1.7189-1.7189c-0.19587-0.19587-0.51116-0.19587-0.70703 0-0.19587 0.19587-0.19587 0.51116 0 0.70703l2.5724 2.5724c0.047009 0.04701 0.10324 0.08408 0.16602 0.10938 0.12034 0.04897 0.25466 0.04897 0.375 1e-6 0.062777-0.0253 0.119-0.06236 0.16602-0.10938l2.5724-2.5724c0.19587-0.19587 0.19587-0.51116 0-0.70703-0.19587-0.19587-0.51116-0.19587-0.70703 2e-7l-1.7189 1.7189v-5.3163c3e-7 -0.277-0.223-0.5-0.5-0.5z" fill="currentColor"/>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 916 B After Width: | Height: | Size: 984 B |
@ -374,7 +374,7 @@ menu[disabled] > .menu-right {
|
||||
#downloads-button .toolbarbutton-icon { /* Downloads button / Glitch - it swaps to the default one anyway */
|
||||
list-style-image: url("../icons/folder-download-symbolic.svg") !important;
|
||||
}
|
||||
#downloads-button, #downloads-indicator-anchor {
|
||||
#downloads-indicator-anchor {
|
||||
list-style-image: url("../icons/folder-download-symbolic.svg") !important;
|
||||
}
|
||||
|
||||
@ -746,7 +746,7 @@ treechildren::-moz-tree-image {
|
||||
#screenshot-button .toolbarbutton-icon,
|
||||
#scrollbutton-up .toolbarbutton-icon,
|
||||
#scrollbutton-down .toolbarbutton-icon,
|
||||
#downloads-button,
|
||||
#downloads-button .toolbarbutton-icon,
|
||||
#downloads-indicator-anchor,
|
||||
#tracking-protection-icon,
|
||||
#pageActionButton,
|
||||
|
||||
15
tweaks.sh
15
tweaks.sh
@ -25,9 +25,9 @@ usage() {
|
||||
helpify_title
|
||||
helpify "[GDM theme]" "options" ".................." ""
|
||||
helpify "-g, --gdm" "[default|x2]" "Install '${THEME_NAME}' theme for GDM (scaling: 100%/200%, default is 100%)" "Requires to run this shell as root"
|
||||
helpify "-o, --opacity" "[$(IFS='|'; echo "${OPACITY_VARIANTS[*]}")]" "Set '${THEME_NAME}' GDM theme opacity variants" "Default is 'normal'"
|
||||
helpify "-c, --color" "[$(IFS='|'; echo "${COLOR_VARIANTS[*]}")]" "Set '${THEME_NAME}' GDM and Dash to Dock theme color variants" "Default is 'light'"
|
||||
helpify "-t, --theme" "[$(IFS='|'; echo "${THEME_VARIANTS[*]}")]" "Set '${THEME_NAME}' GDM theme accent color" "Default is BigSur-like theme"
|
||||
helpify "-o, --opacity" "[$(IFS='|'; echo "${OPACITY_VARIANTS[*]}")]" "Set '${THEME_NAME}' GDM/Flatpak theme opacity variants" "Default is 'normal'"
|
||||
helpify "-c, --color" "[$(IFS='|'; echo "${COLOR_VARIANTS[*]}")]" "Set '${THEME_NAME}' GDM/Flatpak and Dash to Dock theme color variants" "Default is 'light'"
|
||||
helpify "-t, --theme" "[$(IFS='|'; echo "${THEME_VARIANTS[*]}")]" "Set '${THEME_NAME}' GDM/Flatpak theme accent color" "Default is BigSur-like theme"
|
||||
helpify "-N, --no-darken" "" "Don't darken '${THEME_NAME}' GDM theme background image" ""
|
||||
helpify "-n, --no-blur" "" "Don't blur '${THEME_NAME}' GDM theme background image" ""
|
||||
helpify "-b, --background" "[default|blank|IMAGE_PATH]" "Set '${THEME_NAME}' GDM theme background image" "Default is BigSur-like wallpaper"
|
||||
@ -115,6 +115,7 @@ while [[ $# -gt 0 ]]; do
|
||||
fi; shift ;;
|
||||
-F|--flatpak)
|
||||
flatpak="true"; signal_exit
|
||||
prompt -w "Without options it will only install default themes\n"
|
||||
|
||||
if ! has_command flatpak; then
|
||||
prompt -e "'${1}' ERROR: There's no Flatpak installed in your system"
|
||||
@ -173,11 +174,11 @@ while [[ $# -gt 0 ]]; do
|
||||
-P|--panel-size)
|
||||
check_param "${1}" "${1}" "${2}" "optional" "optional" "optional" && shift 2 || shift ;;
|
||||
-o|--opacity)
|
||||
check_param "${1}" "${1}" "${2}" "must" "must" "must" "false" && shift 2 || shift ;;
|
||||
check_param "${1}" "${1}" "${2}" "not-at-all" "must" "must" && shift 2 || shift ;;
|
||||
-c|--color)
|
||||
check_param "${1}" "${1}" "${2}" "must" "must" "must" "false" && shift 2 || shift ;;
|
||||
check_param "${1}" "${1}" "${2}" "not-at-all" "must" "must" && shift 2 || shift ;;
|
||||
-t|--theme)
|
||||
check_param "${1}" "${1}" "${2}" "must" "must" "must" "false" && shift 2 || shift ;;
|
||||
check_param "${1}" "${1}" "${2}" "not-at-all" "must" "must" && shift 2 || shift ;;
|
||||
*)
|
||||
prompt -e "ERROR: Unrecognized tweak option '${1}'."
|
||||
has_any_error="true"; shift ;;
|
||||
@ -245,7 +246,7 @@ else
|
||||
|
||||
if [[ "${flatpak}" == 'true' && "${gdm}" != 'true' ]]; then
|
||||
prompt -i "Connecting '${name}' themes to your Flatpak... \n"
|
||||
connect_flatpak
|
||||
customize_theme; avoid_variant_duplicates; connect_flatpak
|
||||
prompt -s "Done! '${name}' theme has been connected to your Flatpak. \n"
|
||||
fi
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user