diff --git a/apps/timecal/ChangeLog b/apps/timecal/ChangeLog index 43bff461d..e48145b4b 100644 --- a/apps/timecal/ChangeLog +++ b/apps/timecal/ChangeLog @@ -6,4 +6,5 @@ -> locale: weekday name (first two characters) from locale -> 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 \ No newline at end of file +0.04: finalized README, fixed settings cancel, fixed border-setting +0.05: bugfix: default settings \ No newline at end of file diff --git a/apps/timecal/metadata.json b/apps/timecal/metadata.json index 4dd8a8ca0..f439f4e9c 100644 --- a/apps/timecal/metadata.json +++ b/apps/timecal/metadata.json @@ -1,7 +1,7 @@ { "id": "timecal", "name": "TimeCal", "shortName":"TimeCal", - "version":"0.04", + "version":"0.05", "description": "TimeCal shows the date/time along with a 3 week calendar", "icon": "icon.png", "type": "clock", diff --git a/apps/timecal/testing/timecal.app.test.js b/apps/timecal/testing/timecal.app.test._js similarity index 100% rename from apps/timecal/testing/timecal.app.test.js rename to apps/timecal/testing/timecal.app.test._js diff --git a/apps/timecal/timecal.settings.js b/apps/timecal/timecal.settings.js index 38c87903b..2642c9628 100644 --- a/apps/timecal/timecal.settings.js +++ b/apps/timecal/timecal.settings.js @@ -2,7 +2,7 @@ (function(exit) { ABR_DAY = require("locale") && require("locale").abday ? require("locale").abday : ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]; - var FILE = "timecal.validSttngs.json"; + var FILE = "timecal.settings.json"; const DEFAULTS = { shwDate:1, //0:none, 1:locale, 2:month, 3:monthshort.year #week @@ -19,14 +19,14 @@ calBrdr:false }; - validSttngs = require("Storage").readJSON("timecal.validSttngs.json", 1) || {}; + validSttngs = require("Storage").readJSON(FILE, 1) || {}; for (const k in validSttngs) if (!DEFAULTS.hasOwnProperty(k)) delete this.validSttngs[k]; //remove invalid settings - for (const k in DEFAULTS) if(!validSttngs.hasOwnProperty(k)) validSttngs[k] = validSttngs[k]; //assign missing defaults + for (const k in DEFAULTS) if(!validSttngs.hasOwnProperty(k)) validSttngs[k] = DEFAULTS[k]; //assign missing defaults - var changedSttngs = Object.assign({}, validSttngs); + var chngdSttngs = Object.assign({}, validSttngs); var saveExitSettings = () => { - require('Storage').writeJSON(FILE, changedSttngs); + require('Storage').writeJSON(FILE, chngdSttngs); exit(); }; @@ -42,27 +42,27 @@ }, /*LANG*/"< Save": () => saveExitSettings(), /*LANG*/"Show date": { - value: validSttngs.shwDate, + value: chngdSttngs.shwDate, min: 0, max: 3, format: v => [/*LANG*/"none", /*LANG*/"locale", /*LANG*/"M", /*LANG*/"m.Y #W"][v], - onchange: v => validSttngs.shwDate = v + onchange: v => chngdSttngs.shwDate = v }, /*LANG*/"Start wday": { - value: validSttngs.wdStrt, + value: chngdSttngs.wdStrt, min: -1, max: 6, format: v => v>=0 ? ABR_DAY[v] : /*LANG*/"today", - onchange: v => validSttngs.wdStrt = v + onchange: v => chngdSttngs.wdStrt = v }, /*LANG*/"Su color": { - value: validSttngs.suClr, + value: chngdSttngs.suClr, min: 0, max: 3, format: v => [/*LANG*/"none", /*LANG*/"red", /*LANG*/"green", /*LANG*/"blue"][v], - onchange: v => validSttngs.suClr = v + onchange: v => chngdSttngs.suClr = v }, /*LANG*/"Border": { - value: validSttngs.calBrdr, + value: chngdSttngs.calBrdr, format: v => v ? /*LANG*/"show" : /*LANG*/"none", - onchange: v => validSttngs.calBrdr = v + onchange: v => chngdSttngs.calBrdr = v }, /*LANG*/"Today settings": () => { showTodayMenu(); @@ -78,28 +78,28 @@ }, "< Back": () => showMainMenu(), /*LANG*/"Color": { - value: validSttngs.tdyNumClr, + value: chngdSttngs.tdyNumClr, min: 0, max: 3, format: v => [/*LANG*/"none", /*LANG*/"red", /*LANG*/"green", /*LANG*/"blue"][v], - onchange: v => validSttngs.tdyNumClr = v + onchange: v => chngdSttngs.tdyNumClr = v }, /*LANG*/"Marker": { - value: validSttngs.tdyMrkr, + value: chngdSttngs.tdyMrkr, min: 0, max: 3, format: v => [/*LANG*/"none", /*LANG*/"circle", /*LANG*/"rectangle", /*LANG*/"filled"][v], - onchange: v => validSttngs.tdyMrkr = v + onchange: v => chngdSttngs.tdyMrkr = v }, /*LANG*/"Mrk.Color": { - value: validSttngs.tdyMrkClr, + value: chngdSttngs.tdyMrkClr, min: 0, max: 2, format: v => [/*LANG*/"red", /*LANG*/"green", /*LANG*/"blue"][v], - onchange: v => validSttngs.tdyMrkClr = v + onchange: v => chngdSttngs.tdyMrkClr = v }, /*LANG*/"Mrk.Size": { - value: validSttngs.tdyMrkPxl, + value: chngdSttngs.tdyMrkPxl, min: 1, max: 10, format: v => v+"px", - onchange: v => validSttngs.tdyMrkPxl = v + onchange: v => chngdSttngs.tdyMrkPxl = v }, /*LANG*/"< Cancel": () => cancelExitSettings() });