Compare commits

...

2 Commits

Author SHA1 Message Date
Daniel Napora 56d8cd14fd upd 2024-09-30 00:41:52 +02:00
Daniel Napora 7187cb23cc upd 2024-09-26 07:54:43 +02:00
5 changed files with 36 additions and 25 deletions

View File

@ -124,7 +124,7 @@ case "$LANG" in
RESETCOLORS="Przywróć domyślne kolory" RESETCOLORS="Przywróć domyślne kolory"
AREYOUSURE="Czy aby napewno?" AREYOUSURE="Czy aby napewno?"
_COLORIZER_ROOT="<b>Colorizer</b> - menu główne" _COLORIZER_ROOT="<b>Colorizer</b> - menu główne"
LEFTSIDEPANEL="Lewy panel boczny" _LEFTSIDEPANEL="Lewy panel boczny"
;; ;;
*) *)
COLORIZECONKY="Conky Manager" COLORIZECONKY="Conky Manager"
@ -182,7 +182,7 @@ case "$LANG" in
RESETCOLORS="Restore default colors" RESETCOLORS="Restore default colors"
AREYOUSURE="Are you sure?" AREYOUSURE="Are you sure?"
_COLORIZER_ROOT="<b>Colorizer</b> rootmenu" _COLORIZER_ROOT="<b>Colorizer</b> rootmenu"
LEFTSIDEPANEL="Left Sidepanel" _LEFTSIDEPANEL="Left Sidepanel"
;; ;;
esac esac
@ -479,7 +479,7 @@ if [[ "$1" == "-s" ]]; then
out+=("^sep()") out+=("^sep()")
out+=(" ${arrow_string_left} $_COLORIZER_ROOT,colorizer -s") out+=(" ${arrow_string_left} $_COLORIZER_ROOT,colorizer -s")
out+=(" ${arrow_string_left} ${arrow_string_left} $LEFTSIDEPANEL,mb-jgtools places") out+=(" ${arrow_string_left} ${arrow_string_left} $_LEFTSIDEPANEL,mb-jgtools places")
if [[ "$colorizer_size" == "full" ]];then if [[ "$colorizer_size" == "full" ]];then
eval $(xdotool getdisplaygeometry --shell) eval $(xdotool getdisplaygeometry --shell)

View File

