Author: fmueller
Date: Mon Mar 26 02:47:37 2012
New Revision: 9681
URL: http://svn.slimdevices.com/jive?rev=9681&view=rev
Log:
Bug: n/a
Description: Network setup changes
- Explicit set timer parameter (repeating or once)
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=9681&r1=9680&r2=9681&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
Mon Mar 26 02:47:37 2012
@@ -124,7 +124,7 @@
self.wlanIface:scan(setupNext)
-- or timeout after 10 seconds if no networks are found
- window:addTimer(10000, function() setupNext() end)
+ window:addTimer(10000, function() setupNext() end, true) -- once
self:tieAndShowWindow(window)
return window
@@ -351,7 +351,9 @@
end
status:setValue(self:string("NETWORK_FOUND_NETWORKS",
tostring(numNetworks) ) )
- end)
+ end,
+ false -- repeat
+ )
-- start network scan
iface:scan(function()
@@ -363,7 +365,9 @@
function()
ifaceCount = 0
_networkScanComplete(self, iface)
- end)
+ end,
+ true -- once
+ )
self:tieAndShowWindow(popup)
end
@@ -464,7 +468,9 @@
window:setTitle(self:string("NETWORK_WIRELESS_NETWORKS"))
_scanResults(self, iface)
end)
- end)
+ end,
+ false -- repeat
+ )
--]]
-- fm-
_helpAction(self, window, "NETWORK_LIST_HELP",
"NETWORK_LIST_HELP_BODY", self.scanMenu)
@@ -1112,7 +1118,9 @@
local remaining_walk_time = WPS_WALK_TIMEOUT -
self.processWPSTimeout
status:setValue(self:string("NETWORK_WPS_REMAINING_WALK_TIME",
tostring(remaining_walk_time)))
- end)
+ end,
+ false -- repeat
+ )
local _stopWPSAction = function(self, event)
if iface:isMarvell() then
@@ -1293,7 +1301,9 @@
icon:addTimer(1000,
function()
_connectTimer(self, iface, ssid, createNetwork)
- end)
+ end,
+ false -- repeat
+ )
popup:addWidget(icon)
popup:ignoreAllInputExcept()
@@ -1415,7 +1425,8 @@
end
end
):addTask()
- end
+ end,
+ false -- repeat
)
_helpAction(self, window, nil, nil, menu)
@@ -1546,7 +1557,8 @@
function(event)
self.setupNext()
end,
- true)
+ true -- once
+ )
popup:addListener(EVENT_KEY_PRESS | EVENT_MOUSE_PRESS, --todo IR should
work too, but not so simple - really window:hideOnAllButtonInput should allow
for a callback on hide for "next" type situations such as this
function(event)
_______________________________________________
Jive-checkins mailing list
Jive-checkins@lists.slimdevices.com
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
