Author: bklaas
Date: Sat Nov 15 10:05:28 2008
New Revision: 3384
URL: http://svn.slimdevices.com?rev=3384&root=Jive&view=rev
Log:
Bug: 9101
Description: add multiline menu item style, same as albumitem but with no icon
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua?rev=3384&root=Jive&r1=3383&r2=3384&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
Sat Nov 15 10:05:28 2008
@@ -1011,6 +1011,7 @@
s.albummenu.fg = {0xbb, 0xbb, 0xbb }
s.albummenu.font = FONT_BOLD_200px
+ s.multilinemenu = _uses(s.albummenu)
-- items with artwork and song info
--s.albumitem.h = 60
@@ -1037,6 +1038,10 @@
s.albumitem.icon.img = _loadImage(self, "album_noartwork_56.png")
s.albumitem.icon.border = { 8, 0, 0, 0 }
+ s.multilineitem = _uses(s.albumitem, {
+ order = {'text', 'play'}
+ })
+
-- checked albummenu item
s.albumchecked =
_uses(s.albumitem, {
@@ -1047,6 +1052,9 @@
}
})
+ s.multilinechecked = _uses(s.albumchecked, {
+ order = { 'text', 'check' },
+ })
-- styles for choose player menu
s.chooseplayer = _uses(s.albumitem, {
@@ -1205,6 +1213,7 @@
s.albumitemNoAction.text.fg = TEXT_COLOR
s.albumitemNoAction.text.sh = TEXT_SH_COLOR
+ s.multilineitemNoAction = _uses(s.albumitemNoAction)
--FIXME: albumitemNoAction can't use _uses because it sticks an icon on the
screen
--[[
@@ -1214,6 +1223,7 @@
})
--]]
s.selected.albumitemNoAction = _uses(s.albumitemNoAction)
+ s.selected.multilineitemNoAction = _uses(s.multilineitemNoAction)
-- selected item with artwork and song info
s.selected.albumitem = {}
@@ -1228,12 +1238,17 @@
s.selected.albumitem.play.img = _loadImage(self,
"Icons/selection_right.png")
s.selected.albumitem.play.border = { 0, 0, 5, 0 }
+ s.selected.multilineitem = _uses(s.selected.albumitem)
+
s.selected.albumitemplay = _uses(s.selected.albumitem, {
play = { img = _loadImage(self,
"Icons/selection_play.png") }
})
+ s.selected.multilineitemplay = _uses(s.selected.albumitemplay)
+
s.selected.albumitemadd = _uses(s.selected.albumitem, {
play = { img = _loadImage(self,
"Icons/selection_add.png") }
})
+ s.selected.mulitlineadd = _uses(s.selected.albumitemadd)
s.selected.albumchecked = _uses(s.selected.albumitem, {
order = { "icon", "text", "check", "play" },
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua?rev=3384&root=Jive&r1=3383&r2=3384&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua
Sat Nov 15 10:05:28 2008
@@ -959,6 +959,7 @@
s.albummenu.fg = {0xbb, 0xbb, 0xbb }
s.albummenu.font = _boldfont(400)
+ s.multilinemenu = _uses(s.albummenu)
-- items with artwork and song info
s.albumitem = {}
@@ -986,6 +987,10 @@
s.albumitem.icon.img = _loadImage(self, "menu_album_noartwork_125.png")
s.albumitem.icon.padding = { 0, 5, 0, 0}
+ s.multilineitem = _uses(s.albumitem, {
+ order = {'text', 'play'}
+ })
+
-- checked albummenu item
s.albumchecked =
_uses(s.albumitem, {
@@ -995,6 +1000,9 @@
align = "right"
}
})
+ s.multilinechecked = _uses(s.albumchecked, {
+ order = { 'text', 'check' }
+ })
-- styles for choose player menu
s.chooseplayer = _uses(s.albumitem, {
@@ -1118,6 +1126,9 @@
s.albumitemplay = _uses(s.albumitem)
s.albumitemadd = _uses(s.albumitem)
+
+ s.multilineitemplay = _uses(s.multilineitem)
+ s.multilineitemadd = _uses(s.multilineitem)
s.popupToast = _uses(s.albumitem,
{
@@ -1164,6 +1175,8 @@
--]]
s.selected.albumitemNoAction = _uses(s.albumitemNoAction)
+ s.selected.multilineitemNoAction = _uses(s.multilineitemNoAction)
+
-- selected item with artwork and song info
s.selected.albumitem = {}
s.selected.albumitem.text = {}
@@ -1173,6 +1186,7 @@
s.selected.albumitemplay = _uses(s.selected.albumitem)
s.selected.albumitemadd = _uses(s.selected.albumitem)
+ s.selected.multilineitem = _uses(s.selected.albumitem)
--[[
s.selected.albumitemplay = _uses(s.selected.albumitem, {
@@ -1192,6 +1206,9 @@
img = _loadImage(self,
"Icons/icon_check_selected.png")
}
})
+ s.selected.multilinechecked = _uses(s.selected.albumchecked, {
+ order = { 'text', 'check', 'play' },
+ })
s.selected.chooseplayer = _uses(s.selected.albumitem, {
order = { "icon", "text", "play" },
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
