From 24d4a9284dc963b6809a60ec6cad2b68f37ad347 Mon Sep 17 00:00:00 2001 From: June Bennison Date: Mon, 10 Feb 2025 01:06:21 +1100 Subject: [PATCH] grandfatherclock: draw widget option --- apps/grandfatherclock/settings.js | 8 ++++++++ apps/grandfatherclock/widget.js | 21 ++++++++++++--------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/apps/grandfatherclock/settings.js b/apps/grandfatherclock/settings.js index e59e969bf..6401dffa5 100644 --- a/apps/grandfatherclock/settings.js +++ b/apps/grandfatherclock/settings.js @@ -3,6 +3,7 @@ const configFile = "grandfatherclock.json"; let config = Object.assign({ + draw_widget: true, twelve_hour: true, swap_meridian: false, hour_attention_buzz_ms: 1000, @@ -21,6 +22,13 @@ E.showMenu({ "": {"title" : "Grandfather Clock"}, "< Back": () => back(), + "Draw widget": { + value: config.draw_widget, + onchange: v => { + config.draw_widget = v; + writeConfig(); + } + }, "12 hour": { value: config.twelve_hour, onchange: v => { diff --git a/apps/grandfatherclock/widget.js b/apps/grandfatherclock/widget.js index 32162186a..b7014d595 100644 --- a/apps/grandfatherclock/widget.js +++ b/apps/grandfatherclock/widget.js @@ -1,16 +1,8 @@ (() => { - WIDGETS["grandfatherclock"] = { - area: "tr", - width: 16, - draw: function() { - g.reset(); - g.drawImage(atob("EBiDASSTJJISSSSZJJJCSSTJ///ISSZP///5CTJ/////ITJ/////ITJ/+B//ITJ/+B//ITJ//+P/ITJ/////ISZP///5CSRJ///ICSQJJJJACSYBJJIBCSYABgABCSYABgABCSYAJAABCSYANgABCSYBtgABCSYNtsABCSYBtgABCSYAMAABCSYAAAABCSZJJJJJCQ=="), this.x, this.y); - } - }; - // sensible defaults let config = Object.assign({ + draw_widget: true, twelve_hour: true, swap_meridian: false, hour_attention_buzz_ms: 1000, @@ -22,6 +14,17 @@ meridian_buzz_wait_ms: 300 }, require('Storage').readJSON("grandfatherclock.json", true) || {}); // or, load the app settings file. + WIDGETS["grandfatherclock"] = { + area: "tr", + width: config.draw_widget ? 16, + draw: function() { + if (config.draw_widget) { + g.reset(); + g.drawImage(atob("EBiDASSTJJISSSSZJJJCSSTJ///ISSZP///5CTJ/////ITJ/////ITJ/+B//ITJ/+B//ITJ//+P/ITJ/////ISZP///5CSRJ///ICSQJJJJACSYBJJIBCSYABgABCSYABgABCSYAJAABCSYANgABCSYBtgABCSYNtsABCSYBtgABCSYAMAABCSYAAAABCSZJJJJJCQ=="), this.x, this.y); + } + } + }; + let date; let fractionMs = 3600000 / config.fractions_of_hour;