diff --git a/usr/bin/jgmenusettings-pipe b/usr/bin/jgmenusettings-pipe
index 218e456..b6ac02f 100755
--- a/usr/bin/jgmenusettings-pipe
+++ b/usr/bin/jgmenusettings-pipe
@@ -371,37 +371,37 @@ out2+=("^tag(lineheight)")
for i in 160 180 200 240 280 300 400; do out2+=("$(printf "%4s%%,%s" "$i" "mb-setvar item_height_factor=${i};$me")");done
########## THEMES
-out+=("^sep($COLOR_SCHEME)")
+#out+=("^sep($COLOR_SCHEME)")
-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")
+#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")
-if [ $jgmenu_theme != obtheme ]; then #INNY NIŻ OB THEME
-. $HOME/.config/mabox/jgobthemes/${jgmenu_theme}.colorrc > /dev/null 2>&1 &
-out+=("$CHOOSE [$jgmenu_theme],^checkout(motywy)")
-out+=("$EDIT_CURRENT: ($jgmenu_theme),xdg-open $HOME/.config/mabox/jgobthemes/$jgmenu_theme.colorrc,geany")
-out+=("$RANDTHEME,mb-setvar jgmenu_theme=$(basename -s .colorrc $(ls ~/.config/mabox/jgobthemes/*.colorrc | shuf -n 1));$me")
-out+=("$FOLLOW_OB,mb-setvar jgmenu_theme=obtheme;$me
-^sep()")
-out+=("$GRADIENT [ ${menu_gradient_pos:-none} ],^checkout(gradient)")
-out2+=("^tag(gradient)")
-for i in none top right bottom left top_left top_right bottom_left bottom_right; do out2+=("$(printf "%14s,%s" "$i" "mb-setvar menu_gradient_pos=${i};$me")");done
-out2+=("^tag(motywy)")
-else
+#if [ $jgmenu_theme != obtheme ]; then #INNY NIŻ OB THEME
+#. $HOME/.config/mabox/jgobthemes/${jgmenu_theme}.colorrc > /dev/null 2>&1 &
+#out+=("$CHOOSE [$jgmenu_theme],^checkout(motywy)")
+#out+=("$EDIT_CURRENT: ($jgmenu_theme),xdg-open $HOME/.config/mabox/jgobthemes/$jgmenu_theme.colorrc,geany")
+#out+=("$RANDTHEME,mb-setvar jgmenu_theme=$(basename -s .colorrc $(ls ~/.config/mabox/jgobthemes/*.colorrc | shuf -n 1));$me")
+#out+=("$FOLLOW_OB,mb-setvar jgmenu_theme=obtheme;$me
+#^sep()")
+#out+=("$GRADIENT [ ${menu_gradient_pos:-none} ],^checkout(gradient)")
+#out2+=("^tag(gradient)")
+#for i in none top right bottom left top_left top_right bottom_left bottom_right; do out2+=("$(printf "%14s,%s" "$i" "mb-setvar menu_gradient_pos=${i};$me")");done
+#out2+=("^tag(motywy)")
+#else
-. $HOME/.config/mabox/jgobthemes/${wm_theme// /_}.colorrc > /dev/null 2>&1 &
+#. $HOME/.config/mabox/jgobthemes/${wm_theme// /_}.colorrc > /dev/null 2>&1 &
#out+=("#${menu_gradient_pos}\n")
-out+=("$CHOOSE [${wm_theme// /_}],^checkout(motywy)")
-out+=("$EDIT_CURRENT: (${wm_theme// /_}),xdg-open $HOME/.config/mabox/jgobthemes/${wm_theme// /_}.colorrc,geany")
-out+=("$RANDTHEME,mb-setvar jgmenu_theme=$(basename -s .colorrc $(ls ~/.config/mabox/jgobthemes/*.colorrc | shuf -n 1));$me")
-out+=("$FOLLOW_OB,mb-setvar jgmenu_theme=obtheme;$me
-^sep()")
-out+=("$GRADIENT [ ${menu_gradient_pos:-none} ],^checkout(gradient)")
-out2+=("^tag(gradient)")
-for i in none top right bottom left top_left top_right bottom_left bottom_right; do out2+=("$(printf "%14s,%s" "$i" "mb-setvar menu_gradient_pos=${i} $HOME/.config/mabox/jgobthemes/${wm_theme// /_}.colorrc;$me")");done
-out2+=("^tag(motywy)")
-fi
+#out+=("$CHOOSE [${wm_theme// /_}],^checkout(motywy)")
+#out+=("$EDIT_CURRENT: (${wm_theme// /_}),xdg-open $HOME/.config/mabox/jgobthemes/${wm_theme// /_}.colorrc,geany")
+#out+=("$RANDTHEME,mb-setvar jgmenu_theme=$(basename -s .colorrc $(ls ~/.config/mabox/jgobthemes/*.colorrc | shuf -n 1));$me")
+#out+=("$FOLLOW_OB,mb-setvar jgmenu_theme=obtheme;$me
+#^sep()")
+#out+=("$GRADIENT [ ${menu_gradient_pos:-none} ],^checkout(gradient)")
+#out2+=("^tag(gradient)")
+#for i in none top right bottom left top_left top_right bottom_left bottom_right; do out2+=("$(printf "%14s,%s" "$i" "mb-setvar menu_gradient_pos=${i} $HOME/.config/mabox/jgobthemes/${wm_theme// /_}.colorrc;$me")");done
+#out2+=("^tag(motywy)")
+#fi
diff --git a/usr/bin/mb-places b/usr/bin/mb-places
index da3f654..23b66d7 100755
--- a/usr/bin/mb-places
+++ b/usr/bin/mb-places
@@ -14,6 +14,7 @@ case $LANG in
EDIT="Edytuj"
FILETOOLS="Narzędzia plikowe"
INST="Instaluj"
+ SETTINGS="Ustawienia"
;;
es*)
LABEL="Places"
@@ -24,6 +25,7 @@ case $LANG in
EDIT="Edit"
FILETOOLS="File Tools"
INST="Install"
+ SETTINGS="Settings"
;;
*)
LABEL="Places"
@@ -34,22 +36,21 @@ case $LANG in
EDIT="Edit"
FILETOOLS="File Tools"
INST="Install"
+ SETTINGS="Settings"
;;
esac
if [ ! -f ${PLACES} ]; then
cat < ${PLACES}
^sep($LABEL)
-$ROOTDIR (/),^pipe(jgbrowser /),folder
+ $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
+ $(basename $(xdg-user-dir PICTURES)),^pipe(jgbrowser $(xdg-user-dir PICTURES)),folder-pictures
+ $(basename $(xdg-user-dir VIDEOS)),^pipe(jgbrowser $(xdg-user-dir VIDEOS)),folder-video
^sep()
-$HOME_DIR (~),^pipe(jgbrowser),folder-home
-$(basename $(xdg-user-dir DOWNLOAD)),^pipe(jgbrowser ~/$(basename $(xdg-user-dir DOWNLOAD))),folder-download
-$(basename $(xdg-user-dir DOCUMENTS)),^pipe(jgbrowser ~/$(basename $(xdg-user-dir DOCUMENTS)),folder-documents
-$(basename $(xdg-user-dir MUSIC)),^pipe(jgbrowser ~/$(basename $(xdg-user-dir MUSIC))),folder-music
-$(basename $(xdg-user-dir PICTURES)),^pipe(jgbrowser ~/$(basename $(xdg-user-dir PICTURES))),folder-pictures
-$(basename $(xdg-user-dir VIDEOS)),^pipe(jgbrowser ~/$(basename $(xdg-user-dir VIDEOS))),folder-video
-^sep()
-~/.config,^pipe(jgbrowser ~/.config),folder
+ ~/.config,^pipe(jgbrowser ~/.config),folder
EOF
fi
mapfile -t out < "$PLACES"
@@ -63,9 +64,7 @@ do
out+=("$MOUNTLBL,^pipe(jgbrowser ${MOUNT}),$ICON")
done < <(df -h | grep -v "boot" | grep '^/dev')
-out+=("^sep()")
-[[ $jgbrowser_show_hidden = false ]] && out+=("$SHOW_HIDDEN,mb-setvar jgbrowser_show_hidden=true;mb-places -s") || out+=("$SHOW_HIDDEN,mb-setvar jgbrowser_show_hidden=false;mb-places -s")
-out+=("$EDIT $LABEL,xdg-open $PLACES,geany")
+out2+=("^tag(inst)")
out+=("^sep($FILETOOLS)")
if hash pcmanfm &>/dev/null; then
@@ -91,12 +90,14 @@ else
out2+=("$INST QDirStat,pamac-installer qdirstat,package-manager-icon")
fi
-if (( ${#out2[@]} > 0 )); then
+if (( ${#out2[@]} > 1 )); then
out+=("^sep()")
out+=("$INST ...,^checkout(inst),package-manager-icon ")
-out+=("^tag(inst)")
fi
+out+=("^sep($SETTINGS)")
+[[ $jgbrowser_show_hidden = false ]] && out+=("$SHOW_HIDDEN,mb-setvar jgbrowser_show_hidden=true;mb-places -s") || out+=("$SHOW_HIDDEN,mb-setvar jgbrowser_show_hidden=false;mb-places -s")
+out+=(" $EDIT $LABEL,xdg-open $PLACES,geany")
### RUN
if [[ "$1" == "-s" || "$1" == "ipc" ]]; then
@@ -123,8 +124,8 @@ fi
[ $(pidof picom) ] && MENU_RADIUS=$jgtools_radius
[ -z $jgmenu_use_borders ] && menu_border=0
-icons=1
-iconmargin=4
+icons=0
+iconmargin=0
mkconfigfile
cat < ${MENU_ITEMS}