diff --git a/bin/colorizer b/bin/colorizer index 27527ad..a0d7412 100755 --- a/bin/colorizer +++ b/bin/colorizer @@ -300,15 +300,17 @@ out+=("^sep()") out+=(" $COLORIZE,^pipe(randomizer c)") out+=("^sep($MODULES)") out+=("$OBTHEME,^pipe(colorizer-ob)") + +#out+=("TINT2,^pipe(colorizer-tint2)") out+=("$MENUPANELS,^pipe(colorizer-menus)") out+=("Conky Manager,^pipe(colorizer-conky)") -#out+=("TINT2,^pipe(colorizer-tint2)") + #out+=("Systray HW monitor,^pipe(colorizer-phwmon)") -###if pgrep -f pyradio >/dev/null ;then -### out+=("^sep()") -### out+=("PyRadio,^pipe(colorizer-pyradio)") -###fi +if pgrep -f pyradio >/dev/null ;then + out+=("^sep()") + out+=("PyRadio,^pipe(colorizer-pyradio)") +fi if pgrep -f cava >/dev/null ;then out+=("^sep()") @@ -702,6 +704,7 @@ if [[ "$1" == "-s" ]]; then MENU_PADDING_TOP=${jgtools_padding:-0} MENU_HALIGN="left" jgmenu_icon_size=0 + TABS=180 [ $(pidof picom) ] && MENU_RADIUS=$jgtools_radius [ -z $jgmenu_use_borders ] && menu_border=0 diff --git a/bin/colorizer-pyradio b/bin/colorizer-pyradio index 9d2ab29..a840e31 100755 --- a/bin/colorizer-pyradio +++ b/bin/colorizer-pyradio @@ -22,6 +22,10 @@ PR_WINID=$(wmctrl -lp |grep 'PyRadio: \|PyRadio -'|cut -d' ' -f1) wmctrl -iR ${PR_WINID} +if [[ ! -f "$HOME"/local/share/applications/pyradio.desktop ]];then + pyradio --terminal terminator > /dev/null 2>&1 +fi + me="colorizer-pyradio -s" THEMERC=~/.config/pyradio/themes/mbcolors.pyradio-theme @@ -51,7 +55,7 @@ case "$LANG" in pl*) COLORIZE_PYRADIO="Pokoloruj PyRadio" START_PYRADIO="Uruchom PyRadio" - INFO="Info" + INFO="Ważna informacja" INFO_HEAD="Jak działa automatyczna zmiana kolorów?" INFO_TXT="Automatyczna zmiana kolorów działa z motywem mbcolors (User theme).\nAby go ustawić:\n- użyj klawisza t - wybór motywów\n- zaznacz motyw mbcolors i naciśnij spację - (ustawia jako domyślny)\n- wciśnij c - aby włączyć śledzenie zmian w pliku motywu.\n\n" GENERATEFROMWP="Generuj z kolorów tapety..." @@ -59,7 +63,7 @@ case "$LANG" in DARKBG="Ciemne tło" SETCOLORS="Ustaw kolory..." RESETTHEME="Resetuj motyw" - EXPORTTHEME="Eksportuj jako nowy motyw" + EXPORTTHEME="Eksportuj jako nowy motyw" CONFIG_AND_DOCS="Konfiguracja i Dokumentacja" README="PyRadio CZYTAJTO" MANUAL="Manual PyRadio" @@ -70,7 +74,7 @@ case "$LANG" in *) COLORIZE_PYRADIO="Colorize PyRadio" START_PYRADIO="Start PyRadio" - INFO="Info" + INFO="Info (important)" INFO_HEAD="How it works?" INFO_TXT="Automatic theme generation works with mbcolors user theme.\n Configuration:\n- use t key to show theme selection dialog\n- navigate to mbcolors theme and press c\n\n" GENERATEFROMWP="Generate from wallpaper colors..." @@ -78,7 +82,7 @@ case "$LANG" in DARKBG="Dark Background" SETCOLORS="Set colors individually..." RESETTHEME="Reset theme" - EXPORTTHEME="Export as new theme" + EXPORTTHEME="Export as new theme" CONFIG_AND_DOCS="Config and Docs" README="PyRadi README" MANUAL="PyRadio Manual" @@ -104,51 +108,61 @@ read MB1 MB2 MBFG<<< "$(grep '^Messages Border ' ${THEMERC})" out+=("^sep($COLORIZE_PYRADIO)") #out+=("$START_PYRADIO,terminator --geometry=420x440-20-20 -e pyradio") + if pgrep -f "/usr/bin/python /usr/bin/pyradio" >/dev/null ;then + : + else + out+=("PYRADIO W + r ,gtk-launch pyradio;sleep 1;$me") + fi + + out+=(" $INFO,notify-send.sh -i pyradio -u critical '$INFO_HEAD' '$INFO_TXT'") out+=("^sep($SETCOLORS)") out+=(" AbCd Stations,^checkout(stations)") out2+=("^tag(stations)") out2+=("^sep(Stations)") - out2+=("Stations Text,^pipe(mbclr '$SFG' prtctl stations_txt 'Stations Text' '$me')") - out2+=("Stations Background,^pipe(mbclr '$SBG' prtctl stations_bg 'Stations Background' '$me')") + out2+=(" AbCd Text,^pipe(mbclr '$SFG' prtctl stations_txt 'Stations Text' '$me')") + out2+=(" Background,^pipe(mbclr '$SBG' prtctl stations_bg 'Stations Background' '$me')") out+=(" AbCd Active Station (text),^pipe(mbclr '$ASFG' prtctl active_station ACTIVE_STATION '$me')") out+=(" AbCd Normal Cursor,^checkout(normalcursor)") out2+=("^tag(normalcursor)") out2+=("^sep(Normal Cursor)") - out2+=("Normal Cursor Text,^pipe(mbclr '$NCFG' prtctl normal_cursor_txt 'Normal Cursor Text' '$me')") - out2+=("Normal Cursor Background,^pipe(mbclr '$NCBG' prtctl normal_cursor_bg 'Normal Cursor Background' '$me')") + out2+=(" AbCd Text,^pipe(mbclr '$NCFG' prtctl normal_cursor_txt 'Normal Cursor Text' '$me')") + out2+=(" Background,^pipe(mbclr '$NCBG' prtctl normal_cursor_bg 'Normal Cursor Background' '$me')") out+=(" AbCd Active Cursor,^checkout(activecursor)") out2+=("^tag(activecursor)") out2+=("^sep(Active Cursor)") - out2+=("Active Cursor Text,^pipe(mbclr '$ACFG' prtctl active_cursor_txt 'Active Cursor Text' '$me')") - out2+=("Active Cursor Background,^pipe(mbclr '$ACBG' prtctl active_cursor_bg 'Active Cursor Background' '$me')") + out2+=(" AbCd Text,^pipe(mbclr '$ACFG' prtctl active_cursor_txt 'Active Cursor Text' '$me')") + out2+=(" Background,^pipe(mbclr '$ACBG' prtctl active_cursor_bg 'Active Cursor Background' '$me')") out+=(" AbCd Edit Cursor,^checkout(editcursor)") out2+=("^tag(editcursor)") out2+=("^sep(Edit Cursor)") - out2+=("Edit Cursor Text,^pipe(mbclr '$ECFG' prtctl edit_cursor_txt 'Edit Cursor Text' '$me')") - out2+=("Edit Cursor Background,^pipe(mbclr '$ECBG' prtctl edit_cursor_bg 'Edit Cursor Background' '$me')") + out2+=(" AbCd Text,^pipe(mbclr '$ECFG' prtctl edit_cursor_txt 'Edit Cursor Text' '$me')") + out2+=(" Background,^pipe(mbclr '$ECBG' prtctl edit_cursor_bg 'Edit Cursor Background' '$me')") out+=(" AbCd Status Bar,^checkout(statusbar)") out2+=("^tag(statusbar)") out2+=("^sep(Status Bar)") - out2+=("Status Bar Text,^pipe(mbclr '$SBFG' prtctl status_bar_txt 'Status Bar Text' '$me')") - out2+=("Status Bar Background,^pipe(mbclr '$SBBG' prtctl status_bar_bg 'Status Bar Background' '$me')") + out2+=(" AbCd Text,^pipe(mbclr '$SBFG' prtctl status_bar_txt 'Status Bar Text' '$me')") + out2+=(" Background,^pipe(mbclr '$SBBG' prtctl status_bar_bg 'Status Bar Background' '$me')") out+=(" AbCd Extra Func,^pipe(mbclr '$EFFG' prtctl extra_func EXTRA_FUNC '$me')") - out+=(" AbCd PyRadio URL,^pipe(mbclr '$PURLFG' prtctl pyradio_url 'PyRadio URL' '$me')") - out+=(" AbCd Messages Border,^pipe(mbclr '$MBFG' prtctl messages_border 'Messages Border' '$me')") + out+=("\"\"\" AbCd Group, PyRadio URL\"\"\",^pipe(mbclr '$PURLFG' prtctl pyradio_url 'PyRadio URL' '$me')") + out+=("_________ Messages Border,^pipe(mbclr '$MBFG' prtctl messages_border 'Messages Border' '$me')") + + out+=("^sep($GENERATEFROMWP)") + out+=(" 1. station $LIGHTBG,w2theme pyradio light;$me") + out+=(" 2. station $DARKBG,w2theme pyradio dark;$me") + out+=("^sep()") out+=(" $RESETTHEME,prtctl resettheme;$me") out+=("^sep()") out+=("$EXPORTTHEME,prtctl exp;$me") - out+=("^sep($GENERATEFROMWP)") - out+=("$LIGHTBG,w2theme pyradio light;$me") - out+=("$DARKBG,w2theme pyradio dark;$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") diff --git a/bin/prtctl b/bin/prtctl index 2ba9310..ab940d3 100755 --- a/bin/prtctl +++ b/bin/prtctl @@ -128,7 +128,7 @@ EOF export_theme () { DATE=$(date +'%Y%m%d-%H-%M-%S') cp ${THEMERC} "$HOME/.config/pyradio/themes/exported_${DATE}.pyradio-theme" - notify-send.sh -i radio "PyRadio theme exported!" "\nNew PyRadio theme created as:\nexported_${DATE}.pyradio-theme\n" -o " Open in editor:xdg-open ${CONF_DIR}/themes/exported_${DATE}.pyradio-theme" -o " Open Themes dir:xdg-open ${CONF_DIR}/themes" + notify-send.sh -i radio "PyRadio theme exported!" "\nNew PyRadio theme created as:\nexported_${DATE}.pyradio-theme\n" -o " Open in editor:xdg-open ${CONF_DIR}/themes/exported_${DATE}.pyradio-theme" -o " Open Themes dir:xdg-open ${CONF_DIR}/themes" } #run if [ ! -f $THEMERC ]; then diff --git a/share/mabox-colorizer/help/en.html b/share/mabox-colorizer/help/en.html index cc1c035..920af72 100644 --- a/share/mabox-colorizer/help/en.html +++ b/share/mabox-colorizer/help/en.html @@ -60,9 +60,9 @@ nav button.w3-bar-item {padding:4px 12px !important;} - - + + @@ -554,7 +554,7 @@ You can add your own commands to each Conky, which will be show

󰕾 Music & Sound dynamic menu can serve as basic, lightweight music player (mpv-based) you might like to try. Also available from panel's volume icon - right click

- -