diff --git a/usr/bin/jgmenusettings-pipe b/usr/bin/jgmenusettings-pipe index c20490f..9207cc4 100755 --- a/usr/bin/jgmenusettings-pipe +++ b/usr/bin/jgmenusettings-pipe @@ -46,12 +46,8 @@ case $LANG in HIDE_ICONS="Ukryj ikony" INSTALL_SARDI="Instaluj sardi-icons" SIZE="Rozmiar i czcionka" - TINY="malutki" - SMALL="mały" - NORMAL="normalny" - BIG="duży" - HUGE="wielki" FONT_FAMILY="Czcionka" + FONT_SIZE="Rozmiar czcionki" COLOR_SCHEME="Schemat kolorystyczny" GRADIENT="Gradient" EDIT_CURRENT="Edytuj aktywny" @@ -102,12 +98,8 @@ case $LANG in HIDE_ICONS="Ocultar iconos" INSTALL_SARDI="Instalar sardi-icons" SIZE="Tamaño de Menu/Panel lateral" - TINY="Diminuto" - SMALL="Pequeño" - NORMAL="Normal" - BIG="Grande" - HUGE="Muy Grande" FONT_FAMILY="Familia tipográfica" + FONT_SIZE="Tamaño de fuente" COLOR_SCHEME="Esquema de colores" GRADIENT="Gradient" EDIT_CURRENT="Editar el actual" @@ -158,12 +150,8 @@ case $LANG in HIDE_ICONS="Hide icons" INSTALL_SARDI="Install sardi-icons" SIZE="Menu/Sidepanels Size and Font" - TINY="tiny" - SMALL="small" - NORMAL="normal" - BIG="big" - HUGE="huge" FONT_FAMILY="Font Family" + FONT_SIZE="Font Size" COLOR_SCHEME="Color Scheme" GRADIENT="Gradient position" EDIT_CURRENT="Edit current" @@ -178,18 +166,6 @@ me="mb-jgtools $jgtools_last" L="mb-jgtools places" R="mb-jgtools right" -#out+=("^sep($TITLE)") -case $menu_font_size in - 7) t="";; - 8) s="";; - 9) n="";; - 10) b="";; - 11) h="";; - *);; -esac - -## NOWE .... -#out+=("^sep()") out+=("^sep($MENU_ITEMS)") out+=("$MAINMENU,^checkout(mainmenu_edit)") out+=("$LEFTPANEL,^checkout(left_edit)") @@ -270,20 +246,12 @@ out2+=("^tag(subspacing)") for i in -8 -6 -4 -2 0 1 2 4 6 8 10 12 14 16 18 20; do out2+=("$(printf "%4s,%s" "$i" "mb-setvar submenu_spacing=${i};$me")");done #for i in -8 -6 -4 -2 0 1 2 3 4 5 6; do out2+=("${i},mb-setvar submenu_spacing=${i};$me");done - +out2+=("^tag(fontsize)") +for i in 7 8 9 10 11 12 14 16 18 20; do out2+=("$(printf "%4s,%s" "$i" "mb-setvar menu_font_size=${i};mb-setvar jgmenu_item_height=$((i*2));mb-setvar jgmenu_icon_size=$((i*2-2));$me")");done out+=("^sep($SIZE)") -out+=(" $t $TINY,mb-setvar menu_font_size=7;mb-setvar jgmenu_item_height=14;mb-setvar jgmenu_icon_size=14;mb-setvar sep_height=1;mb-setvar item_margin_y=0;$me - $s $SMALL,mb-setvar menu_font_size=8;mb-setvar jgmenu_item_height=16;mb-setvar jgmenu_icon_size=16;mb-setvar sep_height=1;mb-setvar item_margin_y=0;$me - $n $NORMAL,mb-setvar menu_font_size=9;mb-setvar jgmenu_item_height=18;mb-setvar jgmenu_icon_size=18;mb-setvar sep_height=1;mb-setvar item_margin_y=1;$me - $b $BIG,mb-setvar menu_font_size=10;mb-setvar jgmenu_item_height=20;mb-setvar jgmenu_icon_size=20;mb-setvar sep_height=1;mb-setvar item_margin_y=2;$me - $h $HUGE,mb-setvar menu_font_size=11;mb-setvar jgmenu_item_height=22;mb-setvar jgmenu_icon_size=22;mb-setvar sep_height=2;mb-setvar item_margin_y=2;$me") - - -#out+=("^sep($FONT_FAMILY)") -######### FONT FAMILY -out+=("^sep()") -out+=("$FONT_FAMILY,^checkout(fonty)") +out+=("$FONT_SIZE [ ${menu_font_size:-0} ],^checkout(fontsize)") +out+=("$FONT_FAMILY[ ${menu_font_family:-0} ],^checkout(fonty)") case $menu_font_family in "Noto Sans Light") nol="";; diff --git a/usr/bin/mabox-conky-pipemenu b/usr/bin/mabox-conky-pipemenu index 5a6f106..fbd92c1 100755 --- a/usr/bin/mabox-conky-pipemenu +++ b/usr/bin/mabox-conky-pipemenu @@ -80,7 +80,7 @@ esac getSessions(){ # read any saved sessions from save-sessions file menuSeparator "$SAVED_SESSIONS" - menuItem "$DEFAULT" "$CSESSION $CSESSIONFILE" + #menuItem "$DEFAULT" "$CSESSION $CSESSIONFILE" if [ -e "$SESSIONS" ] then while read -r session ;do