Author: titmuss
Date: Thu Dec 18 05:45:26 2008
New Revision: 3557
URL: http://svn.slimdevices.com?rev=3557&root=Jive&view=rev
Log:
r3...@harrypotter (orig r3538): bklaas | 2008-12-15 22:58:34 +0000
Bug: 8067
Description: never display a "press brightness" window for SBR and a few others
r3...@harrypotter (orig r3550): bklaas | 2008-12-17 18:02:35 +0000
Bug: 10363
Description: give 'Setup Receiver' menu item shown during setup a style of
'receiver' so an icon is printed
Modified:
7.4/trunk/ (props changed)
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Propchange: 7.4/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Thu Dec 18 05:45:26 2008
@@ -2,7 +2,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/branches/discovery-refactor:2596
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2920
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3476
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3550
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua?rev=3557&root=Jive&r1=3556&r2=3557&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
Thu Dec 18 05:45:26 2008
@@ -348,6 +348,7 @@
callback = function()
appletManager:callService("setupSqueezeboxSettingsShow")
end,
+ style = 'receiver',
weight = 10,
})
end
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=3557&root=Jive&r1=3556&r2=3557&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Thu Dec 18 05:45:26 2008
@@ -651,6 +651,19 @@
if _userUpdatePopup then
return
+ end
+
+
+ -- only show this window if the player has a brightness button available
+ local playerModel = _player:getModel()
+ if playerModel == 'receiver'
+ or playerModel == 'softsqueeze'
+ or playerModel == 'softsqueeze3'
+ or playerModel == 'controller'
+ or playerModel == 'squeezeplay'
+ or playerModel == 'squeezeslave'
+ then
+ return
end
local window = Window("window",
self:string('SLIMBROWSER_PLAYER_UPDATE_REQUIRED'))
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
