diff --git a/bin/colorizer-cava b/bin/colorizer-cava index 363b303..3fd5b5b 100755 --- a/bin/colorizer-cava +++ b/bin/colorizer-cava @@ -1,7 +1,7 @@ #!/bin/bash # # colorizer - set of tools for Mabox (auto)theming -# Copyright (C) 2022-2023 Daniel Napora +# Copyright (C) 2022-2026 Daniel Napora # # 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 @@ -54,7 +54,7 @@ case "$LANG" in DARKBG="Ciemne do jesnego" BARS="Słupki" BAR_WIDTH="Szerokość słupków" - BAR_SPACING="Odstęp między słupkami" + BAR_SPACING="Odstęp..." COLOR_MODE="Tryb kolorowania" SOLID_COLOR="Jednolity kolor" GRADIENT="Gradient" @@ -110,6 +110,8 @@ FGT=$(pastel textcolor ${FGC}|pastel format hex) } getvalues pgrep -f cavatransparent > /dev/null && out+=("󰺢 $STOP_CAVA,mb-music cavakill;$me") || out+=("󰺢 $START_CAVA,mb-music cavastart;$me") + out+=("^sep($COLOR_MODE)") + [[ "$GR" == "0" ]] && out+=("綠 $SOLID_COLOR,cavactl mode solid;$me" "󰝦 $GRADIENT,cavactl mode gradient;$me") || out+=("󰝦 $SOLID_COLOR,cavactl mode solid;$me" "綠 $GRADIENT,cavactl mode gradient;$me") out+=("^sep($COLORIZE_CAVA)") out+=(" ${FGC} $COLOR,^pipe(mbclr '$FGC' cavactl foreground Cava_Bar_Color '$me')") out+=("^sep($GRADIENT)") @@ -118,27 +120,25 @@ FGT=$(pastel textcolor ${FGC}|pastel format hex) out+=("^sep()") out+=(" $MODGRAD_FROM,^pipe(mbclr '$GR_FROM' cavactl grad_from Cava_Grad_From_Color '$me')") out+=(" $MODGRAD_TO,^pipe(mbclr '$GR_TO' cavactl grad_to Cava_Grad_To_Color '$me')") - out+=("^sep($COLOR_MODE)") - [[ "$GR" == "0" ]] && out+=("綠 $SOLID_COLOR,cavactl mode solid;$me" "󰝦 $GRADIENT,cavactl mode gradient;$me") || out+=("󰝦 $SOLID_COLOR,cavactl mode solid;$me" "綠 $GRADIENT,cavactl mode gradient;$me") out+=("^sep($GENERATEFROMWP)") out+=(" $LIGHTBG,w2theme cava light;$me") out+=(" $DARKBG,w2theme cava dark;$me") out+=("^sep($BARS)") - out+=("$BAR_WIDTH [ $BW ],^checkout(barwidth)") + out+=("$BAR_WIDTH [ $BW ],^checkout(barwidth)") out2+=("^tag(barwidth)") out2+=("^sep($BAR_WIDTH)") for i in 1 2 3 4 5 6 8 10 do - out2+=("$i,cavactl bar_width $i;$me") + [[ "$BW" == "$i" ]] && out2+=("綠 $i,cavactl bar_width $i;$me") || out2+=("祿 $i,cavactl bar_width $i;$me") done - out+=("$BAR_SPACING [ $BS ],^checkout(barspacing)") + out+=("$BAR_SPACING [ $BS ],^checkout(barspacing)") out2+=("^tag(barspacing)") out2+=("^sep($BAR_SPACING)") for i in 0 1 2 3 4 5 6 8 10 do - out2+=("$i,cavactl bar_spacing $i;$me") + [[ "$BS" == "$i" ]] && out2+=("綠 $i,cavactl bar_spacing $i;$me") || out2+=("祿 $i,cavactl bar_spacing $i;$me") done out+=("^sep()") out+=(" $EDITCONF,xdg-open ~/.config/cava/config") @@ -219,7 +219,7 @@ cat < ${MENU_ITEMS} #@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, -@text,,$((jgtools_padding + 128)),$((jgtools_padding + 116)),120,28,0,left,top,#FFFFFF ,${WINCLR},Colorizer Cava +@text,,$((jgtools_padding + 128)),$((jgtools_padding + 116)),120,28,0,left,top,#FFFFFF ,${WINCLR},Cava Colorizer $(printf '%s\n' "${out[@]}") diff --git a/bin/colorizer-pyradio b/bin/colorizer-pyradio index c14923a..89a5ccc 100755 --- a/bin/colorizer-pyradio +++ b/bin/colorizer-pyradio @@ -1,7 +1,7 @@ #!/bin/bash # # colorizer - set of tools for Mabox (auto)theming -# Copyright (C) 2022-2025 Daniel Napora +# Copyright (C) 2022-2026 Daniel Napora # # 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 @@ -16,9 +16,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# 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) wmctrl -iR ${PR_WINID} @@ -118,7 +117,7 @@ read MB1 MB2 MBFG<<< "$(grep '^Messages Border ' ${THEMERC})" fi - out+=(" $INFO,notify-send.sh -i pyradio -u critical '$INFO_HEAD' '$INFO_TXT'") + out+=(" $INFO,notify-send.sh -i pyradio -u critical '$INFO_HEAD' '$INFO_TXT'") out+=("^sep($SETCOLORS)") out+=(" AbCd Stations,^checkout(stations)") @@ -162,19 +161,19 @@ read MB1 MB2 MBFG<<< "$(grep '^Messages Border ' ${THEMERC})" out+=(" 2. station $DARKBG,w2theme pyradio dark;$me") out+=("^sep()") - out+=(" $RESETTHEME,prtctl resettheme;$me") + out+=(" $RESETTHEME,prtctl resettheme;$me") out+=("^sep()") out+=("$EXPORTTHEME,prtctl exp;$me") 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+=(" $README,xdg-open /usr/share/doc/pyradio/README.html") - out+=(" $MANUAL,^term(man pyradio)") + out+=(" $README,xdg-open /usr/share/doc/pyradio/README.html") + out+=(" $MANUAL,^term(man pyradio)") out+=("^sep()") - out+=(" $EDITCONF,xdg-open ~/.config/pyradio/config") - out+=(" $EDITSTATIONS,xdg-open ~/.config/pyradio/stations.csv") + out+=(" $EDITCONF,xdg-open ~/.config/pyradio/config") + out+=(" $EDITSTATIONS,xdg-open ~/.config/pyradio/stations.csv") out+=("^sep()") - out+=(" $CONFIGDIR,^pipe(jgbrowser ~/.config/pyradio)") + out+=(" $CONFIGDIR,^pipe(jgbrowser ~/.config/pyradio)") ### RUN @@ -231,7 +230,7 @@ cat < ${MENU_ITEMS} @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 @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},Colorizer PyRadio +@text,,$((jgtools_padding + 144)),$((jgtools_padding + 116)),120,30,0,left,top,#FFFFFF ,${WINCLR},PyRadio Colorizer $(printf '%s\n' "${out[@]}")