From 3a7535cc1ea39170922b76393e083ebb68ed1f56 Mon Sep 17 00:00:00 2001
From: Daniel Napora <napcok@gmail.com>
Date: Wed, 2 Aug 2023 01:34:04 +0200
Subject: [PATCH] upd

---
 bin/colorizer-ob        | 14 +++++++++-----
 bin/conkymountpoints.sh |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/bin/colorizer-ob b/bin/colorizer-ob
index 123dd6c..9728aed 100755
--- a/bin/colorizer-ob
+++ b/bin/colorizer-ob
@@ -95,7 +95,8 @@ case "$LANG" in
     RESET_THEME="Resetuj motyw"
     AREYOUSURE="Czy aby na pewno?"
     NOT_SUPORTED_OBTHEME="Nie wspierany motyw"
-    SWITCH_TO_MBCOLORS="Przełącz na MBColors"
+    UNLOCK="odblokuj swoją kreatywność..."
+    SWITCH_TO_MBCOLORS="Przełącz na <b>MBColors</b>"
     ;;
     *)
     OBTHEME_LBL="OpenBox theme"
@@ -155,8 +156,9 @@ case "$LANG" in
     RESET="Reset"
     RESET_THEME="Reset theme to default"
     AREYOUSURE="Are you sure?"
-    NOT_SUPORTED_OBTHEME="OpenBox theme not supported"
-    SWITCH_TO_MBCOLORS="Switch to MBColors"
+    NOT_SUPORTED_OBTHEME="Theme not supported"
+    UNLOCK="Unlock your creativity..."
+    SWITCH_TO_MBCOLORS="Switch to <b>MBColors</b>"
     ;;
 esac
 
@@ -231,11 +233,12 @@ if [[ -f "$THEMERC" ]] && [[ "$OBTHEME" = "MBcolor"* ]]; then
 getvalues
 getvaluesrc
 
-out+=("^sep($OBTHEME_LBL: <i>$OBTHEME</i>)")
+#out+=("^sep($OBTHEME_LBL: <i>$OBTHEME</i>)")
 
 out+=("^sep($TITLEBAR)")
 out+=("<tt><span bgcolor='$ABG' fgcolor='$AFG'> <b>AbCd</b> </span></tt>   $TITLEBAR_TEXT,^checkout(titletext)")
 out+=("<tt><span bgcolor='$ABG' fgcolor='$AFG'><small>     </small></span></tt>   $BUTTONS,^checkout(tbuttons)")
+out+=("^sep()")
 out+=("<tt><span bgcolor='$ABG'>      </span></tt>   $ACTIVE_BG,^pipe(mbclr '$ABG' obtctl clractivebg_only '${ACTIVE_BG}' '$me')")
 [[ ! -z "$ABGTO" ]] && out+=("<tt><span bgcolor='$ABG'>  </span><span bgcolor='$ABGTO'>    </span></tt>   $ACTIVE_BG_TO,^pipe(mbclr '$ABGTO' obtctl clractivebgto '${ACTIVE_BG_TO}' '$me')")
 out+=("^sep()")
@@ -246,7 +249,7 @@ out+=("<tt><span bgcolor='$NBG'>      </span></tt>   $INACTIVE_BG,^pipe(mbclr '$
 out+=("^sep()")
 out+=("$PADDING [ <b>$PHEIGHT $PWIDTH</b> ],^checkout(padding)")
 out+=("\"\"\"$RAISED_OR_FLAT? [ <b>$WINRAISED</b> ]\"\"\",^checkout(raised)")
-out+=("^sep()")
+
 out+=("^sep(Gradient)")
 out+=("$GRADIENT_TYPE [ <b>${REST##* }</b> ],^checkout(gradient)")
 out+=("<tt><span bgcolor='#16a084'> </span><span bgcolor='#43a480'> </span><span bgcolor='#5da97b'> </span><span bgcolor='#72ad77'> </span><span bgcolor='#84b171'> </span><span bgcolor='#95b66c'> </span><span bgcolor='#a5ba66'> </span><span bgcolor='#b5be61'> </span><span bgcolor='#c3c15a'> </span><span bgcolor='#d1c753'> </span><span bgcolor='#dfc94c'> </span><span bgcolor='#edce44'> </span><span bgcolor='#f4d03f'> </span></tt>  $PRE_GRADIENTS,^pipe(mbgrad ob)")
@@ -430,6 +433,7 @@ out2+=("10,obtctl handlewidth 10;$me")
 else # Theme other than MBColors, we can only edit rc.xml
 getvaluesrc
 out+=("^sep($NOT_SUPORTED_OBTHEME)")
+out+=("^sep(<small>$UNLOCK</small>)")
 out+=("$SWITCH_TO_MBCOLORS,obtctl theme MBcolors;$me")
 out+=("^sep($TITLEBAR_FONT)")
 out+=("$FONT... [ <b> ${FNAME} ${FSIZE} </b> ],mb-setfont obtitle;$me")
diff --git a/bin/conkymountpoints.sh b/bin/conkymountpoints.sh
index ec27a9d..7a8e4a5 100755
--- a/bin/conkymountpoints.sh
+++ b/bin/conkymountpoints.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 getdata () {
-df -h | grep -v "boot" | grep '^/dev' | while read DEVICE SIZE USED FREE PERCENT MOUNT
+df -h | grep -v "boot" | grep -v "/dev/loop" | grep '^/dev' | while read DEVICE SIZE USED FREE PERCENT MOUNT
 do
 [[ "${#MOUNT}" -gt "10" ]] && MOUNTLBL=${MOUNT##*/} || MOUNTLBL=${MOUNT}
 [[ "${#MOUNTLBL}" -gt "10" ]] && MOUNTLBL=${MOUNTLBL:0:9}