Conky and mbclr improvements

This commit is contained in:
Daniel Napora 2023-09-11 18:59:49 +02:00
parent 33550720c2
commit 106b6909d9
5 changed files with 114 additions and 58 deletions

View File

@ -17,7 +17,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
SYSSCHEMES="/usr/share/mabox-colorizer/colorschemes/conky.csv" SYSSCHEMES="/usr/share/mabox-colorizer/colorschemes/conky.csv"
USERSCHEMES="$HOME/.config/colorizer/conky/userschemes.csv" USERSCHEMES="$HOME/.config/colorizer/conky/c_userschemes.csv"
me="colorizer-conky -s" me="colorizer-conky -s"
@ -205,7 +205,8 @@ getvalues () {
read BORD <<< "$(grep draw_borders ${BASECONKY} | cut -d'=' -f2 | cut -d"," -f1)" read BORD <<< "$(grep draw_borders ${BASECONKY} | cut -d'=' -f2 | cut -d"," -f1)"
read STIP <<< "$(grep stippled_borders ${BASECONKY} | cut -d'=' -f2 | cut -d"," -f1)" read STIP <<< "$(grep stippled_borders ${BASECONKY} | cut -d'=' -f2 | cut -d"," -f1)"
currcolors="${WINCLR}|${CLR}|${CLR0}|${CLR1}|${CLR2}|" #currcolors="${WINCLR}|${CLR}|${CLR0}|${CLR1}|${CLR2}|"
cursettings="${WINCLR}|${CLR}|${CLR0}|${CLR1}|${CLR2}|${WINTRANS}|${OUTLINE}|${SHADES}|${BORD}|${STIP}|"
} }
if pgrep -u $USER -af "conky.*mbcolor" >/dev/null; then if pgrep -u $USER -af "conky.*mbcolor" >/dev/null; then
@ -213,7 +214,7 @@ if pgrep -u $USER -af "conky.*mbcolor" >/dev/null; then
getvalues getvalues
if [ ! -f "$USERSCHEMES" ]; then if [ ! -f "$USERSCHEMES" ]; then
mkdir -p "$HOME/.config/colorizer/conky/" mkdir -p "$HOME/.config/colorizer/conky/"
echo "WINCLR | CLR | CLR0 | CLR1 | CLR2 |scheme_name" > "$USERSCHEMES" echo "WINCLR | CLR | CLR0 | CLR1 | CLR2 |WINTRANS|OUTLINE|SHADES | BORD | STIP |scheme_name" > "$USERSCHEMES"
fi fi
@ -314,33 +315,34 @@ if pgrep -u $USER -af "conky.*mbcolor" >/dev/null; then
out+=("^sep($GLOBALSETTINGS)") out+=("^sep($GLOBALSETTINGS)")
out+=(" $MOVEABLEALL,conkyctl makemoveableall") out+=(" $MOVEABLEALL,conkyctl makemoveableall")
out+=("^sep()") out+=("^sep()")
out+=("<big><span bgcolor='$WINCLR'> <span fgcolor='$CLR'></span> <span fgcolor='$CLR0'></span> <span fgcolor='$CLR1'></span> <span fgcolor='$CLR2'></span> </span></big> $REGENERATE,^checkout(regenconky)") [[ "$WINTRANS" = true ]] && bga=1 || bga=100
out+=("<big><span bgcolor='$WINCLR' bgalpha='${bga}%'> <span fgcolor='$CLR'></span> <span fgcolor='$CLR0'></span> <span fgcolor='$CLR1'></span> <span fgcolor='$CLR2'></span> </span></big> $REGENERATE,^checkout(regenconky)")
out2+=("^tag(regenconky)") out2+=("^tag(regenconky)")
out2+=("^sep($REGENERATE)") out2+=("^sep($REGENERATE)")
out2+=("^sep($SYSTEM_SCHEMES)") out2+=("^sep($SYSTEM_SCHEMES)")
n=1 n=1
while IFS="|" read -r winclr clr clr0 clr1 clr2 scheme_name while IFS="|" read -r winclr clr clr0 clr1 clr2 wintrans outline shades bord stip scheme_name
do do
((n=n+1)) ((n=n+1))
[[ "$wintrans" = true ]] && bga=1 || bga=100
out2+=("<tt>$(printf '%-20s' "${scheme_name}")</tt><big><span bgcolor='$winclr'> <span fgcolor='$clr'>󰯲</span> <span fgcolor='$clr0'>󰝥</span> <span fgcolor='$clr1'>󰲠</span> <span fgcolor='$clr2'>󰲢</span> </span></big>,conkyctl applyscheme_all sys ${n};$me") out2+=("<tt>$(printf '%-20s' "${scheme_name}")</tt><big><span bgcolor='$winclr' bgalpha='${bga}%'> <span fgcolor='$clr'>󰯲</span> <span fgcolor='$clr0'>󰝥</span> <span fgcolor='$clr1'>󰲠</span> <span fgcolor='$clr2'>󰲢</span> </span></big>,conkyctl applyscheme_all sys ${n};$me")
done < <(tail -n +2 "$SYSSCHEMES") done < <(tail -n +2 "$SYSSCHEMES")
out2+=("^sep($YOUR_SCHEMES)") out2+=("^sep($YOUR_SCHEMES)")
out2+=("<big></big> $SAVE_CURRSCHEME,conkyctl savescheme '${currcolors}';$me") out2+=("<big></big> $SAVE_CURRSCHEME,conkyctl savescheme '${cursettings}';$me")
out2+=("<big></big> $OPEN_SCHEMEFILE,xdg-open $USERSCHEMES") out2+=("<big></big> $OPEN_SCHEMEFILE,xdg-open $USERSCHEMES")
out2+=("^sep()") out2+=("^sep()")
n=1 n=1
while IFS="|" read -r winclr clr clr0 clr1 clr2 scheme_name while IFS="|" read -r winclr clr clr0 clr1 clr2 wintrans outline shades bord stip scheme_name
do do
((n=n+1)) ((n=n+1))
[[ "$wintrans" = true ]] && bga=1 || bga=100
out2+=("<tt>$(printf '%-20s' "${scheme_name}")</tt><big><span bgcolor='$winclr'> <span fgcolor='$clr'>󰯲</span> <span fgcolor='$clr0'>󰝥</span> <span fgcolor='$clr1'>󰲠</span> <span fgcolor='$clr2'>󰲢</span> </span></big>,^checkout(sch${n})") out2+=("<tt>$(printf '%-20s' "${scheme_name}")</tt><big><span bgcolor='$winclr' bgalpha='${bga}%'> <span fgcolor='$clr'>󰯲</span> <span fgcolor='$clr0'>󰝥</span> <span fgcolor='$clr1'>󰲠</span> <span fgcolor='$clr2'>󰲢</span> </span></big>,^checkout(sch${n})")
#echo "${own_window_colour}|${default_color}|${color0}|${color1}|${color2}|${themename}" >> "$USERSCHEMES" #echo "${own_window_colour}|${default_color}|${color0}|${color1}|${color2}|${themename}" >> "$USERSCHEMES"
out3+=("^tag(sch${n}") out3+=("^tag(sch${n}")
out3+=("^sep($COLORSCHEME: ${scheme_name})") out3+=("^sep($COLORSCHEME: ${scheme_name})")
out3+=("<big></big> $APPLY_SCHEME <big><span bgcolor='$winclr'> <span fgcolor='$clr'>󰯲</span> <span fgcolor='$clr0'>󰝥</span> <span fgcolor='$clr1'>󰲠</span> <span fgcolor='$clr2'>󰲢</span> </span></big>,conkyctl applyscheme_all usr ${n};$me") out3+=("<big></big> $APPLY_SCHEME <big><span bgcolor='$winclr' bgalpha='${bga}%'> <span fgcolor='$clr'>󰯲</span> <span fgcolor='$clr0'>󰝥</span> <span fgcolor='$clr1'>󰲠</span> <span fgcolor='$clr2'>󰲢</span> </span></big>,conkyctl applyscheme_all usr ${n};$me")
out3+=("^sep($DELETE)") out3+=("^sep($DELETE)")
out3+=("<big>󰗨</big> $DELETE_SCHEME ${scheme_name},conkyctl delscheme ${n};$me") out3+=("<big>󰗨</big> $DELETE_SCHEME ${scheme_name},conkyctl delscheme ${n};$me")
done < <(tail -n +2 "$USERSCHEMES") done < <(tail -n +2 "$USERSCHEMES")
@ -403,6 +405,7 @@ if pgrep -u $USER -af "conky.*mbcolor" >/dev/null; then
[[ "$STIP" == 4 ]] && out2+=("<big>綠</big> 4 px,conkyctl stippled_borders_all 4;$me") || out2+=("<big>祿</big> 4 px,conkyctl stippled_borders_all 4;$me") [[ "$STIP" == 4 ]] && out2+=("<big>綠</big> 4 px,conkyctl stippled_borders_all 4;$me") || out2+=("<big>祿</big> 4 px,conkyctl stippled_borders_all 4;$me")
out+=("^sep()") out+=("^sep()")
pgrep -af "conky/sysinfo_mbcolor" > /dev/null || out+=("<big><span bgcolor='red' fgcolor='white'>  README <small>(important info)</small>  </span></big>,conkyctl baseconky_info")
if [ "$WINTRANS" == false ];then if [ "$WINTRANS" == false ];then
out+=("<span bgcolor='$WINCLR'> </span><span weight='bold' ${BG} fgcolor='$WINCLR'> AbCd </span> $BACKGROUND,^pipe(mbclr '$WINCLR' conkyctl win_bgcolor_all '${BACKGROUND}' '$me')") out+=("<span bgcolor='$WINCLR'> </span><span weight='bold' ${BG} fgcolor='$WINCLR'> AbCd </span> $BACKGROUND,^pipe(mbclr '$WINCLR' conkyctl win_bgcolor_all '${BACKGROUND}' '$me')")
else else

