Mabox
/
mb-jgtools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix sep_markup with default theme

master
Daniel Napora 2020-02-16 01:51:13 +01:00
parent f9b1955b09
commit fa12ae1e8b
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bin/mb-jgtools
View File

@ -4,7 +4,9 @@
#JGTHEME=${jgmenu_theme:-default} #JGTHEME=${jgmenu_theme:-default}
case $jgmenu_theme in case $jgmenu_theme in
default) ;; default)
export color_norm_fg="#FFFFFF"
;;
obtheme) obtheme)
ob_file=$HOME/.config/openbox/rc.xml ob_file=$HOME/.config/openbox/rc.xml
[[ -f $ob_file ]] && wm_theme=$(awk '/<theme>/ {while (getline n) {if (match(n, /<name>/)){l=n; exit}}} END {split(l, a, "[<>]"); print a[3]}' "$ob_file") [[ -f $ob_file ]] && wm_theme=$(awk '/<theme>/ {while (getline n) {if (match(n, /<name>/)){l=n; exit}}} END {split(l, a, "[<>]"); print a[3]}' "$ob_file")
@ -13,7 +15,9 @@ case $jgmenu_theme in
[[ -n "$a" && "$a" != [[:blank:]#]* ]] && export "$a$b$c";echo "$a$b$c" [[ -n "$a" && "$a" != [[:blank:]#]* ]] && export "$a$b$c";echo "$a$b$c"
done < $HOME/.config/mabox/jgobthemes/$wm_theme.colorrc done < $HOME/.config/mabox/jgobthemes/$wm_theme.colorrc
;; ;;
*) ;; *)
export color_norm_fg="#FFFFF"
;;
esac esac
echo "BG$color_menu_bg" echo "BG$color_menu_bg"
# jgmenu_use-icons= # jgmenu_use-icons=
@ -81,10 +85,6 @@ arrow_string = ${ARROW_STRING:-⮞}
columns = ${COLUMNS:-1} columns = ${COLUMNS:-1}
sep_markup = weight="bold" foreground="${color_norm_fg% *}"
font = ${font:-Noto Sans Medium 9}
icon_size = ${ICON_SIZE:-0}
color_menu_bg = ${color_menu_bg:-#222222 80} color_menu_bg = ${color_menu_bg:-#222222 80}
color_menu_border = ${COLOR_MENU_BORDER:-#2f9b85 100} color_menu_border = ${COLOR_MENU_BORDER:-#2f9b85 100}
color_norm_bg = ${color_norm_bg:-#000000 0} color_norm_bg = ${color_norm_bg:-#000000 0}
@ -95,6 +95,10 @@ color_sel_border = ${color_sel_border:-#504e65 100}
color_sep_fg = ${color_sep_fg:-#4D4D4D 100} color_sep_fg = ${color_sep_fg:-#4D4D4D 100}
color_sep_bg = ${color_sep_bg:-#262626 100} color_sep_bg = ${color_sep_bg:-#262626 100}
color_scroll_ind = ${COLOR_SCROLL_IND:-#504e65 100} color_scroll_ind = ${COLOR_SCROLL_IND:-#504e65 100}
sep_markup = weight="bold" foreground="${color_norm_fg% *}"
font = ${font:-Noto Sans Medium 9}
icon_size = ${ICON_SIZE:-0}
EOF EOF
} }
@ -249,7 +253,7 @@ mkconfigfile
cat <<EOF > ${MENU_ITEMS} cat <<EOF > ${MENU_ITEMS}
@icon,,10,10,48,48,4,left,top,,,/usr/share/icons/hicolor/48x48/apps/mbcc.png @icon,,10,10,48,48,4,left,top,,,/usr/share/icons/hicolor/48x48/apps/mbcc.png
#@icon,,40,$(expr $MENU_HEIGHT_MIN - 96),143,96,4,left,top,,,/home/napcok/.config/mabox/tux.svg @icon,,40,$(expr $MENU_HEIGHT_MIN - 96),143,96,4,left,top,,,$HOME/.config/mabox/tux.svg
@text,,70,10,200,20,4,left,top,${color_norm_fg% *},#111111,<big>$OSNAME $OSVERSION</big> <sup> $OSCODE</sup> @text,,70,10,200,20,4,left,top,${color_norm_fg% *},#111111,<big>$OSNAME $OSVERSION</big> <sup> $OSCODE</sup>
@text,,70,30,200,20,4,left,top,#666666,#444444,<small>$USER@$HOSTNAME</small> @text,,70,30,200,20,4,left,top,#666666,#444444,<small>$USER@$HOSTNAME</small>
@text,,70,50,200,20,4,left,top,#666666,#444444, @text,,70,50,200,20,4,left,top,#666666,#444444,