From 76ac2a37aa5b61b654ef20ac70cf772a6ed430d2 Mon Sep 17 00:00:00 2001 From: Daniel Napora Date: Sat, 3 Dec 2022 16:23:34 +0100 Subject: [PATCH] big conky update --- bin/colorizer-conky | 56 ++- bin/conkyctl | 411 ++++++++++++++++-- bin/conkymountpoints.sh | 3 +- share/mabox-colorizer/help/en.html | 19 +- share/mabox-colorizer/help/pl.html | 66 +-- .../themes/conky/default.colors | 5 + .../themes/conky/doom-one.colors | 5 + .../themes/conky/dracula.colors | 5 + .../themes/conky/gruvbox-dark.colors | 5 + .../themes/conky/gruvbox-light.colors | 5 + .../themes/conky/marooned.colors | 5 + .../themes/conky/mellow-purple.colors | 5 + .../themes/conky/mono-cyan.colors | 5 + .../themes/conky/mono-red.colors | 5 + .../themes/conky/mono-yellow.colors | 5 + .../themes/conky/one-light.colors | 5 + .../themes/conky/selenized-dark.colors | 5 + .../themes/conky/selenized-light.colors | 5 + .../mabox-colorizer/themes/conky/seti.colors | 5 + 19 files changed, 538 insertions(+), 87 deletions(-) create mode 100644 share/mabox-colorizer/themes/conky/default.colors create mode 100644 share/mabox-colorizer/themes/conky/doom-one.colors create mode 100644 share/mabox-colorizer/themes/conky/dracula.colors create mode 100644 share/mabox-colorizer/themes/conky/gruvbox-dark.colors create mode 100644 share/mabox-colorizer/themes/conky/gruvbox-light.colors create mode 100644 share/mabox-colorizer/themes/conky/marooned.colors create mode 100644 share/mabox-colorizer/themes/conky/mellow-purple.colors create mode 100644 share/mabox-colorizer/themes/conky/mono-cyan.colors create mode 100644 share/mabox-colorizer/themes/conky/mono-red.colors create mode 100644 share/mabox-colorizer/themes/conky/mono-yellow.colors create mode 100644 share/mabox-colorizer/themes/conky/one-light.colors create mode 100644 share/mabox-colorizer/themes/conky/selenized-dark.colors create mode 100644 share/mabox-colorizer/themes/conky/selenized-light.colors create mode 100644 share/mabox-colorizer/themes/conky/seti.colors diff --git a/bin/colorizer-conky b/bin/colorizer-conky index f5822d8..a88aae8 100755 --- a/bin/colorizer-conky +++ b/bin/colorizer-conky @@ -3,6 +3,14 @@ me="colorizer-conky -s" CONKYDIR="$HOME/.config/conky" BASECONKY="$CONKYDIR/sysinfo_mbcolor.conkyrc" +COLORIZERDIR="$HOME/.config/colorizer" + +CONKYTHEMEDIR="$COLORIZERDIR/conky/themes" +if [ ! -d "$CONKYTHEMEDIR" ];then +mkdir -p "$CONKYTHEMEDIR" +rsync -a /usr/share/mabox-colorizer/themes/conky/* ${CONKYTHEMEDIR}/ +fi + LNG=${LANG:0:2} if [ ! -f "${BASECONKY}" ]; then if [ -d "/usr/share/mabox/lang/$LNG/.config/conky" ]; then @@ -22,11 +30,15 @@ fi case "$LANG" in pl*) - COLORIZECONKY="Pokoloruj Conky" + COLORIZECONKY="Conky Colorizer" + MOVEABLEALL="Ustaw wszystkie (poprzez przeciąganie)..." GENERATEFROMWP="Generuj z kolorów tapety" LIGHTBG="Jasne tło" DARKBG="Ciemne tło" GLOBALSETTINGS="Ustawienia globalne (zmień dla wszystkich)" + REGENERATE="Motywy kolorów" + OPENTHEMEDIR="Otwórz katalog motywów" + APPLY_THEME="Zastosuj motyw" DEFCOLOR="Domyślny kolor (tekst i ramka)" COLOR_0="Kolor 0 (tekst2)" COLOR_1="Kolor 1 (większy tekst)" @@ -56,10 +68,14 @@ case "$LANG" in ;; *) COLORIZECONKY="Colorize Conky" + MOVEABLEALL="Make moveable all..." GENERATEFROMWP="Generate from wallpaper colors" LIGHTBG="Light Background" DARKBG="Dark Background" GLOBALSETTINGS="Global settings (apply to all)" + REGENERATE="Color schemes" + OPENTHEMEDIR="Open schemes dir" + APPLY_THEME="Apply colorscheme" DEFCOLOR="Default color (text and border)" COLOR_0="Color 0 (text2)" COLOR_1="Color 1 (bigger text)" @@ -121,26 +137,42 @@ if pgrep -af "conky.*mbcolor" >/dev/null; then [[ "$WINTRANS" == false ]] && BG="bgcolor='$WINCLR'" || BG="" out+=("^sep($COLORIZECONKY)") - out+=("^sep($GENERATEFROMWP)") - out+=("$LIGHTBG,w2theme conky light;$me") - out+=("$DARKBG,w2theme conky dark;$me") + out+=(" $MOVEABLEALL,conkyctl makemoveableall") out+=("^sep($GLOBALSETTINGS)") + 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") + done + out2+=("^sep()") + out2+=(" $OPENTHEMEDIR,xdg-open ${COLORIZERDIR}/conky/themes/") + 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 + out+=("$TRANSPARENT [ $WINTRANS ],^checkout(trans)") + 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()") - if [ "$WINTRANS" == false ];then - out+=(" AbCd $BACKGROUND,^checkout(trans)") - else - out+=("transparent $BACKGROUND,^checkout(trans)") - fi + #out+=("^sep()") out2+=("^tag(trans)") out2+=("^sep($TRANSPARENT)") out2+=("$YES,conkyctl transparent_all true;$me") out2+=("$NO,conkyctl transparent_all false;$me") - out2+=("^sep()") - out2+=(" $BACKGROUND,^pipe(mbclr '$WINCLR' conkyctl win_bgcolor_all '${BACKGROUND}' '$me')") out+=("^sep()") out+=("$FONTS [ $FONT $FONTSIZE ],^checkout(font)") out2+=("^tag(font)") diff --git a/bin/conkyctl b/bin/conkyctl index 2f76204..a77c34e 100755 --- a/bin/conkyctl +++ b/bin/conkyctl @@ -4,6 +4,13 @@ CONKYDIR="$HOME/.config/conky" BASECONKY="$CONKYDIR/sysinfo_mbcolor.conkyrc" SESSIONFILE="$CONKYDIR/conky-sessionfile" +COLORIZERDIR="$HOME/.config/colorizer" +CONKYTHEMEDIR="$COLORIZERDIR/conky/themes" +CONKYTHEMEDIR="$COLORIZERDIR/conky/themes" +if [ ! -d "$CONKYTHEMEDIR" ];then +mkdir -p "$CONKYTHEMEDIR" +rsync -a /usr/share/mabox-colorizer/themes/conky/* ${CONKYTHEMEDIR}/ +fi update_session () { sleep 1 @@ -180,6 +187,12 @@ setpos () { ABORTED_SUMM="Anulowano!" ABORTED_BODY="\n...operacja anulowana" ;; + es*) + SUMM="Mark new position for ${title^} Conky" + BODY="\nDraw small rectangle to mark new position...\n (ESC or right click to abort)" + ABORTED_SUMM="Aborted!" + ABORTED_BODY="\n... operation aborted!" + ;; *) SUMM="Mark new position for ${title^} Conky" BODY="\nDraw small rectangle to mark new position...\n (ESC or right click to abort)" @@ -196,9 +209,9 @@ then notify-send.sh -i mbcc --replace-file=/tmp/conkyctlfile "${ABORTED_SUMM}" "${ABORTED_BODY}" else pos top_left ${1} - # improve gap_calculation here - ((X=X+16)) - ((Y=Y+16)) + # improve conky margin calculation here: gap = border_width + border_inner_margin + border_outer_margin + ((X=X+17)) + ((Y=Y+17)) gap_x ${X} ${1} gap_y ${Y} ${1} case "$LANG" in @@ -206,6 +219,10 @@ else THNX_SUMM="Dziękuję!" THNX_BODY="Zapisano nową pozycję ${title^} \n\tX: $X\n\tY: $Y" ;; + es*) + THNX_SUMM="Thank you!" + THNX_BODY="New position of ${title^} saved! \n\tX: $X\n\tY: $Y" + ;; *) THNX_SUMM="Thank you!" THNX_BODY="New position of ${title^} saved! \n\tX: $X\n\tY: $Y" @@ -240,24 +257,58 @@ restartone () { startone ${1} } makemoveableall () { + wmctrl -k on sd "own_window_type.*$" "own_window_type = 'normal'," ${CONKYDIR}/*mbcolor.conkyrc + case "$LANG" in + pl*) + TITLE="Przenieś Conky dokąd chcesz" + DESC="Możesz teraz przesuwać wszystkie Conky.\nPrzytrzymaj wciśnięty klawisz Alt i przesuń każde Conky gdzie chcesz\n " + CANCEL="Anuluj" + SAVE="Zapisz nowe pozycje" + ;; + es*) + TITLE="Move Conkies where you want" + DESC="Move Conkies to desired locations now...\n Hold Alt and drag Conkies one by one.\n" + CANCEL="Cancel" + SAVE="Save new positions" + ;; + *) + TITLE="Move Conkies where you want" + DESC="Move Conkies to desired locations now...\n Hold Alt and drag Conkies one by one.\n" + CANCEL="Cancel" + SAVE="Save new positions" + ;; + esac cmd=( yad --center --borders=20 - --title="Move Conkies where you want" - --text="Move Conkies to desired locations now...\n Hold Alt and drag Conkies one by one.\n" - --button="Cancel":1 - --button="Save new positions":0 + --title="$TITLE" + --text="$DESC" + --button="$CANCEL":1 + --button="$SAVE":0 ) "${cmd[@]}" exval=$? + #notify-send.sh -t 10000 "Exval" "${exval}" case $exval in 1) makedesktoptypeall;; 0) saveposall;; 252) makedesktoptypeall;; esac + } saveposall () { # save new positions here + while read -r WIN_ID b c X Y rest + do + conffile=$(xprop -id $WIN_ID |grep WM_COMMAND |cut -d'"' -f6) + pos top_left ${conffile} + #notify-send.sh -t 10000 "${X} ${Y}" "${conffile}" + # improve conky margin calculation here: gap = border_width + border_inner_margin + border_outer_margin + ((X=X+17)) + ((Y=Y+17)) + gap_x ${X} ${conffile} + gap_y ${Y} ${conffile} + done < <(wmctrl -lpG | grep '1 0 ') makedesktoptypeall } makedesktoptypeall () { @@ -286,6 +337,7 @@ languages () { case "$LANG" in pl*) POSITION="Pozycja" + MAKEMOVEABLE="Ustaw wszystkie (poprzez przeciąganie)..." MARKNEWPOS="Nowa pozycja (zaznacz na ekranie)..." ALIGNMENT="Wyrównanie" TOPLEFT="Góra po lewej" @@ -305,12 +357,18 @@ languages () { COLOR_1="Kolor 1 (większy tekst)" COLOR_2="Kolor 2 (pasek/graf)" BACKGROUND="Kolor tła" - REGENERATE="(Re)Generuj kolory" + REGENERATE="Motywy kolorów" + OPENTHEMEDIR="Otwórz katalog motywów" + APPLY_THEME="Zastosuj motyw" + APPLY_TO_ONE="Zastosuj do " + 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" RESETCOLORS="Przywróć domyślne kolory" GENFROMWP="Generuj z kolorów tapety" - TRANSPARENT="Przezroczyste?" + TRANSPARENT="Przezroczyste tło?" YES="Tak" NO="Nie" FONTS="Czcionka" @@ -331,9 +389,11 @@ languages () { STIPPLED_BORDERS="Nakrapiane" SOLID_LINE="linia ciągła" NOT_WORKING="Nie działa? Naprawmy to :)" + MOUNTPOINTS="Dyski (punkty montowania)" ;; - *) + es*) POSITION="Position" + MAKEMOVEABLE="Make moveable all..." MARKNEWPOS="New position (mark on the screen)..." ALIGNMENT="Alignment" TOPLEFT="TopLeft" @@ -354,11 +414,17 @@ languages () { COLOR_2="Color 2 (bars/graphs)" BACKGROUND="Background color" REGENERATE="(Re)Generate colors" + OPENTHEMEDIR="Open schemes dir" + APPLY_THEME="Color schemes" + APPLY_TO_ONE="Apply to " + APPLY_TO_ALL="Apply to All" + NEWTHEME="New Color scheme..." + SAVENEWTHEME="from current colors..." LIGHTBG="light" DARKBG="dark" RESETCOLORS="Restore default colors" GENFROMWP="Generate from wallpaper" - TRANSPARENT="Transparent?" + TRANSPARENT="Transparent background?" YES="Yes" NO="No" FONTS="Font" @@ -367,7 +433,7 @@ languages () { DECREASE="Decrease" OLINE="Outline" SHADOW="Shadow" - DRAW="Deaw" + DRAW="Draw" BORDERS="Borders" EDIT="Edit file" RELOAD="Reload" @@ -379,6 +445,63 @@ languages () { STIPPLED_BORDERS="Stippled borders" SOLID_LINE="solid line" NOT_WORKING="Not working? Try to fix" + MOUNTPOINTS="Discs (mount points)" + ;; + *) + POSITION="Position" + MAKEMOVEABLE="Make moveable all..." + MARKNEWPOS="New position (mark on the screen)..." + ALIGNMENT="Alignment" + TOPLEFT="TopLeft" + TOP="Top" + TOPRIGHT="TopRight" + LEFT="Left" + CENTER="Center" + RIGHT="Right" + BOTTOMLEFT="BottomLeft" + BOTTOM="Bottom" + BOTTOMRIGHT="BottomRight" + HORIZONTAL_GAP="Horizontal Gap" + VERTICAL_GAP="Vertical Gap" + COLORS="Colors" + DEFCOLOR="Default color (text and border)" + COLOR_0="Color 0 (text2)" + COLOR_1="Color 1 (bigger text)" + COLOR_2="Color 2 (bars/graphs)" + BACKGROUND="Background color" + REGENERATE="(Re)Generate colors" + OPENTHEMEDIR="Open schemes dir" + APPLY_THEME="Color schemes" + APPLY_TO_ONE="Apply to " + APPLY_TO_ALL="Apply to All" + NEWTHEME="New Color scheme..." + SAVENEWTHEME="from current colors..." + LIGHTBG="light" + DARKBG="dark" + RESETCOLORS="Restore default colors" + GENFROMWP="Generate from wallpaper" + TRANSPARENT="Transparent background?" + YES="Yes" + NO="No" + FONTS="Font" + SELECTFONT="Select Font..." + INCREASE="Increase" + DECREASE="Decrease" + OLINE="Outline" + SHADOW="Shadow" + DRAW="Draw" + BORDERS="Borders" + EDIT="Edit file" + RELOAD="Reload" + KILL="Kill" + LOGOSIZE="Logo size" + SMALL="Small" + NORMAL="Normal" + BIG="Big" + STIPPLED_BORDERS="Stippled borders" + SOLID_LINE="solid line" + NOT_WORKING="Not working? Try to fix" + MOUNTPOINTS="Discs (mount points)" ;; esac } @@ -390,7 +513,7 @@ single () { title=${name//_/ } # breaks mbclr color picking from contextmenu, leave it as "colorizer-conky -s" for now if [[ "$2" == "s" ]];then - me="colorizer-conky -s" + me="none none" else me="colorizer-conky -s" fi @@ -459,6 +582,8 @@ single () { for i in 0 10 20 30 40 60 80 100 120 140 160 180 200 220 240 260 280 300 320 340 360; do out3+=("${i},conkyctl gap_y ${i} ${1};$me") done + out2+=("^sep()") + out2+=(" $MAKEMOVEABLE,conkyctl makemoveableall") if [[ "$1" =~ "logo_mbcolor" ]]; then read LSIZE <<< "$(grep minimum_height ${1} | cut -d'=' -f2 | cut -d"," -f1)" @@ -480,6 +605,13 @@ single () { EDIT_CONF="Edytuj plik konfiguracyjny" RELOAD="Przeładuj" ;; + es*) + FONTSIZE="Font size" + QUOTE_FSIZE="Quote" + AUTHOR_FSIZE="Author" + EDIT_CONF="Edit conf file" + RELOAD="Reload" + ;; *) FONTSIZE="Font size" QUOTE_FSIZE="Quote" @@ -493,9 +625,6 @@ single () { out+=("^sep($FONTSIZE)") out+=("$QUOTE_FSIZE [ $quote_fontsize ],^checkout(qsize)") out+=("$AUTHOR_FSIZE [ $author_fontsize ],^checkout(asize)") - #out+=("^sep()") - #out+=("$EDIT_CONF,xdg-open '${Q_CFG}'") - #out+=("$RELOAD,conkyctl restartone ${1};$me") out2+=("^tag(qsize)") out2+=("^sep($QUOTE_FSIZE)") for i in 10 11 12 13 14 15 16 18 20; do @@ -509,36 +638,63 @@ single () { fi out+=("^sep($COLORS)") - if [[ "$1" != *"logo_mbcolor"* ]]; then - [[ "$CLR" != "#" ]] && out+=(" AbCd $DEFCOLOR,^pipe(mbclr '$CLR' conkyctl default_color '${DEFCOLOR}' '$me' ${1})") - [[ "$CLR0" != "#" ]] && out+=(" AbCd $COLOR_0,^pipe(mbclr '$CLR0' conkyctl color0 '$COLOR_0' '$me' ${1})") - [[ "$CLR1" != "#" ]] && out+=(" AbCd $COLOR_1,^pipe(mbclr '$CLR1' conkyctl color1 '$COLOR_1' '$me' ${1})") - [[ "$CLR2" != "#" ]] && out+=(" AbCd $COLOR_2,^pipe(mbclr '$CLR2' conkyctl color2 '$COLOR_2' '$me' ${1})") - out+=("^sep()") - fi if [ "$WINTRANS" == false ];then - out+=(" AbCd $BACKGROUND,^checkout(transsingle)") - else - out+=("transparent $BACKGROUND,^checkout(transsingle)") - fi - out+=("^sep()") - if [[ "$1" != *"logo_mbcolor"* ]]; then - out+=("$REGENERATE,^checkout(regensingle)") + + out+=(" $REGENERATE,^checkout(regensingle)") out2+=("^tag(regensingle)") out2+=("^sep($REGENERATE)") 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)") + out3+=("^sep($APPLY_TO_ALL)") + for i in "${COLORIZERDIR}"/conky/themes/*.colors + do + source "${i}" + themefilename=${i##*/} + themename=${themefilename%%.colors} + out2+=(" $themename,conkyctl settheme $themefilename $1") + #out3+=("TEST [ ${title^} ],notify-send.sh $themefilename $1") + out3+=(" $themename,conkyctl settheme_all $themefilename") + done + out2+=("^sep()") + out2+=(" $OPENTHEMEDIR,xdg-open ${COLORIZERDIR}/conky/themes/") + out2+=("^sep()") + out2+=("$APPLY_TO_ALL,^checkout(applytoall)") + if [[ "$1" =~ "sysinfo_" ]]; then + out2+=("^sep($NEWTHEME)") + out2+=("$SAVENEWTHEME,conkyctl newcolorscheme ${1}") + fi + + + out+=("^sep()") + + fi + + out+=("$TRANSPARENT [ $WINTRANS ],^checkout(transsingle)") + if [ "$WINTRANS" == false ];then + out+=(" AbCd $BACKGROUND,^pipe(mbclr '$WINCLR' conkyctl win_bgcolor '${BACKGROUND}' '$me' ${1})") + else + out+=(" transparent $BACKGROUND,^pipe(mbclr '$WINCLR' conkyctl win_bgcolor '${BACKGROUND}' '$me' ${1})") + fi + out+=("^sep()") + if [[ "$1" != *"logo_mbcolor"* ]]; then + + [[ "$CLR" != "#" ]] && out+=(" AbCd $DEFCOLOR,^pipe(mbclr '$CLR' conkyctl default_color '${DEFCOLOR}' '$me' ${1})") + [[ "$CLR0" != "#" ]] && out+=(" AbCd $COLOR_0,^pipe(mbclr '$CLR0' conkyctl color0 '$COLOR_0' '$me' ${1})") + [[ "$CLR1" != "#" ]] && out+=(" AbCd $COLOR_1,^pipe(mbclr '$CLR1' conkyctl color1 '$COLOR_1' '$me' ${1})") + [[ "$CLR2" != "#" ]] && out+=(" AbCd $COLOR_2,^pipe(mbclr '$CLR2' conkyctl color2 '$COLOR_2' '$me' ${1})") out+=("^sep()") fi + out2+=("^tag(transsingle)") out2+=("^sep($TRANSPARENT)") out2+=("$YES,conkyctl transparent true ${1};$me") out2+=("$NO,conkyctl transparent false ${1};$me") - out2+=("^sep()") - out2+=(" $BACKGROUND,^pipe(mbclr '$WINCLR' conkyctl win_bgcolor '${BACKGROUND}' '$me' ${1})") - #notify-send.sh "1" "${1}" + if [[ "$1" != *"logo_mbcolor"* ]]; then if [[ "$1" != *"quoter_mbcolor"* ]]; then out+=("$FONTS [ $FONT $FONTSIZE ],^checkout(fontsingle)") @@ -655,40 +811,64 @@ contextmenu () { single "${CONKYCFG}" "s" + + out+=("^sep()") + out+=(" ⮜⮜⮜ Colorizer Conky,colorizer-conky -s") + + if [[ "$CONKYCFG" =~ "mount_points" ]]; then + out+=("^sep($MOUNTPOINTS)") + while read DEVICE SIZE USED FREE PERCENT MOUNT + do + [[ "${#MOUNT}" -gt "10" ]] && MOUNTLBL=${MOUNT##*/} || MOUNTLBL=${MOUNT} + [[ "${#MOUNTLBL}" -gt "10" ]] && MOUNTLBL=${MOUNTLBL:0:9} + out+=("$MOUNTLBL,^pipe(jgbrowser ${MOUNT})") + done < <(df -h | grep -v "boot" | grep '^/dev') + fi + + mkconfigfile - # if conky_contextmenu_colors = conky - echo "color_menu_bg=${WINCLR} 100" >> ${CONFIG_FILE} + echo "color_menu_bg_to=${WINCLR} 100" >> ${CONFIG_FILE} TXTCOLOR=$(pastel textcolor ${WINCLR}|pastel format hex) #notify-send.sh "TXTCOLOR" "${TXTCOLOR} ${menu_gradient_pos}" - if [ "$TXTCOLOR" == "#ffffff" ];then + if [ "$TXTCOLOR" == "#ffffff" ];then #bg is dark TXTCOLOR_NORM="#cccccc" + WINCLR=$(pastel lighten 0.03 ${WINCLR}|pastel format hex) echo "color_norm_fg=${TXTCOLOR_NORM} 100" >> ${CONFIG_FILE} echo "color_sel_fg=${TXTCOLOR} 100" >> ${CONFIG_FILE} echo "color_title_fg=${TXTCOLOR} 60" >> ${CONFIG_FILE} - SELBG=$(pastel darken 0.1 ${WINCLR}|pastel format hex) + SELBG=$(pastel darken 0.05 ${WINCLR}|pastel format hex) echo "color_sel_bg=${SELBG} 80" >> ${CONFIG_FILE} echo "color_title_bg=${SELBG} 30" >> ${CONFIG_FILE} echo "color_title_border=${SELBG} 60" >> ${CONFIG_FILE} - else + else #bg is light TXTCOLOR_NORM="#333333" echo "color_norm_fg=${TXTCOLOR_NORM} 100" >> ${CONFIG_FILE} echo "color_sel_fg=${TXTCOLOR} 100" >> ${CONFIG_FILE} echo "color_title_fg=${TXTCOLOR} 90" >> ${CONFIG_FILE} - SELBG=$(pastel darken 0.1 ${WINCLR}|pastel format hex) + SELBG=$(pastel darken 0.05 ${WINCLR}|pastel format hex) echo "color_sel_bg=${SELBG} 80" >> ${CONFIG_FILE} echo "color_title_bg=${SELBG} 90" >> ${CONFIG_FILE} echo "color_title_border=${SELBG} 90" >> ${CONFIG_FILE} fi + echo "color_menu_bg=${WINCLR} 90" >> ${CONFIG_FILE} + echo "color_menu_border=${CLR} 60" >> ${CONFIG_FILE} + echo "menu_border=2" >> ${CONFIG_FILE} + echo "menu_radius=4" >> ${CONFIG_FILE} echo "color_sep_fg=${CLR} 10" >> ${CONFIG_FILE} + echo "font=${FONT} 10" >> ${CONFIG_FILE} case "$LANG" in pl*) CUSTOM_COMMANDS_SEP="Własne polecenia" EDIT_CUSTOMCOMMANDS=" Edytuj własne polecenia" ;; + es*) + CUSTOM_COMMANDS_SEP="Custom commands" + EDIT_CUSTOMCOMMANDS=" Edit custom commands" + ;; *) CUSTOM_COMMANDS_SEP="Custom commands" EDIT_CUSTOMCOMMANDS=" Edit custom commands" @@ -700,7 +880,6 @@ if [ "$LINES" -gt "0" ]; then cat < ${MENU_ITEMS} $(printf '%s\n' "${out[@]}") - ⮜⮜⮜ Colorizer Conky,colorizer-conky -s ^sep($CUSTOM_COMMANDS_SEP) $EDIT_CUSTOMCOMMANDS,touch ~/.config/mabox/${name}.csv;sleep 1;xdg-open ~/.config/mabox/${name}.csv ^sep() @@ -711,8 +890,6 @@ EOF else cat < ${MENU_ITEMS} $(printf '%s\n' "${out[@]}") -^sep() - ⮜⮜⮜ Colorizer Conky,colorizer-conky -s ^sep($CUSTOM_COMMANDS_SEP) ${CUSTOMCOMMANDS} $EDIT_CUSTOMCOMMANDS,touch ~/.config/mabox/${name}.csv;sleep 1;xdg-open ~/.config/mabox/${name}.csv @@ -723,8 +900,6 @@ fi else cat < ${MENU_ITEMS} $(printf '%s\n' "${out[@]}") -^sep() - ⮜⮜⮜ Colorizer Conky,colorizer-conky -s ^sep($CUSTOM_COMMANDS_SEP) $EDIT_CUSTOMCOMMANDS,touch ~/.config/mabox/${name}.csv;sleep 1;xdg-open ~/.config/mabox/${name}.csv ${CUSTOMCOMMANDS} @@ -752,6 +927,12 @@ case "$LANG" in IP="Adres IP" DOWNLOAD="Pobieranie" ;; + es*) + NETWORK="NETWORK" + DEVICE="Device" + IP="IP" + DOWNLOAD="Download" + ;; *) NETWORK="NETWORK" DEVICE="Device" @@ -776,6 +957,145 @@ EOF cat /tmp/xx00 > ${CFGFILE} } +settheme () { + source "$COLORIZERDIR"/conky/themes/${1} + win_bgcolor ${own_window_colour} $2 + default_color ${default_color} $2 + color0 ${color0} $2 + color1 ${color1} $2 + color2 ${color2} $2 +} + +settheme_all () { + source "$COLORIZERDIR"/conky/themes/${1} + win_bgcolor_all ${own_window_colour} + default_color_all ${default_color} + color0_all ${color0} + color1_all ${color1} + color2_all ${color2} +} + +savecolorscheme () { + # $1 - themename $2 - source conkyrc + #notify-send.sh "${1}" "${2}" + ## get colors + read WINCLR <<< "$(grep own_window_colour ${2} | cut -d'=' -f2 | cut -d"'" -f2)" + [[ $WINCLR =~ ^#.* ]] && : || WINCLR="#${WINCLR}" + + read CLR <<< "$(grep default_color ${2} | cut -d'=' -f2 | cut -d"'" -f2)" + [[ $CLR =~ ^#.* ]] && : || CLR="#${CLR}" + read CLR0 <<< "$(grep color0 ${2} | cut -d'=' -f2 | cut -d"'" -f2)" + [[ $CLR0 =~ ^#.* ]] && : || CLR0="#${CLR0}" + read CLR1 <<< "$(grep color1 ${2} | cut -d'=' -f2 | cut -d"'" -f2)" + [[ $CLR1 =~ ^#.* ]] && : || CLR1="#${CLR1}" + read CLR2 <<< "$(grep color2 ${2} | cut -d'=' -f2 | cut -d"'" -f2)" + [[ $CLR2 =~ ^#.* ]] && : || CLR2="#${CLR2}" + +cat << EOF > "$CONKYTHEMEDIR/$1".colors +own_window_colour='${WINCLR}' +default_color='${CLR}' +color0='${CLR0}' +color1='${CLR1}' +color2='${CLR2}' +EOF + case "$LANG" in + pl*) + TITLE="Zapisano motyw ${themename}!" + DESC="Czy zastosować motyw ${themename} do wszystkich Conky?\n" + NO="Nie, dzieki" + YES="Tak, zastosuj do wszystkich" + ;; + es*) + TITLE="Colorscheme ${themename} saved!" + DESC="Do you want to apply ${themename} color scheme to all Conky?\n" + NO="No,thanks" + YES="Yes, apply to all" + ;; + *) + TITLE="Colorscheme ${themename} saved!" + DESC="Do you want to apply ${themename} color scheme to all Conky?\n" + NO="No,thanks" + YES="Yes, apply to all" + ;; + esac + cmd=( + yad --center --borders=20 + --title="$TITLE" + --text="$DESC" + --button="$NO":1 + --button="$YES":0 + ) + "${cmd[@]}" + exval=$? + case $exval in + 1) :;; + 0) settheme_all "${themename}.colors";; + 252) :;; + esac +} + +newcolorscheme () { + #notify-send.sh "NEW" "${1}" + case "$LANG" in + pl*) + SAVE_AS="Zapisz motyw jako..." + LABEL="Nazwa motywu kolorów:" + NAME="nazwa-motywu" + ;; + *) + SAVE_AS="Save theme as..." + LABEL="Conky colorscheme name:" + NAME="colorscheme-name" + ;; + *) + SAVE_AS="Save theme as..." + LABEL="Conky colorscheme name:" + NAME="colorscheme-name" + ;; + esac + themename=$(yad --center --width=300 --title "$SAVE_AS" --entry --entry-label="$LABEL" --entry-text="$NAME") || exit 1 + themename="${themename// /-}" + if [[ -f "$CONKYTHEMEDIR/${themename}.colors" ]]; then + # Themefile EXIST overwrite??? + case "$LANG" in + pl*) + TITLE="Nadpisać?" + EXIST="Motyw ${themename} już istnieje.\nNadpisać?" + CANCEL="Anuluj" + YES="Tak, nadpisz" + ;; + es*) + TITLE="Overwrite?" + EXIST="Colorscheme ${themename} exist.\nOverwrite?" + CANCEL="Cancel" + YES="Yes, overwrite" + ;; + *) + TITLE="Overwrite?" + EXIST="Colorscheme ${themename} exist.\nOverwrite?" + CANCEL="Cancel" + YES="Yes, overwrite" + ;; + esac + cmd=( + yad --center --borders=20 + --title="$TITLE" + --text="$EXIST" + --button="$CANCEL":1 + --button="$YES ${themename}":0 + ) + "${cmd[@]}" + exval=$? + case $exval in + 1) :;; + 0) savecolorscheme "${themename}" "${1}";; + 252) :;; + esac + else # New themefile, create + savecolorscheme "${themename}" "${1}" + fi +} + case "$1" in transparent_all) transparent_all "$2";; transparent) transparent "$2" "$3";; @@ -816,6 +1136,9 @@ case "$1" in saveposall) saveposall;; resetcolorsall) resetcolorsall ;; resetcolorsone) resetcolorsone "$2";; + settheme) settheme "$2" "$3";; + settheme_all) settheme_all "$2";; + newcolorscheme) newcolorscheme "$2";; netdevice) netdevice ;; *) : ;; esac diff --git a/bin/conkymountpoints.sh b/bin/conkymountpoints.sh index 6102602..ec27a9d 100755 --- a/bin/conkymountpoints.sh +++ b/bin/conkymountpoints.sh @@ -3,7 +3,8 @@ getdata () { df -h | grep -v "boot" | grep '^/dev' | while read DEVICE SIZE USED FREE PERCENT MOUNT do -[[ "${#MOUNT}" -gt "12" ]] && MOUNTLBL=${MOUNT##*/} || MOUNTLBL=${MOUNT} +[[ "${#MOUNT}" -gt "10" ]] && MOUNTLBL=${MOUNT##*/} || MOUNTLBL=${MOUNT} +[[ "${#MOUNTLBL}" -gt "10" ]] && MOUNTLBL=${MOUNTLBL:0:9} echo "$MOUNTLBL\${goto 90}\${color2}\${fs_bar 6,64 $MOUNT}\${color}\${goto 160}$USED\${goto 200}$PERCENT\${alignr}$SIZE" done } diff --git a/share/mabox-colorizer/help/en.html b/share/mabox-colorizer/help/en.html index 2cac771..05c99ba 100644 --- a/share/mabox-colorizer/help/en.html +++ b/share/mabox-colorizer/help/en.html @@ -109,9 +109,8 @@ Changing the background color will also set:
  • border color to the same color
  • computed BGCOLOR_TO color for a subtle gradient
    • -
  • accent color in Menu, Sidepanels and other jgmenu-based Mabox tools
-You can change all of them to you liking afterwards. +You can change them to you liking afterwards.

Buttons

@@ -171,7 +170,7 @@ You can change all of them to you liking afterwards. - Raised or flat? + Raised, flat or sunken? Raised @@ -181,6 +180,10 @@ You can change all of them to you liking afterwards. Flat + + Sunken + +
@@ -209,6 +212,16 @@ You can change all of them to you liking afterwards.

Global settings allow you to change all Conky at once.

Individual settings allow you to tweak individual Conkies, which can be very convenient to fit some wallpapers.

+

NEW! Context menu for individual Conkies

+

Mabox delivers Conky on steroids ;)

+

For each individual Conky there is a context menu (right click).

+

The context menu offers interesting possibilities: +

    +
  • Change position, colors and other settings for individual Conky
    • +
  • Set predefined color themes
    • +
  • Adding your own commands (for each Conky separately)
    • +

+