diff --git a/usr/bin/jgkeys-pipe b/usr/bin/jgkeys-pipe
index c3710b2..c10fd04 100755
--- a/usr/bin/jgkeys-pipe
+++ b/usr/bin/jgkeys-pipe
@@ -19,24 +19,25 @@ case $LANG in
LOCK="Blokada ekranu"
EXIT="Wyloguj..."
REMOVE="Usuń to menu z panelu"
-
+
;;
es*)
- APPS=""
- FILEMNGR=""
- BROWSER=""
- TERMINAL=""
- EDITOR=""
- FSEARCH=""
+ APPS="Ejacutar"
+ FILEMNGR="gestor archivos"
+ BROWSER="Navegador"
+ TERMINAL="Terminal"
+ EDITOR="Editor de textos"
+ FSEARCH="FSearch"
- PANELS=""
- M_MAIN=""
- M_SETTINGS=""
- PLACES=""
- RIGHT=""
- LOCK=""
- EXIT=""
+ PANELS="Paneles Laterales"
+ M_MAIN="Menú principal"
+ M_SETTINGS="Menú de configuración"
+ PLACES="Lugares (izquierda)"
+ RIGHT="Ajustes (derecha)"
+ LOCK="Bloquear pantalla"
+ EXIT="Salir "
REMOVE="Eliminar este menú del panel"
+
;;
*)
APPS="Applications"
@@ -49,11 +50,12 @@ case $LANG in
PANELS="Menu/SidePanels"
M_MAIN="Main Menu"
M_SETTINGS="Settings Menu"
- PLACES=""
- RIGHT=""
+ PLACES="Places Sidepanel (Left)"
+ RIGHT="Help/Settings Sidepanel (Right)"
LOCK="Lock screen"
EXIT="Exit Dialog"
REMOVE="Remove this menu from panel"
+
;;
esac
@@ -93,6 +95,8 @@ out+=("$(printf "%-10s %s,%s" "W-w" "$BROWSER" "exo-open --launch WebBr
out+=("$(printf "%-10s %s,%s" "W-t" "$TERMINAL" "exo-open --launch TerminalEmulator")")
out+=("$(printf "%-10s %s,%s" "W-e" "$EDITOR" geany)")
out+=("$(printf "%-10s %s,%s" "W-/" "$FSEARCH" fsearch)")
+out+=("$(printf "%-10s %s,%s" "W-l" "$LOCK" "betterlockscreen -l")")
+out+=("$(printf "%-10s %s,%s" "W-x" "$EXIT" "mb-jgtools mblogout")")
out+=("^sep($PANELS)")
@@ -100,9 +104,6 @@ out+=("$(printf "%-10s %s,%s" "W" "$M_MAIN" "mb-jgtools main")")
out+=("$(printf "%-10s %s,%s" "W-s" "$M_SETTINGS" "mb-jgtools settings")")
out+=("$(printf "%-10s %s,%s" "C-tab" "$PLACES" "mb-jgtools places")")
out+=("$(printf "%-10s %s,%s" "W-tab" "$RIGHT" "mb-jgtools right")")
-out+=("$(printf "%-10s %s,%s" "W-l" "$LOCK" "betterlockscreen -l")")
-out+=("$(printf "%-10s %s,%s" "W-x" "$EXIT" "mb-jgtools mblogout")")
-
### RUN
if [ $1 == "-s" ]; then
@@ -124,4 +125,6 @@ exit 0
fi
printf '%s\n' "${out[@]}"
+printf '%s\n' "^sep()"
+printf '%s\n' "$REMOVE,mb-setvar places_keyspipe=false"
diff --git a/usr/bin/jgsysinfo-pipe b/usr/bin/jgsysinfo-pipe
index f7e30c0..44b1da4 100755
--- a/usr/bin/jgsysinfo-pipe
+++ b/usr/bin/jgsysinfo-pipe
@@ -8,7 +8,7 @@ case $LANG in
PKGS="Zainstalowane pakiety:"
RESOLUTION="Rozdzielczość:"
DF_HEADER="System plików ~~ Typ ~~ Rozmiar ~ Użyte ~ Wolne ~ % ~ Punkt mont."
- CPU_RAM="CPU ~ RAM ~ Swap | Użyte/Całość "
+ CPU_RAM="CPU ~ RAM ~ Swap | Użyte/Całość"
NETWORK="Sieć"
DATETIME="Data ~ Godzina"
DATE="Data:"
@@ -22,7 +22,7 @@ case $LANG in
PKGS="Paquetes instalados:"
RESOLUTION="Resolución:"
DF_HEADER="S.ficheros ~ Tipo ~ Tamaño ~ Usados ~ Disp ~ % ~ Montado en"
- CPU_RAM="CPU ~ RAM ~ Swap | Usados/Tamaño "
+ CPU_RAM="CPU ~ RAM ~ Swap | Usados/Tamaño"
NETWORK="Red"
DATETIME="Fecha ~ Hora"
DATE="Fecha:"
@@ -35,7 +35,7 @@ case $LANG in
KERNEL="Kernel:"
PKGS="Installed pkgs:"
RESOLUTION="Resolution:"
- DF_HEADER="Filesystem ~~ Type ~~ Total ~ Used ~ Free ~ % ~ Mount "
+ DF_HEADER="Filesystem ~~ Type ~~ Total ~ Used ~ Free ~ % ~ Mount"
CPU_RAM="CPU ~ RAM ~ Swap | Used/Total "
NETWORK="Network"
DATETIME="Date ~ Time"
@@ -57,9 +57,10 @@ Lsb_rel=$(lsb_release -rs)
Lsb_code=$(lsb_release -cs)
NetworkDevice1=$(ip route | grep default | sed -e "s/^.*dev.//" -e "s/.proto.*//")
-NetDev1ip=$(ip address | grep '192.168' | awk '{ print $2}' | sed s:\/.*::g)
-NetDev1down=$(/sbin/ifconfig "$NetworkDevice1" | grep "RX packets" |awk '{print $6}')
-NetDev1up=$(/sbin/ifconfig "$NetworkDevice1" | grep "TX packets" |awk '{print $6}' )
+#NetDev1ip=$(ip address | grep '192.168' | awk '{ print $2}' | sed s:\/.*::g)
+NetDev1ip=$(ip address | grep "$NetworkDevice1$" | awk '{ print $2}' | sed s:\/.*::g)
+NetDev1down=$(/sbin/ifconfig "$NetworkDevice1" | grep "RX packets" |awk '{print $6,$7}')
+NetDev1up=$(/sbin/ifconfig "$NetworkDevice1" | grep "TX packets" |awk '{print $6,$7}' )
MemTotal=$(echo "scale = 2; ("$(grep MemTotal: /proc/meminfo | awk '{print $2}' | sed 's/k//')" /1024)" | bc)
MemFree=$(echo "scale = 2; ("$(grep MemFree: /proc/meminfo | awk '{print $2}' | sed 's/k//')" /1024) + ("$(grep -m 1 Cached: /proc/meminfo | awk '{print $2}' | sed 's/k//')" /1024)" | bc)
@@ -108,8 +109,8 @@ out2+=("CPU ~ $CPUmodel")
out2+=("CPU @ $CPUfreq MHz ~ CPU Cache: $CPUcache")
out2+=("^sep($NETWORK ~ "$NetworkDevice1" ")
out2+=("$NetworkDevice1 ~ ip: $NetDev1ip")
-out2+=("$NetworkDevice1 ~ downloaded: ${NetDev1down:1} MB")
-out2+=("$NetworkDevice1 ~ uploaded: ${NetDev1up:1} MB")
+out2+=("$NetworkDevice1 ~ downloaded: ${NetDev1down:1:-1}")
+out2+=("$NetworkDevice1 ~ uploaded: ${NetDev1up:1:-1}")
out2+=("^sep($DATETIME)")
out2+=("$(printf "%+29s %s" $DATE "$(date '+%Y.%m.%d (%a)')")")
out2+=("$(printf "%+30s %s" $WEEK "$(date '+%W')")")
@@ -145,3 +146,5 @@ fi
printf '%s\n' "${out[@]}"
df -HlT | grep -E '^/'|awk '{print "\"\"\""$0"\"\"\",pcmanfm "$7}'
printf '%s\n' "${out2[@]}"
+printf '%s\n' "^sep()"
+printf '%s\n' "$REMOVE,mb-setvar places_sysinfopipe=false"