Author: fmueller
Date: Thu Mar 29 05:01:40 2012
New Revision: 9693
URL: http://svn.slimdevices.com/jive?rev=9693&view=rev
Log:
Bug: n/a
Description: Network setup changes
- Wait at least 2 seconds while scanning the network to allow the user to read
the screen
Modified:
7.8/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupNetworking/SetupNetworkingApplet.lua
Modified:
7.8/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupNetworking/SetupNetworkingApplet.lua
URL:
http://svn.slimdevices.com/jive/7.8/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupNetworking/SetupNetworkingApplet.lua?rev=9693&r1=9692&r2=9693&view=diff
==============================================================================
---
7.8/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupNetworking/SetupNetworkingApplet.lua
(original)
+++
7.8/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupNetworking/SetupNetworkingApplet.lua
Thu Mar 29 05:01:40 2012
@@ -342,6 +342,8 @@
local status = Label("subtext", self:string("NETWORK_FOUND_NETWORKS",
0))
popup:addWidget(status)
+ local now = os.time()
+
popup:addTimer(1000, function()
local numNetworks = 0
@@ -357,7 +359,18 @@
-- start network scan
iface:scan(function()
- _networkScanComplete(self, iface)
+ -- Wait at least 2 seconds (and leave the spinny up)
+ -- to allow the user to read the screen
+ if os.time() > (now + 2) then
+ _networkScanComplete(self, iface)
+ else
+ popup:addTimer(2000,
+ function ()
+ _networkScanComplete(self, iface)
+ end,
+ true -- once
+ )
+ end
end)
-- or timeout after 10 seconds if no networks are found
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
