diff --git a/bin/jgbrowser b/bin/jgbrowser
index d238c86..799681b 100755
--- a/bin/jgbrowser
+++ b/bin/jgbrowser
@@ -21,7 +21,7 @@
printf "%b\n" "^sep(${DIRECTORY:-/})"
printf "%b\n" " Otwórz w menadżerze plików,${JGMENU_RESOURCE_OPENER} \"${DIRECTORY:-/}\""
-printf "%b\n" " Otwórz w termianlu,terminator --working-directory=\"${DIRECTORY:-/}\""
+printf "%b\n" " Otwórz w terminalu,terminator --working-directory=\"${DIRECTORY:-/}\""
printf "%b\n" "^sep()"
if [ ${#dirs[@]} -ne 0 ]; then
printf "%b\n" "^sep(Katalogi)"
diff --git a/bin/mb-jgtools b/bin/mb-jgtools
index 37f0615..f717785 100755
--- a/bin/mb-jgtools
+++ b/bin/mb-jgtools
@@ -2,10 +2,23 @@
. $HOME/.config/mabox/mabox.conf
+#JGTHEME=${jgmenu_theme:-default}
+case $jgmenu_theme in
+ default) ;;
+ obtheme)
+ ob_file=$HOME/.config/openbox/rc.xml
+ [[ -f $ob_file ]] && wm_theme=$(awk '// {while (getline n) {if (match(n, //)){l=n; exit}}} END {split(l, a, "[<>]"); print a[3]}' "$ob_file")
+ while read -r a b c
+ do
+ [[ -n "$a" && "$a" != [[:blank:]#]* ]] && export "$a$b$c";echo "$a$b$c"
+ done < $HOME/.config/mabox/jgobthemes/$wm_theme.colorrc
+ ;;
+ *) ;;
+esac
+echo "BG$color_menu_bg"
# jgmenu_use-icons=
gtkbookmarks() {
BOOKMARKS="$HOME/.gtk-bookmarks"
-
if [[ -s "$BOOKMARKS" ]]; then
while read -r line
do
@@ -68,19 +81,19 @@ arrow_string = ${ARROW_STRING:-⮞}
columns = ${COLUMNS:-1}
-sep_markup = font="Noto Sans Bold 9" foreground="#FFFFFF"
-font = ${FONT:-Noto Sans Medium 9}
+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_norm_bg = ${COLOR_NORM_BG:-#000000 0}
-color_norm_fg = ${COLOR_NORM_FG:-#CCCCCC 100}
-color_sel_bg = ${COLOR_SEL_BG:-#169f6f 60}
-color_sel_fg = ${COLOR_SEL_FG:-#f8f8f8 100}
-color_sel_border = ${COLOR_SEL_BORDER:-#504e65 100}
-color_sep_fg = ${COLOR_SEP_FG:-#4D4D4D 100}
-color_sep_bg = ${COLOR_SEP_BG:-#262626 100}
+color_norm_bg = ${color_norm_bg:-#000000 0}
+color_norm_fg = ${color_norm_fg:-#CCCCCC 100}
+color_sel_bg = ${color_sel_bg:-#169f6f 60}
+color_sel_fg = ${color_sel_fg:-#f8f8f8 100}
+color_sel_border = ${color_sel_border:-#504e65 100}
+color_sep_fg = ${color_sep_fg:-#4D4D4D 100}
+color_sep_bg = ${color_sep_bg:-#262626 100}
color_scroll_ind = ${COLOR_SCROLL_IND:-#504e65 100}
EOF
}
@@ -123,7 +136,7 @@ mkconfigfile
cat < ${MENU_ITEMS}
@icon,,225,10,48,48,4,left,top,,,/usr/share/icons/hicolor/48x48/apps/distributor-logo-mabox.png
-@text,,20,10,200,20,4,left,top,#EEEEEE,#111111,$OSNAME $OSVERSION $OSCODE
+@text,,20,10,200,20,4,left,top,${color_norm_fg% *},#111111,$OSNAME $OSVERSION $OSCODE
@text,,20,30,200,20,4,left,top,#666666,#444444,$USER@$HOSTNAME
@text,,20,50,200,20,4,left,top,#666666,#444444,
#@rect,,40,70,262,20,0,left,top,#666666,#262626,
@@ -230,13 +243,14 @@ MENU_ITEMS=$(mktemp)
trap "rm -f ${CONFIG_FILE} ${MENU_ITEMS}" EXIT
MENU_HEIGHT_MIN=$(xdpyinfo | awk '/^ +dimensions/ {print $2}' | cut -d 'x' -f2)
-JGWIDTH=240
+JGWIDTH=250
ITEM_HEIGHT="18"
mkconfigfile
cat < ${MENU_ITEMS}
-@icon,,10,20,48,48,4,left,top,,,/usr/share/icons/hicolor/48x48/apps/mbcc.png
-@text,,70,10,200,20,4,left,top,#EEEEEE,#111111,$OSNAME $OSVERSION $OSCODE
+@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
+@text,,70,10,200,20,4,left,top,${color_norm_fg% *},#111111,$OSNAME $OSVERSION $OSCODE
@text,,70,30,200,20,4,left,top,#666666,#444444,$USER@$HOSTNAME
@text,,70,50,200,20,4,left,top,#666666,#444444,