From 785adde17257ff59b53786561453bc337efa6806 Mon Sep 17 00:00:00 2001 From: Daniel Napora Date: Sat, 27 Aug 2022 16:36:46 +0200 Subject: [PATCH] a week update --- bin/colorizer-conky | 35 +++-- bin/colorizer-ob | 207 +++++++++++++++++++++-------- bin/conkyctl | 76 +++++++---- bin/mbclr | 12 +- share/mabox-colorizer/help/en.html | 9 ++ 5 files changed, 238 insertions(+), 101 deletions(-) diff --git a/bin/colorizer-conky b/bin/colorizer-conky index 51402a2..368d00a 100755 --- a/bin/colorizer-conky +++ b/bin/colorizer-conky @@ -27,8 +27,10 @@ case "$LANG" in LIGHTBG="Jasne tło" DARKBG="Ciemne tło" GLOBALSETTINGS="Ustawienia globalne (zmień dla wszystkich)" - DEFCOLOR="Domyślny kolor" - COLOR="Kolor" + DEFCOLOR="Domyślny kolor (tekst i ramka)" + COLOR_0="Kolor 0 (tekst2)" + COLOR_1="Kolor 1 (większy tekst)" + COLOR_2="Kolor 2 (pasek/graf)" BACKGROUND="Kolor tła" TRANSPARENT="Przezroczyste?" YES="Tak" @@ -41,6 +43,8 @@ case "$LANG" in SHADOW="Cień" DRAW="Rysuj" BORDERS="Obramowanie" + STIPPLED_BORDERS="Nakrapiane" + SOLID_LINE="linia ciągła" INDSETTINGS="Ustawiania indywidualne" MORECONKIES="Więcej Conky..." CLICKTOSTART="Kliknij aby uruchomić" @@ -55,8 +59,10 @@ case "$LANG" in LIGHTBG="Light Background" DARKBG="Dark Background" GLOBALSETTINGS="Global settings (apply to all)" - DEFCOLOR="Default color" - COLOR="Color" + 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" TRANSPARENT="Transparent?" YES="Yes" @@ -67,8 +73,10 @@ case "$LANG" in DECREASE="Decrease" OLINE="Outline" SHADOW="Shadow" - DRAW="Rysuj" + DRAW="Draw" BORDERS="Borders" + STIPPLED_BORDERS="Stippled borders" + SOLID_LINE="solid line" INDSETTINGS="Individual settings" MORECONKIES="More Conkies Available" CLICKTOSTART="click to start" @@ -115,13 +123,13 @@ if pgrep -af "conky.*mbcolor" >/dev/null; then out+=("$LIGHTBG,w2theme conky light;$me") out+=("$DARKBG,w2theme conky dark;$me") out+=("^sep($GLOBALSETTINGS)") - out+=(" AbCd $DEFCOLOR (text and border),^pipe(mbclr '$CLR' conkyctl default_color_all DEFAULT_COLOR '$me')") - out+=(" AbCd $COLOR 0 (text2),^pipe(mbclr '$CLR0' conkyctl color0_all COLOR_0 '$me')") - out+=(" AbCd $COLOR 1 (bigger text),^pipe(mbclr '$CLR1' conkyctl color1_all COLOR_1 '$me')") - out+=(" AbCd $COLOR 2 (bars/graphs),^pipe(mbclr '$CLR2' conkyctl color2_all COLOR_2 '$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()") if [ "$WINTRANS" == false ];then - out+=(" AbCd $BACKGROUND,^checkout(trans)") + out+=(" AbCd $BACKGROUND,^checkout(trans)") else out+=("transparent $BACKGROUND,^checkout(trans)") fi @@ -130,7 +138,7 @@ if pgrep -af "conky.*mbcolor" >/dev/null; then 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 WIN_BGCOLOR '$me')") + out2+=(" $BACKGROUND,^pipe(mbclr '$WINCLR' conkyctl win_bgcolor_all '${BACKGROUND}' '$me')") out+=("^sep()") out+=("$FONTS [ $FONT $FONTSIZE ],^checkout(font)") out2+=("^tag(font)") @@ -154,8 +162,9 @@ if pgrep -af "conky.*mbcolor" >/dev/null; then out2+=("^sep($DRAW $BORDERS?)") out2+=("$YES,conkyctl draw_borders_all true;$me") out2+=("$NO,conkyctl draw_borders_all false;$me") - out2+=("^sep(STIPPLED BORDERS?)") - out2+=("0,conkyctl stippled_borders_all 0;$me") + out2+=("^sep($STIPPLED_BORDERS?)") + out2+=("0 ($SOLID_LINE),conkyctl stippled_borders_all 0;$me") + out2+=("^sep()") out2+=("1,conkyctl stippled_borders_all 1;$me") out2+=("2,conkyctl stippled_borders_all 2;$me") out2+=("3,conkyctl stippled_borders_all 3;$me") diff --git a/bin/colorizer-ob b/bin/colorizer-ob index 74ec17c..f125d61 100755 --- a/bin/colorizer-ob +++ b/bin/colorizer-ob @@ -12,6 +12,103 @@ OBTHEME=$(awk '// {while (getline n) {if (match(n, //)) THEMERC="$HOME/.themes/$OBTHEME/openbox-3/themerc" me="colorizer-ob -s" + +case "$LANG" in + pl*) + OBTHEME_LBL="Motyw OpenBox" + TITLEBAR="Pasek tytułowy" + ACTIVE_BG="Tło aktywnego okna" + INACTIVE_BG="Tło nieaktywnego okna" + TITLEBAR_TEXT="Tekst paska tytułowego" + FONT="Czcionka" + TEXTALIGN="Wyrównanie tekstu" + SHADOW="Cień" + NOSHADOW="bez cienia" + DARK="Ciemny" + LIGHT="Jasny" + TEXT="Tekst" + ACTIVE_FG="w aktywnym oknie" + INACTIVE_FG="w nieaktywnym oknie" + PADDING="Odstęp" + VERTICAL="W pionie" + HORIZONTAL="W poziomie" + RAISED_OR_FLAT="Podniesiony czy płaski" + FLAT="płaski - flat" + RAISED="podniesiony - raised" + BUTTONS="Przyciski" + GRADIENT_TYPE="Typ Gradientu" + SOLID_COLOR="Jednolity kolor (brak gradientu)" + SPLITVERTICAL="Podział w pionie" + MIRRORHORIZONTAL="LustroPoziome" + DIAGONAL="Przekątna" + CROSSDIAGONAL="Przekątna krzyżowa" + PYRAMID="Piramida" + ACTIVE_BG_TO="Tło aktywnego okna 2" + INACTIVE_BG_TO="Tło nieaktywnego okna 2" + BORDER="Obramowanie (px)" + ACTIVE_BORDER="Obramowanie aktywnego okna" + INACTIVE_BORDER="Obramowanie nieaktywnego okna" + HANDLEWIDTH="Uchwyt - rozmiar" + ACTIVEHANDLE="Aktywny Uchwyt" + YES="Tak" + NO="Nie" + GRIPONLY="Tylko chwyt (po bokach)" + RESET="Resetuj" + RESET_THEME="Resetuj motyw" + AREYOUSURE="Czy aby na pewno?" + NOT_SUPORTED_OBTHEME="Nie wspierany motyw" + SWITCH_TO_MBCOLORS="Przełącz na MBColors" + ;; + *) + OBTHEME_LBL="OpenBox theme" + TITLEBAR="Title Bar" + ACTIVE_BG="Active Background" + INACTIVE_BG="Inactive Background" + TITLEBAR_TEXT="Title Bar Text" + FONT="Font" + TEXTALIGN="Text align" + SHADOW="Shadow" + NOSHADOW="no shadow" + DARK="Dark" + LIGHT="Light" + TEXT="Text" + ACTIVE_FG="in active window" + INACTIVE_FG="in inactive window" + PADDING="Padding" + VERTICAL="Vertical" + HORIZONTAL="Horizontal" + RAISED_OR_FLAT="Raised or Flat" + FLAT="flat" + RAISED="raised" + BUTTONS="Buttons" + GRADIENT_TYPE="Gradient type" + SPLITVERTICAL="SplitVertical" + MIRRORHORIZONTAL="MirrorHorizontal" + DIAGONAL="Diagonal" + CROSSDIAGONAL="CrossDiagonal" + PYRAMID="Pyramid" + SOLID_COLOR="Solid color (no gradient)" + VERTICAL="" + ACTIVE_BG_TO="Active Background to" + INACTIVE_BG_TO="Inactive Background to" + BORDER="Border (px)" + ACTIVE_BORDER="Active Border" + INACTIVE_BORDER="Inactiva Border" + HANDLEWIDTH="Handle Width" + ACTIVEHANDLE="Active Handle" + YES="Yes" + NO="No" + GRIPONLY="Grip only" + 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" + ;; +esac + + + if [ -f "$THEMERC" ]; then if [ ! -f "${THEMERC}.bak" ]; then cp ${THEMERC} ${THEMERC}.bak @@ -66,30 +163,34 @@ getvalues () { } getvalues -out+=("^sep(Openbox theme: $OBTHEME)") -out+=("^sep(TITLEBAR)") -out+=(" ACTIVE_BG,^pipe(mbclr '$ABG' obtctl clractivebg ACTIVE_BG '$me')") -out+=(" INACTIVE_BG,^pipe(mbclr '$NBG' obtctl clrnormalbg INACTIVE_BG '$me')") -out+=(" AbCd TITLEBAR TEXT,^checkout(titletext)") +out+=("^sep($OBTHEME_LBL: $OBTHEME)") +out+=("^sep($TITLEBAR)") +out+=(" $ACTIVE_BG,^pipe(mbclr '$ABG' obtctl clractivebg '${ACTIVE_BG}' '$me')") +out+=(" $INACTIVE_BG,^pipe(mbclr '$NBG' obtctl clrnormalbg '${INACTIVE_BG}' '$me')") +out+=(" AbCd $TITLEBAR_TEXT,^checkout(titletext)") -out+=("PADDING [ $PHEIGHT $PWIDTH ],^checkout(padding)") -out+=("Raised or flat? [ $WINRAISED ],^checkout(raised)") +out+=("$PADDING [ $PHEIGHT $PWIDTH ],^checkout(padding)") +out+=("$RAISED_OR_FLAT? [ $WINRAISED ],^checkout(raised)") out+=("^sep()") -out+=("Titlebar Buttons,^checkout(tbuttons)") +out+=("$BUTTONS,^checkout(tbuttons)") out+=("^sep(Gradient)") -out+=("Gradient type [ ${REST##* } ],^checkout(gradient)") -[[ ! -z "$ABGTO" ]] && out+=(" ACTIVE_BG_TO,^pipe(mbclr '$ABGTO' obtctl clractivebgto ACTIVE_BG_TO '$me')") -[[ ! -z "$ABGTO" ]] && out+=(" INACTIVE_BG_TO,^pipe(mbclr '$NBGTO' obtctl clrnormalbgto INACTIVE_BG_TO '$me')") -out+=("^sep(BORDER)") -out+=(" ACTIVE_BORDER,^pipe(mbclr '$ALINE' obtctl activeborderColor ACTIVE_BORDER_COLOR '$me')") -out+=(" INACTIVE_BORDER,^pipe(mbclr '$NLINE' obtctl inactiveborderColor INACTIVE_BORDER_COLOR '$me')") -out+=("BORDER [ $BORD ],^checkout(border)") -out+=("HANDLEWIDTH [ $HANDLE ],^checkout(handlewidth)") -out+=("ACTIVEHANDLE? [ $AHANDLE ],^checkout(handle)") +out+=("$GRADIENT_TYPE [ ${REST##* } ],^checkout(gradient)") +[[ ! -z "$ABGTO" ]] && out+=(" $ACTIVE_BG_TO,^pipe(mbclr '$ABGTO' obtctl clractivebgto '${ACTIVE_BG_TO}' '$me')") +[[ ! -z "$ABGTO" ]] && out+=(" $INACTIVE_BG_TO,^pipe(mbclr '$NBGTO' obtctl clrnormalbgto '${INACTIVE_BG_TO}' '$me')") +out+=("^sep($BORDER)") +out+=(" $ACTIVE_BORDER,^pipe(mbclr '$ALINE' obtctl activeborderColor '${ACTIVE_BORDER_COLOR}' '$me')") +out+=(" $INACTIVE_BORDER,^pipe(mbclr '$NLINE' obtctl inactiveborderColor '${INACTIVE_BORDER_COLOR}' '$me')") +out+=("$BORDER [ $BORD ],^checkout(border)") +out+=("$HANDLEWIDTH [ $HANDLE ],^checkout(handlewidth)") +out+=("$ACTIVEHANDLE? [ $AHANDLE ],^checkout(handle)") if [ -f "${THEMERC}.bak" ]; then -out+=("^sep()") -out+=("RESET TO DEFAULTS,obtctl reset;$me") + +out+=("^sep($RESET)") +out+=("$RESET_THEME,^checkout(resettheme)") + out2+=("^tag(resettheme)") + out2+=("^sep($AREYOUSURE)") + out2+=("$YES,obctl reset;$me") fi #out+=("Edit...,xdg-open ${THEMERC}") @@ -102,35 +203,35 @@ fi #done #TBUTTONS out2+=("^tag(tbuttons)") -out2+=("^sep(Titlebar Buttons)") +out2+=("^sep($BUTTONS)") out2+=("Tiny,obtctl buttons tiny;$me") out2+=("Normal,obtctl buttons normal;$me") out2+=("Bold,obtctl buttons bold;$me") out2+=("Dots,obtctl buttons dots;$me") #TEXT out2+=("^tag(titletext)") -out2+=("^sep(TITLE_BAR TEXT)") -out2+=("FONT...,mb-setfont obtitle;$me") -out2+=("TEXTALIGN [ $TXTJUST ],^checkout(talign)") -out2+=("SHADOW,^checkout(shadow)") +out2+=("^sep($TITLEBAR_TEXT)") +out2+=("$FONT...,mb-setfont obtitle;$me") +out2+=("$TEXTALIGN [ $TXTJUST ],^checkout(talign)") +out2+=("$SHADOW,^checkout(shadow)") out2+=("^sep()") -out2+=(" ACTIVE_FG,^pipe(mbclr '$AFG' obtctl activetextcolor ACTIVE_COLOR '$me')") -out2+=(" INACTIVE_FG,^pipe(mbclr '$NFG' obtctl inactivetextcolor INACTIVE_COLOR '$me')") +out2+=(" $ACTIVE_FG,^pipe(mbclr '$AFG' obtctl activetextcolor '${TEXT} ${ACTIVE_FG}' '$me')") +out2+=(" $INACTIVE_FG,^pipe(mbclr '$NFG' obtctl inactivetextcolor '${TEXT} ${INACTIVE_FG}' '$me')") #TEXTALIGN out2+=("^tag(talign)") -out2+=("^sep(TEXTALIGN)") +out2+=("^sep($TEXTALIGN)") out2+=("center,obtctl textjustify center;$me") out2+=("left,obtctl textjustify left;$me") out2+=("right,obtctl textjustify right;$me") out2+=("^tag(shadow)") -out2+=("^sep(SHADOW)") -out2+=("no shadow,obtctl shadow 0;$me") +out2+=("^sep($SHADOW)") +out2+=("$NOSHADOW,obtctl shadow 0;$me") out2+=("^sep()") -out2+=("Dark,obtctl shadow 1;$me") -out2+=("Light,obtctl shadow 2;$me") +out2+=("$DARK,obtctl shadow 1;$me") +out2+=("$LIGHT,obtctl shadow 2;$me") #PADDING out2+=("^tag(padding)") -out2+=("^sep(VERTICAL)") +out2+=("^sep($VERTICAL)") out2+=("0,obtctl paddingHeight 0;$me") out2+=("^sep()") out2+=("1,obtctl paddingHeight 1;$me") @@ -142,7 +243,7 @@ out2+=("6,obtctl paddingHeight 6;$me") out2+=("7,obtctl paddingHeight 7;$me") out2+=("8,obtctl paddingHeight 8;$me") out2+=("10,obtctl paddingHeight 10;$me") -out2+=("^sep(HORIZONTAL)") +out2+=("^sep($HORIZONTAL)") out2+=("0,obtctl paddingWidth 0;$me") out2+=("^sep()") out2+=("1,obtctl paddingWidth 1;$me") @@ -152,7 +253,7 @@ out2+=("4,obtctl paddingWidth 4;$me") out2+=("5,obtctl paddingWidth 5;$me") #BORDER out2+=("^tag(border)") -out2+=("^sep(border)") +out2+=("^sep($BORDER)") out2+=("0,obtctl borderWidth 0;$me") out2+=("^sep()") out2+=("1,obtctl borderWidth 1;$me") @@ -162,31 +263,31 @@ out2+=("4,obtctl borderWidth 4;$me") out2+=("5,obtctl borderWidth 5;$me") #RAISED out2+=("^tag(raised)") -out2+=("^sep(Raised or flat?)") -out2+=("0 (flat),obtctl raised 0;$me") -out2+=("1 (raised),obtctl raised 1;$me") +out2+=("^sep($RAISED_OR_FLAT?)") +out2+=("0 ($FLAT),obtctl raised 0;$me") +out2+=("1 ($RAISED),obtctl raised 1;$me") #GRADIENT out2+=("^tag(gradient)") -out2+=("^sep(GRADIENT)") -out2+=("Solid color (no gradient),obtctl gradient solid;$me") +out2+=("^sep($GRADIENT_TYPE)") +out2+=("$SOLID_COLOR,obtctl gradient solid;$me") out2+=("^sep()") -out2+=("Vertical,obtctl gradient vertical;$me") -out2+=("Horizontal,obtctl gradient horizontal;$me") -out2+=("MirrorHorizontal,obtctl gradient mirrorhorizontal;$me") -out2+=("SplitVertical,obtctl gradient splitvertical;$me") -out2+=("Diagonal,obtctl gradient diagonal;$me") -out2+=("CrossDiagonal,obtctl gradient crossdiagonal;$me") -out2+=("Pyramid,obtctl gradient pyramid;$me") +out2+=("$VERTICAL,obtctl gradient vertical;$me") +out2+=("$HORIZONTAL,obtctl gradient horizontal;$me") +out2+=("$MIRRORHORIZONTAL,obtctl gradient mirrorhorizontal;$me") +out2+=("$SPLITVERTICAL,obtctl gradient splitvertical;$me") +out2+=("$DIAGONAL,obtctl gradient diagonal;$me") +out2+=("$CROSSDIAGONAL,obtctl gradient crossdiagonal;$me") +out2+=("$PYRAMID,obtctl gradient pyramid;$me") #HANDLE out2+=("^tag(handle)") -out2+=("^sep(ACTIVEHANDLE)") -out2+=("NO,obtctl activehandle no;$me") -out2+=("YES,obtctl activehandle yes;$me") -out2+=("GRIPONLY,obtctl activehandle grip;$me") +out2+=("^sep($ACTIVEHANDLE)") +out2+=("$NO,obtctl activehandle no;$me") +out2+=("$YES,obtctl activehandle yes;$me") +out2+=("$GRIPONLY,obtctl activehandle grip;$me") #HANDLE out2+=("^tag(handlewidth)") -out2+=("^sep(HANDLEWIDTH)") +out2+=("^sep($HANDLEWIDTH)") out2+=("0,obtctl handlewidth 0;$me") out2+=("^sep()") out2+=("2,obtctl handlewidth 2;$me") @@ -197,8 +298,8 @@ out2+=("8,obtctl handlewidth 8;$me") out2+=("10,obtctl handlewidth 10;$me") else -out+=("^sep(NOT SUPORTED OB theme)") -out+=("Switch to MBcolors,obtctl theme MBcolors;$me") +out+=("^sep($NOT_SUPORTED_OBTHEME)") +out+=("$SWITCH_TO_MBCOLORS,obtctl theme MBcolors;$me") #for i in $(ls $HOME/.themes);do #if [ -f "$HOME/.themes/${i}/openbox-3/themerc" ]; then #out+=("$i,obtctl theme $i;$me") diff --git a/bin/conkyctl b/bin/conkyctl index bf3be1d..824092e 100755 --- a/bin/conkyctl +++ b/bin/conkyctl @@ -169,36 +169,44 @@ setpos () { title=${name//_/ } case "$LANG" in pl*) - SUMM="Mark new position for ${title^} Conky" - BODY="" - ABORTED_SUMM="" - ABORTED_BODY="" - THNX_SUMM="" - THNX_BODY="" + SUMM="Nowa pozycja dla Conky: ${title^}" + BODY="\nNarysuj mały prostokąt na ekranie aby wyznaczyć nową pozycję...\n (ESC lub prawy klik anuluje" + ABORTED_SUMM="Anulowano!" + ABORTED_BODY="\n...operacja anulowana" ;; *) SUMM="Mark new position for ${title^} Conky" - BODY="" - ABORTED_SUMM="" - ABORTED_BODY="" - THNX_SUMM="" - THNX_BODY="" - ;; + BODY="\nDraw small rectangle to mark new position...\n (ESC or right click to abort)" + ABORTED_SUMM="Aborted!" + ABORTED_BODY="\n... operation aborted!" + ;; esac wmctrl -k on - notify-send.sh -i mbcc --replace-file=/tmp/conkyctlfile "${SUMM}" "\nDraw small rectangle to mark new position...\n (ESC or right click to abort)" + notify-send.sh -i mbcc --replace-file=/tmp/conkyctlfile "${SUMM}" "${BODY}" read -r X Y < <(slop -t 0 -l -b 3 --color=0.3,0.4,0.6,0.4 -f "%x %y") if [ -z "$X" ] then - notify-send.sh -i mbcc --replace-file=/tmp/conkyctlfile "Mark new position for ${title^} Conky" "\n....anulowano" + 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)) gap_x ${X} ${1} gap_y ${Y} ${1} - notify-send.sh -i mbcc --replace-file=/tmp/conkyctlfile "Dziękuję!" "Zmieniono pozycję ${title^} \nX: $X\nY: $Y" + case "$LANG" in + pl*) + THNX_SUMM="Dziękuję!" + THNX_BODY="Zapisano nową pozycję ${title^} \n\tX: $X\n\tY: $Y" + ;; + *) + THNX_SUMM="Thank you!" + THNX_BODY="New position of ${title^} saved! \n\tX: $X\n\tY: $Y" + ;; + esac + + notify-send.sh -i mbcc --replace-file=/tmp/conkyctlfile "${THNX_SUMM}" "${THNX_BODY}" #wmctrl -k off fi } @@ -231,8 +239,10 @@ single () { HORIZONTAL_GAP="Odstęp poziomy" VERTICAL_GAP="Odstęp pionowy" COLORS="Kolory" - DEFCOLOR="Domyślny kolor" - COLOR="Kolor" + DEFCOLOR="Domyślny kolor (tekst i ramka)" + COLOR_0="Kolor 0 (tekst2)" + COLOR_1="Kolor 1 (większy tekst)" + COLOR_2="Kolor 2 (pasek/graf)" BACKGROUND="Kolor tła" TRANSPARENT="Przezroczyste?" YES="Tak" @@ -251,6 +261,8 @@ single () { SMALL="Małe" NORMAL="Normalne" BIG="Duże" + STIPPLED_BORDERS="Nakrapiane" + SOLID_LINE="linia ciągła" ;; *) POSITION="Position" @@ -259,8 +271,10 @@ single () { HORIZONTAL_GAP="Horizontal Gap" VERTICAL_GAP="Vertical Gap" COLORS="Colors" - DEFCOLOR="Default color" - COLOR="Color" + 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" TRANSPARENT="Transparent?" YES="Yes" @@ -271,7 +285,7 @@ single () { DECREASE="Decrease" OLINE="Outline" SHADOW="Shadow" - DRAW="DRAW" + DRAW="Deaw" BORDERS="Borders" EDIT="Edit file" KILL="Kill" @@ -279,6 +293,8 @@ single () { SMALL="Small" NORMAL="Normal" BIG="Big" + STIPPLED_BORDERS="Stippled borders" + SOLID_LINE="solid line" ;; esac filename=${1##*/} @@ -316,6 +332,7 @@ single () { [[ "$WINTRANS" == false ]] && BG="bgcolor='$WINCLR'" || BG="" + out+=("^sep(Conky: [ ${title^} ])") out+=("^sep($POSITION)") out+=("$MARKNEWPOS,conkyctl setpos ${1};$me") out+=("^sep()") @@ -357,10 +374,10 @@ single () { out+=("^sep($COLORS)") if [[ "$1" != *"logo_mbcolor"* ]]; then - [[ "$CLR" != "#" ]] && out+=(" AbCd $DEFCOLOR,^pipe(mbclr '$CLR' conkyctl default_color DEFAULT_COLOR '$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})") + [[ "$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 @@ -374,7 +391,7 @@ single () { out2+=("$YES,conkyctl transparent true ${1};$me") out2+=("$NO,conkyctl transparent false ${1};$me") out2+=("^sep()") - out2+=(" $BACKGROUND,^pipe(mbclr '$WINCLR' conkyctl win_bgcolor WIN_BGCOLOR '$me' ${1})") + out2+=(" $BACKGROUND,^pipe(mbclr '$WINCLR' conkyctl win_bgcolor '${BACKGROUND}' '$me' ${1})") if [[ "$1" != *"logo_mbcolor"* ]]; then if [[ "$1" != *"quoter_mbcolor"* ]]; then @@ -401,17 +418,18 @@ single () { out2+=("^sep($DRAW $BORDERS?)") out2+=("$YES,conkyctl draw_borders true ${1};$me") out2+=("$NO,conkyctl draw_borders false ${1};$me") - out2+=("^sep(STIPPLED BORDERS?)") - out2+=("0,conkyctl stippled_borders 0 ${1};$me") + out2+=("^sep($STIPPLED_BORDERS ?)") + out2+=("0 ($SOLID_LINE),conkyctl stippled_borders 0 ${1};$me") + out2+=("^sep()") out2+=("1,conkyctl stippled_borders 1 ${1};$me") out2+=("2,conkyctl stippled_borders 2 ${1};$me") out2+=("3,conkyctl stippled_borders 3 ${1};$me") out2+=("4,conkyctl stippled_borders 4 ${1};$me") out+=("^sep()") - out+=(" $EDIT ${title^},xdg-open ${1}") + out+=(" $EDIT ${title^},xdg-open ${1}") out+=("^sep()") - out+=(" $KILL ${title^},conkyctl kill ${1##*/};${me}") + out+=(" $KILL ${title^},conkyctl kill ${1##*/};${me}") printf '%s\n' "${out[@]}" printf '%s\n' "${out2[@]}" diff --git a/bin/mbclr b/bin/mbclr index 19ccd42..64e07b5 100755 --- a/bin/mbclr +++ b/bin/mbclr @@ -74,7 +74,7 @@ THEMERC="$HOME/.config/mabox/jgobthemes/${jgmenu_theme}.colorrc";; esac read COLOR OP<<< $(grep "${3}" ${THEMERC} | cut -d'=' -f2) out+=("^sep($OPACITY)") -out+=("$OPACITY [ $OP ],^checkout(opacity)") +out+=("$OPACITY [ $OP ],^checkout(opacity)") out2+=("^tag(opacity)") out2+=("^sep($OPACITY [ $OP ]") out2+=("100 ,jgctl $3 100;${5}") @@ -96,10 +96,10 @@ fi #Current out+=("^sep($SELECT_COLOR)") -out+=(" $PICK_FROM_SCREEN,mbclr pixelcolor $2 $3 ${5} ${6}") -out+=(" $SELECT_OR_PICK,mbclr pick $2 $3 ${5} ${6}") +out+=(" $PICK_FROM_SCREEN,mbclr pixelcolor $2 $3 ${5} ${6}") +out+=(" $SELECT_OR_PICK,mbclr pick $2 $3 ${5} ${6}") out+=("^sep()") -out+=(" $SHADES_OF_CURRENT ($1),^checkout(curshades)") +out+=(" $SHADES_OF_CURRENT ($1),^checkout(curshades)") out+=("^sep($WALLPAPER_COLORS)") for i in "${wallcolors[@]}" @@ -119,7 +119,7 @@ out2+=("^sep(Plasma)") for i in ${plasma[@]};do out2+=("$i ,$2 $3 '${i}' ${6};${5}");done out+=("^sep()") -out+=(" $LIGHTCOLORS,^checkout(light)") +out+=(" $LIGHTCOLORS,^checkout(light)") out2+=("^tag(light)") out2+=("^sep($LIGHTCOLORS)") for i in "${light[@]}" @@ -127,7 +127,7 @@ do out2+=("$i ,$2 $3 '${i}' ${6};${5}") done out+=("^sep()") -out+=(" $DARKCOLORS,^checkout(dark)") +out+=(" $DARKCOLORS,^checkout(dark)") out2+=("^tag(dark)") out2+=("^sep($DARKCOLORS)") for i in "${dark[@]}" diff --git a/share/mabox-colorizer/help/en.html b/share/mabox-colorizer/help/en.html index 36e5d8d..1d8a6dc 100644 --- a/share/mabox-colorizer/help/en.html +++ b/share/mabox-colorizer/help/en.html @@ -42,6 +42,7 @@ div.fixeddown {

Mabox Colorizer beta

+ (Colorizer is in rapid development ... this help may be incomplete prior to 1.0 release)

a set of tools to easily customize your Mabox Linux Desktop

Easily change look and feel of:

    @@ -228,6 +229,14 @@ You can change all of them to you liking afterwards.
    Launch Wallpaper Menu

    Wallpapers

    Colorizer automatically generates a color palette from the currently set wallpaper.

    +

    Automatic themes generation

    +

    Colorizar will automatically generate themes after wallpaper change (if configured, see:
    Colorizer -> Settings -> Autogenerate themes

    +

    For fast preview do not use Nitrogen GUI, better use:

    +
      +
    • Random wallpaper option from Colorizer (sysytem or users wallpapers)
      • +
    • any option from Wallpaper menu should work (also slideshow)
      • +
    • you can also set wallpaper from file manager image context menu
      • +