Author: bklaas
Date: Thu Sep 4 08:38:54 2008
New Revision: 2906
URL: http://svn.slimdevices.com?rev=2906&root=Jive&view=rev
Log:
Bug: 8655
Description: Pull 7.2 checkin r2746 into 7.1 branch
allows for two new menu item styles, albumitemplay and albumitemadd
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua?rev=2906&root=Jive&r1=2905&r2=2906&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
Thu Sep 4 08:38:54 2008
@@ -986,6 +986,9 @@
s.albumitem.icon.img = Surface:loadImage(imgpath ..
"menu_album_noartwork.png")
s.albumitem.icon.border = { 8, 0, 0, 0 }
+ s.albumitemplay = _uses(s.albumitem)
+ s.albumitemadd = _uses(s.albumitem)
+
s.popupToast = _uses(s.albumitem,
{
order = { 'icon', 'text', 'textarea' },
@@ -1044,6 +1047,13 @@
s.selected.albumitem.play.img = Surface:loadImage(imgpath ..
"selection_right.png")
s.selected.albumitem.play.border = { 0, 0, 5, 0 }
+ s.selected.albumitemplay = _uses(s.selected.albumitem, {
+ play = { img = Surface:loadImage(imgpath ..
"selection_play.png") }
+ })
+ s.selected.albumitemadd = _uses(s.selected.albumitem, {
+ play = { img = Surface:loadImage(imgpath ..
"selection_add.png") }
+ })
+
-- locked item with artwork and song info
s.locked.albumitem = {}
s.locked.albumitem.text = {}
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=2906&root=Jive&r1=2905&r2=2906&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
Thu Sep 4 08:38:54 2008
@@ -1647,7 +1647,13 @@
if current then
style = "albumcurrent"
elseif item and item["style"] then
- style = item["style"]
+ local menuStyle = menu:getStyle()
+ local menuPrefix = string.match(menuStyle,
"(%a+)menu")
+ if menuPrefix then
+ style = menuPrefix .. item["style"]
+ else
+ style = item["style"]
+ end
end
widgets[widgetIndex] = _decoratedLabel(widget, style,
item, db, menuAccel)
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