View File

@ -67,6 +67,7 @@ case "$LANG" in
pl*) pl*)
MENU_THEME="Motyw menu" MENU_THEME="Motyw menu"
QUICK_TWEAKS="Ustawienia główne" QUICK_TWEAKS="Ustawienia główne"
OVERALL_STYLE="Ogólny styl"
SCHEMES="Motywy kolorystycznie" SCHEMES="Motywy kolorystycznie"
SYSTEM_SCHEMES="Systemowe" SYSTEM_SCHEMES="Systemowe"
YOUR_SCHEMES="Moje motywy" YOUR_SCHEMES="Moje motywy"
@ -148,6 +149,7 @@ case "$LANG" in
*) *)
MENU_THEME="Menu theme" MENU_THEME="Menu theme"
QUICK_TWEAKS="Global Settings/Quick Tweaks" QUICK_TWEAKS="Global Settings/Quick Tweaks"
OVERALL_STYLE="Overall style"
SCHEMES="Color Schemes" SCHEMES="Color Schemes"
SYSTEM_SCHEMES="System colorschemes" SYSTEM_SCHEMES="System colorschemes"
YOUR_SCHEMES="My colorschemes" YOUR_SCHEMES="My colorschemes"
@ -264,7 +266,7 @@ out+=("^sep($MENU_THEME: <i>${jgmenu_theme}</i>)")
out+=("$QUICK_TWEAKS,^checkout(tweaks)") out+=("$QUICK_TWEAKS,^checkout(tweaks)")
out2+=("^tag(tweaks)") out2+=("^tag(tweaks)")
out2+=("^sep(Overall style)") out2+=("^sep($OVERALL_STYLE)")
###### ######
out2+=("$BORDER [ <b>${jgtools_border:-0}px</b> ],^checkout(mborder)") out2+=("$BORDER [ <b>${jgtools_border:-0}px</b> ],^checkout(mborder)")
out2+=("$PADDING [ <b>${jgtools_padding:-0}px</b> ],^checkout(mpadding)") out2+=("$PADDING [ <b>${jgtools_padding:-0}px</b> ],^checkout(mpadding)")
@ -550,14 +552,10 @@ out2+=("^sep()")
[[ "$IRADIUS" == 6 ]] && out2+=("<big>綠</big> 6 px,jgctl item_radius 6;$me") || out2+=("<big>祿</big> 6 px,jgctl item_radius 6;$me") [[ "$IRADIUS" == 6 ]] && out2+=("<big>綠</big> 6 px,jgctl item_radius 6;$me") || out2+=("<big>祿</big> 6 px,jgctl item_radius 6;$me")
out+=("^sep($MORE_MENU_SETTINGS)") #out+=("^sep($MORE_MENU_SETTINGS)")
out+=(" $GLOBAL_MENU_SETTINGS,jgmenusettings-pipe -c") #out+=(" $GLOBAL_MENU_SETTINGS,jgmenusettings-pipe -c")
#out+=("$GLOBAL_MENU_SETTINGS,^pipe(jgmenusettings-pipe -r)") #out+=("$GLOBAL_MENU_SETTINGS,^pipe(jgmenusettings-pipe -r)")
### We don't need many menu themes anymore
#out+=(" $SET_RANDOM,mb-setvar jgmenu_theme=$(basename -s .colorrc $(ls ~/.config/mabox/jgobthemes/*.colorrc | shuf -n 1));$me")
### RUN ### RUN
if [[ "$1" == "-s" ]]; then if [[ "$1" == "-s" ]]; then
. /usr/share/mb-jgtools/pipemenu-standalone.cfg . /usr/share/mb-jgtools/pipemenu-standalone.cfg

