Author: bklaas
Date: Mon Oct 6 12:18:27 2008
New Revision: 3080
URL: http://svn.slimdevices.com?rev=3080&root=Jive&view=rev
Log:
Bug: 9362
Description: temporarily disable choice items from availability in the
Customize Home Menu applet
add getCanCustomize method to HomeMenu
also, softsqueeze should return true from Player.canConnectToServer method
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/CustomizeHomeMenu/CustomizeHomeMenuApplet.lua
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
7.1/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
7.1/trunk/squeezeplay/src/squeezeplay/share/jive/ui/HomeMenu.lua
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/CustomizeHomeMenu/CustomizeHomeMenuApplet.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/applets/CustomizeHomeMenu/CustomizeHomeMenuApplet.lua?rev=3080&root=Jive&r1=3079&r2=3080&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/CustomizeHomeMenu/CustomizeHomeMenuApplet.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/CustomizeHomeMenu/CustomizeHomeMenuApplet.lua
Mon Oct 6 12:18:27 2008
@@ -127,7 +127,8 @@
item.weights = { 2 }
end
local menuItem
- if item.noCustom then
+
+ if not jiveMain:getCanCustomize(item) then
menuItem = {
text = title,
weights = item.weights,
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=3080&root=Jive&r1=3079&r2=3080&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Mon Oct 6 12:18:27 2008
@@ -1036,6 +1036,9 @@
elseif choiceAction then
+ -- FIXME: Bug 9362, do not allow choice items
to be promoted to home menu
+ item.noCustom = true
+
local selectedIndex = 1
if v.selectedIndex then
selectedIndex =
tonumber(v.selectedIndex)
Modified: 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua?rev=3080&root=Jive&r1=3079&r2=3080&view=diff
==============================================================================
--- 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua (original)
+++ 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua Mon Oct 6
12:18:27 2008
@@ -1166,6 +1166,7 @@
or self.info.model == "receiver"
or self.info.model == "transporter"
or self.info.model == "boom"
+ or self.info.model == "softsqueeze"
end
Modified: 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/ui/HomeMenu.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/jive/ui/HomeMenu.lua?rev=3080&root=Jive&r1=3079&r2=3080&view=diff
==============================================================================
--- 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/ui/HomeMenu.lua (original)
+++ 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/ui/HomeMenu.lua Mon Oct 6
12:18:27 2008
@@ -96,6 +96,14 @@
end
end
+function getCanCustomize(self, item)
+ if item and item.noCustom then
+ return false
+ else
+ return true
+ end
+end
+
function setTitle(self, title)
if title then
self.window:setTitle(title)
@@ -235,6 +243,7 @@
if self.nodeTable[node] then
self.nodeTable[node].items[item.id] = item
+ log:debug('adding ', item.id, 'to ', node)
local menuIdx = self.nodeTable[node].menu:addItem(item)
if node == 'home' and item.homeMenuText then
local labelText = item.homeMenuText
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
