Author: bklaas
Date: Mon Sep 29 13:01:36 2008
New Revision: 3013
URL: http://svn.slimdevices.com?rev=3013&root=Jive&view=rev
Log:
Bug: 9576
Description: another few fixes later in the setup screens for service manager
API. This should fix it from not being able to select a wireless region.
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWireless/SetupWirelessMeta.lua
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua?rev=3013&root=Jive&r1=3012&r2=3013&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua
Mon Sep 29 13:01:36 2008
@@ -126,14 +126,14 @@
log:info("step4")
-- finding networks
- self.scanWindow = self.setupWireless:setupScanShow(function()
- self:step5()
- -- FIXME is
this required:
- if
self.scanWindow then
-
self.scanWindow:hide()
-
self.scanWindow = nil
- end
- end)
+ self.scanWindow = appletManager:callService("setupScanShow", function()
+ self:step5()
+ -- FIXME is this
required:
+ if self.scanWindow
then
+
self.scanWindow:hide()
+
self.scanWindow = nil
+ end
+ end)
return self.scanWindow
end
@@ -167,7 +167,7 @@
log:info("step52")
-- connect using other wireless network
- return self.setupWireless:setupNetworksShow(function() self:step6() end)
+ return appletManager:callService("setupNetworksShow", function()
self:step6() end)
end
function step6(self)
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWireless/SetupWirelessMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWireless/SetupWirelessMeta.lua?rev=3013&root=Jive&r1=3012&r2=3013&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWireless/SetupWirelessMeta.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWireless/SetupWirelessMeta.lua
Mon Sep 29 13:01:36 2008
@@ -23,6 +23,8 @@
jul.addCategory("applet.wireless", jul.DEBUG)
meta:registerService("setupRegionShow")
+ meta:registerService("setupScanShow")
+ meta:registerService("setupNetworksShow")
jiveMain:addItem(meta:menuItem('networkSettings', 'advancedSettings',
"NETWORK", function(applet, ...) applet:settingsNetworksShow(...) end))
jiveMain:addItem(meta:menuItem('networkRegion', 'advancedSettings',
"NETWORK_REGION", function(applet, ...) applet:settingsRegionShow(...) end))
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