View File

@ -575,10 +575,10 @@ single () {
unset NOT_SUPPORTED OLD_SYNTAX unset NOT_SUPPORTED OLD_SYNTAX
SYSSCHEMES="/usr/share/mabox-colorizer/colorschemes/conky.csv" SYSSCHEMES="/usr/share/mabox-colorizer/colorschemes/conky.csv"
USERSCHEMES="$HOME/.config/colorizer/conky/userschemes.csv" USERSCHEMES="$HOME/.config/colorizer/conky/c_userschemes.csv"
if [ ! -f "$USERSCHEMES" ]; then if [ ! -f "$USERSCHEMES" ]; then
mkdir -p "$HOME/.config/colorizer/conky/" mkdir -p "$HOME/.config/colorizer/conky/"
echo "WINCLR | CLR | CLR0 | CLR1 | CLR2 |scheme_name" > "$USERSCHEMES" echo "WINCLR | CLR | CLR0 | CLR1 | CLR2 |WINTRANS|OUTLINE|SHADES | BORD | STIP |scheme_name" > "$USERSCHEMES"
fi fi
### Wallpaper colors ### Wallpaper colors
@ -738,28 +738,31 @@ if [[ "$OLD_SYNTAX" = "true" ]];then
out+=("^sep($COLORS)") out+=("^sep($COLORS)")
# COLOR SCHEMES # COLOR SCHEMES
if [ "$WINTRANS" == false ];then #if [ "$WINTRANS" == false ];then
out+=("<span bgcolor='#282828'> <span fgcolor='#ebdbb2'></span> <span fgcolor='#98971a'></span> <span fgcolor='#d79921'></span> <span fgcolor='#cc241d'></span> </span> $COLORSCHEME,^checkout(regensingle)") out+=("<span bgcolor='#282828'> <span fgcolor='#ebdbb2'></span> <span fgcolor='#98971a'></span> <span fgcolor='#d79921'></span> <span fgcolor='#cc241d'></span> </span> $COLORSCHEME,^checkout(regensingle)")
out2+=("^tag(regensingle)") out2+=("^tag(regensingle)")
out2+=("^sep($APPLY_THEME)") out2+=("^sep($APPLY_THEME)")
out2+=("^sep($SYSTEM_SCHEMES)") out2+=("^sep($SYSTEM_SCHEMES)")
n=1 n=1
while IFS="|" read -r winclr clr clr0 clr1 clr2 scheme_name while IFS="|" read -r winclr clr clr0 clr1 clr2 wintrans outline shades bord stip scheme_name
do do
((n=n+1)) ((n=n+1))
out2+=("<tt>$(printf '%-20s' "${scheme_name}")</tt><big><span bgcolor='$winclr'> <span fgcolor='${clr}'></span> <span fgcolor='${clr0}'></span> <span fgcolor='${clr1}'></span> <span fgcolor='${clr2}'></span> </span></big>,conkyctl applyscheme sys $n ${1}") [[ "$wintrans" = true ]] && bga=1 || bga=100
out2+=("<tt>$(printf '%-20s' "${scheme_name}")</tt><big><span bgcolor='$winclr' bgalpha='${bga}%'> <span fgcolor='${clr}'></span> <span fgcolor='${clr0}'></span> <span fgcolor='${clr1}'></span> <span fgcolor='${clr2}'></span> </span></big>,conkyctl applyscheme sys $n ${1}")
done < <(tail -n +2 "$SYSSCHEMES") done < <(tail -n +2 "$SYSSCHEMES")
out2+=("^sep($YOUR_SCHEMES)") out2+=("^sep($YOUR_SCHEMES)")
if [[ "$1" =~ "sysinfo_" ]]; then if [[ "$1" =~ "sysinfo_" ]]; then
currcolors="${WINCLR}|${CLR}|${CLR0}|${CLR1}|${CLR2}|" #currcolors="${WINCLR}|${CLR}|${CLR0}|${CLR1}|${CLR2}|"
out2+=("<big></big> $SAVE_CURRSCHEME,conkyctl savescheme '${currcolors}'" "^sep()") cursettings="${WINCLR}|${CLR}|${CLR0}|${CLR1}|${CLR2}|${WINTRANS}|${OUTLINE}|${SHADES}|${BORD}|${STIP}|"
out2+=("<big></big> $SAVE_CURRSCHEME,conkyctl savescheme '${cursettings}'" "^sep()")
fi fi
n=1 n=1
while IFS="|" read -r winclr clr clr0 clr1 clr2 scheme_name while IFS="|" read -r winclr clr clr0 clr1 clr2 wintrans outline shades bord stip scheme_name
do do
((n=n+1)) ((n=n+1))
out2+=("<tt>$(printf '%-20s' "${scheme_name}")</tt><big><span bgcolor='$winclr'> <span fgcolor='${clr}'></span> <span fgcolor='${clr0}'></span> <span fgcolor='${clr1}'></span> <span fgcolor='${clr2}'></span> </span></big>,conkyctl applyscheme usr $n ${1}") [[ "$wintrans" = true ]] && bga=1 || bga=100
out2+=("<tt>$(printf '%-20s' "${scheme_name}")</tt><big><span bgcolor='$winclr' bgalpha='${bga}%'> <span fgcolor='${clr}'></span> <span fgcolor='${clr0}'></span> <span fgcolor='${clr1}'></span> <span fgcolor='${clr2}'></span> </span></big>,conkyctl applyscheme usr $n ${1}")
#out2+=("<span bgcolor='$own_window_colour'> <span fgcolor='$default_color'></span> <span fgcolor='$color0'></span> <span fgcolor='$color1'></span> <span fgcolor='$color2'></span> </span> $schemetitle,conkyctl settheme $themefilename $1") #out2+=("<span bgcolor='$own_window_colour'> <span fgcolor='$default_color'></span> <span fgcolor='$color0'></span> <span fgcolor='$color1'></span> <span fgcolor='$color2'></span> </span> $schemetitle,conkyctl settheme $themefilename $1")
done < <(tail -n +2 "$USERSCHEMES") done < <(tail -n +2 "$USERSCHEMES")
@ -769,7 +772,7 @@ if [[ "$OLD_SYNTAX" = "true" ]];then
out2+=("<big><span bgcolor='${w[0]}' fgcolor='${w[-1]}'> $DARKBG <span fgcolor='${w[-4]}'></span> <span fgcolor='${w[-5]}'></span> </span></big>,w2theme conkyone dark ${1}") out2+=("<big><span bgcolor='${w[0]}' fgcolor='${w[-1]}'> $DARKBG <span fgcolor='${w[-4]}'></span> <span fgcolor='${w[-5]}'></span> </span></big>,w2theme conkyone dark ${1}")
out+=("^sep()") out+=("^sep()")
fi #fi
if [[ "$WINCLR" != "#" ]];then if [[ "$WINCLR" != "#" ]];then
if [ "$WINTRANS" == false ];then if [ "$WINTRANS" == false ];then
@ -1132,24 +1135,32 @@ savescheme () {
esac esac
# ask for scheme name # ask for scheme name
schemename=$(yad --center --width=300 --borders=20 --window-icon=mbcc --title "$SAVE_AS" --text="$DESC" --entry --entry-label="$LABEL" --entry-text="$NAME") || exit 1 schemename=$(yad --center --width=300 --borders=20 --window-icon=mbcc --title "$SAVE_AS" --text="$DESC" --entry --entry-label="$LABEL" --entry-text="$NAME") || exit 1
echo "${1}${schemename}" >> "$HOME/.config/colorizer/conky/userschemes.csv" echo "${1}${schemename}" >> "$HOME/.config/colorizer/conky/c_userschemes.csv"
} }
delscheme() { delscheme() {
sed -i ${1}d "$HOME/.config/colorizer/conky/userschemes.csv" sed -i ${1}d "$HOME/.config/colorizer/conky/c_userschemes.csv"
} }
applyscheme () { applyscheme () {
case "$1" in case "$1" in
sys) SCHEMEFILE="/usr/share/mabox-colorizer/colorschemes/conky.csv";; sys) SCHEMEFILE="/usr/share/mabox-colorizer/colorschemes/conky.csv";;
usr) SCHEMEFILE="$HOME/.config/colorizer/conky/userschemes.csv";; usr) SCHEMEFILE="$HOME/.config/colorizer/conky/c_userschemes.csv";;
esac esac
while IFS="|" read -r own_window_colour default_color color0 color1 color2 scheme_name while IFS="|" read -r own_window_colour default_color color0 color1 color2 wintrans outline shades bord stip scheme_name
do do
win_bgcolor ${own_window_colour} ${3} win_bgcolor ${own_window_colour} ${3}
default_color ${default_color} ${3} default_color ${default_color} ${3}
color0 ${color0} ${3} color0 ${color0} ${3}
color1 ${color1} ${3} color1 ${color1} ${3}
color2 ${color2} ${3} color2 ${color2} ${3}
transparent ${wintrans} ${3}
shadow="no"
[[ "$outline" == true ]] && shadow="outline"
[[ "$shades" == true ]] && shadow="shadow"
shades "$shadow" ${3}
stippled_borders ${stip} ${3}
draw_borders ${bord} ${3}
done < <(awk 'NR == n' n=$2 "$SCHEMEFILE") done < <(awk 'NR == n' n=$2 "$SCHEMEFILE")
} }
@ -1157,15 +1168,22 @@ done < <(awk 'NR == n' n=$2 "$SCHEMEFILE")
applyscheme_all () { applyscheme_all () {
case "$1" in case "$1" in
sys) SCHEMEFILE="/usr/share/mabox-colorizer/colorschemes/conky.csv";; sys) SCHEMEFILE="/usr/share/mabox-colorizer/colorschemes/conky.csv";;
usr) SCHEMEFILE="$HOME/.config/colorizer/conky/userschemes.csv";; usr) SCHEMEFILE="$HOME/.config/colorizer/conky/c_userschemes.csv";;
esac esac
while IFS="|" read -r own_window_colour default_color color0 color1 color2 scheme_name while IFS="|" read -r own_window_colour default_color color0 color1 color2 wintrans outline shades bord stip scheme_name
do do
win_bgcolor_all ${own_window_colour} win_bgcolor_all ${own_window_colour}
default_color_all ${default_color} default_color_all ${default_color}
color0_all ${color0} color0_all ${color0}
color1_all ${color1} color1_all ${color1}
color2_all ${color2} color2_all ${color2}
transparent_all ${wintrans}
shadow="no"
[[ "$outline" == true ]] && shadow="outline"
[[ "$shades" == true ]] && shadow="shadow"
shades_all "$shadow"
stippled_borders_all ${stip}
draw_borders_all ${bord}
done < <(awk 'NR == n' n=$2 "$SCHEMEFILE") done < <(awk 'NR == n' n=$2 "$SCHEMEFILE")
} }
@ -1178,7 +1196,39 @@ convert_from_old () {
sleep 1 sleep 1
startone ${1} startone ${1}
} }
baseconky_info() {
#notify-send.sh -i mbcc "Important" "Baseconky info"
case "$LANG" in
pl*)
TITLE="Ważna informacja"
MSG="Podczas pracy nad nowymi schematami kolorów lub dostosowywaniem kolorów warto uruchomić Conky: Sysinfo - który jest bazowym Conky.\nJego kolory i inne zmienne są brane pod uwagę.\n\nUruchomić Sysinfo teraz?\n\n"
START="Tak, uruchom Sysinfo Conky"
NO="Nie"
;;
*)
TITLE="Important info"
MSG="When working on new color schemes or customizing colors, it's worth running Conky: Sysinfo - which is the base Conky. Its colors and other variables are taken into account by Colorizer.\n\nStart Sysinfo Conky now?\n\n"
START="Yes, start Sysinfo Conky"
NO="No"
;;
esac
cmd=(
yad --center --width=360 --borders=20 --window-icon=mbcc --image=colorizer
--title "${TITLE}"
--text="${MSG}"
--button="${START}:1"
--button="${NO}:0"
)
"${cmd[@]}"
exval=$?
#notify-send.sh -t 10000 "Exval" "${exval}"
case $exval in
1) startone "$HOME/.config/conky/sysinfo_mbcolor.conkyrc";;
0) : ;;
252): ;;
esac
colorizer-conky -s
}
case "$1" in case "$1" in
transparent_all) transparent_all "$2";; transparent_all) transparent_all "$2";;
transparent) transparent "$2" "$3";; transparent) transparent "$2" "$3";;
@ -1231,5 +1281,6 @@ case "$1" in
applyscheme_all) applyscheme_all "$2" "$3";; applyscheme_all) applyscheme_all "$2" "$3";;
netdevice) netdevice ;; netdevice) netdevice ;;
convert_from_old) convert_from_old "$2";; convert_from_old) convert_from_old "$2";;
baseconky_info) baseconky_info;;
*) : ;; *) : ;;
esac esac

