diff --git a/bin/mb-jgtools b/bin/mb-jgtools
index 484aa90..fc36006 100755
--- a/bin/mb-jgtools
+++ b/bin/mb-jgtools
@@ -506,6 +506,9 @@ case $LANG in
TINT2SETTINGS="Ustawienia panelu Tint2"
CONKYSETTINGS="Ustawienia Conky"
SSH_CONN="Połącz po SSH"
+ DESKMNGR="Desktop Session Manager"
+ DESKTOPS="Pulpity i Okna"
+ DESKGRID="DeskGrid"
;;
es*)
QUICK_NAV="Navegación rápida"
@@ -519,6 +522,9 @@ case $LANG in
TINT2SETTINGS="Tint2 panel settings"
CONKYSETTINGS="Conky settings"
SSH_CONN="Conexiones SSH"
+ DESKMNGR="Desktop Session Manager"
+ DESKTOPS="Desktops and Windows"
+ DESKGRID="Desktop Grid"
;;
*)
QUICK_NAV="Quick Navigation"
@@ -532,6 +538,9 @@ case $LANG in
TINT2SETTINGS="Tint2 panel settings"
CONKYSETTINGS="Conky settings"
SSH_CONN="SSH connections"
+ DESKMNGR="Desktop Session Manager"
+ DESKTOPS="Desktops and Windows"
+ DESKGRID="DeskGrid"
;;
esac
@@ -587,17 +596,20 @@ fi
[ $places_sysinfopipe == true ] && sysinfopipe=" $SYSINFO,^pipe(jgsysinfo-pipe -r)" && pipesep="^sep($PIPEMENUS)"
[ $places_keyspipe == true ] && keyspipe=" $SHORTCUTS,^pipe(jgkeys-pipe -r)" && pipesep="^sep($PIPEMENUS)"
[ $places_sshpipe == true ] && sshpipe=" $SSH_CONN,^pipe(jgssh -r)" && pipesep="^sep($PIPEMENUS)"
-[ $places_softwarepipe == true ] && softwarepipe=" $POPINSTALL,^pipe(jgsoftware-pipe -r)" && pipesep="^sep($PIPEMENUS)"
-[ $places_conkypipe == true ] && conkypipe=" $CONKYSETTINGS,^pipe(jgconky-pipe -r)" && pipesep="^sep($PIPEMENUS)"
+[ $places_softwarepipe == true ] && softwarepipe=" $POPINSTALL,^pipe(jgsoftware-pipe -r)" && pipesep="^sep($PIPEMENUS)"
+[[ $places_conkypipe == true || -z ${places_conkypipe} ]] && conkypipe=" $CONKYSETTINGS,^pipe(jgconky-pipe -r)" && pipesep="^sep($PIPEMENUS)"
+[[ $places_jgdeskmngr == true || -z ${places_jgdeskmngr} ]] && jgdeskmngr=" $DESKMNGR,^pipe(jgdeskmngr -r)" && pipesep="^sep($PIPEMENUS)"
+[[ $places_jgdesktops == true || -z ${places_jgdesktops} ]] && jgdesktops=" $DESKTOPS,^pipe(jgdesktops -r)" && pipesep="^sep($PIPEMENUS)"
+[[ $places_jgdeskgrid == true || -z ${places_jgdeskgrid} ]] && jgdeskgrid=" $DESKGRID,^pipe(jgdeskgrid -r)" && pipesep="^sep($PIPEMENUS)"
# VBOXES
-[ $places_vboxes == true ] && vboxes=". $HOME/.config/mabox/vboxes.csv" || vboxes=""
+[[ $places_vboxes == true ]] && vboxes=". $HOME/.config/mabox/vboxes.csv" || vboxes=""
mkconfigfile
cat < ${MENU_ITEMS}
@icon,,$((jgtools_padding + 10)),$((jgtools_padding + 10)),48,48,4,left,top,,,/usr/share/icons/hicolor/48x48/apps/mbcc.png
-#@icon,,10,$(expr $MENU_HEIGHT_MIN - 160),240,180,4,center,top,,,$BOTTOM_IMG
+#@icon,,10,$((MENU_HEIGHT_MIN - 160)),240,180,4,center,top,,,$BOTTOM_IMG
@text,,$((jgtools_padding + 70)),$((jgtools_padding + 10)),200,20,4,left,top,auto,#111111,$OSNAME $OSVERSION $OSCODE
@text,,$((jgtools_padding + 70)),$((jgtools_padding + 30)),200,20,4,left,top,auto,#444444,$USER@$HOSTNAME
@@ -607,6 +619,9 @@ cat < ${MENU_ITEMS}
$(gtkbookmarks)
$pipesep
+$jgdesktops
+$jgdeskmngr
+$jgdeskgrid
$sysinfopipe
$keyspipe
$sshpipe
diff --git a/bin/mb-reset b/bin/mb-reset
index 924b979..960b38c 100755
--- a/bin/mb-reset
+++ b/bin/mb-reset
@@ -41,7 +41,13 @@ mb-setvar places_menusettingspipe=true
mb-setvar places_sysinfopipe=true
mb-setvar places_keyspipe=true
mb-setvar places_sshpipe=true
+mb-setvar places_conkypipe=true
+mb-setvar places_tint2pipe=true
+mb-setvar places_jgdesktops=true
+mb-setvar places_jgdeskmngr=true
+mb-setvar places_jgdeskgrid=true
mb-setvar places_softwarepipe=true
+
}
__mainmenu() {
@@ -55,6 +61,11 @@ mb-setvar places_menusettingspipe=true
mb-setvar places_sysinfopipe=true
mb-setvar places_keyspipe=true
mb-setvar places_sshpipe=true
+mb-setvar places_conkypipe=true
+mb-setvar places_tint2pipe=true
+mb-setvar places_jgdesktops=true
+mb-setvar places_jgdeskmngr=true
+mb-setvar places_jgdeskgrid=true
mb-setvar places_softwarepipe=true
}
@@ -85,6 +96,7 @@ echo "Not implemented yet"
}
__obrcxml() {
+cp $HOME/.config/openbox/rc.xml{,.bak."$(date +%Y%m%d-%H%M%S)"}
rsync -a /usr/share/mabox/common/rc.xml $HOME/.config/openbox/
openbox --reconfigure
}
@@ -94,6 +106,7 @@ rsync -a /usr/share/mabox/common/autostart $HOME/.config/openbox/
}
__bashrc() {
+cp $HOME/.bashrc{,.bak."$(date +%Y%m%d-%H%M%S)"}
rsync -a /usr/share/mabox/common/.bashrc $HOME/
}