From 4b166777fa3f79e9588429315c08318f99533375 Mon Sep 17 00:00:00 2001
From: Daniel Napora <napcok@gmail.com>
Date: Sat, 26 Sep 2020 18:21:46 +0200
Subject: [PATCH] menu/sidepanels theming handling updated

---
 usr/bin/jgmenusettings-pipe | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/usr/bin/jgmenusettings-pipe b/usr/bin/jgmenusettings-pipe
index bb840a8..20d560c 100755
--- a/usr/bin/jgmenusettings-pipe
+++ b/usr/bin/jgmenusettings-pipe
@@ -150,17 +150,22 @@ out+=("$CIRCLE,mb-setvar jgmenu_icon_theme=Numix-Circle;mb-setvar jgmenu_use_ico
 
 ########## THEMES
 out+=("^sep($COLOR_SCHEME)")
-out+=("$CHOOSE,^checkout(motywy)")
+
+
 if [ $jgmenu_theme != obtheme ]; then
+out+=("<s>$FOLLOW_OB</s>,mb-setvar jgmenu_theme=obtheme;mb-jgtools settings
+^sep()")
 out+=("$EDIT_CURRENT: (<i>$jgmenu_theme</i>),geany $HOME/.config/mabox/jgobthemes/$jgmenu_theme.colorrc,geany")
 else
 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")
-out+=("$EDIT_CURRENT: (<i>$wm_theme</i>),geany $HOME/.config/mabox/jgobthemes/$wm_theme.colorrc,geany")
-fi
-out2+=("^tag(motywy)")
-out2+=("$FOLLOW_OB,mb-setvar jgmenu_theme=obtheme;mb-jgtools settings
+out+=("$FOLLOW_OB,mb-setvar jgmenu_theme=obtheme;mb-jgtools settings
 ^sep()")
+out+=("$EDIT_CURRENT: (<i>${wm_theme// /_}</i>),geany $HOME/.config/mabox/jgobthemes/${wm_theme// /_}.colorrc,geany")
+fi
+out+=("$CHOOSE,^checkout(motywy)")
+out2+=("^tag(motywy)")
+
 for item in "$HOME"/.config/mabox/jgobthemes/*colorrc; do
             theme="${item##*/}"
             out2+=("${theme%.*},mb-setvar jgmenu_theme=${theme%.*};mb-jgtools settings")