conky improvements

This commit is contained in:
Daniel Napora 2025-01-11 15:43:23 +01:00
parent 4ded5ac5a2
commit e1cabc24a3

View File

@ -717,28 +717,28 @@ if [[ "$OLD_SYNTAX" = "true" ]];then
if [[ "$1" =~ "quoter" ]]; then if [[ "$1" =~ "quoter" ]]; then
case "$LANG" in case "$LANG" in
pl*) pl*)
FONTSIZE="Rozmiar czcionki" FONTSIZE="Czcionka i rozmiar"
QUOTE_FSIZE="Cytat" QUOTE_FSIZE="Cytat"
AUTHOR_FSIZE="Autor" AUTHOR_FSIZE="Autor"
EDIT_CONF="Edytuj plik konfiguracyjny" EDIT_CONF="Edytuj plik konfiguracyjny"
RELOAD="Przeładuj" RELOAD="Przeładuj"
;; ;;
es*) es*)
FONTSIZE="Font size" FONTSIZE="Font size & family"
QUOTE_FSIZE="Quote" QUOTE_FSIZE="Quote"
AUTHOR_FSIZE="Author" AUTHOR_FSIZE="Author"
EDIT_CONF="Edit conf file" EDIT_CONF="Edit conf file"
RELOAD="Reload" RELOAD="Reload"
;; ;;
*) *)
FONTSIZE="Font size" FONTSIZE="Font size & family"
QUOTE_FSIZE="Quote" QUOTE_FSIZE="Quote"
AUTHOR_FSIZE="Author" AUTHOR_FSIZE="Author"
EDIT_CONF="Edit conf file" EDIT_CONF="Edit conf file"
RELOAD="Reload" RELOAD="Reload"
;; ;;
esac esac
Q_CFG="$HOME/.config/quoter/quoter.cfg" Q_CFG="$HOME/.config/quoter/quoter.conf"
source "$Q_CFG" source "$Q_CFG"
out+=("^sep($FONTSIZE)") out+=("^sep($FONTSIZE)")
out+=("$QUOTE_FSIZE [ <b>$quote_fontsize</b> ],^checkout(qsize)") out+=("$QUOTE_FSIZE [ <b>$quote_fontsize</b> ],^checkout(qsize)")
@ -753,6 +753,22 @@ if [[ "$OLD_SYNTAX" = "true" ]];then
for i in 10 11 12 13 14 15 16 18 20; do for i in 10 11 12 13 14 15 16 18 20; do
out2+=("${i},mb-setvar author_fontsize=$i $Q_CFG;conkyctl restartone ${1};$me") out2+=("${i},mb-setvar author_fontsize=$i $Q_CFG;conkyctl restartone ${1};$me")
done done
#FONT FAMILY FOR QUOTER
out+=("$FONT_NAME [ <b>${font_name}</b> ],^checkout(qfontfamily)")
out2+=("^tag(qfontfamily)")
if [ -f "$HOME/.config/mabox/fonts.list" ];then
mapfile -t favfonts < <( grep -vE "^($|#)" ~/.config/mabox/fonts.list)
else
mapfile -t favfonts < <( grep -vE "^($|#)" /usr/share/mabox-colorizer/fonts.list)
cp /usr/share/mabox-colorizer/fonts.list ~/.config/mabox/
fi
#notify-send.sh "Ile" "${#favfonts[@]}"
if [ "${#favfonts[@]}" -gt 0 ];then
out2+=("^sep($FONTFAMILY_LBL)")
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>,mb-setvar 'font_name=\"${fon}\"' $Q_CFG;conkyctl restartone ${1}")
done
fi
fi fi
out+=("^sep($COLORS)") out+=("^sep($COLORS)")
@ -1192,7 +1208,11 @@ do
done < <(awk 'NR == n' n=$2 "$SCHEMEFILE") done < <(awk 'NR == n' n=$2 "$SCHEMEFILE")
} }
fix_transparent_conkies(){
transparent true ${CONKYDIR}/Polaroid_mbcolor.conkyrc
transparent true ${CONKYDIR}/logo_mbcolor.conkyrc
transparent true ${CONKYDIR}/logo_SVG_mbcolor.conkyrc
}
applyscheme_all () { applyscheme_all () {
case "$1" in case "$1" in
@ -1214,6 +1234,8 @@ do
stippled_borders_all ${stip} stippled_borders_all ${stip}
draw_borders_all ${bord} draw_borders_all ${bord}
done < <(awk 'NR == n' n=$2 "$SCHEMEFILE") done < <(awk 'NR == n' n=$2 "$SCHEMEFILE")
fix_transparent_conkies
} }
@ -1297,6 +1319,8 @@ else # light
color1_all "${pal[8]}" color1_all "${pal[8]}"
color2_all "${pal[1]}" color2_all "${pal[1]}"
fi fi
fix_transparent_conkies
colorizer-conky -s 2>/dev/null colorizer-conky -s 2>/dev/null
} }
monoone () { monoone () {