From 9f859f21873f3c4085787aa61237a6f8156ca821 Mon Sep 17 00:00:00 2001
From: Daniel Napora <napcok@gmail.com>
Date: Tue, 9 May 2023 16:45:54 +0200
Subject: [PATCH] upd

---
 bin/colorizer-cava  | 16 ++++++++++++----
 bin/colorizer-menus | 12 ++++++------
 bin/conkyctl        |  4 ++--
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/bin/colorizer-cava b/bin/colorizer-cava
index b0d9bc7..beacc52 100755
--- a/bin/colorizer-cava
+++ b/bin/colorizer-cava
@@ -56,6 +56,7 @@ case "$LANG" in
     COLOR_MODE="Tryb kolorowania"
     SOLID_COLOR="Jednolity kolor"
     GRADIENT="Gradient"
+    PREGRADIENT="Zastosuj gotowy gradient"
     MODGRAD_FROM="Gradient kolor 1"
     MODGRAD_TO="Gradient kolor 2"
     EDITCONF="Edytuj plik konfiguracyjny"
@@ -76,6 +77,7 @@ case "$LANG" in
     COLOR_MODE="Color mode"
     SOLID_COLOR="Solid color"
     GRADIENT="Gradient"
+    PREGRADIENT="Apply predefined gradient"
     MODGRAD_FROM="Modify Gradient From"
     MODGRAD_TO="Modify Gradient To"
     EDITCONF="Edit config file"
@@ -93,14 +95,20 @@ read GR <<< "$(grep '.*gradient ' ${CFGFILE} | cut -d"=" -f2)"
 read GR_FROM <<< "$(grep '.*gradient_color_1 ' ${CFGFILE} | cut -d"'" -f2)"
 read GR_TO <<< "$(grep '.*gradient_color_8 ' ${CFGFILE} | cut -d"'" -f2)"
 
-FGC=$(pastel textcolor ${FG}|pastel format hex)
+
+if [ ${#FG} != 7 ];then
+FGC="#59cc33"
+else
+FGC=${FG}
+fi
+FGT=$(pastel textcolor ${FGC}|pastel format hex)
 }
     getvalues
     out+=("^sep($COLORIZE_CAVA)")
 
-    out+=("<tt><span bgcolor='$FG' fgcolor='$FGC'>  ${FG}  </span></tt>  $COLOR,^pipe(mbclr '$FG' cavactl foreground Cava_Bar_Color '$me')")
+    out+=("<tt><span bgcolor='$FGC' fgcolor='$FGT'>  ${FGC}  </span></tt>  $COLOR,^pipe(mbclr '$FGC' cavactl foreground Cava_Bar_Color '$me')")
     out+=("^sep($GRADIENT)")
-    out+=("<span bgcolor='$GR_FROM'>     </span><span bgcolor='$GR_TO'>     </span>  Gradient,^pipe(mbgrad cava)")
+    out+=("<span bgcolor='$GR_FROM'>     </span><span bgcolor='$GR_TO'>     </span>  $PREGRADIENT,^pipe(mbgrad cava)")
     out+=("<span bgcolor='$GR_TO'>     </span><span bgcolor='$GR_FROM'>     </span>  $REVERSE_GRADIENT,cavactl gradient '${GR_TO}' '${GR_FROM}';$me")
     out+=("^sep()")
     out+=("<tt><span bgcolor='$GR_FROM'>    </span></tt>  $MODGRAD_FROM,^pipe(mbclr '$GR_FROM' cavactl grad_from Cava_Grad_From_Color '$me')")
@@ -121,7 +129,7 @@ FGC=$(pastel textcolor ${FG}|pastel format hex)
     out+=("$BAR_SPACING [ <b>$BS</b> ],^checkout(barspacing)")
     out2+=("^tag(barspacing)")
     out2+=("^sep($BAR_SPACING)")
-    for i in 0 1 2 3 4
+    for i in 0 1 2 3 4 5 6 8 10
     do
     out2+=("$i,cavactl bar_spacing $i;$me")
     done
diff --git a/bin/colorizer-menus b/bin/colorizer-menus
index a973fc3..84a6330 100755
--- a/bin/colorizer-menus
+++ b/bin/colorizer-menus
@@ -63,7 +63,7 @@ case "$LANG" in
     BOTTOM_RIGHT="z dołu od prawej (bottom_right)"
     PRE_GRADIENTS="Gotowe gradienty"
     GRADIENT_REVERSE="Odwróć kolory Gradientu"
-    ITEM="pozycja menu (element)"
+    ITEM="Pozycja (element) menu "
     COLOR_NORM_FG="Kolor tekstu"
     COLOR_SEL_BG="Tło aktywnej pozycji"
     COLOR_SEL_FG="Tekst aktywnej pozycji"
@@ -71,7 +71,7 @@ case "$LANG" in
     ITEM_BORDER="Obramowanie (px)"
     ITEM_RADIUS="Zaokrąglenie (px)"
     COLOR_NORM_BG="Tło"
-    SEPARATOR_TITLE="separator/nagłówek"
+    SEPARATOR_TITLE="Separator/Nagłówek"
     COLOR_TITLE_BG="Tło nagłówka"
     COLOR_TITLE_FG="Kolor tekstu nagłówka"
     COLOR_TITLE_BORDER="Kolor obramowania"
@@ -85,7 +85,7 @@ case "$LANG" in
     RESET="Resetuj motyw"
     TO_DEFAULT=""
     EDIT="Edytuj plik "
-    FILE=""
+    FILE="plik"
     SET_RANDOM="Ustaw losowy motyw menu"
     ;;
     *)
