diff --git a/usr/bin/jgmenusettings-pipe b/usr/bin/jgmenusettings-pipe index 11448ca..8856a35 100755 --- a/usr/bin/jgmenusettings-pipe +++ b/usr/bin/jgmenusettings-pipe @@ -335,8 +335,8 @@ out2+=("$TOPMARGIN [ ${panels_topmargin:-0} ],^checkout(topmargin)") # FONTS out+=("^sep($SIZE)") -out+=("$ITEM_FONT [ $menu_font_family $menu_font_size ],^checkout(itemfont)") -out+=("$TITLE_FONT [ $menu_sep_font_family $menu_sep_font_size ],^checkout(titlefont)") +out+=("󰛖 $ITEM_FONT [ $menu_font_family $menu_font_size ],^checkout(itemfont)") +out+=("󰛖 $TITLE_FONT [ $menu_sep_font_family $menu_sep_font_size ],^checkout(titlefont)") #out+=("$FONT_FAMILY [ ${menu_font_family:-0} ],^checkout(fonty)") #out+=("$FONT_SIZE [ ${menu_font_size:-0} ],^checkout(fontsize)") out+=("$LINEHEIGHT [ $item_height_factor% ],^checkout(lineheight)") @@ -352,27 +352,58 @@ case $menu_font_family in esac out2+=("^tag(itemfont)") -out2+=("^sep($FONT_FAMILY)") -out2+=("$FONT_CUSTOM,mb-setfont menu_item;$me") -out2+=("^sep()") -out2+=(" ++ $INCREASE ( $((menu_font_size+1)) ),mb-setvar menu_font_size=$((menu_font_size+1));$me") -out2+=(" -- $DECREASE ( $((menu_font_size-1)) ),mb-setvar menu_font_size=$((menu_font_size-1));$me") +out2+=("^sep($ITEM_FONT)") +out2+=("󰛖 $FONT_CUSTOM,mb-setfont menu_item;$me") out2+=("^sep()") -out2+=("$nol Noto Sans Light,mb-setvar \"menu_font_family='Noto Sans Light'\";$me") -out2+=("$nom Noto Sans Medium,mb-setvar \"menu_font_family='Noto Sans Medium'\";$me") -out2+=("$de DejaVu Serif,mb-setvar \"menu_font_family='DejaVu Serif'\";$me") -out2+=("$ro Roboto Light,mb-setvar \"menu_font_family='Roboto Light'\";$me") -out2+=("$in Inconsolata,mb-setvar menu_font_family=Inconsolata;$me") -out2+=("$ub Ubuntu Regular,mb-setvar \"menu_font_family='Ubuntu Regular'\";$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 + + if [ "${#favfonts[@]}" -gt 0 ];then + out2+=("^sep($FONT_FAMILY)") + for fon in "${favfonts[@]}";do + [[ "$menu_font_family" == "$fon" ]] && out2+=(" ${fon},$me") || out2+=(" ${fon},mb-setvar \"menu_font_family='${fon}'\";$me") + done + fi + out2+=("^sep()") + out2+=(" Edit favorited fonts list,geany ~/.config/mabox/fonts.list") + out2+=("^sep($FONT_SIZE)") + out2+=("󰧴 $INCREASE $((menu_font_size+1)) px,mb-setvar menu_font_size=$((menu_font_size+1));$me") + out2+=("󰧳 $DECREASE $((menu_font_size-1)) px,mb-setvar menu_font_size=$((menu_font_size-1));$me") + out2+=("^sep()") + sizes=(14 13 12 11 10 9 8) + for i in "${sizes[@]}" + do + [[ "$menu_font_size" == "$i" ]] && out2+=(" $i px,$me") || out2+=(" $i px,mb-setvar menu_font_size=$i;$me") + done out2+=("^tag(titlefont)") out2+=("^sep($TITLE_FONT)") -out2+=("$FONT_CUSTOM,mb-setfont menu_sep;$me") +out2+=("󰛖 $FONT_CUSTOM,mb-setfont menu_sep;$me") out2+=("^sep()") -out2+=(" ++ $INCREASE ( $((menu_sep_font_size+1)) ),mb-setvar menu_sep_font_size=$((menu_sep_font_size+1));$me") -out2+=(" -- $DECREASE ( $((menu_sep_font_size-1)) ),mb-setvar menu_sep_font_size=$((menu_sep_font_size-1));$me") + +if [ "${#favfonts[@]}" -gt 0 ];then + out2+=("^sep($FONT_FAMILY)") + for fon in "${favfonts[@]}";do + [[ "$menu_sep_font_family" == "$fon" ]] && out2+=(" ${fon},$me") || out2+=(" ${fon},mb-setvar \"menu_sep_font_family='${fon}'\";$me") + done + fi + out2+=("^sep()") + out2+=(" Edit favorited fonts list,geany ~/.config/mabox/fonts.list") + out2+=("^sep($FONT_SIZE)") + out2+=("󰧴 $INCREASE $((menu_sep_font_size+1)) px,mb-setvar menu_sep_font_size=$((menu_sep_font_size+1));$me") + out2+=("󰧳 $DECREASE $((menu_sep_font_size-1)) px,mb-setvar menu_sep_font_size=$((menu_sep_font_size-1));$me") + out2+=("^sep()") + sizes=(14 13 12 11 10 9 8) + for i in "${sizes[@]}" + do + [[ "$menu_sep_font_size" == "$i" ]] && out2+=(" $i px,$me") || out2+=(" $i px,mb-setvar menu_sep_font_size=$i;$me") + done out2+=("^tag(lineheight)") for i in 160 180 200 240 280 300 400; do out2+=("$(printf "%4s%%,%s" "$i" "mb-setvar item_height_factor=${i};$me")");done