From 1a42e8dcb424d3eb0055f2ab2741d36e2349fd36 Mon Sep 17 00:00:00 2001
From: Danny <31635744+DDDanny@users.noreply.github.com>
Date: Mon, 18 Apr 2022 15:13:25 +0200
Subject: [PATCH] Mrk.Color doesn't reflect the color selected #1706

---
 apps/timecal/ChangeLog           |  3 ++-
 apps/timecal/README.md           | 20 ++++++++++----------
 apps/timecal/metadata.json       |  2 +-
 apps/timecal/timecal.settings.js | 18 ++++++++----------
 4 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/apps/timecal/ChangeLog b/apps/timecal/ChangeLog
index e48145b4b..57e7a1758 100644
--- a/apps/timecal/ChangeLog
+++ b/apps/timecal/ChangeLog
@@ -7,4 +7,5 @@
       -> added settings to render cal view begin day (-1: today, 0:sunday, 1:monday [default])
 0.03: a lot of more settings for outline, colors and highlights
 0.04: finalized README, fixed settings cancel, fixed border-setting
-0.05: bugfix: default settings
\ No newline at end of file
+0.05: bugfix: default settings
+0.06: bugfix: Mrk.Color doesn't reflect the color selected, fixes #1706
diff --git a/apps/timecal/README.md b/apps/timecal/README.md
index d26f9ba4d..8c5d619ad 100644
--- a/apps/timecal/README.md
+++ b/apps/timecal/README.md
@@ -8,15 +8,15 @@ Shows the
 
 ### The settings menu
 Calendar View can be customized
-* < Save: Exist and save the current settings
-* Show date: Choose if and how the date is displayed: none, locale (default), monthfull or monthshort.yearshort #weeknum with 0 prefixed
-* Start wday: Set day of week start. Values: 0=Sunday, 1=Monday,...,6=Saturday or -1=Relative to today (default 0: Sunday)
-* Su color: Set Sundays color. Values: none (default), red, green or blue
-* Border: show or none (default)
+* < Save: Exit and save the current settings
+* Show date: Choose if and how the date is displayed: none, locale [default], monthfull or monthshort.yearshort #weeknum with 0 prefixed
+* Start wday: Set day of week start. Values: 0=Sunday, 1=Monday,...,6=Saturday or -1=Relative to today [default 0: Sunday]
+* Su color: Set Sundays color. Values: none [default], red, green or blue
+* Border: show or none [default]
 * Submenu Today settings - choose how today is highlighted
   * < Back:
-  * Color: none, red (default), green or blue
-  * Marker: Outline today graphically. Values: none (default), circle, rect(angle)
-  * Mrk.Color: Circle/rectangle color: red (default), green or blue
-  * Mrk.Size: Circle/rectangle thickness in pixel: min:1, max: 10, default:3
-* < Cancel: Exit and no change. Nevertheless missing default settings and superflous settings will be removed and saved.
+  * Color: none, red [default], green or blue
+  * Marker: Highlight today graphically. Values: none [default], circle, rectangle or filled
+  * Mrk.Color: Circle/rectangle color: red, green [default] or blue
+  * Mrk.Size: Circle/rectangle thickness in pixel: min: 1 to 10:max [default:3]
+* < Cancel: Exit and no change. (Nevertheless missing default settings will be added and superflous settings will be removed.)
diff --git a/apps/timecal/metadata.json b/apps/timecal/metadata.json
index f439f4e9c..287dce0ae 100644
--- a/apps/timecal/metadata.json
+++ b/apps/timecal/metadata.json
@@ -1,7 +1,7 @@
 { "id": "timecal",
   "name": "TimeCal",
   "shortName":"TimeCal",
-  "version":"0.05",
+  "version":"0.06",
   "description": "TimeCal shows the date/time along with a 3 week calendar",
   "icon": "icon.png",
   "type": "clock",
diff --git a/apps/timecal/timecal.settings.js b/apps/timecal/timecal.settings.js
index e86f3d8b8..8a7867c0d 100644
--- a/apps/timecal/timecal.settings.js
+++ b/apps/timecal/timecal.settings.js
@@ -64,9 +64,7 @@
         format: v => v ? /*LANG*/"show" : /*LANG*/"none",
         onchange: v => chngdSttngs.calBrdr = v
       },
-      /*LANG*/"Today settings": () => {
-        showTodayMenu();
-      },
+      /*LANG*/"Today settings": () => showTodayMenu(),
       /*LANG*/"< Cancel": () => cancelExitSettings()
     });
   };
@@ -75,9 +73,9 @@
     E.showMenu({
       "": {
         "title": /*LANG*/"Today settings"
-    },
-    "< Back": () => showMainMenu(),
-    /*LANG*/"Color": {
+      },
+      "< Back": () => showMainMenu(),
+      /*LANG*/"Color": {
         value: chngdSttngs.tdyNumClr,
         min: 0, max: 3,
         format: v => [/*LANG*/"none", /*LANG*/"red", /*LANG*/"green", /*LANG*/"blue"][v],
@@ -91,8 +89,8 @@
       },
       /*LANG*/"Mrk.Color": {
         value: chngdSttngs.tdyMrkClr,
-        min: 0, max: 2,
-        format: v => [/*LANG*/"red", /*LANG*/"green", /*LANG*/"blue"][v],
+        min: 1, max: 3,
+        format: v => [undefined, /*LANG*/"red", /*LANG*/"green", /*LANG*/"blue"][v],
         onchange: v => chngdSttngs.tdyMrkClr = v
       },
       /*LANG*/"Mrk.Size": {
@@ -101,8 +99,8 @@
         format: v => v+"px",
         onchange: v => chngdSttngs.tdyMrkPxl = v
       },
-    /*LANG*/"< Cancel": () => cancelExitSettings()
-  });
+      /*LANG*/"< Cancel": () => cancelExitSettings()
+    });
   };
 
   showMainMenu();