cava, pyradio modules update

This commit is contained in:
2026-02-12 02:37:39 +01:00
parent fa2f8dc743
commit 853dbe0214
2 changed files with 20 additions and 21 deletions

View File

@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# #
# colorizer - set of tools for Mabox (auto)theming # colorizer - set of tools for Mabox (auto)theming
# Copyright (C) 2022-2023 Daniel Napora <napcok@gmail.com> # Copyright (C) 2022-2026 Daniel Napora <napcok@gmail.com>
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@@ -54,7 +54,7 @@ case "$LANG" in
DARKBG="Ciemne do jesnego" DARKBG="Ciemne do jesnego"
BARS="Słupki" BARS="Słupki"
BAR_WIDTH="Szerokość słupków" BAR_WIDTH="Szerokość słupków"
BAR_SPACING="Odstęp między słupkami" BAR_SPACING="Odstęp..."
COLOR_MODE="Tryb kolorowania" COLOR_MODE="Tryb kolorowania"
SOLID_COLOR="Jednolity kolor" SOLID_COLOR="Jednolity kolor"
GRADIENT="Gradient" GRADIENT="Gradient"
@@ -110,6 +110,8 @@ FGT=$(pastel textcolor ${FGC}|pastel format hex)
} }
getvalues getvalues
pgrep -f cavatransparent > /dev/null && out+=("<big>󰺢</big> $STOP_CAVA,mb-music cavakill;$me") || out+=("<big>󰺢</big> $START_CAVA,mb-music cavastart;$me") pgrep -f cavatransparent > /dev/null && out+=("<big>󰺢</big> $STOP_CAVA,mb-music cavakill;$me") || out+=("<big>󰺢</big> $START_CAVA,mb-music cavastart;$me")
out+=("^sep($COLOR_MODE)")
[[ "$GR" == "0" ]] && out+=("<big>綠</big> $SOLID_COLOR,cavactl mode solid;$me" "<big>󰝦</big> $GRADIENT,cavactl mode gradient;$me") || out+=("<big>󰝦</big> $SOLID_COLOR,cavactl mode solid;$me" "<big>綠</big> $GRADIENT,cavactl mode gradient;$me")
out+=("^sep($COLORIZE_CAVA)") out+=("^sep($COLORIZE_CAVA)")
out+=("<tt><span bgcolor='$FGC' fgcolor='$FGT'> ${FGC} </span></tt> $COLOR,^pipe(mbclr '$FGC' cavactl foreground Cava_Bar_Color '$me')") out+=("<tt><span bgcolor='$FGC' fgcolor='$FGT'> ${FGC} </span></tt> $COLOR,^pipe(mbclr '$FGC' cavactl foreground Cava_Bar_Color '$me')")
out+=("^sep($GRADIENT)") out+=("^sep($GRADIENT)")
@@ -118,27 +120,25 @@ FGT=$(pastel textcolor ${FGC}|pastel format hex)
out+=("^sep()") out+=("^sep()")
out+=("<tt><span bgcolor='$GR_FROM'> </span></tt> $MODGRAD_FROM,^pipe(mbclr '$GR_FROM' cavactl grad_from Cava_Grad_From_Color '$me')") out+=("<tt><span bgcolor='$GR_FROM'> </span></tt> $MODGRAD_FROM,^pipe(mbclr '$GR_FROM' cavactl grad_from Cava_Grad_From_Color '$me')")
out+=("<tt><span bgcolor='$GR_TO'> </span></tt> $MODGRAD_TO,^pipe(mbclr '$GR_TO' cavactl grad_to Cava_Grad_To_Color '$me')") out+=("<tt><span bgcolor='$GR_TO'> </span></tt> $MODGRAD_TO,^pipe(mbclr '$GR_TO' cavactl grad_to Cava_Grad_To_Color '$me')")
out+=("^sep($COLOR_MODE)")
[[ "$GR" == "0" ]] && out+=("<big>綠</big> $SOLID_COLOR,cavactl mode solid;$me" "<big>󰝦</big> $GRADIENT,cavactl mode gradient;$me") || out+=("<big>󰝦</big> $SOLID_COLOR,cavactl mode solid;$me" "<big>綠</big> $GRADIENT,cavactl mode gradient;$me")
out+=("^sep(<i>$GENERATEFROMWP</i>)") out+=("^sep(<i>$GENERATEFROMWP</i>)")
out+=("<span bgcolor='${w[-3]}'> </span><span bgcolor='${w[3]}'> </span> $LIGHTBG,w2theme cava light;$me") out+=("<span bgcolor='${w[-3]}'> </span><span bgcolor='${w[3]}'> </span> $LIGHTBG,w2theme cava light;$me")
out+=("<span bgcolor='${w[3]}'> </span><span bgcolor='${w[-3]}'> </span> $DARKBG,w2theme cava dark;$me") out+=("<span bgcolor='${w[3]}'> </span><span bgcolor='${w[-3]}'> </span> $DARKBG,w2theme cava dark;$me")
out+=("^sep($BARS)") out+=("^sep($BARS)")
out+=("$BAR_WIDTH [ <b>$BW</b> ],^checkout(barwidth)") out+=("$BAR_WIDTH [ <b>$BW</b> ],^checkout(barwidth)")
out2+=("^tag(barwidth)") out2+=("^tag(barwidth)")
out2+=("^sep($BAR_WIDTH)") out2+=("^sep($BAR_WIDTH)")
for i in 1 2 3 4 5 6 8 10 for i in 1 2 3 4 5 6 8 10
do do
out2+=("$i,cavactl bar_width $i;$me") [[ "$BW" == "$i" ]] && out2+=("<big>綠</big> <b>$i</b>,cavactl bar_width $i;$me") || out2+=("<big>祿</big> $i,cavactl bar_width $i;$me")
done done
out+=("$BAR_SPACING [ <b>$BS</b> ],^checkout(barspacing)") out+=("$BAR_SPACING [ <b>$BS</b> ],^checkout(barspacing)")
out2+=("^tag(barspacing)") out2+=("^tag(barspacing)")
out2+=("^sep($BAR_SPACING)") out2+=("^sep($BAR_SPACING)")
for i in 0 1 2 3 4 5 6 8 10 for i in 0 1 2 3 4 5 6 8 10
do do
out2+=("$i,cavactl bar_spacing $i;$me") [[ "$BS" == "$i" ]] && out2+=("<big>綠</big> <b>$i</b>,cavactl bar_spacing $i;$me") || out2+=("<big>祿</big> $i,cavactl bar_spacing $i;$me")
done done
out+=("^sep()") out+=("^sep()")
out+=(" $EDITCONF,xdg-open ~/.config/cava/config") out+=(" $EDITCONF,xdg-open ~/.config/cava/config")
@@ -219,7 +219,7 @@ cat <<EOF > ${MENU_ITEMS}
#@rect,,$((jgtools_padding+260)),$((jgtools_padding+106)),10,40,0,left,top,,${clr} 100, #@rect,,$((jgtools_padding+260)),$((jgtools_padding+106)),10,40,0,left,top,,${clr} 100,
@rect,,$((jgtools_padding+4)),$((jgtools_padding + 116)),262,28,0,left,top,#222222 20,#222222 70, @rect,,$((jgtools_padding+4)),$((jgtools_padding + 116)),262,28,0,left,top,#222222 20,#222222 70,
@text,,$((jgtools_padding + 128)),$((jgtools_padding + 116)),120,28,0,left,top,#FFFFFF ,${WINCLR},<span size='10400' font_family='Ubuntu'><b>Colorizer</b> Cava</span> @text,,$((jgtools_padding + 128)),$((jgtools_padding + 116)),120,28,0,left,top,#FFFFFF ,${WINCLR},<span size='10400' font_family='Ubuntu'><b>Cava</b> Colorizer</span>
$(printf '%s\n' "${out[@]}") $(printf '%s\n' "${out[@]}")