@@ -108,7 +108,7 @@ case "$LANG" in
     BOTTOM_RIGHT="bottom_right"
     PRE_GRADIENTS="Predefined gradients"
     GRADIENT_REVERSE="Reverse gradient colors"
-    ITEM="item"
+    ITEM="Item"
     COLOR_NORM_FG="Text Color"
     COLOR_SEL_BG="Selected Item Background"
     COLOR_SEL_FG="Selected Item Text"
@@ -116,7 +116,7 @@ case "$LANG" in
     ITEM_BORDER="Item Border (px)"
     ITEM_RADIUS="Item Radius (px)"
     COLOR_NORM_BG="Item Background"
-    SEPARATOR_TITLE="separator/title"
+    SEPARATOR_TITLE="Separator/Title"
     COLOR_TITLE_BG="Title Background"
     COLOR_TITLE_FG="Title Foreground"
     COLOR_TITLE_BORDER="Title Border color "
@@ -183,7 +183,7 @@ out2+=("tight,jgctl tweak padding tight;$me")
 out+=("^sep($GENERATEFROMWP)")
 out+=("$LIGHTBG,w2theme menu light;$me")
 out+=("$DARKBG,w2theme menu dark;$me")
-out+=("^sep(menu)")
+out+=("^sep(Menu)")
 out+=("<tt><small>$(printf '%3s' "$MBGA")</small> <span bgcolor='$MBG' bgalpha='${MBGA/#[0]/1}%'>     </span><span bgcolor='$MBG'> </span></tt>   $COLOR_MENU_BG,^pipe(mbclr '$MBG' jgctl color_menu_bg '${COLOR_MENU_BG}' '$me')")
 out+=("<tt><small>$(printf '%3s' "$MBGTA")</small> <span bgcolor='$MBGT' bgalpha='${MBGTA/#[0]/1}%'>     </span><span bgcolor='$MBGT'> </span></tt>   $COLOR_MENU_BG_TO,^pipe(mbclr '$MBGT' jgctl color_menu_bg_to '${COLOR_MENU_BG_TO}' '$me')")
 out+=("<tt><small>$(printf '%3s' "$MBORDERA")</small> <span bgcolor='$MBORDER' bgalpha='${MBORDERA/#[0]/1}%'>     </span><span bgcolor='$MBORDER'> </span></tt>   $COLOR_MENU_BORDER,^pipe(mbclr '$MBORDER' jgctl color_menu_border '${COLOR_MENU_BORDER}' '$me')")
diff --git a/bin/conkyctl b/bin/conkyctl
index 946c470..4543b01 100755
--- a/bin/conkyctl
+++ b/bin/conkyctl
@@ -1067,8 +1067,8 @@ EOF
 jgmenu --config-file=${CONFIG_FILE} --csv-file=${MENU_ITEMS} 2>/dev/null
 }
 cmdmenu_edit() {
-	if [[ -f "${CONKYDIR}/menuscripts/${1}.csv" ]];then
-	geany "${CONKYDIR}/menuscripts/${1}.csv"
+	if [[ -s "${CONKYDIR}/menuscripts/${1}.csv" ]];then
+		geany "${CONKYDIR}/menuscripts/${1}.csv"
 	else
 	
 cat <<EOF > "${CONKYDIR}/menuscripts/${1}.csv"