@ -70,6 +70,7 @@ case "$LANG" in
_USE="Użyj czcionki" _USE="Użyj czcionki"
_FOR="dla..." _FOR="dla..."
_COLORIZER_ROOT="<b>Colorizer</b> - menu główne" _COLORIZER_ROOT="<b>Colorizer</b> - menu główne"
_LEFTSIDEPANEL="Lewy panel boczny"
;; ;;
*) *)
_INCREASE_ALL="Increase all" _INCREASE_ALL="Increase all"
@ -107,6 +108,7 @@ case "$LANG" in
_USE="Use" _USE="Use"
_FOR="font for ..." _FOR="font for ..."
_COLORIZER_ROOT="<b>Colorizer</b> rootmenu" _COLORIZER_ROOT="<b>Colorizer</b> rootmenu"
_LEFTSIDEPANEL="Left Sidepanel"
;; ;;
esac esac
@ -350,6 +352,7 @@ if [[ "$1" == "-s" ]]; then
out+=("^sep()") out+=("^sep()")
out+=(" ${arrow_string_left} $_COLORIZER_ROOT,colorizer -s") out+=(" ${arrow_string_left} $_COLORIZER_ROOT,colorizer -s")
out+=(" ${arrow_string_left} ${arrow_string_left} $_LEFTSIDEPANEL,mb-jgtools places")
if [[ "$colorizer_size" == "full" ]];then if [[ "$colorizer_size" == "full" ]];then
eval $(xdotool getdisplaygeometry --shell) eval $(xdotool getdisplaygeometry --shell)
@ -372,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 | cut -d'=' -f2) read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | tail -1 | cut -d'=' -f2)
THUMBDIR="$HOME/.cache/colorizer/thumbs" THUMBDIR="$HOME/.cache/colorizer/thumbs"
mkdir -p ${THUMBDIR} mkdir -p ${THUMBDIR}
NAME=${WALLPATH////_} NAME=${WALLPATH////_}

View File

@ -147,6 +147,7 @@ case "$LANG" in
FILE="plik" FILE="plik"
SET_RANDOM="Ustaw losowy motyw menu" SET_RANDOM="Ustaw losowy motyw menu"
_COLORIZER_ROOT="<b>Colorizer</b> - menu główne" _COLORIZER_ROOT="<b>Colorizer</b> - menu główne"
_LEFTSIDEPANEL="Lewy panel boczny"
;; ;;
*) *)
MENU_THEME="Menu theme" MENU_THEME="Menu theme"
@ -231,6 +232,7 @@ case "$LANG" in
FILE="file" FILE="file"
SET_RANDOM="Set random menu theme" SET_RANDOM="Set random menu theme"
_COLORIZER_ROOT="<b>Colorizer</b> rootmenu" _COLORIZER_ROOT="<b>Colorizer</b> rootmenu"
_LEFTSIDEPANEL="Left Sidepanel"
;; ;;
esac esac
@ -573,6 +575,7 @@ if [[ "$1" == "-s" ]]; then
out+=("^sep()") out+=("^sep()")
out+=(" ${arrow_string_left} $_COLORIZER_ROOT,colorizer -s") out+=(" ${arrow_string_left} $_COLORIZER_ROOT,colorizer -s")
out+=(" ${arrow_string_left} ${arrow_string_left} $_LEFTSIDEPANEL,mb-jgtools places")
if [[ "$colorizer_size" == "full" ]];then if [[ "$colorizer_size" == "full" ]];then
eval $(xdotool getdisplaygeometry --shell) eval $(xdotool getdisplaygeometry --shell)

View File

@ -140,6 +140,7 @@ case "$LANG" in
UNLOCK="odblokuj swoją kreatywność..." UNLOCK="odblokuj swoją kreatywność..."
SWITCH_TO_MBCOLORS="Przełącz na <b>MBColors</b>" SWITCH_TO_MBCOLORS="Przełącz na <b>MBColors</b>"
_COLORIZER_ROOT="<b>Colorizer</b> - menu główne" _COLORIZER_ROOT="<b>Colorizer</b> - menu główne"
_LEFTSIDEPANEL="Lewy panel boczny"
;; ;;
*) *)
QUICK_TWEAKS="Global Settings/Quick Tweaks" QUICK_TWEAKS="Global Settings/Quick Tweaks"
@ -225,6 +226,7 @@ case "$LANG" in
UNLOCK="Unlock your creativity..." UNLOCK="Unlock your creativity..."
SWITCH_TO_MBCOLORS="Switch to <b>MBColors</b>" SWITCH_TO_MBCOLORS="Switch to <b>MBColors</b>"
_COLORIZER_ROOT="<b>Colorizer</b> rootmenu" _COLORIZER_ROOT="<b>Colorizer</b> rootmenu"
_LEFTSIDEPANEL="Left Sidepanel"
;; ;;
esac esac
@ -667,6 +669,7 @@ source $HOME/.config/colorizer/colorizer.conf
out+=("^sep()") out+=("^sep()")
out+=(" ${arrow_string_left} $_COLORIZER_ROOT,colorizer -s") out+=(" ${arrow_string_left} $_COLORIZER_ROOT,colorizer -s")
out+=(" ${arrow_string_left} ${arrow_string_left} $_LEFTSIDEPANEL,mb-jgtools places")
if [[ "$colorizer_size" == "full" ]];then if [[ "$colorizer_size" == "full" ]];then

View File

@ -817,9 +817,10 @@ 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)")
@ -828,32 +829,32 @@ if [[ "$OLD_SYNTAX" = "true" ]];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
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 done
fi
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
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)")
@ -868,6 +869,7 @@ if [[ "$OLD_SYNTAX" = "true" ]];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}")