View File

@ -54,7 +54,8 @@ case "$LANG" in
GRAYS="Shades of Gray" GRAYS="Shades of Gray"
;; ;;
esac esac
ccol_ind="<span bgcolor='${1}'> </span>"
gtkthemename=$(grep gtk-theme ~/.config/gtk-3.0/settings.ini |cut -d'=' -f2)
main () { main () {
#read WALLPAPER<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | cut -d'=' -f2) #read WALLPAPER<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | cut -d'=' -f2)
@ -149,7 +150,7 @@ out+=("^sep()")
out+=("<big><span bgcolor='#e93d57'> </span> <span bgcolor='#f4a300'> </span> <span bgcolor='#3cd425'> </span> <span bgcolor='#3584e4'> </span> <span bgcolor='#e93a9a'> </span></big> $ACCENT_COLORS,^checkout(accents)") out+=("<big><span bgcolor='#e93d57'> </span> <span bgcolor='#f4a300'> </span> <span bgcolor='#3cd425'> </span> <span bgcolor='#3584e4'> </span> <span bgcolor='#e93a9a'> </span></big> $ACCENT_COLORS,^checkout(accents)")
out2+=("^tag(accents)") out2+=("^tag(accents)")
out2+=("^sep($ACCENT_COLORS)") out2+=("^sep($ACCENT_COLORS)")
for i in ${accents[@]};do out2+=("<tt><small>$i</small> <span bgcolor='$i'> </span></tt>,$2 $3 '${i}' ${6};${5}");done for i in ${accents[@]};do out2+=("<tt><small>$i</small> <span bgcolor='$i'> </span>${ccol_ind}</tt>,$2 $3 '${i}' ${6};${5}");done
out+=("^sep()") out+=("^sep()")
mapfile -t gtkcolors < <( gtkcolors.py 2>/dev/null| grep -v None|awk '{print "#"$2}'|sort|uniq) mapfile -t gtkcolors < <( gtkcolors.py 2>/dev/null| grep -v None|awk '{print "#"$2}'|sort|uniq)
@ -157,7 +158,8 @@ if [ "${#gtkcolors[@]}" -gt 0 ];then
out+=("$GTKCOLORS,^checkout(gtkcols)") out+=("$GTKCOLORS,^checkout(gtkcols)")
out2+=("^tag(gtkcols)") out2+=("^tag(gtkcols)")
out2+=("^sep($GTKCOLORS)") out2+=("^sep($GTKCOLORS)")
for i in ${gtkcolors[@]};do out2+=("<tt><small>$i</small> <span bgcolor='$i'> </span></tt>,$2 $3 '${i}' ${6};${5}");done out2+=("^sep($gtkthemename)")
for i in ${gtkcolors[@]};do out2+=("<tt><small>$i</small> <span bgcolor='$i'> </span>${ccol_ind}</tt>,$2 $3 '${i}' ${6};${5}");done
out+=("^sep()") out+=("^sep()")
fi fi
@ -167,14 +169,14 @@ out2+=("^tag(grayscol)")
out2+=("^sep($GRAYS)") out2+=("^sep($GRAYS)")
for i in "${grays[@]}" for i in "${grays[@]}"
do do
out2+=("<tt><small>$i</small> <span bgcolor='$i'> </span></tt>,$2 $3 '${i}' ${6};${5}") out2+=("<tt><small>$i</small> <span bgcolor='$i'> </span>${ccol_ind}</tt>,$2 $3 '${i}' ${6};${5}")
done done
out+=("^sep($WALLPAPER_COLORS)") out+=("^sep($WALLPAPER_COLORS)")
for i in "${wallcolors[@]}" for i in "${wallcolors[@]}"
do do
out+=("<tt><small>$i</small> <span bgcolor='$i'> </span></tt>,$2 $3 '${i}' ${6};${5}") out+=("<tt><small>$i</small> <span bgcolor='$i'> </span>${ccol_ind}</tt>,$2 $3 '${i}' ${6};${5}")
done done
@ -186,7 +188,7 @@ out2+=("^sep($SHADES_OF $1)")
for i in 3 25 2 15 1 05; do for i in 3 25 2 15 1 05; do
clr=$(pastel lighten 0.$i "${1}" | pastel format hex) clr=$(pastel lighten 0.$i "${1}" | pastel format hex)
if [ "${clr}" != "#ffffff" ];then if [ "${clr}" != "#ffffff" ];then
out2+=("<tt><small>$clr</small> <span bgcolor='$clr'> </span></tt>,$2 $3 '${clr}' ${6};${5}") out2+=("<tt><small>$clr</small> <span bgcolor='$clr'> </span>${ccol_ind}</tt>,$2 $3 '${clr}' ${6};${5}")
fi fi
done done
@ -196,7 +198,7 @@ out2+=("^sep()")
for i in 05 1 15 2 25 3; do for i in 05 1 15 2 25 3; do
clr=$(pastel darken 0.$i "${1}" | pastel format hex) clr=$(pastel darken 0.$i "${1}" | pastel format hex)
if [ "${clr}" != "#000000" ];then if [ "${clr}" != "#000000" ];then
out2+=("<tt><small>$clr</small> <span bgcolor='$clr'> </span></tt>,$2 $3 '${clr}' ${6};${5}") out2+=("<tt><small>$clr</small> <span bgcolor='$clr'> </span>${ccol_ind}</tt>,$2 $3 '${clr}' ${6};${5}")
fi fi
done done
# Shades ENG # Shades ENG
@ -209,7 +211,7 @@ out2+=("^sep($SATURATION)")
for i in 9 8 7 6 5 4 3 2 1; do for i in 9 8 7 6 5 4 3 2 1; do
clr=$(pastel desaturate 0.$i "${1}" | pastel format hex) clr=$(pastel desaturate 0.$i "${1}" | pastel format hex)
if [ "${clr}" != "${oldclr}" ];then if [ "${clr}" != "${oldclr}" ];then
out2+=("<tt><small>$clr</small> <span bgcolor='$clr'> </span></tt>,$2 $3 '${clr}' ${6};${5}") out2+=("<tt><small>$clr</small> <span bgcolor='$clr'> </span>${ccol_ind}</tt>,$2 $3 '${clr}' ${6};${5}")
oldclr=${clr} oldclr=${clr}
fi fi
done done
@ -219,7 +221,7 @@ out2+=("^sep()")
for i in 1 2 3 4 5 6 7 8 9; do for i in 1 2 3 4 5 6 7 8 9; do
clr=$(pastel saturate 0.$i "${1}" | pastel format hex) clr=$(pastel saturate 0.$i "${1}" | pastel format hex)
if [ "${clr}" != "${oldclr}" ];then if [ "${clr}" != "${oldclr}" ];then
out2+=("<tt><small>$clr</small> <span bgcolor='$clr'> </span></tt>,$2 $3 '${clr}' ${6};${5}") out2+=("<tt><small>$clr</small> <span bgcolor='$clr'> </span>${ccol_ind}</tt>,$2 $3 '${clr}' ${6};${5}")
oldclr=${clr} oldclr=${clr}
fi fi
done done
@ -230,14 +232,14 @@ out2+=("^tag(rotate_hsl)")
out2+=("^sep($ROTATE_HSL_HUE)") out2+=("^sep($ROTATE_HSL_HUE)")
for i in {135..15..15};do for i in {135..15..15};do
clr=$(pastel rotate -- -$i "${1}" |pastel format hex) clr=$(pastel rotate -- -$i "${1}" |pastel format hex)
out2+=("<tt><small>$clr</small> <span bgcolor='$clr'> </span> <small>-$i°</small></tt>,$2 $3 '${clr}' ${6};${5}") out2+=("<tt><small>$clr</small> <span bgcolor='$clr'> </span>${ccol_ind} <small>-$i°</small></tt>,$2 $3 '${clr}' ${6};${5}")
done done
out2+=("^sep()") out2+=("^sep()")
out2+=("<tt><span bgcolor='$1' fgcolor='$CUR_FG'> <small>$CURRENT $1</small> </span></tt>,$2 $3 '${1}' ${6};${5}") out2+=("<tt><span bgcolor='$1' fgcolor='$CUR_FG'> <small>$CURRENT $1</small> </span></tt>,$2 $3 '${1}' ${6};${5}")
out2+=("^sep()") out2+=("^sep()")
for i in {15..135..15};do for i in {15..135..15};do
clr=$(pastel rotate $i "${1}" |pastel format hex) clr=$(pastel rotate $i "${1}" |pastel format hex)
out2+=("<tt><small>$clr</small> <span bgcolor='$clr'> </span> <small>$i°</small></tt>,$2 $3 '${clr}' ${6};${5}") out2+=("<tt><small>$clr</small> <span bgcolor='$clr'> </span>${ccol_ind} <small>$i°</small></tt>,$2 $3 '${clr}' ${6};${5}")
done done
# ROTATE HSL END # ROTATE HSL END

View File

@ -1,10 +1,12 @@
WINCLR | CLR | CLR0 | CLR1 | CLR2 |scheme_name WINCLR | CLR | CLR0 | CLR1 | CLR2 |WINTRANS|OUTLINE|SHADES | BORD | STIP |scheme_name
#142c2c|#309552|#accdc7|#61c4bc|#E8CB2D|Istredd default #142c2c|#309552|#accdc7|#61c4bc|#E8CB2D|false|false|false|true|0|Istredd default
#282936|#e9e9f4|#ea51b2|#00f769|#ebff87|Dracula #282936|#e9e9f4|#ea51b2|#00f769|#ebff87|false|false|false|false|1|Dracula
#282828|#ebdbb2|#98971a|#d79921|#cc241d|Gruvbox Dark #282828|#ebdbb2|#98971a|#d79921|#cc241d|false|false|false|false|1|Gruvbox Dark
#2D2A2E|#AB9DF2|#FCFCFA|#78DCE8|#A9DC76|Monokai Pro #2D2A2E|#AB9DF2|#FCFCFA|#78DCE8|#A9DC76|false|false|false|false|1|Monokai Pro
#2E3440|#B48EAD|#D8DEE9|#88C0D0|#EBCB8B|Nord #2E3440|#B48EAD|#D8DEE9|#88C0D0|#EBCB8B|false|false|false|false|1|Nord
#184956|#adbcbc|#ff665c|#84c747|#ebc13d|Selenized Dark #f8f8f8|#181415|#282828|#0e8420|#e95620|true|false|true|false|1|transparent DarkTxt
#ECE3CC|#3A4D53|#AD8900|#CC1729|#428B00|Selenized Light #1b1b1b|#bbc8c8|#f2f2f2|#84c747|#ebc13d|true|false|false|false|1|transparent WhiteTxt
#151718|#D6D6D6|#CD3F45|#9FCA56|#E6CD69|Seti #184956|#adbcbc|#ff665c|#84c747|#ebc13d|false|false|false|false|1|Selenized Dark
#1d1f21|#b294bb|#c5c8c6|#81a2be|#b5bd68|Tomorrow Nigh #ECE3CC|#3A4D53|#AD8900|#CC1729|#428B00|false|false|false|false|1|Selenized Light
#151718|#D6D6D6|#CD3F45|#9FCA56|#E6CD69|false|false|false|false|1|Seti
#1d1f21|#b294bb|#c5c8c6|#81a2be|#b5bd68|false|false|false|false|1|Tomorrow Nigh

1 WINCLR CLR CLR0 CLR1 CLR2 WINTRANS OUTLINE SHADES BORD STIP scheme_name
2 #142c2c #309552 #accdc7 #61c4bc #E8CB2D false false false true 0 Istredd default
3 #282936 #e9e9f4 #ea51b2 #00f769 #ebff87 false false false false 1 Dracula
4 #282828 #ebdbb2 #98971a #d79921 #cc241d false false false false 1 Gruvbox Dark
5 #2D2A2E #AB9DF2 #FCFCFA #78DCE8 #A9DC76 false false false false 1 Monokai Pro
6 #2E3440 #B48EAD #D8DEE9 #88C0D0 #EBCB8B false false false false 1 Nord
7 #184956 #f8f8f8 #adbcbc #181415 #ff665c #282828 #84c747 #0e8420 #ebc13d #e95620 true false true false 1 Selenized Dark transparent DarkTxt
8 #ECE3CC #1b1b1b #3A4D53 #bbc8c8 #AD8900 #f2f2f2 #CC1729 #84c747 #428B00 #ebc13d true false false false 1 Selenized Light transparent WhiteTxt
9 #151718 #184956 #D6D6D6 #adbcbc #CD3F45 #ff665c #9FCA56 #84c747 #E6CD69 #ebc13d false false false false 1 Seti Selenized Dark
10 #1d1f21 #ECE3CC #b294bb #3A4D53 #c5c8c6 #AD8900 #81a2be #CC1729 #b5bd68 #428B00 false false false false 1 Tomorrow Nigh Selenized Light
11 #151718 #D6D6D6 #CD3F45 #9FCA56 #E6CD69 false false false false 1 Seti
12 #1d1f21 #b294bb #c5c8c6 #81a2be #b5bd68 false false false false 1 Tomorrow Nigh