From 82941cdf3de427fbbc16c0ab71337f576bab4194 Mon Sep 17 00:00:00 2001 From: Daniel Napora Date: Tue, 1 Jun 2021 12:14:29 +0200 Subject: [PATCH] upd --- usr/bin/jgconky-pipe | 12 ++++++++++++ usr/bin/jgmenusettings-pipe | 4 ++-- usr/bin/jgwallpaperchanger | 12 +++++++++--- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/usr/bin/jgconky-pipe b/usr/bin/jgconky-pipe index a070e56..472b086 100755 --- a/usr/bin/jgconky-pipe +++ b/usr/bin/jgconky-pipe @@ -17,6 +17,8 @@ fi case $LANG in pl*) + ENABLE="Uruchom sesję Conky" + DISABLE="Zatrzymaj sesję Conky" CHOOSE_CONKY="Wybierz Conky..." SESSIONS_LBL="Sesje Conky" NEW_SESSION="Nowa sesja Conky" @@ -31,6 +33,8 @@ case $LANG in REMOVE="Usuń to menu z panelu" ;; es*) + ENABLE="Start Conky session" + DISABLE="Stop Conky session" CHOOSE_CONKY="Elegir recuadro Conky..." SESSIONS_LBL="Conky Sesiones" NEW_SESSION="Guardar sesión actual Conky" @@ -45,6 +49,8 @@ case $LANG in REMOVE="Eliminar este menú del panel" ;; *) + ENABLE="Start Conky session" + DISABLE="Stop Conky session" CHOOSE_CONKY="Choose Conky..." SESSIONS_LBL="Conky Sessions" NEW_SESSION="New Conky session" @@ -60,6 +66,7 @@ case $LANG in ;; esac +me="jgconky-pipe -s" EditMenu(){ if [[ $(pidof conky) ]];then @@ -82,6 +89,11 @@ EditMenu(){ out+=("^sep(Conky)") +if [[ $(pidof conky) ]];then + out+=("$DISABLE,conky_toggle") +else + out+=("$ENABLE,conky_toggle;$me") +fi if type "$CZEN" &>/dev/null;then # mb-conky-manager script found out+=("$CHOOSE_CONKY,$CZEN") diff --git a/usr/bin/jgmenusettings-pipe b/usr/bin/jgmenusettings-pipe index 017226e..08a25bc 100755 --- a/usr/bin/jgmenusettings-pipe +++ b/usr/bin/jgmenusettings-pipe @@ -56,7 +56,7 @@ case $LANG in SIZE="Rozmiar i czcionka" FONT_FAMILY="Czcionka" FONT_SIZE="Rozmiar czcionki" - COLOR_SCHEME="Schemat kolorystyczny" + COLOR_SCHEME="Motyw kolorystyczny" GRADIENT="Kierunek Gradientu" EDIT_CURRENT="Edytuj aktywny" FOLLOW_OB="Zgodny z motywem OpenBox" @@ -346,7 +346,7 @@ else #out+=("#${menu_gradient_pos}\n") out+=("$CHOOSE [${wm_theme// /_}],^checkout(motywy)") out+=("$EDIT_CURRENT: (${wm_theme// /_}),geany $HOME/.config/mabox/jgobthemes/${wm_theme// /_}.colorrc,geany") -out+=("$RANDOM,mb-setvar jgmenu_theme=$(basename -s .colorrc $(ls ~/.config/mabox/jgobthemes/*.colorrc | shuf -n 1));$me") +out+=("$RANDTHEME,mb-setvar jgmenu_theme=$(basename -s .colorrc $(ls ~/.config/mabox/jgobthemes/*.colorrc | shuf -n 1));$me") out+=("$FOLLOW_OB,mb-setvar jgmenu_theme=obtheme;$me ^sep()") out+=("$GRADIENT [ ${menu_gradient_pos:-none} ],^checkout(gradient)") diff --git a/usr/bin/jgwallpaperchanger b/usr/bin/jgwallpaperchanger index fe49e7e..871dd8b 100755 --- a/usr/bin/jgwallpaperchanger +++ b/usr/bin/jgwallpaperchanger @@ -26,14 +26,15 @@ fi source <(grep = $CONFIG_FILE) case $LANG in pl*) - TITLE="Zmieniacz tapet i Blokada ekranu" + TITLE="Zmieniacz tapet i Blokada ekranu" + WALLPAPERS="Tapety" RANDWALL="Losowa tapeta" CHOOSE="Wybierz tapetę..." STARTS="Uruchom Pokaz slajdów (zatrzymany)" STOPS="Zatrzymaj Pokaz slajdów (działający)" CONF="Konfiguracja" WALLDIR="Katalog z tapetami" - INTERVAL="Interwał" + INTERVAL="Interwał pokazu slajdów" SEC="sekund" EDITCONF="Edytuj plik konfiguracyjny" OPENDIR="Otwórz katalog z tapetami" @@ -49,6 +50,7 @@ case $LANG in ;; *) TITLE="Wallpaper Changer & ScreenLocker" + WALLPAPERS="Wallpapers" RANDWALL="Random Wallpaper" CHOOSE="Choose Wallpaper..." STARTS="Start Slideshow (stopped)" @@ -77,15 +79,17 @@ me="jgwallpaperchanger -s" #help='\nBased on Mabox forum member Shwaybo idea.\n\nchange wallpapers from a directory, never using the same picture twice until all the pictures have been shown, and rotating x number of seconds (configurable) before the next wallpaper change.\n' out+=("^sep($TITLE)") +out+=("^sep($WALLPAPERS)") if ! pgrep mbwallpaper > /dev/null; then out+=("$RANDWALL,mbwallpaper -o;$me") out+=("$CHOOSE,mbwallpaper -c") out+=("$STARTS,run_wallpaperslideshow;$me") + out+=("Nitrogen,nitrogen") else out+=("$STOPS,killall mbwallpaper;$me") fi -out+=("^sep($CONF)") +out+=("^sep($CONF)") #out+=("About Wallpaper changer,\"\"\"notify-send.sh -u critical -i mbcc 'Wallpaper Changer - rotate desktop wallpaper every n-seconds' '$help' -o 'Edit configuration file:geany ~/.config/mbwallpaper/mbwallpaper.conf'\"\"\"") out+=("$WALLDIR: [ $wallpaper_dir ],geany $CONFIG_FILE") @@ -105,6 +109,8 @@ out+=("$DIMBLUR,mb-setvar screenlocker=betterlockscreen $SCRNLOCKCFG;mb-setvar e out+=("$PIXEL,mb-setvar screenlocker=betterlockscreen $SCRNLOCKCFG;mb-setvar effect=pixel $SCRNLOCKCFG;mbscreenlocker") out+=("^sep()") out+=("$DESK,mb-setvar screenlocker=i3lock $SCRNLOCKCFG;mbscreenlocker") +out+=("^sep()") +out+=("$EDITCONF ,geany $SCRNLOCKCFG") out2+=("^tag(interval)") for i in 10 30 60 120 300 600 1800 3600; do out2+=("$(printf " %4s,%s" "$i" "mb-setvar interval=${i} $CONFIG_FILE;$me")");done