diff --git a/bin/conkyctl b/bin/conkyctl
index d8a1314..ab5dd43 100755
--- a/bin/conkyctl
+++ b/bin/conkyctl
@@ -405,6 +405,7 @@ languages () {
APPLY_TO_ALL="Zastosuj do wszystkich"
NEWTHEME="Nowy motyw kolorów..."
SAVENEWTHEME="utwórz nowy motyw..."
+ SAVE_CURRSCHEME="Zapisz aktualną kolorystykę jako..."
LIGHTBG="Jasne tło"
DARKBG="Ciemne tło"
RESETCOLORS="Przywróć domyślne kolory"
@@ -470,6 +471,7 @@ languages () {
APPLY_TO_ALL="Apply to All"
NEWTHEME="New Color scheme..."
SAVENEWTHEME="from current colors..."
+ SAVE_CURRSCHEME="Save current colors as..."
LIGHTBG="Light Background"
DARKBG="Dark Background"
RESETCOLORS="Restore default colors"
@@ -535,6 +537,7 @@ languages () {
APPLY_TO_ALL="Apply to All"
NEWTHEME="New Color scheme..."
SAVENEWTHEME="from current colors..."
+ SAVE_CURRSCHEME="Save current colors as..."
LIGHTBG="Light Background"
DARKBG="Dark Background"
RESETCOLORS="Restore default colors"
@@ -734,7 +737,40 @@ if [[ "$OLD_SYNTAX" = "true" ]];then
fi
out+=("^sep($COLORS)")
+ # COLOR SCHEMES
+ if [ "$WINTRANS" == false ];then
+ out+=(" $COLORSCHEME,^checkout(regensingle)")
+ out2+=("^tag(regensingle)")
+
+ out2+=("^sep($APPLY_THEME)")
+ out2+=("^sep($SYSTEM_SCHEMES)")
+ n=1
+ while IFS="|" read -r winclr clr clr0 clr1 clr2 scheme_name
+ do
+ ((n=n+1))
+ out2+=("$(printf '%-20s' "${scheme_name}") ,conkyctl applyscheme sys $n ${1}")
+ done < <(tail -n +2 "$SYSSCHEMES")
+ out2+=("^sep($YOUR_SCHEMES)")
+ if [[ "$1" =~ "sysinfo_" ]]; then
+ currcolors="${WINCLR}|${CLR}|${CLR0}|${CLR1}|${CLR2}|"
+ out2+=(" $SAVE_CURRSCHEME,conkyctl savescheme '${currcolors}'" "^sep()")
+ fi
+ n=1
+ while IFS="|" read -r winclr clr clr0 clr1 clr2 scheme_name
+ do
+ ((n=n+1))
+ out2+=("$(printf '%-20s' "${scheme_name}") ,conkyctl applyscheme usr $n ${1}")
+ #out2+=(" $schemetitle,conkyctl settheme $themefilename $1")
+
+ done < <(tail -n +2 "$USERSCHEMES")
+
+ out2+=("^sep($GENFROMWP)")
+ out2+=(" $LIGHTBG ,w2theme conkyone light ${1}")
+ out2+=(" $DARKBG ,w2theme conkyone dark ${1}")
+ out+=("^sep()")
+ fi
+
if [[ "$WINCLR" != "#" ]];then
if [ "$WINTRANS" == false ];then
out+=(" AbCd $BACKGROUND,^pipe(mbclr '$WINCLR' conkyctl win_bgcolor '${BACKGROUND}' '$me' ${1})")
@@ -754,41 +790,8 @@ if [[ "$OLD_SYNTAX" = "true" ]];then
out+=("^sep()")
fi
-
- if [ "$WINTRANS" == false ];then
- out+=(" $COLORSCHEME,^checkout(regensingle)")
- out2+=("^tag(regensingle)")
-
- out2+=("^sep($APPLY_THEME)")
- out2+=("^sep($SYSTEM_SCHEMES)")
- n=1
- while IFS="|" read -r winclr clr clr0 clr1 clr2 scheme_name
- do
- ((n=n+1))
- out2+=("$(printf '%-20s' "${scheme_name}") ,conkyctl applyscheme sys $n ${1}")
- done < <(tail -n +2 "$SYSSCHEMES")
-
- out2+=("^sep($YOUR_SCHEMES)")
- if [[ "$1" =~ "sysinfo_" ]]; then
- currcolors="${WINCLR}|${CLR}|${CLR0}|${CLR1}|${CLR2}|"
- out2+=(" $SAVE_CURRSCHEME,conkyctl savescheme '${currcolors}'")
- fi
- n=1
- while IFS="|" read -r winclr clr clr0 clr1 clr2 scheme_name
- do
- ((n=n+1))
- out2+=("$(printf '%-20s' "${scheme_name}") ,conkyctl applyscheme usr $n ${1}")
- done < <(tail -n +2 "$USERSCHEMES")
-
- out2+=("^sep($GENFROMWP)")
- out2+=(" $LIGHTBG ,w2theme conkyone light ${1}")
- out2+=(" $DARKBG ,w2theme conkyone dark ${1}")
-
- out+=("^sep()")
- fi
-
if [[ "$1" != *"logo_mbcolor"* ]]; then
if [[ "$1" != *"quoter_mbcolor"* ]]; then
out+=(" $FONTS [ $FONT $FONTSIZE ],^checkout(fontsingle)")