Compare commits
No commits in common. "master" and "0.9.78" have entirely different histories.
|
|
@ -124,7 +124,7 @@ case "$LANG" in
|
|||
RESETCOLORS="Przywróć domyślne kolory"
|
||||
AREYOUSURE="Czy aby napewno?"
|
||||
_COLORIZER_ROOT="<b>Colorizer</b> - menu główne"
|
||||
_LEFTSIDEPANEL="Lewy panel boczny"
|
||||
LEFTSIDEPANEL="Lewy panel boczny"
|
||||
;;
|
||||
*)
|
||||
COLORIZECONKY="Conky Manager"
|
||||
|
|
@ -182,7 +182,7 @@ case "$LANG" in
|
|||
RESETCOLORS="Restore default colors"
|
||||
AREYOUSURE="Are you sure?"
|
||||
_COLORIZER_ROOT="<b>Colorizer</b> rootmenu"
|
||||
_LEFTSIDEPANEL="Left Sidepanel"
|
||||
LEFTSIDEPANEL="Left Sidepanel"
|
||||
;;
|
||||
esac
|
||||
|
||||
|
|
@ -479,7 +479,7 @@ if [[ "$1" == "-s" ]]; then
|
|||
|
||||
out+=("^sep()")
|
||||
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
|
||||
eval $(xdotool getdisplaygeometry --shell)
|
||||
|
|
|
|||
|
|
@ -70,7 +70,6 @@ case "$LANG" in
|
|||
_USE="Użyj czcionki"
|
||||
_FOR="dla..."
|
||||
_COLORIZER_ROOT="<b>Colorizer</b> - menu główne"
|
||||
_LEFTSIDEPANEL="Lewy panel boczny"
|
||||
;;
|
||||
*)
|
||||
_INCREASE_ALL="Increase all"
|
||||
|
|
@ -108,7 +107,6 @@ case "$LANG" in
|
|||
_USE="Use"
|
||||
_FOR="font for ..."
|
||||
_COLORIZER_ROOT="<b>Colorizer</b> rootmenu"
|
||||
_LEFTSIDEPANEL="Left Sidepanel"
|
||||
;;
|
||||
esac
|
||||
|
||||
|
|
@ -352,7 +350,6 @@ if [[ "$1" == "-s" ]]; then
|
|||
|
||||
out+=("^sep()")
|
||||
out+=(" ${arrow_string_left} $_COLORIZER_ROOT,colorizer -s")
|
||||
out+=(" ${arrow_string_left} ${arrow_string_left} $_LEFTSIDEPANEL,mb-jgtools places")
|
||||
|
||||
if [[ "$colorizer_size" == "full" ]];then
|
||||
eval $(xdotool getdisplaygeometry --shell)
|
||||
|
|
@ -375,7 +372,7 @@ if [[ "$1" == "-s" ]]; then
|
|||
MENU_PADDING_TOP=$((jgtools_padding + 150))
|
||||
|
||||
#WALLPAPER
|
||||
read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | tail -1 | cut -d'=' -f2)
|
||||
read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | cut -d'=' -f2)
|
||||
THUMBDIR="$HOME/.cache/colorizer/thumbs"
|
||||
mkdir -p ${THUMBDIR}
|
||||
NAME=${WALLPATH////_}
|
||||
|
|
|
|||
|
|
@ -147,7 +147,6 @@ case "$LANG" in
|
|||
FILE="plik"
|
||||
SET_RANDOM="Ustaw losowy motyw menu"
|
||||
_COLORIZER_ROOT="<b>Colorizer</b> - menu główne"
|
||||
_LEFTSIDEPANEL="Lewy panel boczny"
|
||||
;;
|
||||
*)
|
||||
MENU_THEME="Menu theme"
|
||||
|
|
@ -232,7 +231,6 @@ case "$LANG" in
|
|||
FILE="file"
|
||||
SET_RANDOM="Set random menu theme"
|
||||
_COLORIZER_ROOT="<b>Colorizer</b> rootmenu"
|
||||
_LEFTSIDEPANEL="Left Sidepanel"
|
||||
;;
|
||||
esac
|
||||
|
||||
|
|
@ -575,7 +573,6 @@ if [[ "$1" == "-s" ]]; then
|
|||
|
||||
out+=("^sep()")
|
||||
out+=(" ${arrow_string_left} $_COLORIZER_ROOT,colorizer -s")
|
||||
out+=(" ${arrow_string_left} ${arrow_string_left} $_LEFTSIDEPANEL,mb-jgtools places")
|
||||
|
||||
if [[ "$colorizer_size" == "full" ]];then
|
||||
eval $(xdotool getdisplaygeometry --shell)
|
||||
|
|
|
|||
|
|
@ -140,7 +140,6 @@ case "$LANG" in
|
|||
UNLOCK="odblokuj swoją kreatywność..."
|
||||
SWITCH_TO_MBCOLORS="Przełącz na <b>MBColors</b>"
|
||||
_COLORIZER_ROOT="<b>Colorizer</b> - menu główne"
|
||||
_LEFTSIDEPANEL="Lewy panel boczny"
|
||||
;;
|
||||
*)
|
||||
QUICK_TWEAKS="Global Settings/Quick Tweaks"
|
||||
|
|
@ -226,7 +225,6 @@ case "$LANG" in
|
|||
UNLOCK="Unlock your creativity..."
|
||||
SWITCH_TO_MBCOLORS="Switch to <b>MBColors</b>"
|
||||
_COLORIZER_ROOT="<b>Colorizer</b> rootmenu"
|
||||
_LEFTSIDEPANEL="Left Sidepanel"
|
||||
;;
|
||||
esac
|
||||
|
||||
|
|
@ -669,7 +667,6 @@ source $HOME/.config/colorizer/colorizer.conf
|
|||
|
||||
out+=("^sep()")
|
||||
out+=(" ${arrow_string_left} $_COLORIZER_ROOT,colorizer -s")
|
||||
out+=(" ${arrow_string_left} ${arrow_string_left} $_LEFTSIDEPANEL,mb-jgtools places")
|
||||
|
||||
|
||||
if [[ "$colorizer_size" == "full" ]];then
|
||||
|
|
|
|||
42
bin/conkyctl
42
bin/conkyctl
|
|
@ -817,10 +817,9 @@ if [[ "$OLD_SYNTAX" = "true" ]];then
|
|||
fi
|
||||
|
||||
|
||||
if [[ "$FONT" != "" ]];then
|
||||
|
||||
if [[ "$1" != *"logo_mbcolor"* ]]; then
|
||||
if [[ "$1" != *"quoter_mbcolor"* ]]; then
|
||||
|
||||
out+=("<big></big> $FONTS [ <b><span font_family=\"${FONT}\">$FONT</span> $FONTSIZE</b> ],^checkout(fontsingle)")
|
||||
out2+=("^tag(fontsingle)")
|
||||
out2+=("^sep($FONTS)")
|
||||
|
|
@ -829,32 +828,32 @@ if [[ "$FONT" != "" ]];then
|
|||
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
|
||||
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
|
||||
|
||||
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
|
||||
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+=("<small> $_EDIT_FAVFONTS</small>,geany ~/.config/mabox/fonts.list")
|
||||
|
||||
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+=("^sep()")
|
||||
fi
|
||||
|
||||
[[ "$BORD" == false ]] && out+=("<big></big> $BORDERS [ <b>$STIP</b> ],^checkout(bordersingle)") || out+=("<big></big> $BORDERS [ <b>$STIP</b> ],^checkout(bordersingle)")
|
||||
|
|
@ -869,7 +868,6 @@ if [[ "$FONT" != "" ]];then
|
|||
out2+=("2,conkyctl stippled_borders 2 ${1};$me")
|
||||
out2+=("3,conkyctl stippled_borders 3 ${1};$me")
|
||||
out2+=("4,conkyctl stippled_borders 4 ${1};$me")
|
||||
fi
|
||||
fi #OLD SYNTAX CHECK
|
||||
out+=("^sep()")
|
||||
out+=(" $EDIT ${title^},xdg-open ${1}")
|
||||
|
|
|
|||
Loading…
Reference in New Issue