diff --git a/bin/mb-jgtools b/bin/mb-jgtools index f7a99a4..556f488 100755 --- a/bin/mb-jgtools +++ b/bin/mb-jgtools @@ -675,6 +675,7 @@ case $LANG in HOME_DIR="Katalog Domowy" ROOTDIR="Katalog główny" PIPEMENUS="Narzędzia" + _CONFIG_FONTS="Konfiguruj Czcionki" POPINSTALL="Instaluj popularne programy" SYSINFO="Informacje o systemie" SHORTCUTS="Skróty klawiszowe" @@ -694,6 +695,7 @@ case $LANG in HOME_DIR="Carpeta personal" ROOTDIR="Directorio raíz" PIPEMENUS="Menu con extras" + _CONFIG_FONTS="Configure Fonts" POPINSTALL="Instalar Programas populares" SYSINFO="System information" SHORTCUTS="Atajos del teclado" @@ -713,6 +715,7 @@ case $LANG in HOME_DIR="Home Directory" ROOTDIR="Main Directory" PIPEMENUS="Mabox Tools" + _CONFIG_FONTS="Configure Fonts" POPINSTALL="Install popular apps" SYSINFO="System information" SHORTCUTS="Keyboard shortcuts" @@ -783,7 +786,7 @@ fi #[ $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 || -z ${places_conkypipe} ]] && conkypipe=" $CONKYSETTINGS,colorizer-conky -s" && pipesep="^sep($PIPEMENUS)" +[[ $places_conkypipe == true || -z ${places_conkypipe} ]] && conkypipe=" $CONKYSETTINGS,colorizer-conky -s" && 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=" $SUPERCLICK,^pipe(jgdeskgrid -r)" && pipesep="^sep($PIPEMENUS)" @@ -839,6 +842,7 @@ $(gtkbookmarks) $pipesep $softwarepipe $tint2pipe + $_CONFIG_FONTS,colorizer-fonts -s $conkypipe $jgwallpaperchanger $jglockscreen @@ -942,9 +946,17 @@ THUMBDIR="$HOME/.cache/colorizer/thumbs" convert ${WALLPATH} -resize 270x150^ -gravity center -extent 270x150 ${THUMB} fi + # system uptime +UPT="$(uptime -p)" +UPT="${UPT/up /}" +UPT="${UPT/ day?/d}" +UPT="${UPT/ hour?/h}" +UPT="${UPT/ minute?/m}" cat < ${MENU_ITEMS} @icon,,$((jgtools_padding)),$((jgtools_padding)),270,150,4,left,top,,,$THUMB +@rect,,$((jgtools_padding + 140)),$((jgtools_padding + 4)),130,20,2,left,top,#222222 50,#222222 80, +@text,,$((jgtools_padding + 148)),$((jgtools_padding + 4)),122,20,4,left,top,#EEEEEE,##EEEEEE,"""uptime $UPT""" @rect,,$((jgtools_padding + 0)),$((jgtools_padding + 120)),270,22,2,left,top,#222222 50,#222222 80, @text,,$((jgtools_padding + 8)),$((jgtools_padding + 120)),292,20,4,left,top,#EEEEEE,##EEEEEE,"""$USER @ $HOSTNAME""" @icon,,224,108,48,48,4,left,top,,,/usr/share/icons/hicolor/48x48/apps/mbcc.png