Author: bklaas
Date: Tue Jun 15 13:53:21 2010
New Revision: 8867
URL: http://svn.slimdevices.com/jive?rev=8867&view=rev
Log:
r39...@daddymac-520 (orig r8866): bklaas | 2010-06-15 15:52:47 -0500
Fixed Bug: 16148
Description: do not display time in BlankScreen SS if clock is deemed not set
add isClockSet() method to datetime.lua
Modified:
7.6/trunk/ (props changed)
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenApplet.lua
7.6/trunk/squeezeplay/src/squeezeplay/share/jive/utils/datetime.lua
Propchange: 7.6/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Tue Jun 15 13:53:21 2010
@@ -13,7 +13,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/private-branches/fab4-skin:4552
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/private-branches/new-alsa:6567
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:8423
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/trunk:8863
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/trunk:8866
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenApplet.lua?rev=8867&r1=8866&r2=8867&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenApplet.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenApplet.lua
Tue Jun 15 13:53:21 2010
@@ -93,9 +93,10 @@
function onOverlayWindowShown(self)
self:_setBrightness("on")
- local time = datetime:getCurrentTime()
+ local clockSet = datetime:isClockSet()
- if time then
+ if clockSet then
+ local time = datetime:getCurrentTime()
self.timeLabel = Group("text_block_black", {
text = Label("text", time)
})
Modified: 7.6/trunk/squeezeplay/src/squeezeplay/share/jive/utils/datetime.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/jive/utils/datetime.lua?rev=8867&r1=8866&r2=8867&view=diff
==============================================================================
--- 7.6/trunk/squeezeplay/src/squeezeplay/share/jive/utils/datetime.lua
(original)
+++ 7.6/trunk/squeezeplay/src/squeezeplay/share/jive/utils/datetime.lua Tue Jun
15 13:53:21 2010
@@ -13,6 +13,7 @@
getAllDateFormats(self)
setWeekstart(self, day)
+isClockSet(self)
getWeekstart(self)
setDateFormat(self, dateformat)
getDateFormat(self)
@@ -483,6 +484,22 @@
end
--[[
+=head2 isClockSet()
+
+Returns a boolean as to whether the clock appears to be set correctly
+
+=cut
+--]]
+function isClockSet()
+ if tonumber(os.date("%Y")) < 2010 then
+ return false
+ end
+ return true
+
+end
+
+
+--[[
=head2 getCurrentTime()
Returns the current, formatted time.
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
