Author: bklaas
Date: Mon Oct 20 10:31:05 2008
New Revision: 3158
URL: http://svn.slimdevices.com?rev=3158&root=Jive&view=rev
Log:
Bug: 9639
Description: add image of Squeezebox 1
if player model does not have icon/style defined, default back to the SD logo
Added:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/squeezebox.png
(with props)
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/squeezebox.png
(with props)
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.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=3158&root=Jive&r1=3157&r2=3158&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
Mon Oct 20 10:31:05 2008
@@ -1042,6 +1042,19 @@
}
})
+ s.squeezebox = _uses(s.chooseplayer, {
+ icon = {
+ img = Surface:loadImage(imgpath ..
"Icons/Players/squeezebox.png"),
+ }
+ })
+ s.squeezeboxchecked = _uses(s.squeezebox, {
+ order = { "icon", "text", "check" },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
+ }
+ })
+
s.squeezebox2 = _uses(s.chooseplayer, {
icon = {
img = Surface:loadImage(imgpath ..
"Icons/Players/squeezebox2.png"),
@@ -1216,6 +1229,19 @@
}
})
+ s.selected.squeezebox = _uses(s.selected.chooseplayer, {
+ icon = {
+ img = Surface:loadImage(imgpath ..
"Icons/Players/squeezebox.png"),
+ }
+ })
+ s.selected.squeezeboxchecked = _uses(s.selected.squeezebox, {
+ order = { "icon", "text", "check", "play" },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
+ }
+ })
+
s.selected.squeezebox2 = _uses(s.selected.chooseplayer, {
icon = {
img = Surface:loadImage(imgpath ..
"Icons/Players/squeezebox2.png"),
@@ -1228,7 +1254,6 @@
img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
}
})
-
s.selected.boom = _uses(s.selected.chooseplayer, {
icon = {
Added:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/squeezebox.png
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/squeezebox.png?rev=3158&root=Jive&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/squeezebox.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua?rev=3158&root=Jive&r1=3157&r2=3158&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
Mon Oct 20 10:31:05 2008
@@ -170,7 +170,25 @@
local playerName = player:getName()
local playerWeight = PLAYER_WEIGHT
- local playerModel = player:getModel() or 'softsqueeze'
+ -- create a lookup table of valid models,
+ -- so Choose Player does not attempt to render a style that doesn't
exist
+ local validModel = {
+ softsqueeze = true,
+ transporter = true,
+ squeezebox2 = true,
+ squeezebox = true,
+ slimp3 = true,
+ receiver = true,
+ boom = true,
+ controller = true,
+ }
+
+ local playerModel = player:getModel()
+
+ if not validModel[playerModel] then
+ -- use a generic style when model lists as not valid
+ playerModel = 'softsqueeze'
+ end
-- if waiting for a SN pin modify name
if player:getPin() then
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=3158&root=Jive&r1=3157&r2=3158&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
Mon Oct 20 10:31:05 2008
@@ -307,6 +307,8 @@
s.title.position = LAYOUT_NORTH
s.title.bgImg = titleBox
s.title.order = { "back", "text" }
+ -- FIXME: for now playing button in title bar
+ --s.title.order = { "back", "text", 'nowplaying' }
s.title.text = {}
s.title.text.w = WH_FILL
s.title.text.padding = TITLE_PADDING
@@ -317,6 +319,12 @@
--FIXME, this png path should likely change
s.title.back.img = Surface:loadImage(imgpath ..
"pointer_selector_L.png")
s.title.back.align = "left"
+--[[
+ s.title.nowplaying = {}
+ --FIXME, this png path should likely change
+ s.title.nowplaying.img = Surface:loadImage(imgpath ..
"Icons/Mini/icon_quarter_note.png")
+ s.title.nowplaying.align = "left"
+--]]
@@ -769,7 +777,7 @@
s.minititle.text.align = 'top-left'
s.minititle.text.font = _boldfont(TITLE_FONT_SIZE)
s.minititle.text.fg = TEXT_COLOR_BLACK
- s.minititle.order = { "back", "text", "icon" }
+ s.minititle.order = { "back", "text", "nowplaying", "icon" }
s.minititle.icon = {}
s.minititle.icon.padding = { 0, 0, 8, 0 }
s.minititle.icon.align = 'right'
@@ -970,6 +978,20 @@
}
})
+ s.squeezebox = _uses(s.chooseplayer, {
+ icon = {
+ img = Surface:loadImage(imgpath ..
"Icons/Players/squeezebox.png"),
+ }
+ })
+ s.squeezeboxchecked = _uses(s.squeezebox, {
+ order = { "icon", "text", "check" },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
+ }
+ })
+
+
s.squeezebox2 = _uses(s.chooseplayer, {
icon = {
img = Surface:loadImage(imgpath ..
"Icons/Players/squeezebox2.png"),
@@ -982,6 +1004,7 @@
img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
}
})
+
s.boom = _uses(s.chooseplayer, {
icon = {
img = Surface:loadImage(imgpath ..
"Icons/Players/boom.png"),
@@ -1142,6 +1165,20 @@
img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
}
})
+
+ s.selected.squeezebox = _uses(s.selected.chooseplayer, {
+ icon = {
+ img = Surface:loadImage(imgpath ..
"Icons/Players/squeezebox.png"),
+ }
+ })
+ s.selected.squeezeboxchecked = _uses(s.selected.squeezebox, {
+ order = { "icon", "text", "check", "play" },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
+ }
+ })
+
s.selected.squeezebox2 = _uses(s.selected.chooseplayer, {
icon = {
Added:
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/squeezebox.png
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/squeezebox.png?rev=3158&root=Jive&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/squeezebox.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
