Author: bklaas
Date: Mon May 12 14:14:37 2008
New Revision: 2447
URL: http://svn.slimdevices.com?rev=2447&root=Jive&view=rev
Log:
Bug: 8123
Description: add the ability to add a homeMenuToken or homeMenuString to a
HomeMenu item
this will be the displayed string (or translated string token) when this item
is displayed on the top menu
for example, the search item "Albums" will appear as "Album Search"
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/CustomizeHomeMenu/CustomizeHomeMenuApplet.lua
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/CustomizeHomeMenu/CustomizeHomeMenuMeta.lua
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/CustomizeHomeMenu/strings.txt
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.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=2447&root=Jive&r1=2446&r2=2447&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 May 12 14:14:37 2008
@@ -111,6 +111,11 @@
jiveMain:setNode(item,
'home')
else
self:getSettings()[item.id] = 'home'
+ if item.homeMenuToken
then
+ item.text =
self:string(item.homeMenuToken)
+ elseif
item.homeMenuText then
+ item.text =
item.homeMenuText
+ end
jiveMain:addItemToNode(item, 'home')
end
else
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/CustomizeHomeMenu/CustomizeHomeMenuMeta.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/applets/CustomizeHomeMenu/CustomizeHomeMenuMeta.lua?rev=2447&root=Jive&r1=2446&r2=2447&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/CustomizeHomeMenu/CustomizeHomeMenuMeta.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/CustomizeHomeMenu/CustomizeHomeMenuMeta.lua
Mon May 12 14:14:37 2008
@@ -28,6 +28,6 @@
jiveMain:setCustomNode(id, node)
end
- jiveMain:addItem(self:menuItem('appletCustomizeHome', 'settings',
"CUSTOMIZE_HOME", function(applet, ...) applet:menu(...) end))
+ jiveMain:addItem(self:menuItem('appletCustomizeHome', 'settings',
"CUSTOMIZE_HOME", function(applet, ...) applet:menu(...) end, _, {
homeMenuToken = 'CUSTOMIZE_HOME_HOMESTRING' }))
end
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/CustomizeHomeMenu/strings.txt
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/applets/CustomizeHomeMenu/strings.txt?rev=2447&root=Jive&r1=2446&r2=2447&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/CustomizeHomeMenu/strings.txt
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/CustomizeHomeMenu/strings.txt
Mon May 12 14:14:37 2008
@@ -4,6 +4,9 @@
CUSTOMIZE_HOME
EN Home Menu
+
+CUSTOMIZE_HOME_HOMESTRING
+ EN Customize This Menu
CUSTOMIZE_HIDDEN
EN Hidden
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=2447&root=Jive&r1=2446&r2=2447&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 May 12 14:14:37 2008
@@ -391,7 +391,6 @@
table.insert( newparams, k .. ":" ..
_lastInput )
end
else
- log:warn(k, ':', v)
table.insert( newparams, k .. ":" .. v )
end
end
@@ -867,6 +866,7 @@
id = v.id,
node = v.node,
text = v.text,
+ homeMenuText = v.homeMenuText,
weight = v.weight,
window = v.window,
sound = "WINDOWSHOW",
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
