diff --git a/bin/mb-jgtools b/bin/mb-jgtools index 7034bba..24a95fd 100755 --- a/bin/mb-jgtools +++ b/bin/mb-jgtools @@ -328,7 +328,7 @@ mkconfigfile cat < ${MENU_ITEMS} @icon,,15,10,48,48,4,left,top,,,/usr/share/icons/hicolor/48x48/apps/distributor-logo-mabox.png -@text,,70,10,200,20,4,left,top,${color_title_fg% *},#111111,$OSNAME $OSVERSION $OSCODE +@text,,70,10,200,20,4,left,top,${color_title_fg% *},#111111,$OSNAME $OSVERSION $OSCODE @text,,70,30,200,20,4,left,top,#666666,#444444,$USER@$HOSTNAME @icon,,5,$(expr $MENU_HEIGHT_MIN - 190),240,180,4,center,top,,,$BOTTOM_IMG @search,,100,50,292,20,4,left,top,auto,#262626,""" $TYPE_TO_SEARCH""" @@ -442,10 +442,11 @@ case $LANG in QUICK_NAV="Szybka nawigacja" HOME_DIR="Katalog Domowy" ROOTDIR="Katalog główny" - PIPEMENUS="Dynamiczne menu" + PIPEMENUS="Dynamiczne (pipe) menu" POPINSTALL="Instaluj popularne programy" SYSINFO="Informacje o systemie" SHORTCUTS="Skróty klawiszowe" + MENUPANELS="Menu / Panele boczne" ;; es*) QUICK_NAV="Navegación rápida" @@ -455,6 +456,7 @@ case $LANG in POPINSTALL="Instalar Programas populares" SYSINFO="System information" SHORTCUTS="Atajos del teclado" + MENUPANELS="Menu / Paneles laterales" ;; *) QUICK_NAV="Quick Navigation" @@ -464,6 +466,7 @@ case $LANG in POPINSTALL="Install popular apps" SYSINFO="System information" SHORTCUTS="Keyboard shortcuts" + MENUPANELS="Menu / Sidepanels" ;; esac @@ -476,6 +479,7 @@ BOTTOM_IMG=${places_bottom_img:-/usr/share/mb-jgtools/mabox_3D_silver.png} [ $places_softwarepipe == true ] && softwarepipe="$POPINSTALL,^pipe(jgsoftware-pipe -r)" && pipesep="^sep($PIPEMENUS)" [ $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_menusettingspipe == true ] && menusettingspipe="$MENUPANELS,^pipe(jgmenusettings-pipe -r)" && pipesep="^sep($PIPEMENUS)" mkconfigfile @@ -483,26 +487,27 @@ mkconfigfile cat < ${MENU_ITEMS} @icon,,10,10,48,48,4,left,top,,,/usr/share/icons/hicolor/48x48/apps/mbcc.png @icon,,10,$(expr $MENU_HEIGHT_MIN - 190),240,180,4,center,top,,,$BOTTOM_IMG -@text,,70,10,200,20,4,left,top,${color_title_fg% *},#111111,$OSNAME $OSVERSION $OSCODE +@text,,70,10,200,20,4,left,top,${color_title_fg% *},#111111,$OSNAME $OSVERSION $OSCODE @text,,70,30,200,20,4,left,top,#666666,#444444,$USER@$HOSTNAME . $HOME/.config/mabox/places-prepend.csv ^sep($QUICK_NAV) -$ROOTDIR,^pipe(jgbrowser /) -$HOME_DIR,^pipe(jgbrowser) +/ ($ROOTDIR),^pipe(jgbrowser /) +~ ($HOME_DIR),^pipe(jgbrowser) -$(basename $(xdg-user-dir DOWNLOAD)),^pipe(jgbrowser $(xdg-user-dir DOWNLOAD)) -$(basename $(xdg-user-dir DOCUMENTS)),^pipe(jgbrowser $(xdg-user-dir DOCUMENTS)) -$(basename $(xdg-user-dir MUSIC)),^pipe(jgbrowser $(xdg-user-dir MUSIC)) -$(basename $(xdg-user-dir PICTURES)),^pipe(jgbrowser $(xdg-user-dir PICTURES)) -$(basename $(xdg-user-dir VIDEOS)),^pipe(jgbrowser $(xdg-user-dir VIDEOS)) +~/$(basename $(xdg-user-dir DOWNLOAD)),^pipe(jgbrowser $(xdg-user-dir DOWNLOAD)) +~/$(basename $(xdg-user-dir DOCUMENTS)),^pipe(jgbrowser $(xdg-user-dir DOCUMENTS)) +~/$(basename $(xdg-user-dir MUSIC)),^pipe(jgbrowser $(xdg-user-dir MUSIC)) +~/$(basename $(xdg-user-dir PICTURES)),^pipe(jgbrowser $(xdg-user-dir PICTURES)) +~/$(basename $(xdg-user-dir VIDEOS)),^pipe(jgbrowser $(xdg-user-dir VIDEOS)) $(gtkbookmarks) . $HOME/.config/mabox/vboxes.csv $pipesep $softwarepipe $sysinfopipe +$menusettingspipe $keyspipe . $HOME/.config/mabox/places-append.csv diff --git a/mb-jgtools/mabox-neon.png b/mb-jgtools/mabox-neon.png new file mode 100644 index 0000000..94145c8 Binary files /dev/null and b/mb-jgtools/mabox-neon.png differ diff --git a/mb-jgtools/quake1.png b/mb-jgtools/quake1.png new file mode 100644 index 0000000..fbf2429 Binary files /dev/null and b/mb-jgtools/quake1.png differ