Author: bklaas
Date: Mon Sep 29 11:35:25 2008
New Revision: 3010
URL: http://svn.slimdevices.com?rev=3010&root=Jive&view=rev
Log:
Bug: 9576, 7873
Description: setupShow was being used as a method name in two different
applets, both of which needed to register that as a service.
they have been split into setupShowSelectPlayer and setupShowSetupLanguage
this checkin fixes Factory Reset, as well as fixed a few other typos to service
manager calls
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupLanguage/SetupLanguageApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupLanguage/SetupLanguageMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimDiscovery/SlimDiscoveryMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SqueezeNetworkPIN/SqueezeNetworkPINMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua?rev=3010&root=Jive&r1=3009&r2=3010&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
Mon Sep 29 11:35:25 2008
@@ -150,7 +150,7 @@
node = 'home',
text = self:string("SELECT_PLAYER"),
sound = "WINDOWSHOW",
- callback = function() self:setupShow() end,
+ callback = function()
self:setupShowSelectPlayer() end,
weight = 80
}
jiveMain:addItem(menuItem)
@@ -270,7 +270,7 @@
end
-function setupShow(self, setupNext)
+function setupShowSelectPlayer(self, setupNext)
-- get list of slimservers
local window = Window("window", self:string("SELECT_PLAYER"),
'settingstitle')
window:setAllowScreensaver(false)
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerMeta.lua?rev=3010&root=Jive&r1=3009&r2=3010&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerMeta.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerMeta.lua
Mon Sep 29 11:35:25 2008
@@ -38,7 +38,7 @@
function registerApplet(meta)
- meta:registerService('setupShow')
+ meta:registerService('setupShowSelectPlayer')
-- SelectPlayer is a resident Applet, Applet loads all menus necessary
appletManager:loadApplet("SelectPlayer")
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupLanguage/SetupLanguageApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupLanguage/SetupLanguageApplet.lua?rev=3010&root=Jive&r1=3009&r2=3010&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupLanguage/SetupLanguageApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupLanguage/SetupLanguageApplet.lua
Mon Sep 29 11:35:25 2008
@@ -46,7 +46,7 @@
oo.class(_M, Applet)
-function setupShow(self, setupNext)
+function setupShowSetupLanguage(self, setupNext)
local currentLocale = locale:getLocale()
log:info("locale currently is ", currentLocale)
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupLanguage/SetupLanguageMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupLanguage/SetupLanguageMeta.lua?rev=3010&root=Jive&r1=3009&r2=3010&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupLanguage/SetupLanguageMeta.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupLanguage/SetupLanguageMeta.lua
Mon Sep 29 11:35:25 2008
@@ -46,7 +46,7 @@
-- set the current locale from the applet settings
locale:setLocale(meta:getSettings().locale)
- meta:registerService("SetupLanguage")
+ meta:registerService("setupShowSetupLanguage")
-- add ourselves to the main menu
-- setupLanguage is the function that gets called from
SetupLanguageApplet.lua when the menu item is selected
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=3010&root=Jive&r1=3009&r2=3010&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Mon Sep 29 11:35:25 2008
@@ -2470,7 +2470,7 @@
text =
self:string("SLIMBROWSER_CHOOSE_PLAYER"),
callback = function()
appletManager:callService("setCurrentPlayer", nil)
-
appletManager:callService("setupShow")
+
appletManager:callService("setupShowSelectPlayer")
end,
sound = "WINDOWSHOW",
})
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimDiscovery/SlimDiscoveryMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimDiscovery/SlimDiscoveryMeta.lua?rev=3010&root=Jive&r1=3009&r2=3010&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimDiscovery/SlimDiscoveryMeta.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimDiscovery/SlimDiscoveryMeta.lua
Mon Sep 29 11:35:25 2008
@@ -125,17 +125,10 @@
-- unsubscribe monitor from future events
jnt:unsubscribe(meta)
- -- push Choose Player menu
- local selectPlayer = appletManager:loadApplet("SelectPlayer")
- if selectPlayer then
- selectPlayer:setupShow(function() end)
- end
+ appletManager:callService("setupShowSelectPlayer", function() end)
- -- push Active Squeezenetwork
- local snPin = appletManager:loadApplet("SqueezeNetworkPIN")
- if snPin then
- snPin:forcePin(player)
- end
+ appletManager:callService("forcePin", player)
+
end
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SqueezeNetworkPIN/SqueezeNetworkPINMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SqueezeNetworkPIN/SqueezeNetworkPINMeta.lua?rev=3010&root=Jive&r1=3009&r2=3010&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SqueezeNetworkPIN/SqueezeNetworkPINMeta.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SqueezeNetworkPIN/SqueezeNetworkPINMeta.lua
Mon Sep 29 11:35:25 2008
@@ -19,7 +19,7 @@
function registerApplet(meta)
meta:registerService("enterPin")
- meta:registerService("forcedPin")
+ meta:registerService("forcePin")
-- check for SN PIN when we connect to a new player
-- this is needed after upgrading from the MP firmware if
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeApplet.lua?rev=3010&root=Jive&r1=3009&r2=3010&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeApplet.lua
Mon Sep 29 11:35:25 2008
@@ -70,7 +70,8 @@
}
jiveMain:addItem(returnToSetup)
- self._topWindow = appletManager:callService("setupShow", function()
self:step2() end)
+ self._topWindow = appletManager:callService("setupShowSetupLanguage",
function() self:step2() end)
+
disableHomeKeyDuringSetup =
Framework:addListener(EVENT_KEY_PRESS,
function(event)
@@ -103,7 +104,7 @@
end
function step3(self)
- return appletManager:callService("setupShow", function() self:step4()
end)
+ return appletManager:callService("setupShowSelectPlayer", function()
self:step4() end)
end
function step4(self)
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=3010&root=Jive&r1=3009&r2=3010&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 11:35:25 2008
@@ -103,7 +103,7 @@
end)
-- choose language
- self._topWindow = appletManager:callService("setupShow", function()
self:step2() end)
+ self._topWindow = appletManager:callService("setupShowSetupLanguage",
function() self:step2() end)
return self.topWindow
end
@@ -203,7 +203,7 @@
end
-- select player
- return appletManager:callService("setupShow", function() self:step8()
end)
+ return appletManager:callService("setupShowSelectPlayer", function()
self:step8() end)
end
function step8(self)
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
