Author: bklaas
Date: Thu Feb 25 12:12:45 2010
New Revision: 8577
URL: http://svn.slimdevices.com/jive?rev=8577&view=rev
Log:
Fixed Bug: 15540
Description: do not hide spinny for starting SC until scan.json file is
detected or 60 seconds, whichever comes first
Modified:
7.5/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterApplet.lua
Modified:
7.5/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterApplet.lua
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterApplet.lua?rev=8577&r1=8576&r2=8577&view=diff
==============================================================================
---
7.5/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterApplet.lua
(original)
+++
7.5/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterApplet.lua
Thu Feb 25 12:12:45 2010
@@ -257,13 +257,28 @@
if (subtext ~= nil) then popup:addWidget(Textarea("subtext",
self:string(subtext))) end
- popup:showBriefly(time,
- function()
- _updateStatus(self)
- end,
- Window.transitionPushPopupUp,
- Window.transitionPushPopupDown
- )
+ -- don't hide starting SC popup until scan.json file is detected
+ if action == 'start' or action == 'restart' then
+ local count = 0
+ popup:addTimer(1000,
+ function()
+ count = count + 1
+ local scanData = self:_scanStatus()
+ if count > 5 and ( scanData or count ==
60) then
+ popup:hide()
+ end
+ end
+ )
+ popup:show()
+ else
+ popup:showBriefly(time,
+ function()
+ _updateStatus(self)
+ end,
+ Window.transitionPushPopupUp,
+ Window.transitionPushPopupDown
+ )
+ end
end
if action == 'stop' then
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
