diff --git a/usr/bin/jgclock b/usr/bin/jgclock
index 6b52e8f..3e6c67c 100755
--- a/usr/bin/jgclock
+++ b/usr/bin/jgclock
@@ -7,8 +7,8 @@ case $LANG in
CLOCK="Zegar"
FONT_COLOR="Kolor"
SET_COLOR="Ustaw kolor"
- CLOCK_LINE1="Linia 1"
- CLOCK_LINE2="Linia 2"
+ LINE1="Linia 1"
+ LINE2="Linia 2"
FORMAT="Format"
FONT="Czcionka"
INCREASE="Powiększ"
@@ -21,8 +21,8 @@ case $LANG in
CLOCK="Clock"
FONT_COLOR="Color"
SET_COLOR="Set color"
- CLOCK_LINE1="Line 1"
- CLOCK_LINE2="Line 2"
+ LINE1="Line 1"
+ LINE2="Line 2"
FORMAT="Format"
FONT="Font"
INCREASE="Increase"
@@ -35,8 +35,8 @@ case $LANG in
CLOCK="Clock"
FONT_COLOR="Color"
SET_COLOR="Set color"
- CLOCK_LINE1="Line 1"
- CLOCK_LINE2="Line 2"
+ LINE1="Line 1"
+ LINE2="Line 2"
FORMAT="Format"
FONT="Font"
INCREASE="Increase"
@@ -61,6 +61,12 @@ L2_SIZE="${FL2[-1]}"
read CLR OPA <<< "$(grep "clock_font_color" ${TINT} | cut -d'=' -f2)"
out+=("^sep($CLOCK)")
+out+=("[ $(date "+${TF1}") ] $FORMAT $LINE1,^checkout(cl1)")
+[[ "$TF2" == "" ]] && out+=("[ $NONE ] $FORMAT $LINE2,^checkout(cl2)")|| out+=("[ $(date "+${TF2}") ] $FORMAT $LINE2,^checkout(cl2)")
+out+=("^sep()")
+out+=("$FONT $LINE1: [ $L1_FONT $L1_SIZE ],^checkout(fl1)")
+[[ "$TF2" != "" ]] && out+=("$FONT $LINE2: [ $L2_FONT $L2_SIZE ],^checkout(fl2)")
+out+=("^sep()")
out+=(" $FONT_COLOR,^checkout(ccolor)")
out2+=("^tag(ccolor)")
out2+=("^sep($SET_COLOR)")
@@ -69,14 +75,8 @@ for i in "${colors[@]}"
do
out2+=("$i ,t2ctl clockcolor '${i}' ${TINT};me")
done
-out+=("^sep($CLOCK $CLOCK_LINE1)")
-out+=("$FORMAT: [ $(date "+${TF1}") ],^checkout(cl1)")
-out+=("$FONT: [ $L1_FONT $L1_SIZE ],^checkout(fl1)")
-out+=("^sep($CLOCK $CLOCK_LINE2)")
-[[ "$TF2" == "" ]] && out+=("$FORMAT: [ $NONE ],^checkout(cl2)")|| out+=("$FORMAT: [ $(date "+${TF2}") ],^checkout(cl2)")
-out+=("$FONT: $L2_FONT $L2_SIZE,^checkout(fl2)")
out2+=("^tag(cl1)")
-out2+=("^sep($CLOCK_LINE1)")
+out2+=("^sep($LINE1)")
out2+=("$(date +"%H:%M") (%H:%M),t2ctl clockline1 '%H:%M' ${TINT};$me")
out2+=("$(date +"%H:%M:%S") (%H:%M:%S),t2ctl clockline1 '%H:%M:%S' ${TINT};$me")
out2+=("$(date +"%I:%M %p") (%I:%M %p),t2ctl clockline1 '%I:%M %p' ${TINT};$me")
@@ -84,7 +84,7 @@ out2+=("$(date +"%-I:%M %p") (%I-:%M %p),t2ctl clockline1
out2+=("$(date +"%H:%M (%a)") (%H:%M (%a)),t2ctl clockline1 '%H:%M (%a)' ${TINT};$me")
out2+=("^tag(cl2)")
-out2+=("^sep($CLOCK_LINE2)")
+out2+=("^sep($LINE2)")
out2+=("$NONE,t2ctl clockline2 none ${TINT};$me")
out2+=("^sep()")
out2+=("$(date +"%A %d %B") (%A %d %B),t2ctl clockline2 '%A %d %B' ${TINT};$me")
@@ -97,6 +97,13 @@ out2+=("^tag(fl1)")
out2+=("^sep($L1_FONT $L1_SIZE)")
out2+=(" $INCREASE ( $((L1_SIZE+1)) ),t2ctl clock1_fontsize $((L1_SIZE+1)) ${TINT};$me")
out2+=(" $DECREASE ( $((L1_SIZE-1)) ),t2ctl clock1_fontsize $((L1_SIZE-1)) ${TINT};$me")
+out2+=("^sep()")
+sizes=(20 19 18 17 16 15 14 13 12 11 10 9 8 7 6)
+for i in "${sizes[@]}"
+do
+[[ "$L1_SIZE" == "$i" ]] && out2+=("$i px,t2ctl clock1_fontsize $i ${TINT};$me") || out2+=("$i px,t2ctl clock1_fontsize $i ${TINT};$me")
+done
+
out2+=("^sep()")
out2+=(" $SETFONT,mb-setfont t2_time1_font ${TINT}")
out2+=("^tag(fl2)")
@@ -104,6 +111,12 @@ out2+=("^sep($L2_FONT $L2_SIZE)")
out2+=(" $INCREASE ( $((L2_SIZE+1)) ),t2ctl clock2_fontsize $((L2_SIZE+1)) ${TINT};$me")
out2+=(" $DECREASE ( $((L2_SIZE-1)) ),t2ctl clock2_fontsize $((L2_SIZE-1)) ${TINT};$me")
out2+=("^sep()")
+sizes=(20 19 18 17 16 15 14 13 12 11 10 9 8 7 6)
+for i in "${sizes[@]}"
+do
+[[ "$L2_SIZE" == "$i" ]] && out2+=("$i px,t2ctl clock2_fontsize $i ${TINT};$me") || out2+=("$i px,t2ctl clock2_fontsize $i ${TINT};$me")
+done
+out2+=("^sep()")
out2+=(" $SETFONT,mb-setfont t2_time2_font ${TINT}")
fi
out+=("^sep()")