Compare commits

..

No commits in common. "master" and "0.9.79" have entirely different histories.

2 changed files with 22 additions and 24 deletions

View File

@ -375,7 +375,7 @@ if [[ "$1" == "-s" ]]; then
MENU_PADDING_TOP=$((jgtools_padding + 150)) MENU_PADDING_TOP=$((jgtools_padding + 150))
#WALLPAPER #WALLPAPER
read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | tail -1 | cut -d'=' -f2) read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | cut -d'=' -f2)
THUMBDIR="$HOME/.cache/colorizer/thumbs" THUMBDIR="$HOME/.cache/colorizer/thumbs"
mkdir -p ${THUMBDIR} mkdir -p ${THUMBDIR}
NAME=${WALLPATH////_} NAME=${WALLPATH////_}

View File

@ -817,10 +817,9 @@ if [[ "$OLD_SYNTAX" = "true" ]];then
fi fi
if [[ "$FONT" != "" ]];then
if [[ "$1" != *"logo_mbcolor"* ]]; then if [[ "$1" != *"logo_mbcolor"* ]]; then
if [[ "$1" != *"quoter_mbcolor"* ]]; then if [[ "$1" != *"quoter_mbcolor"* ]]; then
out+=("<big>󰛖</big> $FONTS [ <b><span font_family=\"${FONT}\">$FONT</span> $FONTSIZE</b> ],^checkout(fontsingle)") out+=("<big>󰛖</big> $FONTS [ <b><span font_family=\"${FONT}\">$FONT</span> $FONTSIZE</b> ],^checkout(fontsingle)")
out2+=("^tag(fontsingle)") out2+=("^tag(fontsingle)")
out2+=("^sep($FONTS)") out2+=("^sep($FONTS)")
@ -854,7 +853,7 @@ if [[ "$FONT" != "" ]];then
fi fi
[[ "$SHADOWS" == "shadow" ]] && out+=("<big>󰄲</big> $SHADOW,conkyctl shades no ${1};$me") || out+=("<big>󰄱</big> $SHADOW,conkyctl shades shadow ${1};$me") [[ "$SHADOWS" == "shadow" ]] && out+=("<big>󰄲</big> $SHADOW,conkyctl shades no ${1};$me") || out+=("<big>󰄱</big> $SHADOW,conkyctl shades shadow ${1};$me")
[[ "$SHADOWS" == "outline" ]] && out+=("<big>󰄲</big> $OLINE,conkyctl shades no ${1};$me") || out+=("<big>󰄱</big> $OLINE,conkyctl shades outline ${1};$me") [[ "$SHADOWS" == "outline" ]] && out+=("<big>󰄲</big> $OLINE,conkyctl shades no ${1};$me") || out+=("<big>󰄱</big> $OLINE,conkyctl shades outline ${1};$me")
#out+=("^sep()") out+=("^sep()")
fi fi
[[ "$BORD" == false ]] && out+=("<big>󰄱</big> $BORDERS [ <b>$STIP</b> ],^checkout(bordersingle)") || out+=("<big>󰄲</big> $BORDERS [ <b>$STIP</b> ],^checkout(bordersingle)") [[ "$BORD" == false ]] && out+=("<big>󰄱</big> $BORDERS [ <b>$STIP</b> ],^checkout(bordersingle)") || out+=("<big>󰄲</big> $BORDERS [ <b>$STIP</b> ],^checkout(bordersingle)")
@ -869,7 +868,6 @@ if [[ "$FONT" != "" ]];then
out2+=("2,conkyctl stippled_borders 2 ${1};$me") out2+=("2,conkyctl stippled_borders 2 ${1};$me")
out2+=("3,conkyctl stippled_borders 3 ${1};$me") out2+=("3,conkyctl stippled_borders 3 ${1};$me")
out2+=("4,conkyctl stippled_borders 4 ${1};$me") out2+=("4,conkyctl stippled_borders 4 ${1};$me")
fi
fi #OLD SYNTAX CHECK fi #OLD SYNTAX CHECK
out+=("^sep()") out+=("^sep()")
out+=(" $EDIT ${title^},xdg-open ${1}") out+=(" $EDIT ${title^},xdg-open ${1}")