From d0a60b25b9c0b7128b958a1b654929ca7ffa268b Mon Sep 17 00:00:00 2001 From: Daniel Napora Date: Thu, 14 Jan 2021 20:04:25 +0100 Subject: [PATCH] upd --- bin/mb-jgtools | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/bin/mb-jgtools b/bin/mb-jgtools index 6a52977..4b084e1 100755 --- a/bin/mb-jgtools +++ b/bin/mb-jgtools @@ -173,8 +173,8 @@ case $LANG in esac cat < $HOME/.config/jgmenu/prepend.csv -@text,,$(expr $jgtools_padding + 10),$(expr $jgtools_padding + 4),150,20,0,left,top,auto,#000000, -@search,,$(expr $jgtools_padding + 24),$(expr $jgtools_padding + 4),150,20,2,left,top,auto,#000000 0,$TYPE_TO_SEARCH +@text,,$(expr $jgtools_padding + 24),$(expr $jgtools_padding + 4),150,20,0,left,top,auto,#000000, +@search,,$(expr $jgtools_padding + 38),$(expr $jgtools_padding + 4),150,20,2,left,top,auto,#000000 0,$TYPE_TO_SEARCH ^sep() . ~/.config/mabox/favorites.csv EOF @@ -360,7 +360,7 @@ cat < ${MENU_ITEMS} @icon,,$(expr $jgtools_padding + 10),$(expr $jgtools_padding + 10),48,48,4,left,top,,,/usr/share/icons/hicolor/48x48/apps/distributor-logo-mabox.png @text,,$(expr $jgtools_padding + 65),$(expr $jgtools_padding + 10),200,20,4,left,top,${color_sel_fg% *},#111111,$OSNAME $OSVERSION $OSCODE @text,,$(expr $jgtools_padding + 65),$(expr $jgtools_padding + 30),200,20,4,left,top,${color_norm_fg% *},#444444,$USER@$HOSTNAME -@icon,,5,$(expr $MENU_HEIGHT_MIN - 180),240,180,4,center,top,,,$BOTTOM_IMG +#@icon,,5,$(expr $MENU_HEIGHT_MIN - 180),240,180,4,center,top,,,$BOTTOM_IMG @search,,$(expr $jgtools_padding + 80),$(expr $jgtools_padding + 50),292,20,4,left,top,auto,#262626,""" $TYPE_TO_SEARCH""" . $HOME/.config/mabox/right-prepend.csv @@ -441,12 +441,18 @@ Branch Compare,exo-open --launch WebBrowser https://manjaro.org/branch-compare/, ^sep(ArchLinux) ArchWiki,exo-open --launch WebBrowser https://wiki.archlinux.org/,distributor-logo-archlinux +Manual pages indexing service,exo-open --launch WebBrowser https://man.archlinux.org/,distributor-logo-archlinux ^sep(Openbox) OpenBox,exo-open --launch WebBrowser http://openbox.org/wiki/Help:Contents,openbox OpenBox ArchWiki,exo-open --launch WebBrowser https://wiki.archlinux.org/index.php/Openbox,openbox ^sep(Jgmenu) Jgmenu homesite,exo-open --launch WebBrowser https://jgmenu.github.io/,jgmenu Jgmenu GitHub,exo-open --launch WebBrowser https://github.com/johanmalm/jgmenu,jgmenu + +^sep(Terminator) +Terminator GitHub,exo-open --launch WebBrowser https://gnome-terminator.github.io/,terminator +Terminator Docs,exo-open --launch WebBrowser https://gnome-terminator.readthedocs.io/en/latest/,terminator + ^sep(Tint2) Tint2 GitLab,exo-open --launch WebBrowser https://gitlab.com/o9000/tint2,tint2 Tint2 ArchWiki,exo-open --launch WebBrowser https://wiki.archlinux.org/index.php/Tint2,tint2 @@ -529,7 +535,7 @@ mkconfigfile cat < ${MENU_ITEMS} @icon,,$(expr $jgtools_padding + 10),$(expr $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,$(expr $MENU_HEIGHT_MIN - 160),240,180,4,center,top,,,$BOTTOM_IMG @text,,$(expr $jgtools_padding + 70),$(expr $jgtools_padding + 10),200,20,4,left,top,${color_sel_fg% *},#111111,$OSNAME $OSVERSION $OSCODE @text,,$(expr $jgtools_padding + 70),$(expr $jgtools_padding + 30),200,20,4,left,top,${color_norm_fg% *},#444444,$USER@$HOSTNAME @@ -537,7 +543,7 @@ cat < ${MENU_ITEMS} ^sep($QUICK_NAV) $ROOTDIR,^pipe(jgbrowser /),folder - $HOME_DIR,^pipe(jgbrowser),folder-home +~ $HOME_DIR,^pipe(jgbrowser),folder-home $(basename $(xdg-user-dir DOWNLOAD)),^pipe(jgbrowser $(xdg-user-dir DOWNLOAD)),folder-download $(basename $(xdg-user-dir DOCUMENTS)),^pipe(jgbrowser $(xdg-user-dir DOCUMENTS)),folder-documents $(basename $(xdg-user-dir MUSIC)),^pipe(jgbrowser $(xdg-user-dir MUSIC)),folder-music @@ -732,15 +738,9 @@ jgmenu --config-file=${CONFIG_FILE} --csv-file=${MENU_ITEMS} 2>/dev/null reset() { case $LANG in - pl*) - #rsync -a /usr/share/mabox/lang/pl/.config/mabox/settings* $HOME/.config/mabox/ - LNGDIR="pl";; - es*) - #rsync -a /usr/share/mabox/lang/es/.config/mabox/settings* $HOME/.config/mabox/ - LNGDIR="es";; - *) - #rsync -a /usr/share/mabox/lang/en/.config/mabox/settings* $HOME/.config/mabox/ - LNGDIR="en";; + pl*) LNGDIR="pl";; + es*) LNGDIR="es";; + *) LNGDIR="en";; esac #echo "$LNGDIR $1" case $1 in @@ -753,6 +753,8 @@ case $1 in ;; main*) rsync -a /usr/share/mabox/lang/$LNGDIR/.config/jgmenu/*.csv $HOME/.config/jgmenu/ + rsync -a /usr/share/mabox/lang/$LNGDIR/.config/mabox/favorites.csv $HOME/.config/mabox/ + ;; left*) rsync -a /usr/share/mabox/lang/$LNGDIR/.config/mabox/places* $HOME/.config/mabox/