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 MBColors"
;;
*)
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 MBColors"
;;
esac
@@ -231,11 +233,12 @@ if [[ -f "$THEMERC" ]] && [[ "$OBTHEME" = "MBcolor"* ]]; then
getvalues
getvaluesrc
-out+=("^sep($OBTHEME_LBL: $OBTHEME)")
+#out+=("^sep($OBTHEME_LBL: $OBTHEME)")
out+=("^sep($TITLEBAR)")
out+=(" AbCd $TITLEBAR_TEXT,^checkout(titletext)")
out+=(" $BUTTONS,^checkout(tbuttons)")
+out+=("^sep()")
out+=(" $ACTIVE_BG,^pipe(mbclr '$ABG' obtctl clractivebg_only '${ACTIVE_BG}' '$me')")
[[ ! -z "$ABGTO" ]] && out+=(" $ACTIVE_BG_TO,^pipe(mbclr '$ABGTO' obtctl clractivebgto '${ACTIVE_BG_TO}' '$me')")
out+=("^sep()")
@@ -246,7 +249,7 @@ out+=(" $INACTIVE_BG,^pipe(mbclr '$
out+=("^sep()")
out+=("$PADDING [ $PHEIGHT $PWIDTH ],^checkout(padding)")
out+=("\"\"\"$RAISED_OR_FLAT? [ $WINRAISED ]\"\"\",^checkout(raised)")
-out+=("^sep()")
+
out+=("^sep(Gradient)")
out+=("$GRADIENT_TYPE [ ${REST##* } ],^checkout(gradient)")
out+=(" $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($UNLOCK)")
out+=("$SWITCH_TO_MBCOLORS,obtctl theme MBcolors;$me")
out+=("^sep($TITLEBAR_FONT)")
out+=("$FONT... [ ${FNAME} ${FSIZE} ],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}