Author: bklaas
Date: Wed Nov 17 13:40:38 2010
New Revision: 9231
URL: http://svn.slimdevices.com/jive?rev=9231&view=rev
Log:
r48...@daddymac (orig r9222): bklaas | 2010-11-12 10:46:07 -0500
Fixed Bug: 16659
Description: add locked treatment with no icon to s.text_only style
r48...@daddymac (orig r9230): bklaas | 2010-11-17 15:30:34 -0500
Fix typo in removeScreensaver() method
Modified:
7.6/branches/new-setup/ (props changed)
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/WQVGAsmallSkinApplet.lua
Propchange: 7.6/branches/new-setup/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed Nov 17 13:40:38 2010
@@ -14,7 +14,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/private-branches/new-alsa:6567
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:8423
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/trunk:9219
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.6/trunk:9220
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.6/trunk:9230
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.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua?rev=9231&r1=9230&r2=9231&view=diff
==============================================================================
---
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua
(original)
+++
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua
Wed Nov 17 13:40:38 2010
@@ -836,6 +836,11 @@
}
},
pressed = {
+ item = {
+ order = { 'text', 'arrow', },
+ }
+ },
+ locked = {
item = {
order = { 'text', 'arrow', },
}
Modified:
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua?rev=9231&r1=9230&r2=9231&view=diff
==============================================================================
---
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
(original)
+++
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
Wed Nov 17 13:40:38 2010
@@ -627,7 +627,7 @@
function removeScreenSaver(self, appletName, method, settingsName,
additionalKey)
- local key = self:getKey(applet, method, additionalKey)
+ local key = self:getKey(appletName, method, additionalKey)
if settingsName then
self.screensaverSettings[settingsName] = nil
Modified:
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/WQVGAsmallSkinApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/WQVGAsmallSkinApplet.lua?rev=9231&r1=9230&r2=9231&view=diff
==============================================================================
---
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/WQVGAsmallSkinApplet.lua
(original)
+++
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/WQVGAsmallSkinApplet.lua
Wed Nov 17 13:40:38 2010
@@ -1462,6 +1462,11 @@
}
},
pressed = {
+ item = {
+ order = { 'text', 'arrow', },
+ }
+ },
+ locked = {
item = {
order = { 'text', 'arrow', },
}
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
