conky contextmenu pick colors fix

master 0.9.1
Daniel Napora 2022-10-15 12:19:57 +02:00
parent 4d6499568a
commit f132019078
3 changed files with 27 additions and 5 deletions

View File

@ -242,6 +242,16 @@ restartone () {
makemovableall () {
echo "dupa"
}
resetcolors () {
transparent_all false
win_bgcolor_all '#142c2c'
draw_borders_all true
stippled_borders_all 0
default_color_all '#309552'
color0_all '#accdc7'
color1_all '#61c4bc'
color2_all '#61c4bc'
}
languages () {
case "$LANG" in
@ -335,8 +345,9 @@ single () {
filename=${1##*/}
name=${filename%%_mb*}
title=${name//_/ }
# breaks mbclr color picking from contextmenu, leave it as "colorizer-conky -s" for now
if [[ "$2" == "s" ]];then
me=""
me="colorizer-conky -s"
else
me="colorizer-conky -s"
fi
@ -468,7 +479,7 @@ single () {
out2+=("$NO,conkyctl transparent false ${1};$me")
out2+=("^sep()")
out2+=("<small><span bgcolor='$WINCLR'> </span></small> $BACKGROUND,^pipe(mbclr '$WINCLR' conkyctl win_bgcolor '${BACKGROUND}' '$me' ${1})")
#notify-send.sh "1" "${1}"
if [[ "$1" != *"logo_mbcolor"* ]]; then
if [[ "$1" != *"quoter_mbcolor"* ]]; then
out+=("$FONTS [ <b>$FONT $FONTSIZE</b> ],^checkout(fontsingle)")
@ -580,7 +591,7 @@ contextmenu () {
jgmenu_icon_size=0
mkconfigfile
single "$CONKYCFG" "s"
single "${CONKYCFG}" "s"
case "$LANG" in
pl*)
@ -643,6 +654,6 @@ case "$1" in
contextmenu) contextmenu;;
makemovableall) makemovableall;;
saveposall) saveposall;;
reset) reset ;;
resetcolors) resetcolors ;;
*) : ;;
esac

View File

@ -0,0 +1,11 @@
#!/bin/bash
getdata () {
df -h | grep -v "boot" | grep '^/dev' | while read DEVICE SIZE USED FREE PERCENT MOUNT
do
[[ "${#MOUNT}" -gt "12" ]] && MOUNTLBL=${MOUNT##*/} || MOUNTLBL=${MOUNT}
echo "$MOUNTLBL\${goto 90}\${color2}\${fs_bar 6,64 $MOUNT}\${color}\${goto 160}$USED\${goto 200}$PERCENT\${alignr}$SIZE"
done
}
echo "\${goto 160}used\${goto 200}%\${alignr}size"
getdata

View File

@ -2,7 +2,7 @@
#
# mbclr current polecenie funkcja argument backprg [config_file]
# mbclr
#notify-send.sh "mbclr" "${1}\n${2}\n${3}\n${4}\n${5}\n${6}"
case "$LANG" in
pl*)
SELECT_COLOR="Wybierz kolor"