diff --git a/bin/obtctl b/bin/obtctl index 5548d6c..33c4962 100755 --- a/bin/obtctl +++ b/bin/obtctl @@ -22,6 +22,13 @@ theme () { reset () { rm ${THEMERC} mv ${THEMERC}.bak ${THEMERC} +} +resetonlycolors () { + theme MBcolors + clractivebg "#579c8e" + clractivebgto "#41756a" + + } resetMBcolors() { theme MBcolors @@ -510,6 +517,7 @@ randomizer () { case "$1" in theme) theme "$2";; reset) reset;; + resetonlycolors) resetonlycolors;; resetMBcolors) resetMBcolors;; borderWidth) borderWidth "$2";; activeborderColor) activeborderColor "$2";; diff --git a/bin/w2theme b/bin/w2theme index 9d54d13..4416dd8 100755 --- a/bin/w2theme +++ b/bin/w2theme @@ -46,6 +46,12 @@ menu_theme () { #sleep 1 ;; esac + case "$2" in + show) + colorizer-menus -s + ;; + *):;; + esac } conky_colors() { source ~/.config/colorizer/colorizer.conf @@ -208,7 +214,38 @@ conkygradient () { fi done } - +obtheme () { +case "$1" in + dark) + obtctl clractivebg ${w[2]} + TITLE_FG=$(pastel textcolor ${w[2]}|pastel format hex) + if [[ "$TITLE_FG" == *"ffffff"* ]];then + obtctl activetextcolor ${w[-1]} + obtctl activebuttonscolors ${w[-1]} + else + obtctl activetextcolor ${w[0]} + obtctl activebuttonscolors ${w[0]} + fi + obtctl clractivebgto ${w[4]} + obtctl clrnormalbg ${w[0]} + obtctl clrnormalbgto "$(pastel darken 0.1 "${w[0]}"|pastel format hex)" + ;; + light) + obtctl clractivebg ${w[-2]} + TITLE_FG=$(pastel textcolor ${w[-2]}|pastel format hex) + if [[ "$TITLE_FG" == *"ffffff"* ]];then + obtctl activetextcolor ${w[-1]} + obtctl activebuttonscolors ${w[-1]} + else + obtctl activetextcolor ${w[0]} + obtctl activebuttonscolors ${w[0]} + fi + obtctl clractivebgto ${w[-4]} + obtctl clrnormalbg ${w[1]} + obtctl clrnormalbgto "$(pastel darken 0.1 "${w[1]}"|pastel format hex)" + ;; + esac +} colorize () { source ~/.config/colorizer/colorizer.conf # CONKY @@ -312,7 +349,7 @@ rm -rf ~/.config/colorizer/pinned/$WALLNAME case "$1" in ob) obtheme "$2";; - menu) menu_theme "$2";; + menu) menu_theme "$2" "$3";; conky) conky_colors "$2";; conkyone) conky_colorsone "$2" "$3";; pyradio) pyradio_theme "$2";; diff --git a/share/mabox-colorizer/help/en.html b/share/mabox-colorizer/help/en.html index fc54e31..c3526a2 100644 --- a/share/mabox-colorizer/help/en.html +++ b/share/mabox-colorizer/help/en.html @@ -10,7 +10,7 @@ color: #999999; } div.fixed { position: fixed; - top: 0; + top: 4px; right: 0; width: 400px; } @@ -20,6 +20,12 @@ div.fixeddown { left:0; width:160px; } +div.fixed .w3-bar-item {margin-right:4px; border-radius:4px;} +.w3-third {padding: 0.01em 4px;} +.w3-button {position:relative;} +.w3-button .w3-right {position:absolute; top:0; right:6px;} +section.tab {padding-top: 3em;} +section#Colorizer {padding-top: 0.01em;} div.fixeddown p {margin:2px 0;} div.fixeddown a {text-decoration:none;margin:0 2px;} .link {cursor:pointer;} @@ -52,7 +58,7 @@ kbd { - + @@ -353,7 +359,7 @@ kbd {
  • apply one of the ready-made color themes for the selected Conky - or for all
  • disable (kill), reload or edit Conky
    • -You can add your own commands to each Conky, which will be shown in the left mouse click (check the logo). +You can add your own commands to each Conky, which will be shown on left mouse click (check the logo).

    Tips
    @@ -368,22 +374,101 @@ You can add your own commands to each Conky, which will be show