Author: titmuss
Date: Thu Jan 31 05:50:47 2008
New Revision: 1720
URL: http://svn.slimdevices.com?rev=1720&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1715): titmuss | 2008-01-31 12:16:50 +0000
Bug: 6764
Description:
Dean asked for the "Set Up Squeezebox" option to be back in "Choose Player".
This is now only displayed during Setup, and
not when selected from the main menu (in this case any Ray's waiting for setup
will be displayed anyway). Dean to clarify
that is the correct behaviour.
Modified:
trunk/ (props changed)
trunk/jive/src/pkg/jive/share/applets/SelectPlayer/SelectPlayerApplet.lua
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Thu Jan 31 05:50:47 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1714
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1715
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
trunk/jive/src/pkg/jive/share/applets/SelectPlayer/SelectPlayerApplet.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/applets/SelectPlayer/SelectPlayerApplet.lua?rev=1720&root=Jive&r1=1719&r2=1720&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/applets/SelectPlayer/SelectPlayerApplet.lua
(original)
+++ trunk/jive/src/pkg/jive/share/applets/SelectPlayer/SelectPlayerApplet.lua
Thu Jan 31 05:50:47 2008
@@ -291,6 +291,19 @@
end
end
+ -- Bug 6130 add a Set up Squeezebox option, only in Setup not Settings
+ local sbsetup = AppletManager:loadApplet("SetupSqueezebox")
+ if sbsetup and setupNext then
+ self.playerMenu:addItem({
+ text = self:string("SQUEEZEBOX_SETUP"),
+ sound = "WINDOWSHOW",
+ callback = function()
+ sbsetup:settingsShow()
+ end,
+ weight = 20,
+ })
+ end
+
window:addWidget(menu)
window:addTimer(5000, function() self:_scan() end)
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
