From 1fe1f8f05d5e6695fb3909e25a8ff83937caad4b Mon Sep 17 00:00:00 2001 From: Daniel Napora Date: Thu, 3 Jun 2021 14:06:57 +0200 Subject: [PATCH] upd --- usr/bin/jgdeskgrid | 7 +++++++ usr/bin/jgdeskmngr | 13 +++++++++++-- usr/bin/jgmenusettings-pipe | 3 +++ usr/bin/jgwallpaperchanger | 9 +++++++-- usr/bin/mbhelper | 5 +++-- 5 files changed, 31 insertions(+), 6 deletions(-) diff --git a/usr/bin/jgdeskgrid b/usr/bin/jgdeskgrid index 6073bf6..719d3f9 100755 --- a/usr/bin/jgdeskgrid +++ b/usr/bin/jgdeskgrid @@ -15,6 +15,7 @@ case $LANG in OUTER_GAP="Zewnętrzny odstęp" NOTIFY="Powiadomienia" EDITCONF="Edytuj plik konfiguracyjny" + LEFTPANEL="Lewy panel" ;; es*) REMOVE="Eliminar este menú del panel" @@ -29,6 +30,7 @@ case $LANG in OUTER_GAP="Show outer gap" NOTIFY="Notifications" EDITCONF="Edit config file" + LEFTPANEL="Left panel" ;; *) REMOVE="Remove this menu from panel" @@ -43,6 +45,7 @@ case $LANG in OUTER_GAP="Show outer gap" NOTIFY="Notifications" EDITCONF="Edit config file" + LEFTPANEL="Left panel" ;; esac @@ -105,6 +108,10 @@ out2+=("$(printf "%3s,%s" "false" "mb-setvar notifications=false $CONFI if [[ "$1" == "-s" ]]; then . /usr/bin/pipemenu-standalone.cfg . $HOME/.config/mabox/mabox.conf + +out+=("^sep()") +out+=(" ⮜ $LEFTPANEL,mb-jgtools places") + if [[ $panels_heightpos == "top" ]]; then MENU_VALIGN="top" MENU_MARGIN_Y=${panels_topmargin:-0} diff --git a/usr/bin/jgdeskmngr b/usr/bin/jgdeskmngr index 4e72132..4b276c7 100755 --- a/usr/bin/jgdeskmngr +++ b/usr/bin/jgdeskmngr @@ -16,6 +16,7 @@ case $LANG in NEW="Nowa sesja z bieżącego pulpitu jako..." title="DeskMngr - zapisuje i przywraca sesje" help='\nZapisuje rozmiar i pozycję wszystkich okien z bieżącego pulpitu.\n\nSesję możesz otworzyć poźniej na dowolnym pulpicie.\n\n' + LEFTPANEL="Lewy panel" ;; es*) REMOVE="Eliminar este menú del panel" @@ -30,6 +31,7 @@ case $LANG in NEW="New session from current desktop as..." title="DeskMngr - save and restore sessions" help='\nSave all opened windows from active desktop as session.\n\nRestore saved session later on desktop of your choice.\n\n' + LEFTPANEL="Left panel" ;; *) REMOVE="Remove this menu from panel" @@ -44,14 +46,17 @@ case $LANG in NEW="New session from current desktop as..." title="DeskMngr - save and restore sessions" help='\nSave all opened windows from active desktop as session.\nRestore saved session later on desktop of your choice.\n\n' + LEFTPANEL="Left panel" ;; esac +me="jgdeskmngr -s" + SESSIONDIR="$HOME/.config/deskmngr/" mkdir -p $SESSIONDIR out+=("^sep($DESKMNGR)") -out+=("$ABOUT,\"\"\"notify-send.sh -u critical -i mbcc '$title' '$help'\"\"\"") +out+=("$ABOUT,\"\"\"notify-send.sh -u critical -i mbcc '$title' '$help';$me\"\"\"") out+=("^sep($SAVED_SESS)") i="0" while IFS= read -r line @@ -66,7 +71,7 @@ out2+=("^sep($RESTORE_TO)") out2+=("\"\"\"  ${dname/&/&}\"\"\",deskmngr -r $name.desk $ID") done < <(wmctrl -d|awk '{print $1}') out2+=("^sep()" "  $EDIT ${name//_/ },geany $SESSIONDIR$name.desk") -out2+=("^sep()" "  $DELETE ${name//_/ },rm -f $SESSIONDIR$name.desk") +out2+=("^sep()" "  $DELETE ${name//_/ },rm -f $SESSIONDIR$name.desk;$me") ((i=i+1)) done < <(deskmngr -l) @@ -79,6 +84,10 @@ out+=("  $NEW,deskmngr -s") if [ $1 == "-s" ]; then . /usr/bin/pipemenu-standalone.cfg . $HOME/.config/mabox/mabox.conf + +out+=("^sep()") +out+=(" ⮜ $LEFTPANEL,mb-jgtools places") + if [[ $panels_heightpos == "top" ]]; then MENU_VALIGN="top" MENU_MARGIN_Y=${panels_topmargin:-0} diff --git a/usr/bin/jgmenusettings-pipe b/usr/bin/jgmenusettings-pipe index 9c11c22..bae55e2 100755 --- a/usr/bin/jgmenusettings-pipe +++ b/usr/bin/jgmenusettings-pipe @@ -398,6 +398,9 @@ fi if [[ $1 == "-s" ]]; then . /usr/bin/pipemenu-standalone.cfg +out+=("^sep()") +out+=(" ⮜ $LEFTPANEL,mb-jgtools places") + if [[ $panels_heightpos == "top" ]]; then MENU_VALIGN="top" diff --git a/usr/bin/jgwallpaperchanger b/usr/bin/jgwallpaperchanger index 6a0ebef..0f46682 100755 --- a/usr/bin/jgwallpaperchanger +++ b/usr/bin/jgwallpaperchanger @@ -38,7 +38,7 @@ case $LANG in SEC="sekund" EDITCONF="Edytuj plik konfiguracyjny" OPENDIR="Otwórz katalog z tapetami" - LOCKER="Blokada ekranu (W+l)" + LOCKER="Blokada ekranu (super+l)" TYPETO="wpisz hasło aby odblokować" CACHE="Użyj aktualnej tapety" EFFECT="Efekt (ustaw i wypróbuj)" @@ -47,6 +47,7 @@ case $LANG in DIMBLUR="przyciemnienie i rozmycie" PIXEL="pikseloza" DESK="Rozmyty pulpit" + LEFTPANEL="Lewy panel" ;; *) TITLE="Wallpaper Changer & ScreenLocker" @@ -61,7 +62,7 @@ case $LANG in SEC="seconds" EDITCONF="Edit config file" OPENDIR="Open wallpaper directory" - LOCKER="ScreenLocker (W+l)" + LOCKER="ScreenLocker (super+l)" TYPETO="type password to unlock" CACHE="Cache current wallpaper for ScreenLock" EFFECT="Effect (set and run)" @@ -70,6 +71,7 @@ case $LANG in DIMBLUR="dim and blur" PIXEL="pixel" DESK="Blurred desktop" + LEFTPANEL="Left panel" ;; esac @@ -120,6 +122,9 @@ if [[ "$1" == "-s" ]]; then . /usr/bin/pipemenu-standalone.cfg . $HOME/.config/mabox/mabox.conf +out+=("^sep()") +out+=(" ⮜ $LEFTPANEL,mb-jgtools places") + if [[ $panels_heightpos == "top" ]]; then MENU_VALIGN="top" MENU_MARGIN_Y=${panels_topmargin:-0} diff --git a/usr/bin/mbhelper b/usr/bin/mbhelper index 841e0c3..2b936e1 100755 --- a/usr/bin/mbhelper +++ b/usr/bin/mbhelper @@ -20,7 +20,8 @@ case $LANG in ;; esac -[[ -f "$HOME/.config/mabox/mbhelper.csv" ]] && CSVFILE="$HOME/.config/mabox/mbhelper.csv" || CSVFILE="/usr/share/mabox/lang/${LNGDIR}/.config/mabox/mbhelper.csv" +##[[ -f "$HOME/.config/mabox/mbhelper.csv" ]] && CSVFILE="$HOME/.config/mabox/mbhelper.csv" || CSVFILE="/usr/share/mabox/lang/${LNGDIR}/.config/mabox/mbhelper.csv" +CSVFILE="/usr/share/mabox/lang/${LNGDIR}/.config/mabox/mbhelper.csv" ### RUN @@ -33,7 +34,7 @@ MENU_VALIGN="top" MENU_MARGIN_Y=40 jgmenu_icon_size=0 JGWIDTH=500 -MENU_HEIGHT_MAX=600 +#MENU_HEIGHT_MAX=600 [ $(pidof picom) ] && MENU_RADIUS=$jgtools_radius