Author: bklaas
Date: Mon May 12 13:45:15 2008
New Revision: 2446
URL: http://svn.slimdevices.com?rev=2446&root=Jive&view=rev
Log:
Bug: 8123
Description: add the ability to send an arbitrary key/value table of 'extras'
to AppletMeta's menuItem method
These key/value pairs will be added to the item table for a HomeMenu item (and
not as an 'extras' table, but as individual key/val pairs to the item table)
add noCustom flag to item that removes it from the CustomizeHomeMenuApplet
checkbox list
add noCustom = 1 to Advanced Settings, Factory Reset, Factory Test and
everything underneath it
Weight "Advanced" so it appears last in the Settings menu
change strings per Dean's suggestions in 8123
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/CustomizeHomeMenu/CustomizeHomeMenuApplet.lua
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/CustomizeHomeMenu/strings.txt
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
7.1/trunk/squeezeplay/src/squeezeplay/share/jive/AppletMeta.lua
7.1/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua
7.1/trunk/squeezeplay/src/squeezeplay/share/jive/ui/HomeMenu.lua
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFactoryReset/SetupFactoryResetMeta.lua
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/TestDisplay/TestDisplayMeta.lua
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/TestIR/TestIRMeta.lua
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/TestKeypad/TestKeypadMeta.lua
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/TestMotion/TestMotionMeta.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=2446&root=Jive&r1=2445&r2=2446&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 13:45:15 2008
@@ -55,11 +55,11 @@
local homeMenuItems = {}
- -- first add an entry for returning everything to defaults
+ -- add an entry for returning everything to defaults
table.insert(homeMenuItems,
{
text = self:string('CUSTOMIZE_RESTORE_DEFAULTS'),
- weight = 1,
+ weight = 100,
callback = function()
self:restoreDefaultsMenu()
end
@@ -69,7 +69,9 @@
for id, item in pairs(self.menuTable) do
if id ~= 'hidden' and
id ~= 'nowhere' and
- id ~= 'settings' then
+ id ~= 'settings' and
+ not item.noCustom
+ then
local title, selected, weight
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=2446&root=Jive&r1=2445&r2=2446&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 13:45:15 2008
@@ -3,13 +3,13 @@
# http://en.wikipedia.org/wiki/List_of_ISO_639_codes
CUSTOMIZE_HOME
- EN Customize Home Menu
+ EN Home Menu
CUSTOMIZE_HIDDEN
EN Hidden
CUSTOMIZE_RESTORE_DEFAULTS
- EN Restore Menu Defaults
+ EN Restore Defaults
CUSTOMIZE_CANCEL
DA Afbryd
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=2446&root=Jive&r1=2445&r2=2446&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 13:45:15 2008
@@ -391,6 +391,7 @@
table.insert( newparams, k .. ":" ..
_lastInput )
end
else
+ log:warn(k, ':', v)
table.insert( newparams, k .. ":" .. v )
end
end
Modified: 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/AppletMeta.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/jive/AppletMeta.lua?rev=2446&root=Jive&r1=2445&r2=2446&view=diff
==============================================================================
--- 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/AppletMeta.lua (original)
+++ 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/AppletMeta.lua Mon May 12
13:45:15 2008
@@ -100,7 +100,7 @@
=cut
--]]
-function menuItem(self, id, node, label, closure, weight)
+function menuItem(self, id, node, label, closure, weight, extras)
return {
id = id,
node = node,
@@ -110,7 +110,8 @@
callback = function(event, menuItem)
local applet =
appletManager:loadApplet(self._entry.appletName)
return closure(applet, menuItem)
- end
+ end,
+ extras = extras
}
end
Modified: 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua?rev=2446&root=Jive&r1=2445&r2=2446&view=diff
==============================================================================
--- 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua (original)
+++ 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua Mon May 12
13:45:15 2008
@@ -231,9 +231,9 @@
jiveMain:addNode( { id = 'extras', node = 'home', text =
_globalStrings:str("EXTRAS"), weight = 70 } )
jiveMain:addNode( { id = 'games', node = 'extras', text =
_globalStrings:str("GAMES"), weight = 70 } )
jiveMain:addNode( { id = 'settings', node = 'home', text =
_globalStrings:str("SETTINGS"), weight = 50, titleStyle = 'settings' })
- jiveMain:addNode( { id = 'advancedSettings', node = 'settings', text =
_globalStrings:str("ADVANCED_SETTINGS"), weight = 100, titleStyle = 'settings'
})
+ jiveMain:addNode( { id = 'advancedSettings', node = 'settings',
noCustom = 1, text = _globalStrings:str("ADVANCED_SETTINGS"), weight = 110,
titleStyle = 'settings' })
jiveMain:addNode( { id = 'screenSettings', node = 'settings', text =
_globalStrings:str("SCREEN_SETTINGS"), weight = 50, titleStyle = 'settings' })
- jiveMain:addNode( { id = 'factoryTest', node = 'advancedSettings', text
= _globalStrings:str("FACTORY_TEST"), weight = 100, titleStyle = 'settings' })
+ jiveMain:addNode( { id = 'factoryTest', node = 'advancedSettings',
noCustom = 1, text = _globalStrings:str("FACTORY_TEST"), weight = 100,
titleStyle = 'settings' })
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=2446&root=Jive&r1=2445&r2=2446&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 May 12
13:45:15 2008
@@ -1,5 +1,5 @@
-local assert, pairs = assert, pairs
+local assert, pairs, type = assert, pairs, type
local oo = require("loop.base")
local table = require("jive.utils.table")
@@ -210,6 +210,13 @@
item.weight = 100
end
+ if item.extras and type(item.extras) == 'table' then
+ for key, val in pairs(item.extras) do
+ item[key] = val
+ end
+ item.extras = nil
+ end
+
-- add or update the item from the menuTable
self.menuTable[item.id] = item
Modified:
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFactoryReset/SetupFactoryResetMeta.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFactoryReset/SetupFactoryResetMeta.lua?rev=2446&root=Jive&r1=2445&r2=2446&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFactoryReset/SetupFactoryResetMeta.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFactoryReset/SetupFactoryResetMeta.lua
Mon May 12 13:45:15 2008
@@ -18,7 +18,7 @@
function registerApplet(meta)
- jiveMain:addItem(meta:menuItem('appletSetupFactoryReset',
'advancedSettings', "RESET_FACTORY_RESET", function(applet, ...)
applet:settingsShow(...) end, 110))
+ jiveMain:addItem(meta:menuItem('appletSetupFactoryReset',
'advancedSettings', "RESET_FACTORY_RESET", function(applet, ...)
applet:settingsShow(...) end, 110, { noCustom = 1 }))
end
Modified:
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua?rev=2446&root=Jive&r1=2445&r2=2446&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
Mon May 12 13:45:15 2008
@@ -80,7 +80,7 @@
meta.player = player
- local fwcmd = { 'firmwareupgrade',
'firmwareVersion:' .. JIVE_VERSION, 'subscribe:3600' }
+ local fwcmd = { 'firmwareupgrade',
'firmwareVersion:' .. JIVE_VERSION, 'subscribe:0' }
player:subscribe(
'/slim/firmwarestatus/' .. player.id,
firmwareUpgradeSink,
Modified:
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/TestDisplay/TestDisplayMeta.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/TestDisplay/TestDisplayMeta.lua?rev=2446&root=Jive&r1=2445&r2=2446&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/TestDisplay/TestDisplayMeta.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/TestDisplay/TestDisplayMeta.lua
Mon May 12 13:45:15 2008
@@ -17,7 +17,7 @@
function registerApplet(meta)
- jiveMain:addItem(meta:menuItem('factoryDisplay', 'factoryTest',
"TEST_DISPLAY", function(applet, ...) applet:DisplayTest(...) end))
+ jiveMain:addItem(meta:menuItem('factoryDisplay', 'factoryTest',
"TEST_DISPLAY", function(applet, ...) applet:DisplayTest(...) end, _, {
noCustom = 1 }))
end
Modified:
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/TestIR/TestIRMeta.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/TestIR/TestIRMeta.lua?rev=2446&root=Jive&r1=2445&r2=2446&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/TestIR/TestIRMeta.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/TestIR/TestIRMeta.lua
Mon May 12 13:45:15 2008
@@ -16,7 +16,7 @@
function registerApplet(meta)
- jiveMain:addItem(meta:menuItem('factoryIR', 'factoryTest', "TEST_IR",
function(applet, ...) applet:IRTest(...) end))
+ jiveMain:addItem(meta:menuItem('factoryIR', 'factoryTest', "TEST_IR",
function(applet, ...) applet:IRTest(...) end, _, { noCustom = 1}))
end
Modified:
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/TestKeypad/TestKeypadMeta.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/TestKeypad/TestKeypadMeta.lua?rev=2446&root=Jive&r1=2445&r2=2446&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/TestKeypad/TestKeypadMeta.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/TestKeypad/TestKeypadMeta.lua
Mon May 12 13:45:15 2008
@@ -17,7 +17,7 @@
function registerApplet(meta)
- jiveMain:addItem(meta:menuItem('factoryKeypad', 'factoryTest',
"TEST_KEYPAD", function(applet, ...) applet:KeypadTest(...) end))
+ jiveMain:addItem(meta:menuItem('factoryKeypad', 'factoryTest',
"TEST_KEYPAD", function(applet, ...) applet:KeypadTest(...) end, _, { noCustom
= 1}))
end
Modified:
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/TestMotion/TestMotionMeta.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/TestMotion/TestMotionMeta.lua?rev=2446&root=Jive&r1=2445&r2=2446&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/TestMotion/TestMotionMeta.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/TestMotion/TestMotionMeta.lua
Mon May 12 13:45:15 2008
@@ -17,7 +17,7 @@
function registerApplet(meta)
- jiveMain:addItem(meta:menuItem('appletTestMotion', 'factoryTest',
"TEST_MOTION", function(applet, ...) applet:settingsShow(...) end))
+ jiveMain:addItem(meta:menuItem('appletTestMotion', 'factoryTest',
"TEST_MOTION", function(applet, ...) applet:settingsShow(...) end, _, {
noCustom = 1}))
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
