From 012d10364d4ef7c98c14d13acdfee84b24ae3b8c Mon Sep 17 00:00:00 2001 From: Daniel Napora Date: Sat, 22 May 2021 02:00:30 +0200 Subject: [PATCH] upd --- usr/bin/jgdeskgrid | 37 +++++++++++++++++++++++++------------ usr/bin/jgdeskmngr | 14 ++++++++++++++ usr/bin/jgdesktops | 16 +++++++++++++--- usr/bin/jgmenusettings-pipe | 14 +++++++++++++- 4 files changed, 65 insertions(+), 16 deletions(-) diff --git a/usr/bin/jgdeskgrid b/usr/bin/jgdeskgrid index 2fe257e..542e997 100755 --- a/usr/bin/jgdeskgrid +++ b/usr/bin/jgdeskgrid @@ -1,6 +1,19 @@ #!/bin/bash # jgdeskgrid - configure DeskGrid from menu # +case $LANG in + pl*) + REMOVE="Usuń to menu z panelu" + ;; + es*) + REMOVE="Eliminar este menú del panel" + ;; + *) + REMOVE="Remove this menu from panel" + ;; +esac + + . ~/.config/mabox/mabox.conf CONFIG_DIR="$HOME/.config/deskgrid" @@ -45,18 +58,18 @@ out+=("Notifications [ $notifications ],^checkout(notify)") out+=("^sep()") out+=("Edit config file ,geany $CONFIG_FILE") -out+=("^tag(columns)") -for i in 8 12 16 24 32; do out+=("$(printf "%3s,%s" "$i" "mb-setvar grid_x=${i} $CONFIG_FILE;$me")");done -out+=("^tag(rows)") -for i in 6 8 12 16 24; do out+=("$(printf "%3s,%s" "$i" "mb-setvar grid_y=${i} $CONFIG_FILE;$me")");done -out+=("^tag(gap)") -for i in 0 2 4 8 12 16 24 32 40; do out+=("$(printf "%3s,%s" "$i" "mb-setvar gap=${i} $CONFIG_FILE;$me")");done -out+=("^tag(outer)") -out+=("$(printf "%3s,%s" "true" "mb-setvar show_outer_gap=true $CONFIG_FILE;$me")") -out+=("$(printf "%3s,%s" "false" "mb-setvar show_outer_gap=false $CONFIG_FILE;$me")") -out+=("^tag(notify)") -out+=("$(printf "%3s,%s" "true" "mb-setvar notifications=true $CONFIG_FILE;$me")") -out+=("$(printf "%3s,%s" "false" "mb-setvar notifications=false $CONFIG_FILE;$me")") +out2+=("^tag(columns)") +for i in 8 12 16 24 32; do out2+=("$(printf "%3s,%s" "$i" "mb-setvar grid_x=${i} $CONFIG_FILE;$me")");done +out2+=("^tag(rows)") +for i in 6 8 12 16 24; do out2+=("$(printf "%3s,%s" "$i" "mb-setvar grid_y=${i} $CONFIG_FILE;$me")");done +out2+=("^tag(gap)") +for i in 0 2 4 8 12 16 24 32 40; do out2+=("$(printf "%3s,%s" "$i" "mb-setvar gap=${i} $CONFIG_FILE;$me")");done +out2+=("^tag(outer)") +out2+=("$(printf "%3s,%s" "true" "mb-setvar show_outer_gap=true $CONFIG_FILE;$me")") +out2+=("$(printf "%3s,%s" "false" "mb-setvar show_outer_gap=false $CONFIG_FILE;$me")") +out2+=("^tag(notify)") +out2+=("$(printf "%3s,%s" "true" "mb-setvar notifications=true $CONFIG_FILE;$me")") +out2+=("$(printf "%3s,%s" "false" "mb-setvar notifications=false $CONFIG_FILE;$me")") diff --git a/usr/bin/jgdeskmngr b/usr/bin/jgdeskmngr index b605aa2..0e3945d 100755 --- a/usr/bin/jgdeskmngr +++ b/usr/bin/jgdeskmngr @@ -1,6 +1,20 @@ #!/bin/bash # jgdeskmngr - pipemenu for deskmngr # + +case $LANG in + pl*) + REMOVE="Usuń to menu z panelu" + ;; + es*) + REMOVE="Eliminar este menú del panel" + ;; + *) + REMOVE="Remove this menu from panel" + ;; +esac + + SESSIONDIR="$HOME/.config/deskmngr/" mkdir -p $SESSIONDIR diff --git a/usr/bin/jgdesktops b/usr/bin/jgdesktops index c1d8800..83c4b1c 100755 --- a/usr/bin/jgdesktops +++ b/usr/bin/jgdesktops @@ -1,7 +1,17 @@ #!/bin/bash # jgdesktops # - +case $LANG in + pl*) + REMOVE="Usuń to menu z panelu" + ;; + es*) + REMOVE="Eliminar este menú del panel" + ;; + *) + REMOVE="Remove this menu from panel" + ;; +esac currdesk=$(wmctrl -d | grep "*" | awk '{print $1}') #out+=("^sep(Okna i pulpity)") @@ -18,7 +28,7 @@ if [[ "$ID" = "$currdesk" ]]; then out+=("^sep(${dname/&/&} (active))") else -out+=("^sep(${dname/&/&})" "  Go to... ${dname/&/&},wmctrl -s $ID") +out+=("^sep(${dname/&/&})" "  Go to... ,wmctrl -s $ID") fi while IFS= read -r line do @@ -52,7 +62,7 @@ out+=("Desktop session Manager,jgdeskmngr -s") ### RUN -if [ $1 == "-s" ]; then +if [[ $1 == "-s" ]]; then . /usr/bin/pipemenu-standalone.cfg . $HOME/.config/mabox/mabox.conf diff --git a/usr/bin/jgmenusettings-pipe b/usr/bin/jgmenusettings-pipe index 7029198..ffe5723 100755 --- a/usr/bin/jgmenusettings-pipe +++ b/usr/bin/jgmenusettings-pipe @@ -29,6 +29,9 @@ case $LANG in BOOKMARKS="Zakładki GTK" VBOXES="Maszyny Wirtualne" PIPEMENUS="Dynamiczne (pipe) menu" + DESKMNGR="Desktop Session Manager" + DESKTOPS="Pulpity i okna" + DESKGRID="DeskGrid" POPINSTALL="Instaluj popularne programy" SYSINFO="Informacje o systemie" SHORTCUTS="Skróty klawiszowe" @@ -85,6 +88,9 @@ case $LANG in BOOKMARKS="GTK Marcadores" VBOXES="Virtual Machines" PIPEMENUS="Menu con extras" + DESKMNGR="Desktop Session Manager" + DESKTOPS="Desktops and Windows" + DESKGRID="Desktop Grid" POPINSTALL="Instalar Programas populares" SYSINFO="System information" SHORTCUTS="Atajos del teclado" @@ -141,6 +147,9 @@ case $LANG in BOOKMARKS="GTK Bookmarks" VBOXES="Virtual Machines" PIPEMENUS="Pipe (dynamic) menus" + DESKMNGR="Desktop Session Manager" + DESKTOPS="Desktops and Windows" + DESKGRID="Desktop Grid" POPINSTALL="Install popular apps" SYSINFO="System information" SHORTCUTS="Keyboard shortcuts" @@ -206,13 +215,16 @@ out2+=("^sep($MODULES)") [[ $places_vboxes == false ]] && out2+=("$VBOXES,mb-setvar places_vboxes=true;$L") || out2+=("$VBOXES,mb-setvar places_vboxes=false;$L") out2+=("^sep($PIPEMENUS)") +[[ $places_jgdesktops = false ]] && out2+=("$DESKTOPS,mb-setvar places_jgdesktops=true;$L") || out2+=("$DESKTOPS,mb-setvar places_jgdesktops=false;$L") +[[ $places_jgdeskmngr = false ]] && out2+=("$DESKMNGR,mb-setvar places_jgdeskmngr=true;$L") || out2+=("$DESKMNGR,mb-setvar places_jgdeskmngr=false;$L") +[[ $places_jgdeskgrid = false ]] && out2+=("$DESKGRID,mb-setvar places_jgdeskgrid=true;$L") || out2+=("$DESKGRID,mb-setvar places_jgdeskgrid=false;$L") [[ $places_sysinfopipe = false ]] && out2+=("$SYSINFO,mb-setvar places_sysinfopipe=true;$L") || out2+=("$SYSINFO,mb-setvar places_sysinfopipe=false;$L") [[ $places_keyspipe = false ]] && out2+=("$SHORTCUTS,mb-setvar places_keyspipe=true;$L") || out2+=("$SHORTCUTS,mb-setvar places_keyspipe=false;$L") [[ $places_sshpipe = false ]] && out2+=("$SSH_CONN,mb-setvar places_sshpipe=true;$L") || out2+=("$SSH_CONN,mb-setvar places_sshpipe=false;$L") [[ $places_softwarepipe = false ]] && out2+=("$POPINSTALL,mb-setvar places_softwarepipe=true;$L") || out2+=("$POPINSTALL,mb-setvar places_softwarepipe=false;$L") [[ $places_menusettingspipe = false ]] && out2+=("$MENUPANELS,mb-setvar places_menusettingspipe=true;$L") || out2+=("$MENUPANELS,mb-setvar places_menusettingspipe=false;$L") [[ $places_tint2pipe = false ]] && out2+=("$TINT2,mb-setvar places_tint2pipe=true;$L") || out2+=("$TINT2,mb-setvar places_tint2pipe=false;$L") -[[ $places_conkypipe = false || -z $places_conkypipe ]] && out2+=("$CONKY,mb-setvar places_conkypipe=true;$L") || out2+=("$CONKY,mb-setvar places_conkypipe=false;$L") +[[ $places_conkypipe = false ]] && out2+=("$CONKY,mb-setvar places_conkypipe=true;$L") || out2+=("$CONKY,mb-setvar places_conkypipe=false;$L") out2+=("^sep()") out2+=("$EDIT $OWN_COMMANDS ($BOTTOM), geany $HOME/.config/mabox/places-append.csv, geany")