Compare commits
No commits in common. "master" and "0.9.79" have entirely different histories.
|
@ -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////_}
|
||||||
|
|
44
bin/conkyctl
44
bin/conkyctl
|
@ -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)")
|
||||||
|
@ -829,32 +828,32 @@ if [[ "$FONT" != "" ]];then
|
||||||
out2+=("<big></big> $INCREASE <b>$((FONTSIZE+1)) px</b>,conkyctl basefont_inc ${1};$me")
|
out2+=("<big></big> $INCREASE <b>$((FONTSIZE+1)) px</b>,conkyctl basefont_inc ${1};$me")
|
||||||
out2+=("<big></big> $DECREASE <b>$((FONTSIZE-1)) px</b>,conkyctl basefont_dec ${1};$me")
|
out2+=("<big></big> $DECREASE <b>$((FONTSIZE-1)) px</b>,conkyctl basefont_dec ${1};$me")
|
||||||
out2+=("^sep()")
|
out2+=("^sep()")
|
||||||
sizes=(14 13 12 11 10 9 8 7 6)
|
sizes=(14 13 12 11 10 9 8 7 6)
|
||||||
for i in "${sizes[@]}"
|
for i in "${sizes[@]}"
|
||||||
do
|
do
|
||||||
[[ "$FONTSIZE" == "$i" ]] && out2+=("<big>綠</big> <b>$i px</b>,conkyctl basefont_size ${1} $i;$me") || out2+=("<big>祿</big> $i px,conkyctl basefont_size ${1} $i;$me")
|
[[ "$FONTSIZE" == "$i" ]] && out2+=("<big>綠</big> <b>$i px</b>,conkyctl basefont_size ${1} $i;$me") || out2+=("<big>祿</big> $i px,conkyctl basefont_size ${1} $i;$me")
|
||||||
done
|
done
|
||||||
|
|
||||||
if [ -f "$HOME/.config/mabox/fonts.list" ];then
|
if [ -f "$HOME/.config/mabox/fonts.list" ];then
|
||||||
mapfile -t favfonts < <( grep -vE "^($|#)" ~/.config/mabox/fonts.list)
|
mapfile -t favfonts < <( grep -vE "^($|#)" ~/.config/mabox/fonts.list)
|
||||||
else
|
else
|
||||||
mapfile -t favfonts < <( grep -vE "^($|#)" /usr/share/mabox-colorizer/fonts.list)
|
mapfile -t favfonts < <( grep -vE "^($|#)" /usr/share/mabox-colorizer/fonts.list)
|
||||||
cp /usr/share/mabox-colorizer/fonts.list ~/.config/mabox/
|
cp /usr/share/mabox-colorizer/fonts.list ~/.config/mabox/
|
||||||
fi
|
fi
|
||||||
#notify-send.sh "Ile" "${#favfonts[@]}"
|
#notify-send.sh "Ile" "${#favfonts[@]}"
|
||||||
if [ "${#favfonts[@]}" -gt 0 ];then
|
if [ "${#favfonts[@]}" -gt 0 ];then
|
||||||
out2+=("^sep($FONTFAMILY_LBL)")
|
out2+=("^sep($FONTFAMILY_LBL)")
|
||||||
for fon in "${favfonts[@]}";do
|
for fon in "${favfonts[@]}";do
|
||||||
[[ "$FONT" == "$fon" ]] && out2+=("<big>綠</big> <span font_family=\"${fon}\">${fon}</span>,$me") || out2+=("<big>祿</big> <span font_family=\"${fon}\">${fon}</span>,conkyctl basefont_family ${1} \"${fon}\";$me")
|
[[ "$FONT" == "$fon" ]] && out2+=("<big>綠</big> <span font_family=\"${fon}\">${fon}</span>,$me") || out2+=("<big>祿</big> <span font_family=\"${fon}\">${fon}</span>,conkyctl basefont_family ${1} \"${fon}\";$me")
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
out2+=("^sep()")
|
out2+=("^sep()")
|
||||||
out2+=("<small> $_EDIT_FAVFONTS</small>,geany ~/.config/mabox/fonts.list")
|
out2+=("<small> $_EDIT_FAVFONTS</small>,geany ~/.config/mabox/fonts.list")
|
||||||
|
|
||||||
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}")
|
||||||
|
|
Loading…
Reference in New Issue