From 404c970f3602a970e899fe150245826552d5614d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=88=9A=28noham=29=C2=B2?= <100566912+NohamR@users.noreply.github.com> Date: Mon, 6 Jul 2026 23:30:35 +0200 Subject: [PATCH] Refine timer QML bindings --- 3.24.0.149/quickSettingsTimer.qmd | 91 ++++++++++++++++--------------- 3.25.1.1/quickSettingsTimer.qmd | 91 ++++++++++++++++--------------- 3.26.0.68/quickSettingsTimer.qmd | 91 ++++++++++++++++--------------- 3.27.1.0/quickSettingsTimer.qmd | 91 ++++++++++++++++--------------- 3.27.3.0/quickSettingsTimer.qmd | 91 ++++++++++++++++--------------- README.md | 4 +- 6 files changed, 237 insertions(+), 222 deletions(-) diff --git a/3.24.0.149/quickSettingsTimer.qmd b/3.24.0.149/quickSettingsTimer.qmd index 9c415cf..cc71bf8 100644 --- a/3.24.0.149/quickSettingsTimer.qmd +++ b/3.24.0.149/quickSettingsTimer.qmd @@ -6,23 +6,24 @@ AFFECT [[1658694193319203921]] TRAVERSE [[6502786168]] LOCATE AFTER ALL INSERT { - property ~&214620122227&~ timerManager: _timerManager + property alias timerManager: _timerManager ~&6502786168&~ { ~&5972374&~: _timerManager - property ~&6503679477&~ timerMode: ~&6504329801&~ + property bool timerMode: ~&6504329801&~ property ~&197088788&~ totalMs: 0 property ~&197088788&~ remainMs: 0 - property ~&6503679477&~ isRunning: ~&214625660372&~ + property bool isRunning: ~&214625660372&~ property ~&7083178290016&~ ~&478322454160073828&~: "00:00" - property ~&6503679477&~ ~&16765420033347753489&~: ~&214625660372&~ + property bool ~&16765420033347753489&~: ~&214625660372&~ property ~&197088788&~ presetMs: 60000 - property ~&6503679477&~ addMode: ~&6504329801&~ - property ~&6503679477&~ blinkLightOnNotification: ~&214625660372&~ + property bool addMode: ~&6504329801&~ + property bool blinkLightOnNotification: ~&214625660372&~ property ~&197102514&~ _blinkLight: ~&6504117156&~ + property bool hasFrontlight: ~&214625660372&~ /* Alarm state*/ - property ~&6503679477&~ alarmMode: ~&214625660372&~ + property bool alarmMode: ~&214625660372&~ property ~&197102514&~ alarms: [] property ~&197088788&~ nextAlarmId: 1 property ~&7083178290016&~ alarmNotificationText: "" @@ -31,9 +32,9 @@ AFFECT [[1658694193319203921]] function fmt(ms) { ~&197102514&~ ~&180970&~ = ~&6502909715&~.~&197079679&~(ms); ~&197102514&~ ~&180977&~ = ~&6502909715&~.~&214626058827&~(~&180970&~ / 3600000); - ~&197102514&~ ~&180982&~ = ~&6502909715&~.~&214626058827&~((~&180970&~ % 3600000) / 60000); + ~&197102514&~ m = ~&6502909715&~.~&214626058827&~((~&180970&~ % 3600000) / 60000); ~&197102514&~ ~&180988&~ = ~&6502909715&~.~&214626058827&~((~&180970&~ % 60000) / 1000); - ~&197102514&~ mm = ~&180982&~.~&7713616118928163&~().~&7713428190834284&~(2, ~&'180921&~); + ~&197102514&~ mm = m.~&7713616118928163&~().~&7713428190834284&~(2, ~&'180921&~); ~&197102514&~ ss = ~&180988&~.~&7713616118928163&~().~&7713428190834284&~(2, ~&'180921&~); ~&5972376&~ (~&180977&~ > 0) { ~&7083121450889&~ ~&180977&~.~&7713616118928163&~().~&7713428190834284&~(2, ~&'180921&~) + ~&"180931&~ + mm + ~&"180931&~ + ss; @@ -76,8 +77,8 @@ AFFECT [[1658694193319203921]] } /* Alarm management*/ - function addAlarm(~&180977&~, ~&180982&~) { - ~&197102514&~ ~&180970&~ = { ~&5972374&~: _timerManager.nextAlarmId, hour: ~&180977&~, minute: ~&180982&~, ~&233726547792244&~: ~&6504329801&~ }; + function addAlarm(~&180977&~, m) { + ~&197102514&~ ~&180970&~ = { ~&5972374&~: _timerManager.nextAlarmId, hour: ~&180977&~, minute: m, ~&233726547792244&~: ~&6504329801&~ }; _timerManager.alarms = _timerManager.alarms.~&7082546043425&~([~&180970&~]); _timerManager.nextAlarmId++; _timerManager.saveAlarms(); @@ -109,13 +110,13 @@ AFFECT [[1658694193319203921]] nextAlarmId: _timerManager.nextAlarmId, blinkLightOnNotification: _timerManager.blinkLightOnNotification }; - ~&197102514&~ xhr = new XMLHttpRequest(); + ~&197102514&~ xhr = new XMLHttpRequest(); xhr.~&6504147419&~("PUT", "file:///home/root/alarms.json"); xhr.~&6504279475&~(~&6502785411&~.~&254548178208422824&~(payload)); } function loadAlarms() { - ~&197102514&~ xhr = new XMLHttpRequest(); + ~&197102514&~ xhr = new XMLHttpRequest(); xhr.~&6504147419&~("GET", "file:///home/root/alarms.json"); xhr.onreadystatechange = function() { ~&5972376&~ (xhr.readyState === XMLHttpRequest.DONE) { @@ -124,7 +125,7 @@ AFFECT [[1658694193319203921]] _timerManager.alarms = ~&6503736259&~.alarms || []; _timerManager.nextAlarmId = ~&6503736259&~.nextAlarmId || 1; _timerManager.blinkLightOnNotification = ~&6503736259&~.blinkLightOnNotification || ~&214625660372&~; - } catch (~&180974&~) { + } catch (e) { _timerManager.alarms = []; _timerManager.nextAlarmId = 1; } @@ -139,18 +140,18 @@ AFFECT [[1658694193319203921]] ~&7083121289162&~: ~&6504329801&~ ~&233743626668842&~: ~&6504329801&~ ~&495358363329399331&~: { - ~&197102514&~ ~&180973&~ = new ~&6502586279&~(); + ~&197102514&~ d = new ~&6502586279&~(); /* Use an absolute epoch-minute (not hour*60+minute) so that a recurring*/ /* alarm can fire again on the next day instead of being permanently*/ /* suppressed once it has matched lastNotifiedMinute.*/ - ~&197102514&~ nowMinute = ~&6502909715&~.~&214626058827&~(~&180973&~.getTime() / 60000); + ~&197102514&~ nowMinute = ~&6502909715&~.~&214626058827&~(d.getTime() / 60000); ~&5972376&~ (nowMinute === _timerManager.lastNotifiedMinute) ~&7083121450889&~; - ~&197102514&~ ~&180977&~ = ~&180973&~.getHours(); - ~&197102514&~ ~&180982&~ = ~&180973&~.getMinutes(); + ~&197102514&~ ~&180977&~ = d.getHours(); + ~&197102514&~ m = d.getMinutes(); ~&197085552&~ (~&197102514&~ ~&180978&~ = 0; ~&180978&~ < _timerManager.alarms.~&7082886407723&~; ~&180978&~++) { ~&197102514&~ ~&180970&~ = _timerManager.alarms[~&180978&~]; - ~&5972376&~ (~&180970&~.~&233726547792244&~ && ~&180970&~.hour === ~&180977&~ && ~&180970&~.minute === ~&180982&~) { + ~&5972376&~ (~&180970&~.~&233726547792244&~ && ~&180970&~.hour === ~&180977&~ && ~&180970&~.minute === m) { _timerManager.alarmNotificationText = ~&180970&~.hour.~&7713616118928163&~().~&7713428190834284&~(2, ~&'180921&~) + ~&"180931&~ + ~&180970&~.minute.~&7713616118928163&~().~&7713428190834284&~(2, ~&'180921&~); _timerManager.~&16765420033347753489&~ = ~&6504329801&~; _timerManager.lastNotifiedMinute = nowMinute; @@ -182,6 +183,8 @@ AFFECT [[1658694193319203921]] ~&254480451320573660&~.~&495334332051582499&~: { _timerManager.loadAlarms(); + ~&197102514&~ _c = ~&5971598&~.~&16810493623656567312&~("qrc:/qt/qml/xofm/modules/light/front/qml/QuickSettingsSlider.qml"); + _timerManager.hasFrontlight = (_c.~&7083177691309&~ === ~&254480451320573660&~.~&214602073246&~); } } } @@ -215,21 +218,21 @@ AFFECT [[12542166428983872557]] ~&7712155293725601&~ { ~&214634455770&~: [ - { ~&197101097&~: ~&"214604601930&~, ~&6504074414&~: ~&"214642551402&~ }, - { ~&197101097&~: "Chrono", ~&6504074414&~: "chrono" }, - { ~&197101097&~: "Alarm", ~&6504074414&~: "alarm" } + { txt: ~&"214604601930&~, ~&6504074414&~: ~&"214642551402&~ }, + { txt: "Chrono", ~&6504074414&~: "chrono" }, + { txt: "Alarm", ~&6504074414&~: "alarm" } ] ~&7712922269353028&~: ~&6502786168&~ { ~&7081629735527&~.~&254529418434902000&~: ~&6504329801&~ ~&7081629735527&~.~&17520348323745447649&~: 68 - readonly property ~&6503679477&~ ~&7082453764421&~: ~&254539508423767444&~.~&6504074414&~ === ~&"214642551402&~ ? !~&7082020628281&~.timerManager.alarmMode && ~&7082020628281&~.timerManager.timerMode + readonly property bool ~&7082453764421&~: ~&254539508423767444&~.~&6504074414&~ === ~&"214642551402&~ ? !~&7082020628281&~.timerManager.alarmMode && ~&7082020628281&~.timerManager.timerMode : ~&254539508423767444&~.~&6504074414&~ === "chrono" ? !~&7082020628281&~.timerManager.alarmMode && !~&7082020628281&~.timerManager.timerMode : ~&7082020628281&~.timerManager.alarmMode ~&6503165774&~ { ~&233721384511543&~.~&7712879746914881&~: ~&7083038346995&~ - ~&6504315758&~: ~&254539508423767444&~.~&197101097&~ + ~&6504315758&~: ~&254539508423767444&~.txt ~&6503823200&~.~&254543497768871654&~: 24 ~&6503823200&~.~&6503679370&~: ~&7082453764421&~ ~&214622605608&~: ~&7082453764421&~ ? ~&7082020628281&~.~&8399340017235344933&~ : "#888888" @@ -286,11 +289,11 @@ AFFECT [[12542166428983872557]] ~&7712155293725601&~ { ~&214634455770&~: [ - { ~&197101097&~: "1 m", ~&197102508&~: 60000 }, - { ~&197101097&~: "5 m", ~&197102508&~: 300000 }, - { ~&197101097&~: "10 m", ~&197102508&~: 600000 }, - { ~&197101097&~: "30 m", ~&197102508&~: 1800000 }, - { ~&197101097&~: "1 h", ~&197102508&~: 3600000 } + { txt: "1 m", ~&197102508&~: 60000 }, + { txt: "5 m", ~&197102508&~: 300000 }, + { txt: "10 m", ~&197102508&~: 600000 }, + { txt: "30 m", ~&197102508&~: 1800000 }, + { txt: "1 h", ~&197102508&~: 3600000 } ] ~&7712922269353028&~: ~&6502786168&~ { ~&7081629735527&~.~&254529418434902000&~: ~&6504329801&~ @@ -302,7 +305,7 @@ AFFECT [[12542166428983872557]] } ~&6503165774&~ { ~&233721384511543&~.~&7712879746914881&~: ~&7083038346995&~ - ~&6504315758&~: ~&254539508423767444&~.~&197101097&~ + ~&6504315758&~: ~&254539508423767444&~.txt ~&6503823200&~.~&254543497768871654&~: 20 ~&6503823200&~.~&6503679370&~: ~&6504329801&~ ~&214622605608&~: ~&7082020628281&~.~&8399340017235344933&~ @@ -421,7 +424,7 @@ AFFECT [[12542166428983872557]] ~&6502786168&~ { ~&7081629735527&~.~&254529418434902000&~: ~&6504329801&~ - ~&7081629735527&~.~&8399470807760157065&~: ~&6504329801&~ + ~&7081629735527&~.fillHeight: ~&6504329801&~ ~&425121728314878811&~.~&6502767986&~ { ~&5972374&~: _radioIcon @@ -499,7 +502,7 @@ AFFECT [[12542166428983872557]] ~&254542236275632405&~: { ~&7082020628281&~.timerManager.~&6504295855&~(); ~&6504254477&~.~&2766288418351025740&~.~&214622501183&~(); - ~&6504254477&~.~&2766288418351025740&~.~&6504147419&~(~&"3271012201642534810&~); + ~&6504254477&~.~&2766288418351025740&~.~&6504147419&~("systemclock/window/settings-info"); } } } @@ -531,7 +534,7 @@ AFFECT /qt/qml/xofm/modules/systemclock/qml/window/SettingsInfoWindow.qml ~&6502786168&~ { ~&7081629735527&~.~&254529418434902000&~: ~&6504329801&~ - ~&7081629735527&~.~&8399470807760157065&~: ~&6504329801&~ + ~&7081629735527&~.fillHeight: ~&6504329801&~ ~&425121728314878811&~.~&6502767986&~ { ~&5972374&~: _alarmIcon @@ -617,7 +620,7 @@ AFFECT /qt/qml/xofm/modules/systemclock/qml/window/SettingsInfoWindow.qml ~&214628545114&~: 8 ~&233736699967534&~: 0 ~&8399894257374503713&~: function(~&180977&~) { _alarmTimeSpinners.~&214628545114&~ = ~&180977&~; } - ~&16346529800820831925&~: function(~&180982&~) { _alarmTimeSpinners.~&233736699967534&~ = ~&180982&~; } + ~&16346529800820831925&~: function(m) { _alarmTimeSpinners.~&233736699967534&~ = m; } } ~&6502786168&~ { @@ -642,9 +645,9 @@ AFFECT /qt/qml/xofm/modules/systemclock/qml/window/SettingsInfoWindow.qml ~&254494525842443467&~ { ~&233721384511543&~.~&6503816592&~: ~&7083038346995&~ ~&254542236275632405&~: { - ~&197102514&~ ~&180973&~ = new ~&6502586279&~(); - _alarmTimeSpinners.~&214628545114&~ = ~&180973&~.getHours(); - _alarmTimeSpinners.~&233736699967534&~ = ~&180973&~.getMinutes(); + ~&197102514&~ d = new ~&6502586279&~(); + _alarmTimeSpinners.~&214628545114&~ = d.getHours(); + _alarmTimeSpinners.~&233736699967534&~ = d.getMinutes(); } } } @@ -659,7 +662,7 @@ AFFECT /qt/qml/xofm/modules/systemclock/qml/window/SettingsInfoWindow.qml ~&214634455770&~: [0, 15, 30, 45] ~&7712922269353028&~: ~&6502786168&~ { ~&7081629735527&~.~&254529418434902000&~: ~&6504329801&~ - ~&7081629735527&~.~&8399470807760157065&~: ~&6504329801&~ + ~&7081629735527&~.fillHeight: ~&6504329801&~ ~&254501108490678590&~ { ~&233721384511543&~.~&6503816592&~: ~&7083038346995&~ @@ -692,7 +695,7 @@ AFFECT /qt/qml/xofm/modules/systemclock/qml/window/SettingsInfoWindow.qml ~&214634455770&~: [15, 30, 45] ~&7712922269353028&~: ~&6502786168&~ { ~&7081629735527&~.~&254529418434902000&~: ~&6504329801&~ - ~&7081629735527&~.~&8399470807760157065&~: ~&6504329801&~ + ~&7081629735527&~.fillHeight: ~&6504329801&~ ~&254501108490678590&~ { ~&233721384511543&~.~&6503816592&~: ~&7083038346995&~ @@ -709,9 +712,9 @@ AFFECT /qt/qml/xofm/modules/systemclock/qml/window/SettingsInfoWindow.qml ~&254494525842443467&~ { ~&233721384511543&~.~&6503816592&~: ~&7083038346995&~ ~&254542236275632405&~: { - ~&197102514&~ ~&180982&~ = _alarmTimeSpinners.~&233736699967534&~ + ~&254539508423767444&~; - ~&5972376&~ (~&180982&~ >= 60) { ~&180982&~ -= 60; } - _alarmTimeSpinners.~&233736699967534&~ = ~&180982&~; + ~&197102514&~ m = _alarmTimeSpinners.~&233736699967534&~ + ~&254539508423767444&~; + ~&5972376&~ (m >= 60) { m -= 60; } + _alarmTimeSpinners.~&233736699967534&~ = m; } } } @@ -747,6 +750,7 @@ AFFECT /qt/qml/xofm/modules/systemclock/qml/window/SettingsInfoWindow.qml ~&425121728314878811&~.~&214599571833&~ { ~&7081629735527&~.~&254529418434902000&~: ~&6504329801&~ + ~&233748328658231&~: ~&7082020628281&~.timerManager.hasFrontlight ~&214632764553&~: "Flash light" ~&478136262235079021&~: "Blink the reading light when the timer ends or an alarm triggers" ~&7082453764199&~: ~&425121728314878811&~.~&7081261925573&~ { @@ -761,7 +765,6 @@ END AFFECT ; Notification bar for timer finish and alarm triggers AFFECT [[2328484894988065446]] IMPORT [[233700934949963.233693781272506]] [[180922.180921]] - IMPORT [[6504469795.233736922911970.214633057601.214626274418]] [[180922.180921]] TRAVERSE [[8397788359424131273]]#[[6504254477]] > [[8397993708429497603]]#[[7713531976371484]] LOCATE AFTER ALL @@ -874,7 +877,7 @@ AFFECT [[2328484894988065446]] END AFFECT ; Capture Light reference from the QuickSettingsSlider so we can blink it -AFFECT [[9830508555522680663]] +AFFECT /qt/qml/xofm/modules/light/front/qml/QuickSettingsSlider.qml TRAVERSE [[425121728314878811.7081916140908]]#[[6504254477]] LOCATE AFTER ALL INSERT { diff --git a/3.25.1.1/quickSettingsTimer.qmd b/3.25.1.1/quickSettingsTimer.qmd index 9c415cf..cc71bf8 100644 --- a/3.25.1.1/quickSettingsTimer.qmd +++ b/3.25.1.1/quickSettingsTimer.qmd @@ -6,23 +6,24 @@ AFFECT [[1658694193319203921]] TRAVERSE [[6502786168]] LOCATE AFTER ALL INSERT { - property ~&214620122227&~ timerManager: _timerManager + property alias timerManager: _timerManager ~&6502786168&~ { ~&5972374&~: _timerManager - property ~&6503679477&~ timerMode: ~&6504329801&~ + property bool timerMode: ~&6504329801&~ property ~&197088788&~ totalMs: 0 property ~&197088788&~ remainMs: 0 - property ~&6503679477&~ isRunning: ~&214625660372&~ + property bool isRunning: ~&214625660372&~ property ~&7083178290016&~ ~&478322454160073828&~: "00:00" - property ~&6503679477&~ ~&16765420033347753489&~: ~&214625660372&~ + property bool ~&16765420033347753489&~: ~&214625660372&~ property ~&197088788&~ presetMs: 60000 - property ~&6503679477&~ addMode: ~&6504329801&~ - property ~&6503679477&~ blinkLightOnNotification: ~&214625660372&~ + property bool addMode: ~&6504329801&~ + property bool blinkLightOnNotification: ~&214625660372&~ property ~&197102514&~ _blinkLight: ~&6504117156&~ + property bool hasFrontlight: ~&214625660372&~ /* Alarm state*/ - property ~&6503679477&~ alarmMode: ~&214625660372&~ + property bool alarmMode: ~&214625660372&~ property ~&197102514&~ alarms: [] property ~&197088788&~ nextAlarmId: 1 property ~&7083178290016&~ alarmNotificationText: "" @@ -31,9 +32,9 @@ AFFECT [[1658694193319203921]] function fmt(ms) { ~&197102514&~ ~&180970&~ = ~&6502909715&~.~&197079679&~(ms); ~&197102514&~ ~&180977&~ = ~&6502909715&~.~&214626058827&~(~&180970&~ / 3600000); - ~&197102514&~ ~&180982&~ = ~&6502909715&~.~&214626058827&~((~&180970&~ % 3600000) / 60000); + ~&197102514&~ m = ~&6502909715&~.~&214626058827&~((~&180970&~ % 3600000) / 60000); ~&197102514&~ ~&180988&~ = ~&6502909715&~.~&214626058827&~((~&180970&~ % 60000) / 1000); - ~&197102514&~ mm = ~&180982&~.~&7713616118928163&~().~&7713428190834284&~(2, ~&'180921&~); + ~&197102514&~ mm = m.~&7713616118928163&~().~&7713428190834284&~(2, ~&'180921&~); ~&197102514&~ ss = ~&180988&~.~&7713616118928163&~().~&7713428190834284&~(2, ~&'180921&~); ~&5972376&~ (~&180977&~ > 0) { ~&7083121450889&~ ~&180977&~.~&7713616118928163&~().~&7713428190834284&~(2, ~&'180921&~) + ~&"180931&~ + mm + ~&"180931&~ + ss; @@ -76,8 +77,8 @@ AFFECT [[1658694193319203921]] } /* Alarm management*/ - function addAlarm(~&180977&~, ~&180982&~) { - ~&197102514&~ ~&180970&~ = { ~&5972374&~: _timerManager.nextAlarmId, hour: ~&180977&~, minute: ~&180982&~, ~&233726547792244&~: ~&6504329801&~ }; + function addAlarm(~&180977&~, m) { + ~&197102514&~ ~&180970&~ = { ~&5972374&~: _timerManager.nextAlarmId, hour: ~&180977&~, minute: m, ~&233726547792244&~: ~&6504329801&~ }; _timerManager.alarms = _timerManager.alarms.~&7082546043425&~([~&180970&~]); _timerManager.nextAlarmId++; _timerManager.saveAlarms(); @@ -109,13 +110,13 @@ AFFECT [[1658694193319203921]] nextAlarmId: _timerManager.nextAlarmId, blinkLightOnNotification: _timerManager.blinkLightOnNotification }; - ~&197102514&~ xhr = new XMLHttpRequest(); + ~&197102514&~ xhr = new XMLHttpRequest(); xhr.~&6504147419&~("PUT", "file:///home/root/alarms.json"); xhr.~&6504279475&~(~&6502785411&~.~&254548178208422824&~(payload)); } function loadAlarms() { - ~&197102514&~ xhr = new XMLHttpRequest(); + ~&197102514&~ xhr = new XMLHttpRequest(); xhr.~&6504147419&~("GET", "file:///home/root/alarms.json"); xhr.onreadystatechange = function() { ~&5972376&~ (xhr.readyState === XMLHttpRequest.DONE) { @@ -124,7 +125,7 @@ AFFECT [[1658694193319203921]] _timerManager.alarms = ~&6503736259&~.alarms || []; _timerManager.nextAlarmId = ~&6503736259&~.nextAlarmId || 1; _timerManager.blinkLightOnNotification = ~&6503736259&~.blinkLightOnNotification || ~&214625660372&~; - } catch (~&180974&~) { + } catch (e) { _timerManager.alarms = []; _timerManager.nextAlarmId = 1; } @@ -139,18 +140,18 @@ AFFECT [[1658694193319203921]] ~&7083121289162&~: ~&6504329801&~ ~&233743626668842&~: ~&6504329801&~ ~&495358363329399331&~: { - ~&197102514&~ ~&180973&~ = new ~&6502586279&~(); + ~&197102514&~ d = new ~&6502586279&~(); /* Use an absolute epoch-minute (not hour*60+minute) so that a recurring*/ /* alarm can fire again on the next day instead of being permanently*/ /* suppressed once it has matched lastNotifiedMinute.*/ - ~&197102514&~ nowMinute = ~&6502909715&~.~&214626058827&~(~&180973&~.getTime() / 60000); + ~&197102514&~ nowMinute = ~&6502909715&~.~&214626058827&~(d.getTime() / 60000); ~&5972376&~ (nowMinute === _timerManager.lastNotifiedMinute) ~&7083121450889&~; - ~&197102514&~ ~&180977&~ = ~&180973&~.getHours(); - ~&197102514&~ ~&180982&~ = ~&180973&~.getMinutes(); + ~&197102514&~ ~&180977&~ = d.getHours(); + ~&197102514&~ m = d.getMinutes(); ~&197085552&~ (~&197102514&~ ~&180978&~ = 0; ~&180978&~ < _timerManager.alarms.~&7082886407723&~; ~&180978&~++) { ~&197102514&~ ~&180970&~ = _timerManager.alarms[~&180978&~]; - ~&5972376&~ (~&180970&~.~&233726547792244&~ && ~&180970&~.hour === ~&180977&~ && ~&180970&~.minute === ~&180982&~) { + ~&5972376&~ (~&180970&~.~&233726547792244&~ && ~&180970&~.hour === ~&180977&~ && ~&180970&~.minute === m) { _timerManager.alarmNotificationText = ~&180970&~.hour.~&7713616118928163&~().~&7713428190834284&~(2, ~&'180921&~) + ~&"180931&~ + ~&180970&~.minute.~&7713616118928163&~().~&7713428190834284&~(2, ~&'180921&~); _timerManager.~&16765420033347753489&~ = ~&6504329801&~; _timerManager.lastNotifiedMinute = nowMinute; @@ -182,6 +183,8 @@ AFFECT [[1658694193319203921]] ~&254480451320573660&~.~&495334332051582499&~: { _timerManager.loadAlarms(); + ~&197102514&~ _c = ~&5971598&~.~&16810493623656567312&~("qrc:/qt/qml/xofm/modules/light/front/qml/QuickSettingsSlider.qml"); + _timerManager.hasFrontlight = (_c.~&7083177691309&~ === ~&254480451320573660&~.~&214602073246&~); } } } @@ -215,21 +218,21 @@ AFFECT [[12542166428983872557]] ~&7712155293725601&~ { ~&214634455770&~: [ - { ~&197101097&~: ~&"214604601930&~, ~&6504074414&~: ~&"214642551402&~ }, - { ~&197101097&~: "Chrono", ~&6504074414&~: "chrono" }, - { ~&197101097&~: "Alarm", ~&6504074414&~: "alarm" } + { txt: ~&"214604601930&~, ~&6504074414&~: ~&"214642551402&~ }, + { txt: "Chrono", ~&6504074414&~: "chrono" }, + { txt: "Alarm", ~&6504074414&~: "alarm" } ] ~&7712922269353028&~: ~&6502786168&~ { ~&7081629735527&~.~&254529418434902000&~: ~&6504329801&~ ~&7081629735527&~.~&17520348323745447649&~: 68 - readonly property ~&6503679477&~ ~&7082453764421&~: ~&254539508423767444&~.~&6504074414&~ === ~&"214642551402&~ ? !~&7082020628281&~.timerManager.alarmMode && ~&7082020628281&~.timerManager.timerMode + readonly property bool ~&7082453764421&~: ~&254539508423767444&~.~&6504074414&~ === ~&"214642551402&~ ? !~&7082020628281&~.timerManager.alarmMode && ~&7082020628281&~.timerManager.timerMode : ~&254539508423767444&~.~&6504074414&~ === "chrono" ? !~&7082020628281&~.timerManager.alarmMode && !~&7082020628281&~.timerManager.timerMode : ~&7082020628281&~.timerManager.alarmMode ~&6503165774&~ { ~&233721384511543&~.~&7712879746914881&~: ~&7083038346995&~ - ~&6504315758&~: ~&254539508423767444&~.~&197101097&~ + ~&6504315758&~: ~&254539508423767444&~.txt ~&6503823200&~.~&254543497768871654&~: 24 ~&6503823200&~.~&6503679370&~: ~&7082453764421&~ ~&214622605608&~: ~&7082453764421&~ ? ~&7082020628281&~.~&8399340017235344933&~ : "#888888" @@ -286,11 +289,11 @@ AFFECT [[12542166428983872557]] ~&7712155293725601&~ { ~&214634455770&~: [ - { ~&197101097&~: "1 m", ~&197102508&~: 60000 }, - { ~&197101097&~: "5 m", ~&197102508&~: 300000 }, - { ~&197101097&~: "10 m", ~&197102508&~: 600000 }, - { ~&197101097&~: "30 m", ~&197102508&~: 1800000 }, - { ~&197101097&~: "1 h", ~&197102508&~: 3600000 } + { txt: "1 m", ~&197102508&~: 60000 }, + { txt: "5 m", ~&197102508&~: 300000 }, + { txt: "10 m", ~&197102508&~: 600000 }, + { txt: "30 m", ~&197102508&~: 1800000 }, + { txt: "1 h", ~&197102508&~: 3600000 } ] ~&7712922269353028&~: ~&6502786168&~ { ~&7081629735527&~.~&254529418434902000&~: ~&6504329801&~ @@ -302,7 +305,7 @@ AFFECT [[12542166428983872557]] } ~&6503165774&~ { ~&233721384511543&~.~&7712879746914881&~: ~&7083038346995&~ - ~&6504315758&~: ~&254539508423767444&~.~&197101097&~ + ~&6504315758&~: ~&254539508423767444&~.txt ~&6503823200&~.~&254543497768871654&~: 20 ~&6503823200&~.~&6503679370&~: ~&6504329801&~ ~&214622605608&~: ~&7082020628281&~.~&8399340017235344933&~ @@ -421,7 +424,7 @@ AFFECT [[12542166428983872557]] ~&6502786168&~ { ~&7081629735527&~.~&254529418434902000&~: ~&6504329801&~ - ~&7081629735527&~.~&8399470807760157065&~: ~&6504329801&~ + ~&7081629735527&~.fillHeight: ~&6504329801&~ ~&425121728314878811&~.~&6502767986&~ { ~&5972374&~: _radioIcon @@ -499,7 +502,7 @@ AFFECT [[12542166428983872557]] ~&254542236275632405&~: { ~&7082020628281&~.timerManager.~&6504295855&~(); ~&6504254477&~.~&2766288418351025740&~.~&214622501183&~(); - ~&6504254477&~.~&2766288418351025740&~.~&6504147419&~(~&"3271012201642534810&~); + ~&6504254477&~.~&2766288418351025740&~.~&6504147419&~("systemclock/window/settings-info"); } } } @@ -531,7 +534,7 @@ AFFECT /qt/qml/xofm/modules/systemclock/qml/window/SettingsInfoWindow.qml ~&6502786168&~ { ~&7081629735527&~.~&254529418434902000&~: ~&6504329801&~ - ~&7081629735527&~.~&8399470807760157065&~: ~&6504329801&~ + ~&7081629735527&~.fillHeight: ~&6504329801&~ ~&425121728314878811&~.~&6502767986&~ { ~&5972374&~: _alarmIcon @@ -617,7 +620,7 @@ AFFECT /qt/qml/xofm/modules/systemclock/qml/window/SettingsInfoWindow.qml ~&214628545114&~: 8 ~&233736699967534&~: 0 ~&8399894257374503713&~: function(~&180977&~) { _alarmTimeSpinners.~&214628545114&~ = ~&180977&~; } - ~&16346529800820831925&~: function(~&180982&~) { _alarmTimeSpinners.~&233736699967534&~ = ~&180982&~; } + ~&16346529800820831925&~: function(m) { _alarmTimeSpinners.~&233736699967534&~ = m; } } ~&6502786168&~ { @@ -642,9 +645,9 @@ AFFECT /qt/qml/xofm/modules/systemclock/qml/window/SettingsInfoWindow.qml ~&254494525842443467&~ { ~&233721384511543&~.~&6503816592&~: ~&7083038346995&~ ~&254542236275632405&~: { - ~&197102514&~ ~&180973&~ = new ~&6502586279&~(); - _alarmTimeSpinners.~&214628545114&~ = ~&180973&~.getHours(); - _alarmTimeSpinners.~&233736699967534&~ = ~&180973&~.getMinutes(); + ~&197102514&~ d = new ~&6502586279&~(); + _alarmTimeSpinners.~&214628545114&~ = d.getHours(); + _alarmTimeSpinners.~&233736699967534&~ = d.getMinutes(); } } } @@ -659,7 +662,7 @@ AFFECT /qt/qml/xofm/modules/systemclock/qml/window/SettingsInfoWindow.qml ~&214634455770&~: [0, 15, 30, 45] ~&7712922269353028&~: ~&6502786168&~ { ~&7081629735527&~.~&254529418434902000&~: ~&6504329801&~ - ~&7081629735527&~.~&8399470807760157065&~: ~&6504329801&~ + ~&7081629735527&~.fillHeight: ~&6504329801&~ ~&254501108490678590&~ { ~&233721384511543&~.~&6503816592&~: ~&7083038346995&~ @@ -692,7 +695,7 @@ AFFECT /qt/qml/xofm/modules/systemclock/qml/window/SettingsInfoWindow.qml ~&214634455770&~: [15, 30, 45] ~&7712922269353028&~: ~&6502786168&~ { ~&7081629735527&~.~&254529418434902000&~: ~&6504329801&~ - ~&7081629735527&~.~&8399470807760157065&~: ~&6504329801&~ + ~&7081629735527&~.fillHeight: ~&6504329801&~ ~&254501108490678590&~ { ~&233721384511543&~.~&6503816592&~: ~&7083038346995&~ @@ -709,9 +712,9 @@ AFFECT /qt/qml/xofm/modules/systemclock/qml/window/SettingsInfoWindow.qml ~&254494525842443467&~ { ~&233721384511543&~.~&6503816592&~: ~&7083038346995&~ ~&254542236275632405&~: { - ~&197102514&~ ~&180982&~ = _alarmTimeSpinners.~&233736699967534&~ + ~&254539508423767444&~; - ~&5972376&~ (~&180982&~ >= 60) { ~&180982&~ -= 60; } - _alarmTimeSpinners.~&233736699967534&~ = ~&180982&~; + ~&197102514&~ m = _alarmTimeSpinners.~&233736699967534&~ + ~&254539508423767444&~; + ~&5972376&~ (m >= 60) { m -= 60; } + _alarmTimeSpinners.~&233736699967534&~ = m; } } } @@ -747,6 +750,7 @@ AFFECT /qt/qml/xofm/modules/systemclock/qml/window/SettingsInfoWindow.qml ~&425121728314878811&~.~&214599571833&~ { ~&7081629735527&~.~&254529418434902000&~: ~&6504329801&~ + ~&233748328658231&~: ~&7082020628281&~.timerManager.hasFrontlight ~&214632764553&~: "Flash light" ~&478136262235079021&~: "Blink the reading light when the timer ends or an alarm triggers" ~&7082453764199&~: ~&425121728314878811&~.~&7081261925573&~ { @@ -761,7 +765,6 @@ END AFFECT ; Notification bar for timer finish and alarm triggers AFFECT [[2328484894988065446]] IMPORT [[233700934949963.233693781272506]] [[180922.180921]] - IMPORT [[6504469795.233736922911970.214633057601.214626274418]] [[180922.180921]] TRAVERSE [[8397788359424131273]]#[[6504254477]] > [[8397993708429497603]]#[[7713531976371484]] LOCATE AFTER ALL @@ -874,7 +877,7 @@ AFFECT [[2328484894988065446]] END AFFECT ; Capture Light reference from the QuickSettingsSlider so we can blink it -AFFECT [[9830508555522680663]] +AFFECT /qt/qml/xofm/modules/light/front/qml/QuickSettingsSlider.qml TRAVERSE [[425121728314878811.7081916140908]]#[[6504254477]] LOCATE AFTER ALL INSERT { diff --git a/3.26.0.68/quickSettingsTimer.qmd b/3.26.0.68/quickSettingsTimer.qmd index 9c415cf..cc71bf8 100644 --- a/3.26.0.68/quickSettingsTimer.qmd +++ b/3.26.0.68/quickSettingsTimer.qmd @@ -6,23 +6,24 @@ AFFECT [[1658694193319203921]] TRAVERSE [[6502786168]] LOCATE AFTER ALL INSERT { - property ~&214620122227&~ timerManager: _timerManager + property alias timerManager: _timerManager ~&6502786168&~ { ~&5972374&~: _timerManager - property ~&6503679477&~ timerMode: ~&6504329801&~ + property bool timerMode: ~&6504329801&~ property ~&197088788&~ totalMs: 0 property ~&197088788&~ remainMs: 0 - property ~&6503679477&~ isRunning: ~&214625660372&~ + property bool isRunning: ~&214625660372&~ property ~&7083178290016&~ ~&478322454160073828&~: "00:00" - property ~&6503679477&~ ~&16765420033347753489&~: ~&214625660372&~ + property bool ~&16765420033347753489&~: ~&214625660372&~ property ~&197088788&~ presetMs: 60000 - property ~&6503679477&~ addMode: ~&6504329801&~ - property ~&6503679477&~ blinkLightOnNotification: ~&214625660372&~ + property bool addMode: ~&6504329801&~ + property bool blinkLightOnNotification: ~&214625660372&~ property ~&197102514&~ _blinkLight: ~&6504117156&~ + property bool hasFrontlight: ~&214625660372&~ /* Alarm state*/ - property ~&6503679477&~ alarmMode: ~&214625660372&~ + property bool alarmMode: ~&214625660372&~ property ~&197102514&~ alarms: [] property ~&197088788&~ nextAlarmId: 1 property ~&7083178290016&~ alarmNotificationText: "" @@ -31,9 +32,9 @@ AFFECT [[1658694193319203921]] function fmt(ms) { ~&197102514&~ ~&180970&~ = ~&6502909715&~.~&197079679&~(ms); ~&197102514&~ ~&180977&~ = ~&6502909715&~.~&214626058827&~(~&180970&~ / 3600000); - ~&197102514&~ ~&180982&~ = ~&6502909715&~.~&214626058827&~((~&180970&~ % 3600000) / 60000); + ~&197102514&~ m = ~&6502909715&~.~&214626058827&~((~&180970&~ % 3600000) / 60000); ~&197102514&~ ~&180988&~ = ~&6502909715&~.~&214626058827&~((~&180970&~ % 60000) / 1000); - ~&197102514&~ mm = ~&180982&~.~&7713616118928163&~().~&7713428190834284&~(2, ~&'180921&~); + ~&197102514&~ mm = m.~&7713616118928163&~().~&7713428190834284&~(2, ~&'180921&~); ~&197102514&~ ss = ~&180988&~.~&7713616118928163&~().~&7713428190834284&~(2, ~&'180921&~); ~&5972376&~ (~&180977&~ > 0) { ~&7083121450889&~ ~&180977&~.~&7713616118928163&~().~&7713428190834284&~(2, ~&'180921&~) + ~&"180931&~ + mm + ~&"180931&~ + ss; @@ -76,8 +77,8 @@ AFFECT [[1658694193319203921]] } /* Alarm management*/ - function addAlarm(~&180977&~, ~&180982&~) { - ~&197102514&~ ~&180970&~ = { ~&5972374&~: _timerManager.nextAlarmId, hour: ~&180977&~, minute: ~&180982&~, ~&233726547792244&~: ~&6504329801&~ }; + function addAlarm(~&180977&~, m) { + ~&197102514&~ ~&180970&~ = { ~&5972374&~: _timerManager.nextAlarmId, hour: ~&180977&~, minute: m, ~&233726547792244&~: ~&6504329801&~ }; _timerManager.alarms = _timerManager.alarms.~&7082546043425&~([~&180970&~]); _timerManager.nextAlarmId++; _timerManager.saveAlarms(); @@ -109,13 +110,13 @@ AFFECT [[1658694193319203921]] nextAlarmId: _timerManager.nextAlarmId, blinkLightOnNotification: _timerManager.blinkLightOnNotification }; - ~&197102514&~ xhr = new XMLHttpRequest(); + ~&197102514&~ xhr = new XMLHttpRequest(); xhr.~&6504147419&~("PUT", "file:///home/root/alarms.json"); xhr.~&6504279475&~(~&6502785411&~.~&254548178208422824&~(payload)); } function loadAlarms() { - ~&197102514&~ xhr = new XMLHttpRequest(); + ~&197102514&~ xhr = new XMLHttpRequest(); xhr.~&6504147419&~("GET", "file:///home/root/alarms.json"); xhr.onreadystatechange = function() { ~&5972376&~ (xhr.readyState === XMLHttpRequest.DONE) { @@ -124,7 +125,7 @@ AFFECT [[1658694193319203921]] _timerManager.alarms = ~&6503736259&~.alarms || []; _timerManager.nextAlarmId = ~&6503736259&~.nextAlarmId || 1; _timerManager.blinkLightOnNotification = ~&6503736259&~.blinkLightOnNotification || ~&214625660372&~; - } catch (~&180974&~) { + } catch (e) { _timerManager.alarms = []; _timerManager.nextAlarmId = 1; } @@ -139,18 +140,18 @@ AFFECT [[1658694193319203921]] ~&7083121289162&~: ~&6504329801&~ ~&233743626668842&~: ~&6504329801&~ ~&495358363329399331&~: { - ~&197102514&~ ~&180973&~ = new ~&6502586279&~(); + ~&197102514&~ d = new ~&6502586279&~(); /* Use an absolute epoch-minute (not hour*60+minute) so that a recurring*/ /* alarm can fire again on the next day instead of being permanently*/ /* suppressed once it has matched lastNotifiedMinute.*/ - ~&197102514&~ nowMinute = ~&6502909715&~.~&214626058827&~(~&180973&~.getTime() / 60000); + ~&197102514&~ nowMinute = ~&6502909715&~.~&214626058827&~(d.getTime() / 60000); ~&5972376&~ (nowMinute === _timerManager.lastNotifiedMinute) ~&7083121450889&~; - ~&197102514&~ ~&180977&~ = ~&180973&~.getHours(); - ~&197102514&~ ~&180982&~ = ~&180973&~.getMinutes(); + ~&197102514&~ ~&180977&~ = d.getHours(); + ~&197102514&~ m = d.getMinutes(); ~&197085552&~ (~&197102514&~ ~&180978&~ = 0; ~&180978&~ < _timerManager.alarms.~&7082886407723&~; ~&180978&~++) { ~&197102514&~ ~&180970&~ = _timerManager.alarms[~&180978&~]; - ~&5972376&~ (~&180970&~.~&233726547792244&~ && ~&180970&~.hour === ~&180977&~ && ~&180970&~.minute === ~&180982&~) { + ~&5972376&~ (~&180970&~.~&233726547792244&~ && ~&180970&~.hour === ~&180977&~ && ~&180970&~.minute === m) { _timerManager.alarmNotificationText = ~&180970&~.hour.~&7713616118928163&~().~&7713428190834284&~(2, ~&'180921&~) + ~&"180931&~ + ~&180970&~.minute.~&7713616118928163&~().~&7713428190834284&~(2, ~&'180921&~); _timerManager.~&16765420033347753489&~ = ~&6504329801&~; _timerManager.lastNotifiedMinute = nowMinute; @@ -182,6 +183,8 @@ AFFECT [[1658694193319203921]] ~&254480451320573660&~.~&495334332051582499&~: { _timerManager.loadAlarms(); + ~&197102514&~ _c = ~&5971598&~.~&16810493623656567312&~("qrc:/qt/qml/xofm/modules/light/front/qml/QuickSettingsSlider.qml"); + _timerManager.hasFrontlight = (_c.~&7083177691309&~ === ~&254480451320573660&~.~&214602073246&~); } } } @@ -215,21 +218,21 @@ AFFECT [[12542166428983872557]] ~&7712155293725601&~ { ~&214634455770&~: [ - { ~&197101097&~: ~&"214604601930&~, ~&6504074414&~: ~&"214642551402&~ }, - { ~&197101097&~: "Chrono", ~&6504074414&~: "chrono" }, - { ~&197101097&~: "Alarm", ~&6504074414&~: "alarm" } + { txt: ~&"214604601930&~, ~&6504074414&~: ~&"214642551402&~ }, + { txt: "Chrono", ~&6504074414&~: "chrono" }, + { txt: "Alarm", ~&6504074414&~: "alarm" } ] ~&7712922269353028&~: ~&6502786168&~ { ~&7081629735527&~.~&254529418434902000&~: ~&6504329801&~ ~&7081629735527&~.~&17520348323745447649&~: 68 - readonly property ~&6503679477&~ ~&7082453764421&~: ~&254539508423767444&~.~&6504074414&~ === ~&"214642551402&~ ? !~&7082020628281&~.timerManager.alarmMode && ~&7082020628281&~.timerManager.timerMode + readonly property bool ~&7082453764421&~: ~&254539508423767444&~.~&6504074414&~ === ~&"214642551402&~ ? !~&7082020628281&~.timerManager.alarmMode && ~&7082020628281&~.timerManager.timerMode : ~&254539508423767444&~.~&6504074414&~ === "chrono" ? !~&7082020628281&~.timerManager.alarmMode && !~&7082020628281&~.timerManager.timerMode : ~&7082020628281&~.timerManager.alarmMode ~&6503165774&~ { ~&233721384511543&~.~&7712879746914881&~: ~&7083038346995&~ - ~&6504315758&~: ~&254539508423767444&~.~&197101097&~ + ~&6504315758&~: ~&254539508423767444&~.txt ~&6503823200&~.~&254543497768871654&~: 24 ~&6503823200&~.~&6503679370&~: ~&7082453764421&~ ~&214622605608&~: ~&7082453764421&~ ? ~&7082020628281&~.~&8399340017235344933&~ : "#888888" @@ -286,11 +289,11 @@ AFFECT [[12542166428983872557]] ~&7712155293725601&~ { ~&214634455770&~: [ - { ~&197101097&~: "1 m", ~&197102508&~: 60000 }, - { ~&197101097&~: "5 m", ~&197102508&~: 300000 }, - { ~&197101097&~: "10 m", ~&197102508&~: 600000 }, - { ~&197101097&~: "30 m", ~&197102508&~: 1800000 }, - { ~&197101097&~: "1 h", ~&197102508&~: 3600000 } + { txt: "1 m", ~&197102508&~: 60000 }, + { txt: "5 m", ~&197102508&~: 300000 }, + { txt: "10 m", ~&197102508&~: 600000 }, + { txt: "30 m", ~&197102508&~: 1800000 }, + { txt: "1 h", ~&197102508&~: 3600000 } ] ~&7712922269353028&~: ~&6502786168&~ { ~&7081629735527&~.~&254529418434902000&~: ~&6504329801&~ @@ -302,7 +305,7 @@ AFFECT [[12542166428983872557]] } ~&6503165774&~ { ~&233721384511543&~.~&7712879746914881&~: ~&7083038346995&~ - ~&6504315758&~: ~&254539508423767444&~.~&197101097&~ + ~&6504315758&~: ~&254539508423767444&~.txt ~&6503823200&~.~&254543497768871654&~: 20 ~&6503823200&~.~&6503679370&~: ~&6504329801&~ ~&214622605608&~: ~&7082020628281&~.~&8399340017235344933&~ @@ -421,7 +424,7 @@ AFFECT [[12542166428983872557]] ~&6502786168&~ { ~&7081629735527&~.~&254529418434902000&~: ~&6504329801&~ - ~&7081629735527&~.~&8399470807760157065&~: ~&6504329801&~ + ~&7081629735527&~.fillHeight: ~&6504329801&~ ~&425121728314878811&~.~&6502767986&~ { ~&5972374&~: _radioIcon @@ -499,7 +502,7 @@ AFFECT [[12542166428983872557]] ~&254542236275632405&~: { ~&7082020628281&~.timerManager.~&6504295855&~(); ~&6504254477&~.~&2766288418351025740&~.~&214622501183&~(); - ~&6504254477&~.~&2766288418351025740&~.~&6504147419&~(~&"3271012201642534810&~); + ~&6504254477&~.~&2766288418351025740&~.~&6504147419&~("systemclock/window/settings-info"); } } } @@ -531,7 +534,7 @@ AFFECT /qt/qml/xofm/modules/systemclock/qml/window/SettingsInfoWindow.qml ~&6502786168&~ { ~&7081629735527&~.~&254529418434902000&~: ~&6504329801&~ - ~&7081629735527&~.~&8399470807760157065&~: ~&6504329801&~ + ~&7081629735527&~.fillHeight: ~&6504329801&~ ~&425121728314878811&~.~&6502767986&~ { ~&5972374&~: _alarmIcon @@ -617,7 +620,7 @@ AFFECT /qt/qml/xofm/modules/systemclock/qml/window/SettingsInfoWindow.qml ~&214628545114&~: 8 ~&233736699967534&~: 0 ~&8399894257374503713&~: function(~&180977&~) { _alarmTimeSpinners.~&214628545114&~ = ~&180977&~; } - ~&16346529800820831925&~: function(~&180982&~) { _alarmTimeSpinners.~&233736699967534&~ = ~&180982&~; } + ~&16346529800820831925&~: function(m) { _alarmTimeSpinners.~&233736699967534&~ = m; } } ~&6502786168&~ { @@ -642,9 +645,9 @@ AFFECT /qt/qml/xofm/modules/systemclock/qml/window/SettingsInfoWindow.qml ~&254494525842443467&~ { ~&233721384511543&~.~&6503816592&~: ~&7083038346995&~ ~&254542236275632405&~: { - ~&197102514&~ ~&180973&~ = new ~&6502586279&~(); - _alarmTimeSpinners.~&214628545114&~ = ~&180973&~.getHours(); - _alarmTimeSpinners.~&233736699967534&~ = ~&180973&~.getMinutes(); + ~&197102514&~ d = new ~&6502586279&~(); + _alarmTimeSpinners.~&214628545114&~ = d.getHours(); + _alarmTimeSpinners.~&233736699967534&~ = d.getMinutes(); } } } @@ -659,7 +662,7 @@ AFFECT /qt/qml/xofm/modules/systemclock/qml/window/SettingsInfoWindow.qml ~&214634455770&~: [0, 15, 30, 45] ~&7712922269353028&~: ~&6502786168&~ { ~&7081629735527&~.~&254529418434902000&~: ~&6504329801&~ - ~&7081629735527&~.~&8399470807760157065&~: ~&6504329801&~ + ~&7081629735527&~.fillHeight: ~&6504329801&~ ~&254501108490678590&~ { ~&233721384511543&~.~&6503816592&~: ~&7083038346995&~ @@ -692,7 +695,7 @@ AFFECT /qt/qml/xofm/modules/systemclock/qml/window/SettingsInfoWindow.qml ~&214634455770&~: [15, 30, 45] ~&7712922269353028&~: ~&6502786168&~ { ~&7081629735527&~.~&254529418434902000&~: ~&6504329801&~ - ~&7081629735527&~.~&8399470807760157065&~: ~&6504329801&~ + ~&7081629735527&~.fillHeight: ~&6504329801&~ ~&254501108490678590&~ { ~&233721384511543&~.~&6503816592&~: ~&7083038346995&~ @@ -709,9 +712,9 @@ AFFECT /qt/qml/xofm/modules/systemclock/qml/window/SettingsInfoWindow.qml ~&254494525842443467&~ { ~&233721384511543&~.~&6503816592&~: ~&7083038346995&~ ~&254542236275632405&~: { - ~&197102514&~ ~&180982&~ = _alarmTimeSpinners.~&233736699967534&~ + ~&254539508423767444&~; - ~&5972376&~ (~&180982&~ >= 60) { ~&180982&~ -= 60; } - _alarmTimeSpinners.~&233736699967534&~ = ~&180982&~; + ~&197102514&~ m = _alarmTimeSpinners.~&233736699967534&~ + ~&254539508423767444&~; + ~&5972376&~ (m >= 60) { m -= 60; } + _alarmTimeSpinners.~&233736699967534&~ = m; } } } @@ -747,6 +750,7 @@ AFFECT /qt/qml/xofm/modules/systemclock/qml/window/SettingsInfoWindow.qml ~&425121728314878811&~.~&214599571833&~ { ~&7081629735527&~.~&254529418434902000&~: ~&6504329801&~ + ~&233748328658231&~: ~&7082020628281&~.timerManager.hasFrontlight ~&214632764553&~: "Flash light" ~&478136262235079021&~: "Blink the reading light when the timer ends or an alarm triggers" ~&7082453764199&~: ~&425121728314878811&~.~&7081261925573&~ { @@ -761,7 +765,6 @@ END AFFECT ; Notification bar for timer finish and alarm triggers AFFECT [[2328484894988065446]] IMPORT [[233700934949963.233693781272506]] [[180922.180921]] - IMPORT [[6504469795.233736922911970.214633057601.214626274418]] [[180922.180921]] TRAVERSE [[8397788359424131273]]#[[6504254477]] > [[8397993708429497603]]#[[7713531976371484]] LOCATE AFTER ALL @@ -874,7 +877,7 @@ AFFECT [[2328484894988065446]] END AFFECT ; Capture Light reference from the QuickSettingsSlider so we can blink it -AFFECT [[9830508555522680663]] +AFFECT /qt/qml/xofm/modules/light/front/qml/QuickSettingsSlider.qml TRAVERSE [[425121728314878811.7081916140908]]#[[6504254477]] LOCATE AFTER ALL INSERT { diff --git a/3.27.1.0/quickSettingsTimer.qmd b/3.27.1.0/quickSettingsTimer.qmd index 9c415cf..cc71bf8 100644 --- a/3.27.1.0/quickSettingsTimer.qmd +++ b/3.27.1.0/quickSettingsTimer.qmd @@ -6,23 +6,24 @@ AFFECT [[1658694193319203921]] TRAVERSE [[6502786168]] LOCATE AFTER ALL INSERT { - property ~&214620122227&~ timerManager: _timerManager + property alias timerManager: _timerManager ~&6502786168&~ { ~&5972374&~: _timerManager - property ~&6503679477&~ timerMode: ~&6504329801&~ + property bool timerMode: ~&6504329801&~ property ~&197088788&~ totalMs: 0 property ~&197088788&~ remainMs: 0 - property ~&6503679477&~ isRunning: ~&214625660372&~ + property bool isRunning: ~&214625660372&~ property ~&7083178290016&~ ~&478322454160073828&~: "00:00" - property ~&6503679477&~ ~&16765420033347753489&~: ~&214625660372&~ + property bool ~&16765420033347753489&~: ~&214625660372&~ property ~&197088788&~ presetMs: 60000 - property ~&6503679477&~ addMode: ~&6504329801&~ - property ~&6503679477&~ blinkLightOnNotification: ~&214625660372&~ + property bool addMode: ~&6504329801&~ + property bool blinkLightOnNotification: ~&214625660372&~ property ~&197102514&~ _blinkLight: ~&6504117156&~ + property bool hasFrontlight: ~&214625660372&~ /* Alarm state*/ - property ~&6503679477&~ alarmMode: ~&214625660372&~ + property bool alarmMode: ~&214625660372&~ property ~&197102514&~ alarms: [] property ~&197088788&~ nextAlarmId: 1 property ~&7083178290016&~ alarmNotificationText: "" @@ -31,9 +32,9 @@ AFFECT [[1658694193319203921]] function fmt(ms) { ~&197102514&~ ~&180970&~ = ~&6502909715&~.~&197079679&~(ms); ~&197102514&~ ~&180977&~ = ~&6502909715&~.~&214626058827&~(~&180970&~ / 3600000); - ~&197102514&~ ~&180982&~ = ~&6502909715&~.~&214626058827&~((~&180970&~ % 3600000) / 60000); + ~&197102514&~ m = ~&6502909715&~.~&214626058827&~((~&180970&~ % 3600000) / 60000); ~&197102514&~ ~&180988&~ = ~&6502909715&~.~&214626058827&~((~&180970&~ % 60000) / 1000); - ~&197102514&~ mm = ~&180982&~.~&7713616118928163&~().~&7713428190834284&~(2, ~&'180921&~); + ~&197102514&~ mm = m.~&7713616118928163&~().~&7713428190834284&~(2, ~&'180921&~); ~&197102514&~ ss = ~&180988&~.~&7713616118928163&~().~&7713428190834284&~(2, ~&'180921&~); ~&5972376&~ (~&180977&~ > 0) { ~&7083121450889&~ ~&180977&~.~&7713616118928163&~().~&7713428190834284&~(2, ~&'180921&~) + ~&"180931&~ + mm + ~&"180931&~ + ss; @@ -76,8 +77,8 @@ AFFECT [[1658694193319203921]] } /* Alarm management*/ - function addAlarm(~&180977&~, ~&180982&~) { - ~&197102514&~ ~&180970&~ = { ~&5972374&~: _timerManager.nextAlarmId, hour: ~&180977&~, minute: ~&180982&~, ~&233726547792244&~: ~&6504329801&~ }; + function addAlarm(~&180977&~, m) { + ~&197102514&~ ~&180970&~ = { ~&5972374&~: _timerManager.nextAlarmId, hour: ~&180977&~, minute: m, ~&233726547792244&~: ~&6504329801&~ }; _timerManager.alarms = _timerManager.alarms.~&7082546043425&~([~&180970&~]); _timerManager.nextAlarmId++; _timerManager.saveAlarms(); @@ -109,13 +110,13 @@ AFFECT [[1658694193319203921]] nextAlarmId: _timerManager.nextAlarmId, blinkLightOnNotification: _timerManager.blinkLightOnNotification }; - ~&197102514&~ xhr = new XMLHttpRequest(); + ~&197102514&~ xhr = new XMLHttpRequest(); xhr.~&6504147419&~("PUT", "file:///home/root/alarms.json"); xhr.~&6504279475&~(~&6502785411&~.~&254548178208422824&~(payload)); } function loadAlarms() { - ~&197102514&~ xhr = new XMLHttpRequest(); + ~&197102514&~ xhr = new XMLHttpRequest(); xhr.~&6504147419&~("GET", "file:///home/root/alarms.json"); xhr.onreadystatechange = function() { ~&5972376&~ (xhr.readyState === XMLHttpRequest.DONE) { @@ -124,7 +125,7 @@ AFFECT [[1658694193319203921]] _timerManager.alarms = ~&6503736259&~.alarms || []; _timerManager.nextAlarmId = ~&6503736259&~.nextAlarmId || 1; _timerManager.blinkLightOnNotification = ~&6503736259&~.blinkLightOnNotification || ~&214625660372&~; - } catch (~&180974&~) { + } catch (e) { _timerManager.alarms = []; _timerManager.nextAlarmId = 1; } @@ -139,18 +140,18 @@ AFFECT [[1658694193319203921]] ~&7083121289162&~: ~&6504329801&~ ~&233743626668842&~: ~&6504329801&~ ~&495358363329399331&~: { - ~&197102514&~ ~&180973&~ = new ~&6502586279&~(); + ~&197102514&~ d = new ~&6502586279&~(); /* Use an absolute epoch-minute (not hour*60+minute) so that a recurring*/ /* alarm can fire again on the next day instead of being permanently*/ /* suppressed once it has matched lastNotifiedMinute.*/ - ~&197102514&~ nowMinute = ~&6502909715&~.~&214626058827&~(~&180973&~.getTime() / 60000); + ~&197102514&~ nowMinute = ~&6502909715&~.~&214626058827&~(d.getTime() / 60000); ~&5972376&~ (nowMinute === _timerManager.lastNotifiedMinute) ~&7083121450889&~; - ~&197102514&~ ~&180977&~ = ~&180973&~.getHours(); - ~&197102514&~ ~&180982&~ = ~&180973&~.getMinutes(); + ~&197102514&~ ~&180977&~ = d.getHours(); + ~&197102514&~ m = d.getMinutes(); ~&197085552&~ (~&197102514&~ ~&180978&~ = 0; ~&180978&~ < _timerManager.alarms.~&7082886407723&~; ~&180978&~++) { ~&197102514&~ ~&180970&~ = _timerManager.alarms[~&180978&~]; - ~&5972376&~ (~&180970&~.~&233726547792244&~ && ~&180970&~.hour === ~&180977&~ && ~&180970&~.minute === ~&180982&~) { + ~&5972376&~ (~&180970&~.~&233726547792244&~ && ~&180970&~.hour === ~&180977&~ && ~&180970&~.minute === m) { _timerManager.alarmNotificationText = ~&180970&~.hour.~&7713616118928163&~().~&7713428190834284&~(2, ~&'180921&~) + ~&"180931&~ + ~&180970&~.minute.~&7713616118928163&~().~&7713428190834284&~(2, ~&'180921&~); _timerManager.~&16765420033347753489&~ = ~&6504329801&~; _timerManager.lastNotifiedMinute = nowMinute; @@ -182,6 +183,8 @@ AFFECT [[1658694193319203921]] ~&254480451320573660&~.~&495334332051582499&~: { _timerManager.loadAlarms(); + ~&197102514&~ _c = ~&5971598&~.~&16810493623656567312&~("qrc:/qt/qml/xofm/modules/light/front/qml/QuickSettingsSlider.qml"); + _timerManager.hasFrontlight = (_c.~&7083177691309&~ === ~&254480451320573660&~.~&214602073246&~); } } } @@ -215,21 +218,21 @@ AFFECT [[12542166428983872557]] ~&7712155293725601&~ { ~&214634455770&~: [ - { ~&197101097&~: ~&"214604601930&~, ~&6504074414&~: ~&"214642551402&~ }, - { ~&197101097&~: "Chrono", ~&6504074414&~: "chrono" }, - { ~&197101097&~: "Alarm", ~&6504074414&~: "alarm" } + { txt: ~&"214604601930&~, ~&6504074414&~: ~&"214642551402&~ }, + { txt: "Chrono", ~&6504074414&~: "chrono" }, + { txt: "Alarm", ~&6504074414&~: "alarm" } ] ~&7712922269353028&~: ~&6502786168&~ { ~&7081629735527&~.~&254529418434902000&~: ~&6504329801&~ ~&7081629735527&~.~&17520348323745447649&~: 68 - readonly property ~&6503679477&~ ~&7082453764421&~: ~&254539508423767444&~.~&6504074414&~ === ~&"214642551402&~ ? !~&7082020628281&~.timerManager.alarmMode && ~&7082020628281&~.timerManager.timerMode + readonly property bool ~&7082453764421&~: ~&254539508423767444&~.~&6504074414&~ === ~&"214642551402&~ ? !~&7082020628281&~.timerManager.alarmMode && ~&7082020628281&~.timerManager.timerMode : ~&254539508423767444&~.~&6504074414&~ === "chrono" ? !~&7082020628281&~.timerManager.alarmMode && !~&7082020628281&~.timerManager.timerMode : ~&7082020628281&~.timerManager.alarmMode ~&6503165774&~ { ~&233721384511543&~.~&7712879746914881&~: ~&7083038346995&~ - ~&6504315758&~: ~&254539508423767444&~.~&197101097&~ + ~&6504315758&~: ~&254539508423767444&~.txt ~&6503823200&~.~&254543497768871654&~: 24 ~&6503823200&~.~&6503679370&~: ~&7082453764421&~ ~&214622605608&~: ~&7082453764421&~ ? ~&7082020628281&~.~&8399340017235344933&~ : "#888888" @@ -286,11 +289,11 @@ AFFECT [[12542166428983872557]] ~&7712155293725601&~ { ~&214634455770&~: [ - { ~&197101097&~: "1 m", ~&197102508&~: 60000 }, - { ~&197101097&~: "5 m", ~&197102508&~: 300000 }, - { ~&197101097&~: "10 m", ~&197102508&~: 600000 }, - { ~&197101097&~: "30 m", ~&197102508&~: 1800000 }, - { ~&197101097&~: "1 h", ~&197102508&~: 3600000 } + { txt: "1 m", ~&197102508&~: 60000 }, + { txt: "5 m", ~&197102508&~: 300000 }, + { txt: "10 m", ~&197102508&~: 600000 }, + { txt: "30 m", ~&197102508&~: 1800000 }, + { txt: "1 h", ~&197102508&~: 3600000 } ] ~&7712922269353028&~: ~&6502786168&~ { ~&7081629735527&~.~&254529418434902000&~: ~&6504329801&~ @@ -302,7 +305,7 @@ AFFECT [[12542166428983872557]] } ~&6503165774&~ { ~&233721384511543&~.~&7712879746914881&~: ~&7083038346995&~ - ~&6504315758&~: ~&254539508423767444&~.~&197101097&~ + ~&6504315758&~: ~&254539508423767444&~.txt ~&6503823200&~.~&254543497768871654&~: 20 ~&6503823200&~.~&6503679370&~: ~&6504329801&~ ~&214622605608&~: ~&7082020628281&~.~&8399340017235344933&~ @@ -421,7 +424,7 @@ AFFECT [[12542166428983872557]] ~&6502786168&~ { ~&7081629735527&~.~&254529418434902000&~: ~&6504329801&~ - ~&7081629735527&~.~&8399470807760157065&~: ~&6504329801&~ + ~&7081629735527&~.fillHeight: ~&6504329801&~ ~&425121728314878811&~.~&6502767986&~ { ~&5972374&~: _radioIcon @@ -499,7 +502,7 @@ AFFECT [[12542166428983872557]] ~&254542236275632405&~: { ~&7082020628281&~.timerManager.~&6504295855&~(); ~&6504254477&~.~&2766288418351025740&~.~&214622501183&~(); - ~&6504254477&~.~&2766288418351025740&~.~&6504147419&~(~&"3271012201642534810&~); + ~&6504254477&~.~&2766288418351025740&~.~&6504147419&~("systemclock/window/settings-info"); } } } @@ -531,7 +534,7 @@ AFFECT /qt/qml/xofm/modules/systemclock/qml/window/SettingsInfoWindow.qml ~&6502786168&~ { ~&7081629735527&~.~&254529418434902000&~: ~&6504329801&~ - ~&7081629735527&~.~&8399470807760157065&~: ~&6504329801&~ + ~&7081629735527&~.fillHeight: ~&6504329801&~ ~&425121728314878811&~.~&6502767986&~ { ~&5972374&~: _alarmIcon @@ -617,7 +620,7 @@ AFFECT /qt/qml/xofm/modules/systemclock/qml/window/SettingsInfoWindow.qml ~&214628545114&~: 8 ~&233736699967534&~: 0 ~&8399894257374503713&~: function(~&180977&~) { _alarmTimeSpinners.~&214628545114&~ = ~&180977&~; } - ~&16346529800820831925&~: function(~&180982&~) { _alarmTimeSpinners.~&233736699967534&~ = ~&180982&~; } + ~&16346529800820831925&~: function(m) { _alarmTimeSpinners.~&233736699967534&~ = m; } } ~&6502786168&~ { @@ -642,9 +645,9 @@ AFFECT /qt/qml/xofm/modules/systemclock/qml/window/SettingsInfoWindow.qml ~&254494525842443467&~ { ~&233721384511543&~.~&6503816592&~: ~&7083038346995&~ ~&254542236275632405&~: { - ~&197102514&~ ~&180973&~ = new ~&6502586279&~(); - _alarmTimeSpinners.~&214628545114&~ = ~&180973&~.getHours(); - _alarmTimeSpinners.~&233736699967534&~ = ~&180973&~.getMinutes(); + ~&197102514&~ d = new ~&6502586279&~(); + _alarmTimeSpinners.~&214628545114&~ = d.getHours(); + _alarmTimeSpinners.~&233736699967534&~ = d.getMinutes(); } } } @@ -659,7 +662,7 @@ AFFECT /qt/qml/xofm/modules/systemclock/qml/window/SettingsInfoWindow.qml ~&214634455770&~: [0, 15, 30, 45] ~&7712922269353028&~: ~&6502786168&~ { ~&7081629735527&~.~&254529418434902000&~: ~&6504329801&~ - ~&7081629735527&~.~&8399470807760157065&~: ~&6504329801&~ + ~&7081629735527&~.fillHeight: ~&6504329801&~ ~&254501108490678590&~ { ~&233721384511543&~.~&6503816592&~: ~&7083038346995&~ @@ -692,7 +695,7 @@ AFFECT /qt/qml/xofm/modules/systemclock/qml/window/SettingsInfoWindow.qml ~&214634455770&~: [15, 30, 45] ~&7712922269353028&~: ~&6502786168&~ { ~&7081629735527&~.~&254529418434902000&~: ~&6504329801&~ - ~&7081629735527&~.~&8399470807760157065&~: ~&6504329801&~ + ~&7081629735527&~.fillHeight: ~&6504329801&~ ~&254501108490678590&~ { ~&233721384511543&~.~&6503816592&~: ~&7083038346995&~ @@ -709,9 +712,9 @@ AFFECT /qt/qml/xofm/modules/systemclock/qml/window/SettingsInfoWindow.qml ~&254494525842443467&~ { ~&233721384511543&~.~&6503816592&~: ~&7083038346995&~ ~&254542236275632405&~: { - ~&197102514&~ ~&180982&~ = _alarmTimeSpinners.~&233736699967534&~ + ~&254539508423767444&~; - ~&5972376&~ (~&180982&~ >= 60) { ~&180982&~ -= 60; } - _alarmTimeSpinners.~&233736699967534&~ = ~&180982&~; + ~&197102514&~ m = _alarmTimeSpinners.~&233736699967534&~ + ~&254539508423767444&~; + ~&5972376&~ (m >= 60) { m -= 60; } + _alarmTimeSpinners.~&233736699967534&~ = m; } } } @@ -747,6 +750,7 @@ AFFECT /qt/qml/xofm/modules/systemclock/qml/window/SettingsInfoWindow.qml ~&425121728314878811&~.~&214599571833&~ { ~&7081629735527&~.~&254529418434902000&~: ~&6504329801&~ + ~&233748328658231&~: ~&7082020628281&~.timerManager.hasFrontlight ~&214632764553&~: "Flash light" ~&478136262235079021&~: "Blink the reading light when the timer ends or an alarm triggers" ~&7082453764199&~: ~&425121728314878811&~.~&7081261925573&~ { @@ -761,7 +765,6 @@ END AFFECT ; Notification bar for timer finish and alarm triggers AFFECT [[2328484894988065446]] IMPORT [[233700934949963.233693781272506]] [[180922.180921]] - IMPORT [[6504469795.233736922911970.214633057601.214626274418]] [[180922.180921]] TRAVERSE [[8397788359424131273]]#[[6504254477]] > [[8397993708429497603]]#[[7713531976371484]] LOCATE AFTER ALL @@ -874,7 +877,7 @@ AFFECT [[2328484894988065446]] END AFFECT ; Capture Light reference from the QuickSettingsSlider so we can blink it -AFFECT [[9830508555522680663]] +AFFECT /qt/qml/xofm/modules/light/front/qml/QuickSettingsSlider.qml TRAVERSE [[425121728314878811.7081916140908]]#[[6504254477]] LOCATE AFTER ALL INSERT { diff --git a/3.27.3.0/quickSettingsTimer.qmd b/3.27.3.0/quickSettingsTimer.qmd index 9c415cf..cc71bf8 100644 --- a/3.27.3.0/quickSettingsTimer.qmd +++ b/3.27.3.0/quickSettingsTimer.qmd @@ -6,23 +6,24 @@ AFFECT [[1658694193319203921]] TRAVERSE [[6502786168]] LOCATE AFTER ALL INSERT { - property ~&214620122227&~ timerManager: _timerManager + property alias timerManager: _timerManager ~&6502786168&~ { ~&5972374&~: _timerManager - property ~&6503679477&~ timerMode: ~&6504329801&~ + property bool timerMode: ~&6504329801&~ property ~&197088788&~ totalMs: 0 property ~&197088788&~ remainMs: 0 - property ~&6503679477&~ isRunning: ~&214625660372&~ + property bool isRunning: ~&214625660372&~ property ~&7083178290016&~ ~&478322454160073828&~: "00:00" - property ~&6503679477&~ ~&16765420033347753489&~: ~&214625660372&~ + property bool ~&16765420033347753489&~: ~&214625660372&~ property ~&197088788&~ presetMs: 60000 - property ~&6503679477&~ addMode: ~&6504329801&~ - property ~&6503679477&~ blinkLightOnNotification: ~&214625660372&~ + property bool addMode: ~&6504329801&~ + property bool blinkLightOnNotification: ~&214625660372&~ property ~&197102514&~ _blinkLight: ~&6504117156&~ + property bool hasFrontlight: ~&214625660372&~ /* Alarm state*/ - property ~&6503679477&~ alarmMode: ~&214625660372&~ + property bool alarmMode: ~&214625660372&~ property ~&197102514&~ alarms: [] property ~&197088788&~ nextAlarmId: 1 property ~&7083178290016&~ alarmNotificationText: "" @@ -31,9 +32,9 @@ AFFECT [[1658694193319203921]] function fmt(ms) { ~&197102514&~ ~&180970&~ = ~&6502909715&~.~&197079679&~(ms); ~&197102514&~ ~&180977&~ = ~&6502909715&~.~&214626058827&~(~&180970&~ / 3600000); - ~&197102514&~ ~&180982&~ = ~&6502909715&~.~&214626058827&~((~&180970&~ % 3600000) / 60000); + ~&197102514&~ m = ~&6502909715&~.~&214626058827&~((~&180970&~ % 3600000) / 60000); ~&197102514&~ ~&180988&~ = ~&6502909715&~.~&214626058827&~((~&180970&~ % 60000) / 1000); - ~&197102514&~ mm = ~&180982&~.~&7713616118928163&~().~&7713428190834284&~(2, ~&'180921&~); + ~&197102514&~ mm = m.~&7713616118928163&~().~&7713428190834284&~(2, ~&'180921&~); ~&197102514&~ ss = ~&180988&~.~&7713616118928163&~().~&7713428190834284&~(2, ~&'180921&~); ~&5972376&~ (~&180977&~ > 0) { ~&7083121450889&~ ~&180977&~.~&7713616118928163&~().~&7713428190834284&~(2, ~&'180921&~) + ~&"180931&~ + mm + ~&"180931&~ + ss; @@ -76,8 +77,8 @@ AFFECT [[1658694193319203921]] } /* Alarm management*/ - function addAlarm(~&180977&~, ~&180982&~) { - ~&197102514&~ ~&180970&~ = { ~&5972374&~: _timerManager.nextAlarmId, hour: ~&180977&~, minute: ~&180982&~, ~&233726547792244&~: ~&6504329801&~ }; + function addAlarm(~&180977&~, m) { + ~&197102514&~ ~&180970&~ = { ~&5972374&~: _timerManager.nextAlarmId, hour: ~&180977&~, minute: m, ~&233726547792244&~: ~&6504329801&~ }; _timerManager.alarms = _timerManager.alarms.~&7082546043425&~([~&180970&~]); _timerManager.nextAlarmId++; _timerManager.saveAlarms(); @@ -109,13 +110,13 @@ AFFECT [[1658694193319203921]] nextAlarmId: _timerManager.nextAlarmId, blinkLightOnNotification: _timerManager.blinkLightOnNotification }; - ~&197102514&~ xhr = new XMLHttpRequest(); + ~&197102514&~ xhr = new XMLHttpRequest(); xhr.~&6504147419&~("PUT", "file:///home/root/alarms.json"); xhr.~&6504279475&~(~&6502785411&~.~&254548178208422824&~(payload)); } function loadAlarms() { - ~&197102514&~ xhr = new XMLHttpRequest(); + ~&197102514&~ xhr = new XMLHttpRequest(); xhr.~&6504147419&~("GET", "file:///home/root/alarms.json"); xhr.onreadystatechange = function() { ~&5972376&~ (xhr.readyState === XMLHttpRequest.DONE) { @@ -124,7 +125,7 @@ AFFECT [[1658694193319203921]] _timerManager.alarms = ~&6503736259&~.alarms || []; _timerManager.nextAlarmId = ~&6503736259&~.nextAlarmId || 1; _timerManager.blinkLightOnNotification = ~&6503736259&~.blinkLightOnNotification || ~&214625660372&~; - } catch (~&180974&~) { + } catch (e) { _timerManager.alarms = []; _timerManager.nextAlarmId = 1; } @@ -139,18 +140,18 @@ AFFECT [[1658694193319203921]] ~&7083121289162&~: ~&6504329801&~ ~&233743626668842&~: ~&6504329801&~ ~&495358363329399331&~: { - ~&197102514&~ ~&180973&~ = new ~&6502586279&~(); + ~&197102514&~ d = new ~&6502586279&~(); /* Use an absolute epoch-minute (not hour*60+minute) so that a recurring*/ /* alarm can fire again on the next day instead of being permanently*/ /* suppressed once it has matched lastNotifiedMinute.*/ - ~&197102514&~ nowMinute = ~&6502909715&~.~&214626058827&~(~&180973&~.getTime() / 60000); + ~&197102514&~ nowMinute = ~&6502909715&~.~&214626058827&~(d.getTime() / 60000); ~&5972376&~ (nowMinute === _timerManager.lastNotifiedMinute) ~&7083121450889&~; - ~&197102514&~ ~&180977&~ = ~&180973&~.getHours(); - ~&197102514&~ ~&180982&~ = ~&180973&~.getMinutes(); + ~&197102514&~ ~&180977&~ = d.getHours(); + ~&197102514&~ m = d.getMinutes(); ~&197085552&~ (~&197102514&~ ~&180978&~ = 0; ~&180978&~ < _timerManager.alarms.~&7082886407723&~; ~&180978&~++) { ~&197102514&~ ~&180970&~ = _timerManager.alarms[~&180978&~]; - ~&5972376&~ (~&180970&~.~&233726547792244&~ && ~&180970&~.hour === ~&180977&~ && ~&180970&~.minute === ~&180982&~) { + ~&5972376&~ (~&180970&~.~&233726547792244&~ && ~&180970&~.hour === ~&180977&~ && ~&180970&~.minute === m) { _timerManager.alarmNotificationText = ~&180970&~.hour.~&7713616118928163&~().~&7713428190834284&~(2, ~&'180921&~) + ~&"180931&~ + ~&180970&~.minute.~&7713616118928163&~().~&7713428190834284&~(2, ~&'180921&~); _timerManager.~&16765420033347753489&~ = ~&6504329801&~; _timerManager.lastNotifiedMinute = nowMinute; @@ -182,6 +183,8 @@ AFFECT [[1658694193319203921]] ~&254480451320573660&~.~&495334332051582499&~: { _timerManager.loadAlarms(); + ~&197102514&~ _c = ~&5971598&~.~&16810493623656567312&~("qrc:/qt/qml/xofm/modules/light/front/qml/QuickSettingsSlider.qml"); + _timerManager.hasFrontlight = (_c.~&7083177691309&~ === ~&254480451320573660&~.~&214602073246&~); } } } @@ -215,21 +218,21 @@ AFFECT [[12542166428983872557]] ~&7712155293725601&~ { ~&214634455770&~: [ - { ~&197101097&~: ~&"214604601930&~, ~&6504074414&~: ~&"214642551402&~ }, - { ~&197101097&~: "Chrono", ~&6504074414&~: "chrono" }, - { ~&197101097&~: "Alarm", ~&6504074414&~: "alarm" } + { txt: ~&"214604601930&~, ~&6504074414&~: ~&"214642551402&~ }, + { txt: "Chrono", ~&6504074414&~: "chrono" }, + { txt: "Alarm", ~&6504074414&~: "alarm" } ] ~&7712922269353028&~: ~&6502786168&~ { ~&7081629735527&~.~&254529418434902000&~: ~&6504329801&~ ~&7081629735527&~.~&17520348323745447649&~: 68 - readonly property ~&6503679477&~ ~&7082453764421&~: ~&254539508423767444&~.~&6504074414&~ === ~&"214642551402&~ ? !~&7082020628281&~.timerManager.alarmMode && ~&7082020628281&~.timerManager.timerMode + readonly property bool ~&7082453764421&~: ~&254539508423767444&~.~&6504074414&~ === ~&"214642551402&~ ? !~&7082020628281&~.timerManager.alarmMode && ~&7082020628281&~.timerManager.timerMode : ~&254539508423767444&~.~&6504074414&~ === "chrono" ? !~&7082020628281&~.timerManager.alarmMode && !~&7082020628281&~.timerManager.timerMode : ~&7082020628281&~.timerManager.alarmMode ~&6503165774&~ { ~&233721384511543&~.~&7712879746914881&~: ~&7083038346995&~ - ~&6504315758&~: ~&254539508423767444&~.~&197101097&~ + ~&6504315758&~: ~&254539508423767444&~.txt ~&6503823200&~.~&254543497768871654&~: 24 ~&6503823200&~.~&6503679370&~: ~&7082453764421&~ ~&214622605608&~: ~&7082453764421&~ ? ~&7082020628281&~.~&8399340017235344933&~ : "#888888" @@ -286,11 +289,11 @@ AFFECT [[12542166428983872557]] ~&7712155293725601&~ { ~&214634455770&~: [ - { ~&197101097&~: "1 m", ~&197102508&~: 60000 }, - { ~&197101097&~: "5 m", ~&197102508&~: 300000 }, - { ~&197101097&~: "10 m", ~&197102508&~: 600000 }, - { ~&197101097&~: "30 m", ~&197102508&~: 1800000 }, - { ~&197101097&~: "1 h", ~&197102508&~: 3600000 } + { txt: "1 m", ~&197102508&~: 60000 }, + { txt: "5 m", ~&197102508&~: 300000 }, + { txt: "10 m", ~&197102508&~: 600000 }, + { txt: "30 m", ~&197102508&~: 1800000 }, + { txt: "1 h", ~&197102508&~: 3600000 } ] ~&7712922269353028&~: ~&6502786168&~ { ~&7081629735527&~.~&254529418434902000&~: ~&6504329801&~ @@ -302,7 +305,7 @@ AFFECT [[12542166428983872557]] } ~&6503165774&~ { ~&233721384511543&~.~&7712879746914881&~: ~&7083038346995&~ - ~&6504315758&~: ~&254539508423767444&~.~&197101097&~ + ~&6504315758&~: ~&254539508423767444&~.txt ~&6503823200&~.~&254543497768871654&~: 20 ~&6503823200&~.~&6503679370&~: ~&6504329801&~ ~&214622605608&~: ~&7082020628281&~.~&8399340017235344933&~ @@ -421,7 +424,7 @@ AFFECT [[12542166428983872557]] ~&6502786168&~ { ~&7081629735527&~.~&254529418434902000&~: ~&6504329801&~ - ~&7081629735527&~.~&8399470807760157065&~: ~&6504329801&~ + ~&7081629735527&~.fillHeight: ~&6504329801&~ ~&425121728314878811&~.~&6502767986&~ { ~&5972374&~: _radioIcon @@ -499,7 +502,7 @@ AFFECT [[12542166428983872557]] ~&254542236275632405&~: { ~&7082020628281&~.timerManager.~&6504295855&~(); ~&6504254477&~.~&2766288418351025740&~.~&214622501183&~(); - ~&6504254477&~.~&2766288418351025740&~.~&6504147419&~(~&"3271012201642534810&~); + ~&6504254477&~.~&2766288418351025740&~.~&6504147419&~("systemclock/window/settings-info"); } } } @@ -531,7 +534,7 @@ AFFECT /qt/qml/xofm/modules/systemclock/qml/window/SettingsInfoWindow.qml ~&6502786168&~ { ~&7081629735527&~.~&254529418434902000&~: ~&6504329801&~ - ~&7081629735527&~.~&8399470807760157065&~: ~&6504329801&~ + ~&7081629735527&~.fillHeight: ~&6504329801&~ ~&425121728314878811&~.~&6502767986&~ { ~&5972374&~: _alarmIcon @@ -617,7 +620,7 @@ AFFECT /qt/qml/xofm/modules/systemclock/qml/window/SettingsInfoWindow.qml ~&214628545114&~: 8 ~&233736699967534&~: 0 ~&8399894257374503713&~: function(~&180977&~) { _alarmTimeSpinners.~&214628545114&~ = ~&180977&~; } - ~&16346529800820831925&~: function(~&180982&~) { _alarmTimeSpinners.~&233736699967534&~ = ~&180982&~; } + ~&16346529800820831925&~: function(m) { _alarmTimeSpinners.~&233736699967534&~ = m; } } ~&6502786168&~ { @@ -642,9 +645,9 @@ AFFECT /qt/qml/xofm/modules/systemclock/qml/window/SettingsInfoWindow.qml ~&254494525842443467&~ { ~&233721384511543&~.~&6503816592&~: ~&7083038346995&~ ~&254542236275632405&~: { - ~&197102514&~ ~&180973&~ = new ~&6502586279&~(); - _alarmTimeSpinners.~&214628545114&~ = ~&180973&~.getHours(); - _alarmTimeSpinners.~&233736699967534&~ = ~&180973&~.getMinutes(); + ~&197102514&~ d = new ~&6502586279&~(); + _alarmTimeSpinners.~&214628545114&~ = d.getHours(); + _alarmTimeSpinners.~&233736699967534&~ = d.getMinutes(); } } } @@ -659,7 +662,7 @@ AFFECT /qt/qml/xofm/modules/systemclock/qml/window/SettingsInfoWindow.qml ~&214634455770&~: [0, 15, 30, 45] ~&7712922269353028&~: ~&6502786168&~ { ~&7081629735527&~.~&254529418434902000&~: ~&6504329801&~ - ~&7081629735527&~.~&8399470807760157065&~: ~&6504329801&~ + ~&7081629735527&~.fillHeight: ~&6504329801&~ ~&254501108490678590&~ { ~&233721384511543&~.~&6503816592&~: ~&7083038346995&~ @@ -692,7 +695,7 @@ AFFECT /qt/qml/xofm/modules/systemclock/qml/window/SettingsInfoWindow.qml ~&214634455770&~: [15, 30, 45] ~&7712922269353028&~: ~&6502786168&~ { ~&7081629735527&~.~&254529418434902000&~: ~&6504329801&~ - ~&7081629735527&~.~&8399470807760157065&~: ~&6504329801&~ + ~&7081629735527&~.fillHeight: ~&6504329801&~ ~&254501108490678590&~ { ~&233721384511543&~.~&6503816592&~: ~&7083038346995&~ @@ -709,9 +712,9 @@ AFFECT /qt/qml/xofm/modules/systemclock/qml/window/SettingsInfoWindow.qml ~&254494525842443467&~ { ~&233721384511543&~.~&6503816592&~: ~&7083038346995&~ ~&254542236275632405&~: { - ~&197102514&~ ~&180982&~ = _alarmTimeSpinners.~&233736699967534&~ + ~&254539508423767444&~; - ~&5972376&~ (~&180982&~ >= 60) { ~&180982&~ -= 60; } - _alarmTimeSpinners.~&233736699967534&~ = ~&180982&~; + ~&197102514&~ m = _alarmTimeSpinners.~&233736699967534&~ + ~&254539508423767444&~; + ~&5972376&~ (m >= 60) { m -= 60; } + _alarmTimeSpinners.~&233736699967534&~ = m; } } } @@ -747,6 +750,7 @@ AFFECT /qt/qml/xofm/modules/systemclock/qml/window/SettingsInfoWindow.qml ~&425121728314878811&~.~&214599571833&~ { ~&7081629735527&~.~&254529418434902000&~: ~&6504329801&~ + ~&233748328658231&~: ~&7082020628281&~.timerManager.hasFrontlight ~&214632764553&~: "Flash light" ~&478136262235079021&~: "Blink the reading light when the timer ends or an alarm triggers" ~&7082453764199&~: ~&425121728314878811&~.~&7081261925573&~ { @@ -761,7 +765,6 @@ END AFFECT ; Notification bar for timer finish and alarm triggers AFFECT [[2328484894988065446]] IMPORT [[233700934949963.233693781272506]] [[180922.180921]] - IMPORT [[6504469795.233736922911970.214633057601.214626274418]] [[180922.180921]] TRAVERSE [[8397788359424131273]]#[[6504254477]] > [[8397993708429497603]]#[[7713531976371484]] LOCATE AFTER ALL @@ -874,7 +877,7 @@ AFFECT [[2328484894988065446]] END AFFECT ; Capture Light reference from the QuickSettingsSlider so we can blink it -AFFECT [[9830508555522680663]] +AFFECT /qt/qml/xofm/modules/light/front/qml/QuickSettingsSlider.qml TRAVERSE [[425121728314878811.7081916140908]]#[[6504254477]] LOCATE AFTER ALL INSERT { diff --git a/README.md b/README.md index 301d2f9..992c9f8 100644 --- a/README.md +++ b/README.md @@ -91,12 +91,12 @@ Use [quicksettings-clock-serif](https://github.com/rmitchellscott) by rmitchells --- ### `quickSettingsTimer.qmd` - +[![vellum](https://img.shields.io/badge/vellum-quicksettings--timer-purple)](https://vellum.delivery/#/package/quicksettings-timer/) - Adds a countdown timer, stopwatch, and alarm system to the Quick Settings panel, under the light slider. - Timer: presets: 1min, 5min, 10min, 30min, 1h; add/set mode toggle ( increments, replaces), start/stop/reset controls. - Chrono: start/stop with lap-style elapsed time display. - Alarm: configure recurring alarms in the system clock settings menu with a time picker (hour/minute spinners), quick-off buttons (00/15/30/45, +15/+30/+45), and a "Now" button. Each alarm has an enable/disable toggle and a delete button. -- Flash light toggle in the alarm settings page: when enabled, the reading light blinks 3 times when the timer finishes or an alarm triggers. +- Flash light toggle in the alarm settings page: when enabled, the reading light blinks 3 times when the timer finishes or an alarm triggers. (Only on devices with a reading light.) - Persistence: alarms and the flash light toggle are saved to `file:///home/root/alarms.json` on changes and auto-loaded on startup. - Notification bar: shows "Time's up! (duration)" when the timer finishes, or "Alarm at HH:MM" when an alarm triggers. Timer offers Restart/+1min/+5min buttons; alarm offers a Dismiss button. - Quick access: an "Add alarms" button in Quick Settings opens the system clock alarm management page directly.