Author: titmuss
Date: Wed May 28 11:26:16 2008
New Revision: 2533
URL: http://svn.slimdevices.com?rev=2533&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r2525): bklaas | 2008-05-23 23:13:40 +0100
Bug: 8218
Description: change weight of Factory Test to be just above Factory Reset in
Advanced Settings menu
don't allow any of Factory Test items to be added to the top menu
Modified:
7.2/trunk/ (props changed)
7.2/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua
7.2/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveMeta.lua
Propchange: 7.2/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed May 28 11:26:16 2008
@@ -1,5 +1,5 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.0/trunk:2502
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2519
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2525
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.2/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua?rev=2533&root=Jive&r1=2532&r2=2533&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua (original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua Wed May 28
11:26:16 2008
@@ -233,7 +233,7 @@
jiveMain:addNode( { id = 'settings', node = 'home', noCustom = 1, text
= _globalStrings:str("SETTINGS"), weight = 50, 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',
noCustom = 1, text = _globalStrings:str("FACTORY_TEST"), weight = 100,
titleStyle = 'settings' })
+ jiveMain:addNode( { id = 'factoryTest', node = 'advancedSettings',
noCustom = 1, text = _globalStrings:str("FACTORY_TEST"), weight = 105,
titleStyle = 'settings' })
end
Modified:
7.2/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveMeta.lua
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveMeta.lua?rev=2533&root=Jive&r1=2532&r2=2533&view=diff
==============================================================================
---
7.2/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveMeta.lua
(original)
+++
7.2/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveMeta.lua
Wed May 28 11:26:16 2008
@@ -46,7 +46,7 @@
jiveMain:addItem(meta:menuItem('backlightSetting', 'screenSettings',
"BSP_BACKLIGHT_TIMER", function(applet, ...)
applet:settingsBacklightTimerShow(...) end))
jiveMain:addItem(meta:menuItem('brightnessSetting', 'screenSettings',
"BSP_BRIGHTNESS", function(applet, ...) applet:settingsBrightnessShow(...) end))
jiveMain:addItem(meta:menuItem('powerDown', 'advancedSettings',
"POWER_DOWN", function(applet, ...) applet:settingsPowerDown(...) end))
- jiveMain:addItem(meta:menuItem('suspendTest', 'factoryTest',
"POWER_MANAGEMENT_SETTINGS", function(applet, ...)
applet:settingsTestSuspend(...) end))
+ jiveMain:addItem(meta:menuItem('suspendTest', 'factoryTest',
"POWER_MANAGEMENT_SETTINGS", function(applet, ...)
applet:settingsTestSuspend(...) end, _, { noCustom = 1 }))
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