View File

@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# #
# colorizer - set of tools for Mabox (auto)theming # colorizer - set of tools for Mabox (auto)theming
# Copyright (C) 2022-2025 Daniel Napora <danieln@maboxlinux.org> # Copyright (C) 2022-2026 Daniel Napora <danieln@maboxlinux.org>
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@@ -16,9 +16,8 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# TODO Start Pyradio if not started
# TODO check if theme is writeable (users themes)
# TODO Save as new theme
PR_WINID=$(wmctrl -lp |grep 'PyRadio: \|PyRadio -'|cut -d' ' -f1) PR_WINID=$(wmctrl -lp |grep 'PyRadio: \|PyRadio -'|cut -d' ' -f1)
wmctrl -iR ${PR_WINID} wmctrl -iR ${PR_WINID}
@@ -118,7 +117,7 @@ read MB1 MB2 MBFG<<< "$(grep '^Messages Border ' ${THEMERC})"
fi fi
out+=(" $INFO,notify-send.sh -i pyradio -u critical '$INFO_HEAD' '$INFO_TXT'") out+=("<big></big> $INFO,notify-send.sh -i pyradio -u critical '$INFO_HEAD' '$INFO_TXT'")
out+=("^sep($SETCOLORS)") out+=("^sep($SETCOLORS)")
out+=("<tt><span weight='bold' bgcolor='$SBG' fgcolor='$SFG'> AbCd </span></tt> Stations,^checkout(stations)") out+=("<tt><span weight='bold' bgcolor='$SBG' fgcolor='$SFG'> AbCd </span></tt> Stations,^checkout(stations)")
@@ -162,19 +161,19 @@ read MB1 MB2 MBFG<<< "$(grep '^Messages Border ' ${THEMERC})"
out+=("<tt><span bgcolor='${w[0]}' fgcolor='${w[-3]}'> 2. station </span></tt> $DARKBG,w2theme pyradio dark;$me") out+=("<tt><span bgcolor='${w[0]}' fgcolor='${w[-3]}'> 2. station </span></tt> $DARKBG,w2theme pyradio dark;$me")
out+=("^sep()") out+=("^sep()")
out+=(" $RESETTHEME,prtctl resettheme;$me") out+=("<big></big> $RESETTHEME,prtctl resettheme;$me")
out+=("^sep()") out+=("^sep()")
out+=("$EXPORTTHEME,prtctl exp;$me") out+=("$EXPORTTHEME,prtctl exp;$me")
out+=("^sep($CONFIG_AND_DOCS)") out+=("^sep($CONFIG_AND_DOCS)")
#out+=("PyRadio README,cat /usr/share/doc/pyradio/README.html| yad --html --no-buttons --no-escape --height=800 --width=600") #out+=("PyRadio README,cat /usr/share/doc/pyradio/README.html| yad --html --no-buttons --no-escape --height=800 --width=600")
out+=(" $README,xdg-open /usr/share/doc/pyradio/README.html") out+=("<big></big> $README,xdg-open /usr/share/doc/pyradio/README.html")
out+=(" $MANUAL,^term(man pyradio)") out+=("<big></big> $MANUAL,^term(man pyradio)")
out+=("^sep()") out+=("^sep()")
out+=(" $EDITCONF,xdg-open ~/.config/pyradio/config") out+=("<big></big> $EDITCONF,xdg-open ~/.config/pyradio/config")
out+=(" $EDITSTATIONS,xdg-open ~/.config/pyradio/stations.csv") out+=("<big></big> $EDITSTATIONS,xdg-open ~/.config/pyradio/stations.csv")
out+=("^sep()") out+=("^sep()")
out+=(" $CONFIGDIR,^pipe(jgbrowser ~/.config/pyradio)") out+=("<big></big> $CONFIGDIR,^pipe(jgbrowser ~/.config/pyradio)")
### RUN ### RUN
@@ -231,7 +230,7 @@ cat <<EOF > ${MENU_ITEMS}
@icon,,$((jgtools_padding)),$((jgtools_padding)),270,150,4,left,top,,,${THUMB} @icon,,$((jgtools_padding)),$((jgtools_padding)),270,150,4,left,top,,,${THUMB}
#@icon,,$((jgtools_padding + 4)),$((jgtools_padding + 4)),270,150,4,left,top,,,/usr/share/mabox-colorizer/img/colorizer-conky.png #@icon,,$((jgtools_padding + 4)),$((jgtools_padding + 4)),270,150,4,left,top,,,/usr/share/mabox-colorizer/img/colorizer-conky.png
@rect,,$((jgtools_padding+4)),$((jgtools_padding + 112)),262,34,0,left,top,#222222 20,#222222 70, @rect,,$((jgtools_padding+4)),$((jgtools_padding + 112)),262,34,0,left,top,#222222 20,#222222 70,
@text,,$((jgtools_padding + 144)),$((jgtools_padding + 116)),120,30,0,left,top,#FFFFFF ,${WINCLR},<span size='10400' font_family='Ubuntu'><b>Colorizer</b> PyRadio</span> @text,,$((jgtools_padding + 144)),$((jgtools_padding + 116)),120,30,0,left,top,#FFFFFF ,${WINCLR},<span size='10400' font_family='Ubuntu'><b>PyRadio</b> Colorizer</span>
$(printf '%s\n' "${out[@]}") $(printf '%s\n' "${out[@]}")