fonts handling improvements
This commit is contained in:
parent
3158254a39
commit
7c0bd902af
@ -66,13 +66,15 @@ case "$LANG" in
|
||||
COLOR_1="Kolor 1 <small>(większy tekst)</small>"
|
||||
COLOR_2="Kolor 2 <small>(pasek/graf)</small>"
|
||||
BACKGROUND="Kolor tła"
|
||||
TRANSPARENT="Przezroczyste?"
|
||||
TRANSPARENT="Przezroczyste tło?"
|
||||
YES="Tak"
|
||||
NO="Nie"
|
||||
FONTS="Czcionka"
|
||||
SELECTFONT="Wybierz czcionkę..."
|
||||
INCREASE="Powiększ"
|
||||
DECREASE="Pomniejsz"
|
||||
FONTFAMILY_LBL="czcionka"
|
||||
FONTSIZE_LBL="rozmiar czcionki"
|
||||
INCREASE="Powiększ do"
|
||||
DECREASE="Pomniejsz do"
|
||||
OLINE="Obrys"
|
||||
SHADOW="Cień"
|
||||
DRAW="Rysuj"
|
||||
@ -109,13 +111,15 @@ case "$LANG" in
|
||||
COLOR_1="Color 1 <small>(bigger text)</small>"
|
||||
COLOR_2="Color 2 <small>(bars/graphs)</small>"
|
||||
BACKGROUND="Background color"
|
||||
TRANSPARENT="Transparent?"
|
||||
TRANSPARENT="Transparent background?"
|
||||
YES="Yes"
|
||||
NO="No"
|
||||
FONTS="Font"
|
||||
SELECTFONT="Select Font..."
|
||||
INCREASE="Increase"
|
||||
DECREASE="Decrease"
|
||||
FONTFAMILY_LBL="font family"
|
||||
FONTSIZE_LBL="font size"
|
||||
INCREASE="Increase to"
|
||||
DECREASE="Decrease to"
|
||||
OLINE="Outline"
|
||||
SHADOW="Shadow"
|
||||
DRAW="Draw"
|
||||
@ -160,7 +164,7 @@ getvalues () {
|
||||
read STIP <<< "$(grep stippled_borders ${BASECONKY} | cut -d'=' -f2 | cut -d"," -f1)"
|
||||
}
|
||||
|
||||
if pgrep -af "conky.*mbcolor" >/dev/null; then
|
||||
if pgrep -u $USER -af "conky.*mbcolor" >/dev/null; then
|
||||
|
||||
getvalues
|
||||
[[ "$WINTRANS" == false ]] && BG="bgcolor='$WINCLR'" || BG=""
|
||||
@ -176,7 +180,7 @@ if pgrep -af "conky.*mbcolor" >/dev/null; then
|
||||
#done < <(pgrep -af "conky.*mbcolor")
|
||||
|
||||
# array with running conkies - only filenames with full path
|
||||
readarray -t running < <(pgrep -af "conky -c " | cut -d' ' -f4)
|
||||
readarray -t running < <(pgrep -u $USER -af "conky -c " | cut -d' ' -f4)
|
||||
|
||||
#array with all conkies found
|
||||
#for i in "$CONKYDIR"/*.con* "$CONKYDIR"/**/*.con*; do
|
||||
@ -262,7 +266,7 @@ if pgrep -af "conky.*mbcolor" >/dev/null; then
|
||||
else
|
||||
out+=("<small><span bgcolor='$WINCLR'> transparent </span></small> $BACKGROUND,^pipe(mbclr '$WINCLR' conkyctl win_bgcolor_all '${BACKGROUND}' '$me')")
|
||||
fi
|
||||
out+=("$TRANSPARENT [ <b>$WINTRANS</b> ],^checkout(trans)")
|
||||
[[ "$WINTRANS" == false ]] && out+=("<big></big> $TRANSPARENT,conkyctl transparent_all true;$me") || out+=("<big></big> $TRANSPARENT,conkyctl transparent_all false;$me")
|
||||
out+=("^sep()")
|
||||
|
||||
|
||||
@ -271,10 +275,6 @@ if pgrep -af "conky.*mbcolor" >/dev/null; then
|
||||
out+=("<small><span bgcolor='$CLR1'> </span><span weight='bold' ${BG} fgcolor='$CLR1'> AbCd </span></small> $COLOR_1,^pipe(mbclr '$CLR1' conkyctl color1_all '${COLOR_1}' '$me')")
|
||||
out+=("<small><span bgcolor='$CLR2'> </span><span weight='bold' ${BG} fgcolor='$CLR2'> AbCd </span></small> $COLOR_2,^pipe(mbclr '$CLR2' conkyctl color2_all '${COLOR_2}' '$me')")
|
||||
#out+=("^sep()")
|
||||
out2+=("^tag(trans)")
|
||||
out2+=("^sep($TRANSPARENT)")
|
||||
out2+=("$YES,conkyctl transparent_all true;$me")
|
||||
out2+=("$NO,conkyctl transparent_all false;$me")
|
||||
out+=("^sep()")
|
||||
|
||||
out+=("<span bgcolor='#282828'> <span fgcolor='#ebdbb2'></span> <span fgcolor='#98971a'></span> <span fgcolor='#d79921'></span> <span fgcolor='#cc241d'></span> </span> $REGENERATE,^checkout(regenconky)")
|
||||
@ -296,36 +296,55 @@ if pgrep -af "conky.*mbcolor" >/dev/null; then
|
||||
|
||||
out+=("^sep()")
|
||||
|
||||
out+=("$FONTS [ <b>$FONT $FONTSIZE</b> ],^checkout(font)")
|
||||
out+=("<big></big> $FONTS [ <b><span font_family=\"${FONT}\">$FONT</span> $FONTSIZE</b> ],^checkout(font)")
|
||||
out2+=("^tag(font)")
|
||||
out2+=("^sep($FONTS)")
|
||||
out2+=("$SELECTFONT,mb-setfont conky_all;$me")
|
||||
out2+=("^sep()")
|
||||
out2+=("<tt>++</tt> $INCREASE,conkyctl basefont_inc_all;$me")
|
||||
out2+=("<tt>--</tt> $DECREASE,conkyctl basefont_dec_all;$me")
|
||||
out+=("$OLINE/$SHADOW [ <b>$SHADOWS</b> ],^checkout(outline)")
|
||||
out2+=("^tag(outline)")
|
||||
out2+=("^sep($DRAW $OLINE/$SHADOW?)")
|
||||
out2+=("$NO,conkyctl shades_all no;$me")
|
||||
out2+=("^sep()")
|
||||
out2+=("$DRAW $SHADOW,conkyctl shades_all shadow;$me")
|
||||
out2+=("$DRAW $OLINE,conkyctl shades_all outline;$me")
|
||||
|
||||
|
||||
out2+=("<big></big> $SELECTFONT [ <b><span font_family=\"${FONT}\">$FONT</span> $FONTSIZE</b> ],mb-setfont conky_all;$me")
|
||||
|
||||
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>,conkyctl basefont_family_all \"${fon}\";$me")
|
||||
done
|
||||
fi
|
||||
out2+=("^sep()")
|
||||
out2+=("<small> Edit favorited fonts list</small>,geany ~/.config/mabox/fonts.list")
|
||||
out2+=("^sep($FONTSIZE_LBL)")
|
||||
out2+=("<big></big> $INCREASE <b>$((FONTSIZE+1)) px</b>,conkyctl basefont_inc_all;$me")
|
||||
out2+=("<big></big> $DECREASE <b>$((FONTSIZE-1)) px</b>,conkyctl basefont_dec_all;$me")
|
||||
out2+=("^sep()")
|
||||
sizes=(14 13 12 11 10 9 8 7 6)
|
||||
for i in "${sizes[@]}"
|
||||
do
|
||||
[[ "$FONTSIZE" == "$i" ]] && out2+=("<big>綠</big> <b>$i px</b>,conkyctl basefont_size_all $i;$me") || out2+=("<big>祿</big> $i px,conkyctl basefont_size_all $i;$me")
|
||||
done
|
||||
|
||||
[[ "$SHADOWS" == "shadow" ]] && out+=("<big></big> $SHADOW,conkyctl shades_all no;$me") || out+=("<big></big> $SHADOW,conkyctl shades_all shadow;$me")
|
||||
[[ "$SHADOWS" == "outline" ]] && out+=("<big></big> $OLINE,conkyctl shades_all no;$me") || out+=("<big></big> $OLINE,conkyctl shades_all outline;$me")
|
||||
out+=("^sep()")
|
||||
out+=("$BORDERS [ <b>$BORD $STIP</b> ],^checkout(border)")
|
||||
|
||||
[[ "$BORD" == false ]] && out+=("<big></big> $BORDERS [ <b>$STIP</b> ],^checkout(border)") || out+=("<big></big> $BORDERS [ <b>$STIP</b> ],^checkout(border)")
|
||||
|
||||
out2+=("^tag(border)")
|
||||
out2+=("^sep($DRAW $BORDERS?)")
|
||||
out2+=("$YES,conkyctl draw_borders_all true;$me")
|
||||
out2+=("$NO,conkyctl draw_borders_all false;$me")
|
||||
[[ "$BORD" == false ]] && out2+=("<big>祿</big> $YES,conkyctl draw_borders_all true;$me") || out2+=("<big>綠</big> $YES,conkyctl draw_borders_all false;$me")
|
||||
[[ "$BORD" == false ]] && out2+=("<big>綠</big> $NO,conkyctl draw_borders_all true;$me") || out2+=("<big>祿</big> $NO,conkyctl draw_borders_all false;$me")
|
||||
|
||||
out2+=("^sep($STIPPLED_BORDERS?)")
|
||||
out2+=("0 ($SOLID_LINE),conkyctl stippled_borders_all 0;$me")
|
||||
[[ "$STIP" == 0 ]] && out2+=("<big>綠</big> 0 ($SOLID_LINE),conkyctl stippled_borders_all 0;$me") || out2+=("<big>祿</big> 0 ($SOLID_LINE),conkyctl stippled_borders_all 0;$me")
|
||||
out2+=("^sep()")
|
||||
out2+=("1,conkyctl stippled_borders_all 1;$me")
|
||||
out2+=("2,conkyctl stippled_borders_all 2;$me")
|
||||
out2+=("3,conkyctl stippled_borders_all 3;$me")
|
||||
out2+=("4,conkyctl stippled_borders_all 4;$me")
|
||||
|
||||
[[ "$STIP" == 1 ]] && out2+=("<big>綠</big> 1 px,conkyctl stippled_borders_all 1;$me") || out2+=("<big>祿</big> 1 px,conkyctl stippled_borders_all 1;$me")
|
||||
[[ "$STIP" == 2 ]] && out2+=("<big>綠</big> 2 px,conkyctl stippled_borders_all 2;$me") || out2+=("<big>祿</big> 2 px,conkyctl stippled_borders_all 2;$me")
|
||||
[[ "$STIP" == 3 ]] && out2+=("<big>綠</big> 3 px,conkyctl stippled_borders_all 3;$me") || out2+=("<big>祿</big> 3 px,conkyctl stippled_borders_all 3;$me")
|
||||
[[ "$STIP" == 4 ]] && out2+=("<big>綠</big> 4 px,conkyctl stippled_borders_all 4;$me") || out2+=("<big>祿</big> 4 px,conkyctl stippled_borders_all 4;$me")
|
||||
|
||||
|
||||
out+=("^sep($RESET)")
|
||||
out+=(" $RESETCOLORS,^checkout(resetcolors)")
|
||||
|
||||
@ -320,16 +320,25 @@ out2+=("<tt><span bgcolor='$NBG' fgcolor='$NFG'> <b>inactive title</b> </span>
|
||||
out2+=("^sep($TITLEBAR_FONT)")
|
||||
out2+=("$FONT... [ <b> ${FNAME} ${FSIZE} </b> ],mb-setfont obtitle;$me")
|
||||
out2+=("^sep(font family)")
|
||||
fonts=("Noto Sans" "DejaVu Serif" "Roboto Light" "Inconsolata" "Ubuntu" "Source Code Pro")
|
||||
for i in "${fonts[@]}"
|
||||
do
|
||||
[[ "$FNAME" == "$i" ]] && out2+=("<big>綠</big> <span size=\"large\" font_family=\"${i}\">$i</span>,$me") || out2+=("<big>祿</big> <span size=\"large\" font_family=\"${i}\">$i</span>,obtctl fontfamily \"${i}\";$me")
|
||||
done
|
||||
|
||||
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
|
||||
if [ "${#favfonts[@]}" -gt 0 ];then
|
||||
for fon in "${favfonts[@]}";do
|
||||
[[ "${FNAME}" == "$fon" ]] && out2+=("<big>綠</big> <span font_family=\"${fon}\">${fon}</span>,$me") || out2+=("<big>祿</big> <span font_family=\"${fon}\">${fon}</span>,obtctl fontfamily \"${fon}\";$me")
|
||||
done
|
||||
fi
|
||||
|
||||
|
||||
out2+=("^sep()")
|
||||
[[ "$WEIGHT" =~ .*"old" ]] && out2+=("<big></big> <b>$BOLD</b>,obtctl fontweight Normal;$me") || out2+=("<big></big> <b>$BOLD</b>,obtctl fontweight Bold;$me")
|
||||
[[ "$SLANT" =~ .*"talic" ]] && out2+=("<big></big> <i>$ITALIC</i>,obtctl fontslant Normal;$me") || out2+=("<big></big> <i>$ITALIC</i>,obtctl fontslant Italic;$me")
|
||||
out2+=("^sep($FONTSIZE)")
|
||||
sizes=(8 9 10 11 12 13 14 15 16)
|
||||
sizes=(16 15 14 13 12 11 10 9 8)
|
||||
for i in "${sizes[@]}"
|
||||
do
|
||||
[[ "$FSIZE" == "$i" ]] && out2+=("<big>綠</big> <b>$i px</b>,obtctl fontsize $i;$me") || out2+=("<big>祿</big> $i px,obtctl fontsize $i;$me")
|
||||
@ -438,11 +447,20 @@ out+=("$SWITCH_TO_MBCOLORS,obtctl theme MBcolors;$me")
|
||||
out+=("^sep($TITLEBAR_FONT)")
|
||||
out+=("$FONT... [ <b> ${FNAME} ${FSIZE} </b> ],mb-setfont obtitle;$me")
|
||||
out+=("^sep(font family)")
|
||||
fonts=("Noto Sans" "DejaVu Serif" "Roboto Light" "Inconsolata" "Ubuntu" "Source Code Pro")
|
||||
for i in "${fonts[@]}"
|
||||
do
|
||||
[[ "$FNAME" == "$i" ]] && out+=("<big>綠</big> <span size=\"large\" font_family=\"${i}\">$i</span>,$me") || out+=("<big>祿</big> <span size=\"large\" font_family=\"${i}\">$i</span>,obtctl fontfamily \"${i}\";$me")
|
||||
done
|
||||
|
||||
|
||||
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
|
||||
if [ "${#favfonts[@]}" -gt 0 ];then
|
||||
for fon in "${favfonts[@]}";do
|
||||
[[ "${FNAME}" == "$fon" ]] && out+=("<big>綠</big> <span font_family=\"${fon}\">${fon}</span>,$me") || out+=("<big>祿</big> <span font_family=\"${fon}\">${fon}</span>,obtctl fontfamily \"${fon}\";$me")
|
||||
done
|
||||
fi
|
||||
|
||||
out+=("^sep()")
|
||||
[[ "$WEIGHT" =~ .*"old" ]] && out+=("<big></big> <b>$BOLD</b>,obtctl fontweight Normal;$me") || out+=("<big></big> <b>$BOLD</b>,obtctl fontweight Bold;$me")
|
||||
[[ "$SLANT" =~ .*"talic" ]] && out+=("<big></big> <i>$ITALIC</i>,obtctl fontslant Normal;$me") || out+=("<big></big> <i>$ITALIC</i>,obtctl fontslant Italic;$me")
|
||||
@ -450,7 +468,7 @@ out+=("^sep()")
|
||||
out+=("$FONTSIZE [ <b>$FSIZE px</b> ],^checkout(obfsize)")
|
||||
out2+=("^tag(obfsize)")
|
||||
out2+=("^sep($FONTSIZE)")
|
||||
sizes=(8 9 10 11 12 13 14 15 16)
|
||||
sizes=(16 15 14 13 12 11 10 9 8)
|
||||
for i in "${sizes[@]}"
|
||||
do
|
||||
[[ "$FSIZE" == "$i" ]] && out2+=("<big>綠</big> <b>$i px</b>,obtctl fontsize $i;$me") || out2+=("<big>祿</big> $i px,obtctl fontsize $i;$me")
|
||||
|
||||
113
bin/conkyctl
113
bin/conkyctl
@ -18,7 +18,7 @@ update_session () {
|
||||
while read -r pid b c confpath
|
||||
do
|
||||
echo "$b $c ${confpath} & sleep .5" >> ${SESSIONFILE}
|
||||
done < <(pgrep -af "conky -c ")
|
||||
done < <(pgrep -u $USER -af "conky -c ")
|
||||
# Remove duplicates
|
||||
awk -i inplace '!seen[$0]++' ${SESSIONFILE}
|
||||
}
|
||||
@ -109,6 +109,30 @@ basefont_dec () {
|
||||
((FONTSIZE--))
|
||||
sd "font .*=.*,$" "font = '${FONT}:size=${FONTSIZE}'," ${1}
|
||||
}
|
||||
basefont_family () {
|
||||
read FONTDEF <<< "$(grep "font .*=.*,$" ${1} | cut -d'=' -f2,3 |cut -d"'" -f2)"
|
||||
FONT=${FONTDEF%:*}
|
||||
FONTSIZE=${FONTDEF#*=}
|
||||
sd "font .*=.*,$" "font = '${2}:size=${FONTSIZE}'," ${1}
|
||||
}
|
||||
basefont_family_all () {
|
||||
read FONTDEF <<< "$(grep "font .*=.*,$" ${BASECONKY} | cut -d'=' -f2,3 |cut -d"'" -f2)"
|
||||
FONT=${FONTDEF%:*}
|
||||
FONTSIZE=${FONTDEF#*=}
|
||||
sd "font .*=.*,$" "font = '${1}:size=${FONTSIZE}'," ${CONKYDIR}/*mbcolor.conkyrc
|
||||
}
|
||||
basefont_size () {
|
||||
read FONTDEF <<< "$(grep "font .*=.*,$" ${1} | cut -d'=' -f2,3 |cut -d"'" -f2)"
|
||||
FONT=${FONTDEF%:*}
|
||||
FONTSIZE=${FONTDEF#*=}
|
||||
sd "font .*=.*,$" "font = '${FONT}:size=${2}'," ${1}
|
||||
}
|
||||
basefont_size_all () {
|
||||
read FONTDEF <<< "$(grep "font .*=.*,$" ${BASECONKY} | cut -d'=' -f2,3 |cut -d"'" -f2)"
|
||||
FONT=${FONTDEF%:*}
|
||||
FONTSIZE=${FONTDEF#*=}
|
||||
sd "font .*=.*,$" "font = '${FONT}:size=${1}'," ${CONKYDIR}/*mbcolor.conkyrc
|
||||
}
|
||||
shades_all () {
|
||||
case "$1" in
|
||||
shadow)
|
||||
@ -242,7 +266,7 @@ startone () {
|
||||
}
|
||||
startall () {
|
||||
for i in "$CONKYDIR"/*_mbcolor*; do
|
||||
if pgrep -af "conky .*${i}" >/dev/null; then
|
||||
if pgrep -u $USER -af "conky .*${i}" >/dev/null; then
|
||||
:
|
||||
else
|
||||
conky -c "${i}" &
|
||||
@ -388,8 +412,10 @@ languages () {
|
||||
NO="Nie"
|
||||
FONTS="Czcionka"
|
||||
SELECTFONT="Wybierz czcionkę..."
|
||||
INCREASE="Powiększ"
|
||||
DECREASE="Pomniejsz"
|
||||
FONTFAMILY_LBL="czcionka"
|
||||
FONTSIZE_LBL="rozmiar czcionki"
|
||||
INCREASE="Powiększ do"
|
||||
DECREASE="Pomniejsz do"
|
||||
OLINE="Obrys"
|
||||
SHADOW="Cień"
|
||||
DRAW="Rysuj"
|
||||
@ -448,8 +474,10 @@ languages () {
|
||||
NO="No"
|
||||
FONTS="Font"
|
||||
SELECTFONT="Select Font..."
|
||||
INCREASE="Increase"
|
||||
DECREASE="Decrease"
|
||||
FONTFAMILY_LBL="font family"
|
||||
FONTSIZE_LBL="font size"
|
||||
INCREASE="Increase to"
|
||||
DECREASE="Decrease to"
|
||||
OLINE="Outline"
|
||||
SHADOW="Shadow"
|
||||
DRAW="Draw"
|
||||
@ -508,8 +536,10 @@ languages () {
|
||||
NO="No"
|
||||
FONTS="Font"
|
||||
SELECTFONT="Select Font..."
|
||||
INCREASE="Increase"
|
||||
DECREASE="Decrease"
|
||||
FONTFAMILY_LBL="font family"
|
||||
FONTSIZE_LBL="font size"
|
||||
INCREASE="Increase to"
|
||||
DECREASE="Decrease to"
|
||||
OLINE="Outline"
|
||||
SHADOW="Shadow"
|
||||
DRAW="Draw"
|
||||
@ -671,19 +701,16 @@ if [[ "$OLD_SYNTAX" = "true" ]];then
|
||||
fi
|
||||
|
||||
out+=("^sep($COLORS)")
|
||||
|
||||
|
||||
[[ "$WINTRANS" == false ]] && out+=("<big></big> $TRANSPARENT,conkyctl transparent true ${1}") || out+=("<big></big> $TRANSPARENT,conkyctl transparent false ${1}")
|
||||
|
||||
|
||||
if [[ "$WINCLR" != "#" ]];then
|
||||
if [ "$WINTRANS" == false ];then
|
||||
out+=("<small><span bgcolor='$WINCLR'> </span><span ${BG} fgcolor='$WINCLR'> AbCd </span></small> $BACKGROUND,^pipe(mbclr '$WINCLR' conkyctl win_bgcolor '${BACKGROUND}' '$me' ${1})")
|
||||
out+=("^sep()")
|
||||
else
|
||||
out+=("<small><span bgcolor='$WINCLR'> transparent </span></small> $BACKGROUND,^pipe(mbclr '$WINCLR' conkyctl win_bgcolor '${BACKGROUND}' '$me' ${1})")
|
||||
out+=("^sep()")
|
||||
fi
|
||||
fi
|
||||
[[ "$WINTRANS" == false ]] && out+=("<big></big> $TRANSPARENT,conkyctl transparent true ${1}") || out+=("<big></big> $TRANSPARENT,conkyctl transparent false ${1}")
|
||||
out+=("^sep()")
|
||||
|
||||
if [[ "$1" != *"logo_mbcolor"* ]]; then
|
||||
|
||||
@ -733,23 +760,53 @@ if [[ "$OLD_SYNTAX" = "true" ]];then
|
||||
|
||||
if [[ "$1" != *"logo_mbcolor"* ]]; then
|
||||
if [[ "$1" != *"quoter_mbcolor"* ]]; then
|
||||
out+=("$FONTS [ <b>$FONT $FONTSIZE</b> ],^checkout(fontsingle)")
|
||||
out+=("<big></big> $FONTS [ <b><span font_family=\"${FONT}\">$FONT</span> $FONTSIZE</b> ],^checkout(fontsingle)")
|
||||
out2+=("^tag(fontsingle)")
|
||||
out2+=("^sep($FONTS)")
|
||||
|
||||
out2+=("$SELECTFONT,mb-setfont conky_single ${1};$me")
|
||||
out2+=("^sep()")
|
||||
out2+=("<tt>++</tt> $INCREASE,conkyctl basefont_inc ${1};$me")
|
||||
out2+=("<tt>--</tt> $DECREASE,conkyctl basefont_dec ${1};$me")
|
||||
out2+=("<big></big> $SELECTFONT [ <b><span font_family=\"${FONT}\">$FONT</span> $FONTSIZE</b> ],mb-setfont conky_single ${1};$me")
|
||||
|
||||
|
||||
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>,conkyctl basefont_family ${1} \"${fon}\";$me")
|
||||
done
|
||||
fi
|
||||
out+=("$OLINE/$SHADOW [ <b>$SHADOWS</b> ],^checkout(outline2)")
|
||||
out2+=("^tag(outline2)")
|
||||
out2+=("^sep($DRAW $OLINE/$SHADOW?)")
|
||||
out2+=("$NO,conkyctl shades no ${1};$me")
|
||||
out2+=("^sep()")
|
||||
out2+=("$DRAW $SHADOW,conkyctl shades shadow ${1};$me")
|
||||
out2+=("$DRAW $OLINE,conkyctl shades outline ${1};$me")
|
||||
out2+=("<small> Edit favorited fonts list</small>,geany ~/.config/mabox/fonts.list")
|
||||
out2+=("^sep($FONTSIZE_LBL)")
|
||||
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+=("^sep()")
|
||||
sizes=(14 13 12 11 10 9 8 7 6)
|
||||
for i in "${sizes[@]}"
|
||||
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")
|
||||
done
|
||||
|
||||
|
||||
fi
|
||||
|
||||
|
||||
|
||||
[[ "$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")
|
||||
out+=("^sep()")
|
||||
#out+=("$OLINE/$SHADOW [ <b>$SHADOWS</b> ],^checkout(outline2)")
|
||||
#out2+=("^tag(outline2)")
|
||||
#out2+=("^sep($DRAW $OLINE/$SHADOW?)")
|
||||
#out2+=("$NO,conkyctl shades no ${1};$me")
|
||||
#out2+=("^sep()")
|
||||
#out2+=("$DRAW $SHADOW,conkyctl shades shadow ${1};$me")
|
||||
#out2+=("$DRAW $OLINE,conkyctl shades outline ${1};$me")
|
||||
#out+=("^sep()")
|
||||
fi
|
||||
[[ "$BORD" == false ]] && out+=("<big></big> $BORDERS [ <b>$STIP</b> ],^checkout(bordersingle)") || out+=("<big></big> $BORDERS [ <b>$STIP</b> ],^checkout(bordersingle)")
|
||||
out2+=("^tag(bordersingle)")
|
||||
@ -1209,6 +1266,10 @@ case "$1" in
|
||||
basefont_dec_all) basefont_dec_all;;
|
||||
basefont_inc) basefont_inc "$2";;
|
||||
basefont_dec) basefont_dec "$2";;
|
||||
basefont_family) basefont_family "$2" "$3";;
|
||||
basefont_family_all) basefont_family_all "$2";;
|
||||
basefont_size) basefont_size "$2" "$3";;
|
||||
basefont_size_all) basefont_size_all "$2";;
|
||||
setfont_all) setfont_all;;
|
||||
serfont) setfont;;
|
||||
shades_all) shades_all "$2";;
|
||||
|
||||
@ -8,3 +8,4 @@ Noto Sans
|
||||
Roboto
|
||||
Ubuntu
|
||||
Noto Sans Light
|
||||
Source Code Pro
|
||||
|
||||
Loading…
Reference in New Issue
Block a user