diff --git a/bin/colorizer-cava b/bin/colorizer-cava index 1e935b0..ef3a76d 100755 --- a/bin/colorizer-cava +++ b/bin/colorizer-cava @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -. $HOME/.config/mabox/mabox.conf +. /usr/share/mb-jgtools/jgtools.inc wmctrl -R cavatransparent @@ -137,16 +137,16 @@ FGT=$(pastel textcolor ${FGC}|pastel format hex) out2+=("^sep($CWIDTH)") for i in full half third do - [[ "${cwidth}" == "${i}" ]] && out2+=(" $i,cavactl start $i;$me") || out2+=(" $i,cavactl start $i;$me") + [[ "${cwidth}" == "${i}" ]] && out2+=("${ron} $i,cavactl start $i;$me") || out2+=("${roff} $i,cavactl start $i;$me") done out2+=("^sep($CHEIGHT)") for i in 200 100 50 do - [[ "${cheight}" == "${i}" ]] && out2+=(" $i,cavactl start $i;$me") || out2+=(" $i,cavactl start $i;$me") + [[ "${cheight}" == "${i}" ]] && out2+=("${ron} $i,cavactl start $i;$me") || out2+=("${roff} $i,cavactl start $i;$me") done 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") + [[ "$GR" == "0" ]] && out+=("${ron} $SOLID_COLOR,cavactl mode solid;$me" "󰝦 $GRADIENT,cavactl mode gradient;$me") || out+=("󰝦 $SOLID_COLOR,cavactl mode solid;$me" "${ron} $GRADIENT,cavactl mode gradient;$me") out+=("^sep($COLORIZE_CAVA)") out+=(" ${FGC} $COLOR,^pipe(mbclr '$FGC' cavactl foreground Cava_Bar_Color '$me')") out+=("^sep($GRADIENT)") @@ -165,7 +165,7 @@ FGT=$(pastel textcolor ${FGC}|pastel format hex) out2+=("^sep($BAR_WIDTH)") for i in 1 2 3 4 5 6 8 10 20 do - [[ "$BW" == "$i" ]] && out2+=(" $i,cavactl bar_width $i;$me") || out2+=(" $i,cavactl bar_width $i;$me") + [[ "$BW" == "$i" ]] && out2+=("${ron} $i,cavactl bar_width $i;$me") || out2+=("${roff} $i,cavactl bar_width $i;$me") done out+=("$BAR_SPACING [ $BS ],^checkout(barspacing)") @@ -173,7 +173,7 @@ FGT=$(pastel textcolor ${FGC}|pastel format hex) out2+=("^sep($BAR_SPACING)") for i in 0 1 2 3 4 5 6 8 10 do - [[ "$BS" == "$i" ]] && out2+=(" $i,cavactl bar_spacing $i;$me") || out2+=(" $i,cavactl bar_spacing $i;$me") + [[ "$BS" == "$i" ]] && out2+=("${ron} $i,cavactl bar_spacing $i;$me") || out2+=("${roff} $i,cavactl bar_spacing $i;$me") done out+=("^sep($_GENERAL)") out+=("$_FRAMERATE [ $FPS ],^checkout(fps)") @@ -181,7 +181,7 @@ FGT=$(pastel textcolor ${FGC}|pastel format hex) out2+=("^sep($_FRAMERATE)") for i in 144 120 60 do - [[ "$FPS" == "$i" ]] && out2+=(" $i,cavactl framerate $i;$me") || out2+=(" $i,cavactl framerate $i;$me") + [[ "$FPS" == "$i" ]] && out2+=("${ron} $i,cavactl framerate $i;$me") || out2+=("${roff} $i,cavactl framerate $i;$me") done out+=("$_NOISE_RED [ $NOISE_RED ],^checkout(sens)") @@ -189,7 +189,7 @@ FGT=$(pastel textcolor ${FGC}|pastel format hex) out2+=("^sep($_NOISE_RED)") for i in 90 77 50 25 do - [[ "$NOISE_RED" == "$i" ]] && out2+=(" $i,cavactl noise_reduction $i;$me") || out2+=(" $i,cavactl noise_reduction $i;$me") + [[ "$NOISE_RED" == "$i" ]] && out2+=("${ron} $i,cavactl noise_reduction $i;$me") || out2+=("${roff} $i,cavactl noise_reduction $i;$me") done @@ -202,12 +202,11 @@ FGT=$(pastel textcolor ${FGC}|pastel format hex) #out+=("󰑓 $RELOAD,cavactl reload;$me") out+=("^sep()") - out+=(" $INFO,cavactl info") + out+=(" $INFO,cavactl info") ### RUN if [[ "$1" == "-s" ]]; then - . /usr/share/mb-jgtools/pipemenu-standalone.cfg CNF_DIR="$HOME/.config/colorizer" diff --git a/bin/colorizer-pyradio b/bin/colorizer-pyradio index 89a5ccc..7f5644f 100755 --- a/bin/colorizer-pyradio +++ b/bin/colorizer-pyradio @@ -15,6 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +. /usr/share/mb-jgtools/jgtools.inc @@ -117,7 +118,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)") @@ -161,14 +162,14 @@ 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+=(" $MANUAL,^term(man pyradio)") out+=("^sep()") out+=(" $EDITCONF,xdg-open ~/.config/pyradio/config") out+=(" $EDITSTATIONS,xdg-open ~/.config/pyradio/stations.csv") @@ -178,8 +179,6 @@ read MB1 MB2 MBFG<<< "$(grep '^Messages Border ' ${THEMERC})" ### RUN if [[ "$1" == "-s" ]]; then - . /usr/share/mb-jgtools/pipemenu-standalone.cfg - . $HOME/.config/mabox/mabox.conf CNF_DIR="$HOME/.config/colorizer" CNF_FILE="$CNF_DIR/colorizer.conf"