From a6e97335e12a555c2f67a7648c5aa525fc81e73d Mon Sep 17 00:00:00 2001 From: Daniel Napora Date: Fri, 3 Jun 2022 19:43:56 +0200 Subject: [PATCH] help and updates --- bin/colorizer-conky | 6 +- bin/colorizer-menus | 8 +- bin/colorizer-ob | 22 ++--- bin/conkyctl | 21 +++-- share/mabox-colorizer/help/en.html | 86 +++++++++++++++--- share/mabox-colorizer/img/colorizer-conky.png | Bin 833 -> 0 bytes 6 files changed, 105 insertions(+), 38 deletions(-) delete mode 100644 share/mabox-colorizer/img/colorizer-conky.png diff --git a/bin/colorizer-conky b/bin/colorizer-conky index 0f949ed..686eff6 100755 --- a/bin/colorizer-conky +++ b/bin/colorizer-conky @@ -70,14 +70,14 @@ if pgrep -af "conky.*mbcolor" >/dev/null; then out2+=("^sep()") out2+=(" Background color,^pipe(mbclr '$WINCLR' conkyctl win_bgcolor_all WIN_BGCOLOR '$me')") out+=("^sep()") - out+=("FONTS [ $FONT $FONTSIZE ],^checkout(font)") + out+=("FONTS [ $FONT $FONTSIZE ],^checkout(font)") out2+=("^tag(font)") out2+=("^sep(BASE_FONT)") out2+=("Set custom basefont...,mb-setfont conky_all;$me") out2+=("^sep()") out2+=("++ Increase,conkyctl basefont_inc_all;$me") out2+=("-- Decrease,conkyctl basefont_dec_all;$me") - out+=("Outline/Shadow [ $SHADOWS ],^checkout(outline)") + out+=("Outline/Shadow [ $SHADOWS ],^checkout(outline)") out2+=("^tag(outline)") out2+=("^sep(Outline/Shadow)") out2+=("No,conkyctl shades_all no;$me") @@ -87,7 +87,7 @@ if pgrep -af "conky.*mbcolor" >/dev/null; then out+=("^sep()") - out+=("BORDERS [ $BORD $STIP ],^checkout(border)") + out+=("BORDERS [ $BORD $STIP ],^checkout(border)") out2+=("^tag(border)") out2+=("^sep(DRAW BORDERS?)") out2+=("Yes,conkyctl draw_borders_all true;$me") diff --git a/bin/colorizer-menus b/bin/colorizer-menus index 73c53aa..72875b0 100755 --- a/bin/colorizer-menus +++ b/bin/colorizer-menus @@ -47,15 +47,15 @@ out+=("$(printf '%3s' "$MBGA") COLOR_MENU_BG_TO,^pipe(mbclr '$MBGT' jgctl color_menu_bg_to COLOR_MENU_BG_TO '$me')") out+=("$(printf '%3s' "$MBORDERA") COLOR_MENU_BORDER,^pipe(mbclr '$MBORDER' jgctl color_menu_border COLOR_MENU_BORDER '$me')") out+=("^sep()") -out+=("GRADIENT_POS [ $GRADIENT ],^checkout(gradientpos)") +out+=("GRADIENT_POS [ $GRADIENT ],^checkout(gradientpos)") out+=("^sep(item)") out+=("$(printf '%3s' "$NFGA") AbCd COLOR_NORM_FG,^pipe(mbclr '$NFG' jgctl color_norm_fg COLOR_NORM_FG '$me')") out+=("$(printf '%3s' "$SBGA") COLOR_SEL_BG,^pipe(mbclr '$SBG' jgctl color_sel_bg COLOR_SEL_BG '$me')") out+=("$(printf '%3s' "$SFGA") AbCd COLOR_SEL_FG,^pipe(mbclr '$SFG' jgctl color_sel_fg COLOR_SEL_FG '$me')") out+=("$(printf '%3s' "$SBORDERA") COLOR_SEL_BORDER,^pipe(mbclr '$SBORDER' jgctl color_sel_border COLOR_SEL_BORDER '$me')") -out+=("ITEM_BORDER [ $IBORDER ],^checkout(itemborder)") -out+=("ITEM_RADIUS [ $IRADIUS ],^checkout(itemradius)") +out+=("ITEM_BORDER [ $IBORDER ],^checkout(itemborder)") +out+=("ITEM_RADIUS [ $IRADIUS ],^checkout(itemradius)") out+=("^sep()") [[ ! -z "$NORMBG" ]] && out+=("$(printf '%3s' "$NORMBGA") COLOR_NORM_BG,^pipe(mbclr '$NORMBG' jgctl color_norm_bg COLOR_NORM_BG '$me')") @@ -64,7 +64,7 @@ out+=("$(printf '%3s' "$TBGA") AbCd COLOR_TITLE_FG,^pipe(mbclr '$TFG' jgctl color_title_fg COLOR_TITLE_FG '$me')") out+=("$(printf '%3s' "$TBORDERA") COLOR_TITLE_BORDER,^pipe(mbclr '$TBORDER' jgctl color_title_border COLOR_TITLE_BORDER '$me')") out+=("^sep()") -out+=("SEP_HALIGN [ $SEPHALIGN ],^checkout(sephalign)") +out+=("SEP_HALIGN [ $SEPHALIGN ],^checkout(sephalign)") out+=("^sep()") out+=("$(printf '%3s' "$SEPFGA") ------ COLOR_SEP_FG,^pipe(mbclr '$SEPFG' jgctl color_sep_fg COLOR_SEP_FG '$me')") diff --git a/bin/colorizer-ob b/bin/colorizer-ob index 547d910..9b7e469 100755 --- a/bin/colorizer-ob +++ b/bin/colorizer-ob @@ -72,16 +72,18 @@ out+=(" ACTIVE_BG,^pipe(mbclr '$ABG' out+=(" INACTIVE_BG,^pipe(mbclr '$NBG' obtctl clrnormalbg INACTIVE_BG '$me')") out+=(" AbCd TITLEBAR TEXT,^checkout(titletext)") -out+=("GRADIENT [ ${REST##* } ],^checkout(gradient)") -out+=("PADDING [ $PHEIGHT $PWIDTH ],^checkout(padding)") +out+=("PADDING [ $PHEIGHT $PWIDTH ],^checkout(padding)") +out+=("Raised or flat? [ $WINRAISED ],^checkout(raised)") +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+=("^sep(EFFECTS)") -out+=("RAISED? [ $WINRAISED ],^checkout(raised)") -out+=("ACTIVEHANDLE? [ $AHANDLE ],^checkout(handle)") +out+=("BORDER [ $BORD ],^checkout(border)") +out+=("HANDLEWIDTH [ $HANDLE ],^checkout(handlewidth)") +out+=("ACTIVEHANDLE? [ $AHANDLE ],^checkout(handle)") if [ -f "${THEMERC}.bak" ]; then out+=("^sep()") @@ -151,7 +153,7 @@ out2+=("4,obtctl borderWidth 4;$me") out2+=("5,obtctl borderWidth 5;$me") #RAISED out2+=("^tag(raised)") -out2+=("^sep(raised)") +out2+=("^sep(Raised or flat?)") out2+=("0 (flat),obtctl raised 0;$me") out2+=("1 (raised),obtctl raised 1;$me") #GRADIENT @@ -166,9 +168,7 @@ 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+=("^sep(COLORS)") -[[ ! -z "$ABGTO" ]] && out2+=(" ACTIVE_BG_TO,^pipe(mbclr '$ABGTO' obtctl clractivebgto ACTIVE_BG_TO '$me')") -[[ ! -z "$ABGTO" ]] && out2+=(" INACTIVE_BG_TO,^pipe(mbclr '$NBGTO' obtctl clrnormalbgto INACTIVE_BG_TO '$me')") + #HANDLE out2+=("^tag(handle)") out2+=("^sep(ACTIVEHANDLE)") diff --git a/bin/conkyctl b/bin/conkyctl index ef57c89..eb1bfb3 100755 --- a/bin/conkyctl +++ b/bin/conkyctl @@ -182,6 +182,9 @@ kill () { } single () { + filename=${1##*/} + name=${filename%%_mb*} + title=${name//_/ } me="colorizer-conky -s" read POS <<< "$(grep alignment ${1} | cut -d'=' -f2 | cut -d"'" -f2)" read GAPX <<< "$(grep gap_x ${1} | cut -d'=' -f2 | cut -d"," -f1)" @@ -215,7 +218,7 @@ single () { [[ "$WINTRANS" == false ]] && BG="bgcolor='$WINCLR'" || BG="" out+=("^sep(POSITION)") - out+=("Alignment [ $POS ],^checkout(pos)") + out+=("Alignment [ $POS ],^checkout(pos)") out2+=("^tag(pos)") out2+=("^sep(POSITION)") out2+=("TopLeft,conkyctl pos top_left ${1};$me") @@ -227,13 +230,13 @@ single () { out2+=("BottomLeft,conkyctl pos bottom_left ${1};$me") out2+=("Bottom,conkyctl pos bottom_middle ${1};$me") out2+=("BottomRight,conkyctl pos bottom_right ${1};$me") - out+=("HORIZONTAL GAP [ $GAPX ],^checkout(gapx)") + out+=("HORIZONTAL GAP [ $GAPX ],^checkout(gapx)") out2+=("^tag(gapx)") out2+=("^sep(HORIZONTAL_GAP)") 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 out2+=("${i},conkyctl gap_x ${i} ${1};$me") done - out+=("VERTICAL GAP [ $GAPY ],^checkout(gapy)") + out+=("VERTICAL GAP [ $GAPY ],^checkout(gapy)") out2+=("^tag(gapy)") out2+=("^sep(VERTICAL_GAP)") 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 @@ -243,7 +246,7 @@ single () { if [[ "$1" =~ "logo_mbcolor" ]]; then read LSIZE <<< "$(grep minimum_height ${1} | cut -d'=' -f2 | cut -d"," -f1)" out+=("^sep(Size)") - out+=("Logo size [ $LSIZE ],^checkout(logosize)") + out+=("Logo size [ $LSIZE ],^checkout(logosize)") out2+=("^tag(logosize)") out2+=("^sep(Logo size)") out2+=("Small 64px,conkyctl logosize 64;$me") @@ -273,7 +276,7 @@ single () { if [[ "$1" != *"logo_mbcolor"* ]]; then if [[ "$1" != *"quoter_mbcolor"* ]]; then - out+=("FONT [ $FONT $FONTSIZE ],^checkout(fontsingle)") + out+=("FONT [ $FONT $FONTSIZE ],^checkout(fontsingle)") out2+=("^tag(fontsingle)") out2+=("^sep(BASE_FONT)") @@ -282,7 +285,7 @@ single () { out2+=("++ Increase,conkyctl basefont_inc ${1};$me") out2+=("-- Decrease,conkyctl basefont_dec ${1};$me") fi - out+=("Outline/Shadow [ $SHADOWS ],^checkout(outline2)") + out+=("Outline/Shadow [ $SHADOWS ],^checkout(outline2)") out2+=("^tag(outline2)") out2+=("^sep(Outline/Shadow)") out2+=("No,conkyctl shades no ${1};$me") @@ -291,7 +294,7 @@ single () { out2+=("Draw outline,conkyctl shades outline ${1};$me") out+=("^sep()") fi - out+=("BORDERS [ $BORD $STIP ],^checkout(bordersingle)") + out+=("BORDERS [ $BORD $STIP ],^checkout(bordersingle)") out2+=("^tag(bordersingle)") out2+=("^sep(DRAW BORDERS?)") out2+=("Yes,conkyctl draw_borders true ${1};$me") @@ -304,9 +307,9 @@ single () { out2+=("4,conkyctl stippled_borders 4 ${1};$me") out+=("^sep()") - out+=(" Edit ${1##*/},xdg-open ${1}") + out+=(" Edit ${title^},xdg-open ${1}") out+=("^sep()") - out+=(" Kill ${1##*/},conkyctl kill ${1##*/};${me}") + out+=(" Kill ${title^},conkyctl kill ${1##*/};${me}") printf '%s\n' "${out[@]}" printf '%s\n' "${out2[@]}" diff --git a/share/mabox-colorizer/help/en.html b/share/mabox-colorizer/help/en.html index 072dc05..0cf3700 100644 --- a/share/mabox-colorizer/help/en.html +++ b/share/mabox-colorizer/help/en.html @@ -9,10 +9,11 @@

- + + - + @@ -31,18 +32,81 @@ - - + + -