From 0640f531a00a6310bd4e54efda69809241bd9a45 Mon Sep 17 00:00:00 2001 From: Daniel Napora Date: Wed, 6 Sep 2023 16:13:11 +0200 Subject: [PATCH] polishing --- bin/colorizer | 32 ++++++++-------- bin/colorizer-cava | 5 ++- bin/colorizer-conky | 89 ++++++++++++++++++++++++++++--------------- bin/colorizer-fonts | 7 ++-- bin/colorizer-menus | 4 +- bin/colorizer-ob | 4 +- bin/colorizer-pyradio | 4 +- bin/conkyctl | 42 ++++++++++++++------ bin/w2theme | 19 +++++---- 9 files changed, 130 insertions(+), 76 deletions(-) diff --git a/bin/colorizer b/bin/colorizer index b5ae917..526dff9 100755 --- a/bin/colorizer +++ b/bin/colorizer @@ -301,25 +301,25 @@ fi out+=("^sep()") out+=(" $COLORIZE,^pipe(randomizer c)") out+=("^sep($MODULES)") -out+=(" $FONTS,^pipe(colorizer-fonts)") +out+=(" $FONTS,colorizer-fonts -s") out+=("^sep()") -out+=("$OBTHEME,^pipe(colorizer-ob)") +out+=("$OBTHEME,colorizer-ob -s") #out+=("TINT2,^pipe(colorizer-tint2)") -out+=("$MENUPANELS,^pipe(colorizer-menus)") -out+=("Conky Manager,^pipe(colorizer-conky)") - +out+=("$MENUPANELS,colorizer-menus -s") +out+=("Conky Manager,colorizer-conky -s") +out+=("^sep()") #out+=("Systray HW monitor,^pipe(colorizer-phwmon)") -if pgrep -f pyradio >/dev/null ;then - out+=("^sep()") - out+=("PyRadio,^pipe(colorizer-pyradio)") -fi +#if pgrep -f pyradio >/dev/null ;then +# out+=("^sep()") +out+=("PyRadio,colorizer-pyradio -s") +#fi -if pgrep -f cava >/dev/null ;then - out+=("^sep()") - out+=("$CAVA,^pipe(colorizer-cava)") -fi +#if pgrep -f cava >/dev/null ;then +# out+=("^sep()") +out+=("$CAVA,colorizer-cava -s") +#fi out+=("^sep($WALLCOLORS)") @@ -721,7 +721,7 @@ if [[ "$1" == "-s" ]]; then n=0 m=0 X=$((jgtools_padding + 4)) - Y=$((jgtools_padding + 100)) + Y=$((jgtools_padding + 96)) for i in "${w[@]}" do if [[ "$n" -lt "10" ]];then @@ -756,9 +756,9 @@ fi cat < ${MENU_ITEMS} @icon,,$((jgtools_padding)),$((jgtools_padding)),270,150,4,left,top,,,${THUMB} @rect,,$((jgtools_padding)),$((jgtools_padding + 4)),270,20,0,left,top,#222222 20,#222222 70, -@rect,,$((jgtools_padding)),$((jgtools_padding + 116)),270,34,0,left,top,#222222 20,#222222 70, +@rect,,$((jgtools_padding)),$((jgtools_padding + 114)),270,32,0,left,top,#222222 20,#222222 70, @text,,$((jgtools_padding + 12)),$((jgtools_padding)),270,30,0,left,top,#FFFFFF ,${WINCLR}, ${THGEN} $STATE -@text,,$((jgtools_padding + 194)),$((jgtools_padding + 120)),120,30,0,left,top,#FFFFFF ,${WINCLR},Colorizer +@text,,$((jgtools_padding + 168)),$((jgtools_padding + 116)),120,30,0,left,top,#FFFFFF ,${WINCLR},Colorizer $(printf '%s\n' "${dots[@]}") #@icon,,$((jgtools_padding + 4)),$((jgtools_padding + 34)),270,120,4,left,top,,,/usr/share/mabox-colorizer/img/colorizer.png $(printf '%s\n' "${out[@]}") diff --git a/bin/colorizer-cava b/bin/colorizer-cava index 2664f69..b156e1a 100755 --- a/bin/colorizer-cava +++ b/bin/colorizer-cava @@ -70,6 +70,7 @@ Możesz je więc przesuwać lub zmieniać rozmiar tak jak każde i EDITCONF="Edytuj plik konfiguracyjny" RELOAD="Przeładuj konfigurację" RELOAD_COLORS="Przeładuj kolory" + _COLORIZER_ROOT="Colorizer - menu główne" ;; *) INFO="CaVa tips & tricks" @@ -99,7 +100,7 @@ So you can move or resize it like any other window\n \ EDITCONF="Edit config file" RELOAD="Reload config" RELOAD_COLORS="Reload colors only" - + _COLORIZER_ROOT="Colorizer rootmenu" ;; esac @@ -169,7 +170,7 @@ if [[ "$1" == "-s" ]]; then source "$CNF_FILE" out+=("^sep()") - out+=(" ${arrow_string_left} Colorizer,colorizer -s") + out+=(" ${arrow_string_left} $_COLORIZER_ROOT,colorizer -s") if [[ "$colorizer_size" == "full" ]];then eval $(xdotool getdisplaygeometry --shell) diff --git a/bin/colorizer-conky b/bin/colorizer-conky index 03eb566..54f52f9 100755 --- a/bin/colorizer-conky +++ b/bin/colorizer-conky @@ -22,6 +22,8 @@ CONKYDIR="$HOME/.config/conky" BASECONKY="$CONKYDIR/sysinfo_mbcolor.conkyrc" COLORIZERDIR="$HOME/.config/colorizer" + + CONKYTHEMEDIR="$COLORIZERDIR/conky/themes" if [ ! -d "$CONKYTHEMEDIR" ];then mkdir -p "$CONKYTHEMEDIR" @@ -45,6 +47,23 @@ update_notifications=true EOF fi +### Wallpaper colors +WALLPALDIR="$HOME/.cache/colorizer/palettes" +mkdir -p "$WALLPALDIR" +read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | cut -d'=' -f2) +NAME=${WALLPATH////_} +if [[ "${NAME}" =~ ^_home_.* ]]; then +n=${#HOME} +((n++)) +NAME=${NAME:${n}} +fi + +if [ ! -f "$WALLPALDIR/$NAME.clr" ]; then +convert ${WALLPATH} -resize 25% -colors 16 -unique-colors txt:- |grep -v '^#'| awk '{print substr($3,1,7)}' |pastel sort-by brightness |pastel format hex > "$WALLPALDIR/$NAME.clr" +fi +mapfile -t w < "$WALLPALDIR/$NAME.clr" + + case "$LANG" in pl*) COLORIZECONKY="Conky Manager" @@ -91,6 +110,7 @@ case "$LANG" in RESETALL="Resetuj wszystkie" RESETCOLORS="Przywróć domyślne kolory" AREYOUSURE="Czy aby napewno?" + _COLORIZER_ROOT="Colorizer - menu główne" ;; *) COLORIZECONKY="Conky Manager" @@ -137,6 +157,7 @@ case "$LANG" in RESETALL="Reset all to defaults" RESETCOLORS="Restore default colors" AREYOUSURE="Are you sure?" + _COLORIZER_ROOT="Colorizer rootmenu" ;; esac @@ -171,8 +192,8 @@ if pgrep -u $USER -af "conky.*mbcolor" >/dev/null; then getvalues [[ "$WINTRANS" == false ]] && BG="bgcolor='$WINCLR'" || BG="" - out+=("^sep($COLORIZECONKY)") - out+=(" $MOVEABLEALL,conkyctl makemoveableall") + #out+=("^sep($COLORIZECONKY)") + #while read -r pid b c confpath #do @@ -262,41 +283,28 @@ if pgrep -u $USER -af "conky.*mbcolor" >/dev/null; then #GLOBAL START out+=("^sep($GLOBALSETTINGS)") - - if [ "$WINTRANS" == false ];then - out+=(" AbCd $BACKGROUND,^pipe(mbclr '$WINCLR' conkyctl win_bgcolor_all '${BACKGROUND}' '$me')") - else - out+=(" transparent $BACKGROUND,^pipe(mbclr '$WINCLR' conkyctl win_bgcolor_all '${BACKGROUND}' '$me')") - fi - [[ "$WINTRANS" == false ]] && out+=("󰄱 $TRANSPARENT,conkyctl transparent_all true;$me") || out+=("󰄲 $TRANSPARENT,conkyctl transparent_all false;$me") + out+=(" $MOVEABLEALL,conkyctl makemoveableall") out+=("^sep()") - - - out+=(" AbCd $DEFCOLOR,^pipe(mbclr '$CLR' conkyctl default_color_all '${DEFCOLOR}' '$me')") - out+=(" AbCd $COLOR_0,^pipe(mbclr '$CLR0' conkyctl color0_all '${COLOR_0}' '$me')") - out+=(" AbCd $COLOR_1,^pipe(mbclr '$CLR1' conkyctl color1_all '${COLOR_1}' '$me')") - out+=(" AbCd $COLOR_2,^pipe(mbclr '$CLR2' conkyctl color2_all '${COLOR_2}' '$me')") - #out+=("^sep()") - out+=("^sep()") - - out+=(" $REGENERATE,^checkout(regenconky)") + out+=(" $REGENERATE,^checkout(regenconky)") out2+=("^tag(regenconky)") out2+=("^sep($REGENERATE)") - out2+=("^sep($GENERATEFROMWP)") - out2+=("$LIGHTBG,w2theme conky light;$me") - out2+=("$DARKBG,w2theme conky dark;$me") + out2+=("^sep($APPLY_THEME)") for i in "${COLORIZERDIR}"/conky/themes/*.colors do source "${i}" themefilename=${i##*/} themename=${themefilename%%.col*} - out2+=(" $themename,conkyctl settheme_all $themefilename;$me") + out2+=("$(printf '%-20s' "${themename}") 󰯲 󰝥 󰲠 󰲢 ,conkyctl settheme_all $themefilename;$me") done out2+=("^sep()") out2+=(" $OPENTHEMEDIR,xdg-open ${COLORIZERDIR}/conky/themes/") - + out2+=("^sep($GENERATEFROMWP)") + out2+=(" $LIGHTBG ,w2theme conky light;$me") + out2+=(" $DARKBG ,w2theme conky dark;$me") + out+=("^sep()") + out+=("󰛖 $FONTS [ $FONT $FONTSIZE ],^checkout(font)") out2+=("^tag(font)") @@ -347,12 +355,31 @@ if pgrep -u $USER -af "conky.*mbcolor" >/dev/null; then [[ "$STIP" == 3 ]] && out2+=("綠 3 px,conkyctl stippled_borders_all 3;$me") || out2+=("祿 3 px,conkyctl stippled_borders_all 3;$me") [[ "$STIP" == 4 ]] && out2+=("綠 4 px,conkyctl stippled_borders_all 4;$me") || out2+=("祿 4 px,conkyctl stippled_borders_all 4;$me") + out+=("^sep()") + if [ "$WINTRANS" == false ];then + out+=(" AbCd $BACKGROUND,^pipe(mbclr '$WINCLR' conkyctl win_bgcolor_all '${BACKGROUND}' '$me')") + else + out+=(" transparent $BACKGROUND,^pipe(mbclr '$WINCLR' conkyctl win_bgcolor_all '${BACKGROUND}' '$me')") + fi + [[ "$WINTRANS" == false ]] && out+=("󰄱 $TRANSPARENT,conkyctl transparent_all true;$me") || out+=("󰄲 $TRANSPARENT,conkyctl transparent_all false;$me") + out+=("^sep()") - out+=("^sep($RESET)") - out+=("󰁯 $RESETCOLORS,^checkout(resetcolors)") - out2+=("^tag(resetcolors)") - out2+=("^sep($AREYOUSURE)") - out2+=("$YES,conkyctl resetcolorsall;$me") + + out+=(" AbCd $DEFCOLOR,^pipe(mbclr '$CLR' conkyctl default_color_all '${DEFCOLOR}' '$me')") + out+=(" AbCd $COLOR_0,^pipe(mbclr '$CLR0' conkyctl color0_all '${COLOR_0}' '$me')") + out+=(" AbCd $COLOR_1,^pipe(mbclr '$CLR1' conkyctl color1_all '${COLOR_1}' '$me')") + out+=(" AbCd $COLOR_2,^pipe(mbclr '$CLR2' conkyctl color2_all '${COLOR_2}' '$me')") + #out+=("^sep()") + + + + + + #out+=("^sep($RESET)") + #out+=("󰁯 $RESETCOLORS,^checkout(resetcolors)") + #out2+=("^tag(resetcolors)") + #out2+=("^sep($AREYOUSURE)") + #out2+=("$YES,conkyctl resetcolorsall;$me") #out+=(" $RESETALL,^checkout(resetall)") NOT SAFE!!! #out2+=("^tag(resetall)") #out2+=("^sep($AREYOUSURE)") @@ -388,7 +415,7 @@ if [[ "$1" == "-s" ]]; then source $HOME/.config/colorizer/colorizer.conf out+=("^sep()") - out+=(" ${arrow_string_left} Colorizer,colorizer -s") + out+=(" ${arrow_string_left} $_COLORIZER_ROOT,colorizer -s") if [[ "$colorizer_size" == "full" ]];then eval $(xdotool getdisplaygeometry --shell) @@ -431,7 +458,7 @@ cat < ${MENU_ITEMS} @icon,,$((jgtools_padding)),$((jgtools_padding)),270,150,4,left,top,,,${THUMB} @rect,,$((jgtools_padding)),$((jgtools_padding + 112)),270,34,0,left,top,#222222 20,#222222 70, #@icon,,$((jgtools_padding + 4)),$((jgtools_padding + 4)),270,150,4,left,top,,,/usr/share/mabox-colorizer/img/colorizer-conky.png -@text,,$((jgtools_padding + 154)),$((jgtools_padding + 116)),120,30,0,left,top,#FFFFFF ,${WINCLR},Colorizer Conky +@text,,$((jgtools_padding + 80)),$((jgtools_padding + 116)),190,30,0,left,top,#FFFFFF ,${WINCLR},Conky Manager & Colorizer @rect,,$((jgtools_padding + 239)),$((jgtools_padding + 2)),29,60,0,left,top,#FFFFFF 30,${WINCLR} 60, @rect,,$((jgtools_padding + 2)),$((jgtools_padding + 88)),29,60,0,left,top,#FFFFFF 30,${WINCLR} 60, @rect,,$((jgtools_padding + 34)),$((jgtools_padding + 108)),29,40,0,left,top,#FFFFFF 30,${WINCLR} 60, diff --git a/bin/colorizer-fonts b/bin/colorizer-fonts index b2cd937..a5933d3 100755 --- a/bin/colorizer-fonts +++ b/bin/colorizer-fonts @@ -69,6 +69,7 @@ case "$LANG" in _FAVORITE_LBL="Ulubione czcionki" _USE="Użyj czcionki" _FOR="dla..." + _COLORIZER_ROOT="Colorizer - menu główne" ;; *) _INCREASE_ALL="Increase all" @@ -105,7 +106,7 @@ case "$LANG" in _FAVORITE_LBL="Favorite Fonts" _USE="Use" _FOR="font for ..." - + _COLORIZER_ROOT="Colorizer rootmenu" ;; esac @@ -306,7 +307,7 @@ if [ "${#favfonts[@]}" -gt 0 ];then done fi out2+=("^sep()") -out2+=(" Edit favorited fonts list,geany ~/.config/mabox/fonts.list") +out2+=(" $_EDIT_FAVFONTS,geany ~/.config/mabox/fonts.list") out2+=("^sep($_C_EFFCTS)") [[ "$SHADOWS" == "shadow" ]] && out2+=("󰄲 $_SHADOW,conkyctl shades_all no;$me") || out2+=("󰄱 $_SHADOW,conkyctl shades_all shadow;$me") @@ -348,7 +349,7 @@ if [[ "$1" == "-s" ]]; then source "$CNF_FILE" out+=("^sep()") - out+=(" ${arrow_string_left} Colorizer,colorizer -s") + out+=(" ${arrow_string_left} $_COLORIZER_ROOT,colorizer -s") if [[ "$colorizer_size" == "full" ]];then eval $(xdotool getdisplaygeometry --shell) diff --git a/bin/colorizer-menus b/bin/colorizer-menus index ca3cb28..de45b3c 100755 --- a/bin/colorizer-menus +++ b/bin/colorizer-menus @@ -143,6 +143,7 @@ case "$LANG" in EDIT="Edytuj plik " FILE="plik" SET_RANDOM="Ustaw losowy motyw menu" + _COLORIZER_ROOT="Colorizer - menu główne" ;; *) MENU_THEME="Menu theme" @@ -223,6 +224,7 @@ case "$LANG" in EDIT="Edit" FILE="file" SET_RANDOM="Set random menu theme" + _COLORIZER_ROOT="Colorizer rootmenu" ;; esac @@ -576,7 +578,7 @@ if [[ "$1" == "-s" ]]; then source "$CNF_FILE" out+=("^sep()") - out+=(" ${arrow_string_left} Colorizer,colorizer -s") + out+=(" ${arrow_string_left} $_COLORIZER_ROOT,colorizer -s") if [[ "$colorizer_size" == "full" ]];then eval $(xdotool getdisplaygeometry --shell) diff --git a/bin/colorizer-ob b/bin/colorizer-ob index 3aaa841..a7c636d 100755 --- a/bin/colorizer-ob +++ b/bin/colorizer-ob @@ -100,6 +100,7 @@ case "$LANG" in NOT_SUPORTED_OBTHEME="Nie wspierany motyw" UNLOCK="odblokuj swoją kreatywność..." SWITCH_TO_MBCOLORS="Przełącz na MBColors" + _COLORIZER_ROOT="Colorizer - menu główne" ;; *) OBTHEME_LBL="OpenBox theme" @@ -165,6 +166,7 @@ case "$LANG" in NOT_SUPORTED_OBTHEME="Theme not supported" UNLOCK="Unlock your creativity..." SWITCH_TO_MBCOLORS="Switch to MBColors" + _COLORIZER_ROOT="Colorizer rootmenu" ;; esac @@ -509,7 +511,7 @@ if [[ "$1" == "-s" ]]; then source $HOME/.config/colorizer/colorizer.conf out+=("^sep()") -out+=(" ${arrow_string_left} Colorizer,colorizer -s") +out+=(" ${arrow_string_left} $_COLORIZER_ROOT,colorizer -s") if [[ "$colorizer_size" == "full" ]];then diff --git a/bin/colorizer-pyradio b/bin/colorizer-pyradio index 6a7242b..045ceb8 100755 --- a/bin/colorizer-pyradio +++ b/bin/colorizer-pyradio @@ -70,6 +70,7 @@ case "$LANG" in EDITCONF="Edytuj plik konfiguracyjny" EDITSTATIONS="Edytuj listę stacji" CONFIGDIR="Katalog z konfiguracją" + _COLORIZER_ROOT="Colorizer - menu główne" ;; *) COLORIZE_PYRADIO="Colorize PyRadio" @@ -89,6 +90,7 @@ case "$LANG" in EDITCONF="Edit config file" EDITSTATIONS="Edit stations list" CONFIGDIR="Config Dir" + _COLORIZER_ROOT="Colorizer rootmenu" ;; esac @@ -185,7 +187,7 @@ if [[ "$1" == "-s" ]]; then source "$CNF_FILE" out+=("^sep()") - out+=(" ${arrow_string_left} Colorizer,colorizer -s") + out+=(" ${arrow_string_left} $_COLORIZER_ROOT,colorizer -s") if [[ "$colorizer_size" == "full" ]];then eval $(xdotool getdisplaygeometry --shell) diff --git a/bin/conkyctl b/bin/conkyctl index 38b03cb..50db22c 100755 --- a/bin/conkyctl +++ b/bin/conkyctl @@ -403,8 +403,8 @@ languages () { APPLY_TO_ALL="Zastosuj do wszystkich" NEWTHEME="Nowy motyw kolorów..." SAVENEWTHEME="utwórz nowy motyw..." - LIGHTBG="light - jasne tło" - DARKBG="dark - ciemne tło" + LIGHTBG="Jasne tło" + DARKBG="Ciemne tło" RESETCOLORS="Przywróć domyślne kolory" GENFROMWP="Generuj z kolorów tapety" TRANSPARENT="Przezroczyste tło?" @@ -466,8 +466,8 @@ languages () { APPLY_TO_ALL="Apply to All" NEWTHEME="New Color scheme..." SAVENEWTHEME="from current colors..." - LIGHTBG="light" - DARKBG="dark" + LIGHTBG="Light Background" + DARKBG="Dark Background" RESETCOLORS="Restore default colors" GENFROMWP="Generate from wallpaper" TRANSPARENT="Transparent background?" @@ -529,8 +529,8 @@ languages () { APPLY_TO_ALL="Apply to All" NEWTHEME="New Color scheme..." SAVENEWTHEME="from current colors..." - LIGHTBG="light" - DARKBG="dark" + LIGHTBG="Light Background" + DARKBG="Dark Background" RESETCOLORS="Restore default colors" GENFROMWP="Generate from wallpaper" TRANSPARENT="Transparent background?" @@ -565,6 +565,23 @@ languages () { single () { unset NOT_SUPPORTED OLD_SYNTAX + ### Wallpaper colors +WALLPALDIR="$HOME/.cache/colorizer/palettes" +mkdir -p "$WALLPALDIR" +read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | cut -d'=' -f2) +NAME=${WALLPATH////_} +if [[ "${NAME}" =~ ^_home_.* ]]; then +n=${#HOME} +((n++)) +NAME=${NAME:${n}} +fi + +if [ ! -f "$WALLPALDIR/$NAME.clr" ]; then +convert ${WALLPATH} -resize 25% -colors 16 -unique-colors txt:- |grep -v '^#'| awk '{print substr($3,1,7)}' |pastel sort-by brightness |pastel format hex > "$WALLPALDIR/$NAME.clr" +fi +mapfile -t w < "$WALLPALDIR/$NAME.clr" + + languages filename=${1##*/} name=${filename%%_mb*} @@ -732,9 +749,7 @@ if [[ "$OLD_SYNTAX" = "true" ]];then out2+=("^tag(regensingle)") out2+=("^sep($COLORSCHEME)") out2+=("$RESETCOLORS,conkyctl resetcolorsone ${1}") - out2+=("^sep($GENFROMWP)") - out2+=("$LIGHTBG,w2theme conkyone light ${1}") - out2+=("$DARKBG,w2theme conkyone dark ${1}") + out2+=("^sep($APPLY_THEME)") out3+=("^tag(applytoall)") @@ -747,13 +762,18 @@ if [[ "$OLD_SYNTAX" = "true" ]];then ltitle=${themename//-/ } arr=( $ltitle ) schemetitle=${arr[@]^} - out2+=(" $schemetitle,conkyctl settheme $themefilename $1") - out3+=(" $schemetitle,conkyctl settheme_all $themefilename") + out2+=("$(printf '%-20s' "${schemetitle}") ,conkyctl settheme $themefilename $1") + #out2+=(" $schemetitle,conkyctl settheme $themefilename $1") + out3+=("$(printf '%-20s' "${schemetitle}") ,conkyctl settheme_all $themefilename") + #out3+=(" $schemetitle,conkyctl settheme_all $themefilename") done out2+=("^sep()") out2+=(" $OPENTHEMEDIR,xdg-open ${COLORIZERDIR}/conky/themes/") out2+=("^sep()") out2+=("$APPLY_TO_ALL,^checkout(applytoall)") + out2+=("^sep($GENFROMWP)") + out2+=(" $LIGHTBG ,w2theme conkyone light ${1}") + out2+=(" $DARKBG ,w2theme conkyone dark ${1}") if [[ "$1" =~ "sysinfo_" ]]; then out2+=("^sep($NEWTHEME)") out2+=("$SAVENEWTHEME,conkyctl newcolorscheme ${1}") diff --git a/bin/w2theme b/bin/w2theme index 7c9ab62..8af734a 100755 --- a/bin/w2theme +++ b/bin/w2theme @@ -87,15 +87,15 @@ conky_colors() { dark) #dark bg conkyctl win_bgcolor_all "${w[0]}" conkyctl default_color_all "${w[-1]}" - conkyctl color0_all "${w[-3]}" - conkyctl color1_all "${w[-4]}" + conkyctl color0_all "${w[-4]}" + conkyctl color1_all "${w[-5]}" #conkyctl color2_all "${w[-5]}" ;; *) #light bg conkyctl win_bgcolor_all "${w[-1]}" conkyctl default_color_all "${w[0]}" - conkyctl color0_all "${w[2]}" - conkyctl color1_all "${w[4]}" + conkyctl color0_all "${w[4]}" + conkyctl color1_all "${w[5]}" #conkyctl color2_all "${w[6]}" ;; esac @@ -110,18 +110,17 @@ conky_colorsone () { dark) #dark bg conkyctl win_bgcolor "${w[0]}" "${2}" conkyctl default_color "${w[-1]}" "${2}" - conkyctl color0 "${w[-3]}" "${2}" - conkyctl color1 "${w[-4]}" "${2}" - conkyctl color2 "${w[-5]}" "${2}" + conkyctl color0 "${w[-4]}" "${2}" + conkyctl color1 "${w[-5]}" "${2}" ;; *) #light bg conkyctl win_bgcolor "${w[-1]}" "${2}" conkyctl default_color "${w[0]}" "${2}" - conkyctl color0 "${w[2]}" "${2}" - conkyctl color1 "${w[4]}" "${2}" - conkyctl color2 "${w[6]}" "${2}" + conkyctl color0 "${w[4]}" "${2}" + conkyctl color1 "${w[5]}" "${2}" ;; esac + conkyctl color2_all "${accents[ $RANDOM % ${#accents[@]} ]}" "${2}" } pyradio_theme() { case "$1" in