diff --git a/usr/bin/jgmenusettings-pipe b/usr/bin/jgmenusettings-pipe
index 9ef35e4..5edfa56 100755
--- a/usr/bin/jgmenusettings-pipe
+++ b/usr/bin/jgmenusettings-pipe
@@ -31,6 +31,7 @@ case $LANG in
SYSINFO="Informacje o systemie"
SHORTCUTS="Skróty klawiszowe"
MENUPANELS="Ustawienia Menu/Paneli bocznych"
+ TINT2="Ustawienia panelu Tint2"
SSH_CONN="Połączenia SSH"
LOOKANDFEEL="Wygląd"
BORDER="Obramowanie"
@@ -86,6 +87,7 @@ case $LANG in
SYSINFO="System information"
SHORTCUTS="Atajos del teclado"
MENUPANELS="Menu/Paneles laterales"
+ TINT2="Tint2 panel settings"
SSH_CONN="SSH Connections"
LOOKANDFEEL="Apariencia"
BORDER="Menu Border"
@@ -141,6 +143,7 @@ case $LANG in
SYSINFO="System information"
SHORTCUTS="Keyboard shortcuts"
MENUPANELS="Menu/Sidepanels settings"
+ TINT2="Tint2 panel settings"
SSH_CONN="SSH Connections"
LOOKANDFEEL="Look and Feel"
BORDER="Menu Border"
@@ -188,7 +191,6 @@ esac
## NOWE ....
#out+=("^sep()")
out+=("^sep($MENU_ITEMS)")
-out+=("^sep()")
out+=("$MAINMENU,^checkout(mainmenu_edit)")
out+=("$LEFTPANEL,^checkout(left_edit)")
out+=("$RIGHTPANEL,^checkout(right_edit)")
@@ -209,15 +211,15 @@ out2+=("^sep($LEFTPANEL)")
out2+=("$EDIT $OWN_COMMANDS ($TOP), geany $HOME/.config/mabox/places-prepend.csv, geany")
#out2+=("^sep()")
-#out2+=("^sep($MODULES)")
+out2+=("^sep($MODULES)")
-#out2+=("$QUICK_NAV")
-#out2+=("$BOOKMARKS")
-#out2+=("$VBOXES")
+[[ $places_quicknav == false ]] && out2+=("$QUICK_NAV,mb-setvar places_quicknav=true;$L") || out2+=("$QUICK_NAV,mb-setvar places_quicknav=false;$L")
+[[ $places_bookmarks == false ]] && out2+=("$BOOKMARKS,mb-setvar places_bookmarks=true;$L") || out2+=("$BOOKMARKS,mb-setvar places_bookmarks=false;$L")
+[[ $places_vboxes == false ]] && out2+=("$VBOXES,mb-setvar places_vboxes=true;$L") || out2+=("$VBOXES,mb-setvar places_vboxes=false;$L")
-out2+=("^sep()")
out2+=("^sep($PIPEMENUS)")
[[ $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_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")
@@ -243,7 +245,6 @@ out2+=("$RESET,mb-reset logout")
##
-out+=("^sep()")
out+=("^sep($LOOKANDFEEL)")
out+=("$BORDER [ ${jgtools_border:-0} ],^checkout(mborder)")
out+=("$PADDING [ ${jgtools_padding:-0} ],^checkout(mpadding)")
@@ -272,9 +273,9 @@ for i in -8 -6 -4 -2 0 1 2 4 6 8 10 12 14 16 18 20; do out2+=("$(printf "%4s
out+=("^sep($SIZE)")
-out+=(" $t $TINY,mb-setvar menu_font_size=7;mb-setvar jgmenu_item_height=14;mb-setvar jgmenu_icon_size=14;mb-setvar sep_height=1;mb-setvar item_margin_y=1;$me
- $s $SMALL,mb-setvar menu_font_size=8;mb-setvar jgmenu_item_height=16;mb-setvar jgmenu_icon_size=16;mb-setvar sep_height=1;mb-setvar item_margin_y=1;$me
- $n $NORMAL,mb-setvar menu_font_size=9;mb-setvar jgmenu_item_height=18;mb-setvar jgmenu_icon_size=18;mb-setvar sep_height=1;mb-setvar item_margin_y=2;$me
+out+=(" $t $TINY,mb-setvar menu_font_size=7;mb-setvar jgmenu_item_height=14;mb-setvar jgmenu_icon_size=14;mb-setvar sep_height=1;mb-setvar item_margin_y=0;$me
+ $s $SMALL,mb-setvar menu_font_size=8;mb-setvar jgmenu_item_height=16;mb-setvar jgmenu_icon_size=16;mb-setvar sep_height=1;mb-setvar item_margin_y=0;$me
+ $n $NORMAL,mb-setvar menu_font_size=9;mb-setvar jgmenu_item_height=18;mb-setvar jgmenu_icon_size=18;mb-setvar sep_height=1;mb-setvar item_margin_y=1;$me
$b $BIG,mb-setvar menu_font_size=10;mb-setvar jgmenu_item_height=20;mb-setvar jgmenu_icon_size=20;mb-setvar sep_height=1;mb-setvar item_margin_y=2;$me
$h $HUGE,mb-setvar menu_font_size=11;mb-setvar jgmenu_item_height=22;mb-setvar jgmenu_icon_size=22;mb-setvar sep_height=2;mb-setvar item_margin_y=2;$me")
diff --git a/usr/bin/jgtint2-pipe b/usr/bin/jgtint2-pipe
index b169039..a9641da 100755
--- a/usr/bin/jgtint2-pipe
+++ b/usr/bin/jgtint2-pipe
@@ -11,7 +11,7 @@ case $LANG in
RUNNING_TINT2="Działające Tint2"
DEFAULT_TINT2RC="Domyślny tint2rc"
EDIT_TINT2="Edytuj plik konfiguracyjny"
- APPS="Programy"
+ APPS="Programy (Launcher)"
LAUNCHERS="Dodaj/usuń programy..."
TINT2_EDITOR="Wybierz pliki Tint2 do edycji..."
TINT2_CONFIGURE="Konfiguracja"
@@ -19,6 +19,8 @@ case $LANG in
RESTART_TINT2="Restartuj Tint2"
RELOAD_TINT2="Przeładuj Tint2"
CONFIGURE="Konfiguruj (GUI)"
+ REMOVE="Usuń to menu z panelu"
+ TRAY_HWMON="Monitor zasobów w trayu"
;;
es*)
TITLE="Panel Tint2"
@@ -33,6 +35,8 @@ case $LANG in
RESTART_TINT2="Reiniciar panel(es)"
RELOAD_TINT2="Reload Tint2"
CONFIGURE="Editor gráfico"
+ REMOVE="Eliminar este menú del panel"
+ TRAY_HWMON="Systray HW monitor"
;;
*)
TITLE="Tint2 Panel"
@@ -47,6 +51,8 @@ case $LANG in
RESTART_TINT2="Restart Tint2"
RELOAD_TINT2="Reload Tint2"
CONFIGURE="Configure (GUI)"
+ REMOVE="Remove this menu from panel"
+ TRAY_HWMON="Systray HW monitor"
;;
esac
@@ -68,7 +74,6 @@ out+=("^sep($TINT2_CONFIGURE)")
fi
out+=("$CONFIGURE $TINT2,tint2conf $TINT")
out+=("$EDIT_TINT2 $TINT2,geany $TINT")
-
fi
done < <(pgrep -a tint2)
fi
@@ -76,4 +81,32 @@ fi
out+=("^sep($APPS)")
out+=("$LAUNCHERS,jgtint2launcher")
+if command -v phwmon.py &>/dev/null; then
+PHWRUN="mabox-obstart phwmon"
+
+. $HOME/.config/mabox/mabox.conf
+me="mb-jgtools ${jgtools_last}"
+ out+=("^sep($TRAY_HWMON)")
+ if [ "$(pgrep -f phwmon.py)" ];then
+ out+=("Stop/Disable,mb-setvar phwmon_monitor=false;$PHWRUN;$me")
+ else
+ out+=("Start/Enable,mb-setvar phwmon_monitor=true;$PHWRUN;$me")
+ fi
+ out+=("^sep()")
+[[ $phwmon_cpu = false ]] && out+=("CPU,mb-setvar phwmon_cpu=true;$PHWRUN;$me") || out+=("CPU,mb-setvar phwmon_cpu=false;$PHWRUN;$me")
+[[ $phwmon_mem = false ]] && out+=("Memory,mb-setvar phwmon_mem=true;$PHWRUN;$me") || out+=("Memory,mb-setvar phwmon_mem=false;$PHWRUN;$me")
+[[ $phwmon_swap = false ]] && out+=("Swap,mb-setvar phwmon_swap=true;$PHWRUN;$me") || out+=("Swap,mb-setvar phwmon_swap=false;$PHWRUN;$me")
+[[ $phwmon_net = false ]] && out+=("Network usage,mb-setvar phwmon_net=true;$PHWRUN;$me") || out+=("Network usage,mb-setvar phwmon_net=false;$PHWRUN;$me")
+[[ $phwmon_io = false ]] && out+=("Disk IO,mb-setvar phwmon_io=true;$PHWRUN;$me") || out+=("Disk IO,mb-setvar phwmon_io=false;$PHWRUN;$me")
+
+
+# out+=("^sep()")
+fi
+
+
printf '%s\n' "${out[@]}"
+
+if [ $1 == "-r" ]; then
+printf '%s\n' "^sep()"
+printf '%s\n' "$REMOVE,mb-setvar places_tint2pipe=false"
+fi