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+=(" ${FG} $COLOR,^pipe(mbclr '$FG' cavactl foreground Cava_Bar_Color '$me')")
+ out+=(" ${FGC} $COLOR,^pipe(mbclr '$FGC' cavactl foreground Cava_Bar_Color '$me')")
out+=("^sep($GRADIENT)")
- out+=(" Gradient,^pipe(mbgrad cava)")
+ out+=(" $PREGRADIENT,^pipe(mbgrad cava)")
out+=(" $REVERSE_GRADIENT,cavactl gradient '${GR_TO}' '${GR_FROM}';$me")
out+=("^sep()")
out+=(" $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 [ $BS ],^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+=("$(printf '%3s' "$MBGA") $COLOR_MENU_BG,^pipe(mbclr '$MBG' jgctl color_menu_bg '${COLOR_MENU_BG}' '$me')")
out+=("$(printf '%3s' "$MBGTA") $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')")
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 < "${CONKYDIR}/menuscripts/${1}.csv"