Author: bklaas
Date: Thu Nov 20 15:36:33 2008
New Revision: 3420
URL: http://svn.slimdevices.com?rev=3420&root=Jive&view=rev
Log:
Bug: 9639
Description: artwork update from Noah and relevant skin changes
allow SelectPlayer to render icons for squeezeplay and stream
Added:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/squeezeplay.png
(with props)
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/stream.png
(with props)
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/squeezeplay.png
(with props)
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/stream.png
(with props)
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/boom.png
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/controller.png
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/receiver.png
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/slimp3.png
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/softsqueeze.png
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/squeezebox.png
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/squeezebox3.png
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/transporter.png
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/boom.png
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/controller.png
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/receiver.png
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/slimp3.png
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/softsqueeze.png
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/squeezebox.png
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/squeezebox3.png
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/transporter.png
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=3420&root=Jive&r1=3419&r2=3420&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
Thu Nov 20 15:36:33 2008
@@ -1176,7 +1176,31 @@
img = _loadImage(self,
"Icons/icon_check_selected.png")
}
})
-
+ s.squeezeplay = _uses(s.chooseplayer, {
+ icon = {
+ img = _loadImage(self,
"Icons/Players/squeezeplay.png"),
+ }
+ })
+ s.squeezeplaychecked = _uses(s.squeezeplay, {
+ order = { "icon", "text", "check" },
+ check = {
+ align = "right",
+ img = _loadImage(self,
"Icons/icon_check_selected.png")
+ }
+ })
+ s.stream = _uses(s.chooseplayer, {
+ icon = {
+ img = _loadImage(self,
"Icons/Players/stream.png"),
+ }
+ })
+ s.streamchecked = _uses(s.stream, {
+ order = { "icon", "text", "check" },
+ check = {
+ align = "right",
+ img = _loadImage(self,
"Icons/icon_check_selected.png")
+ }
+ })
+
s.albumitemplay = _uses(s.albumitem)
s.albumitemadd = _uses(s.albumitem)
@@ -1387,7 +1411,31 @@
img = _loadImage(self,
"Icons/icon_check_selected.png")
}
})
-
+ s.selected.squeezeplay = _uses(s.selected.chooseplayer, {
+ icon = {
+ img = _loadImage(self,
"Icons/Players/squeezeplay.png"),
+ }
+ })
+ s.selected.squeezeplaychecked = _uses(s.selected.squeezeplay, {
+ order = { "icon", "text", "check", "play" },
+ check = {
+ align = "right",
+ img = _loadImage(self,
"Icons/icon_check_selected.png")
+ }
+ })
+ s.selected.stream = _uses(s.selected.chooseplayer, {
+ icon = {
+ img = _loadImage(self,
"Icons/Players/stream.png"),
+ }
+ })
+ s.selected.streamchecked = _uses(s.selected.stream, {
+ order = { "icon", "text", "check", "play" },
+ check = {
+ align = "right",
+ img = _loadImage(self,
"Icons/icon_check_selected.png")
+ }
+ })
+
-- locked item with artwork and song info
s.locked.albumitem = {}
s.locked.albumitem.text = {}
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/boom.png
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/boom.png?rev=3420&root=Jive&r1=3419&r2=3420&view=diff
==============================================================================
Binary files - no diff available.
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/controller.png
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/controller.png?rev=3420&root=Jive&r1=3419&r2=3420&view=diff
==============================================================================
Binary files - no diff available.
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/receiver.png
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/receiver.png?rev=3420&root=Jive&r1=3419&r2=3420&view=diff
==============================================================================
Binary files - no diff available.
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/slimp3.png
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/slimp3.png?rev=3420&root=Jive&r1=3419&r2=3420&view=diff
==============================================================================
Binary files - no diff available.
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/softsqueeze.png
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/softsqueeze.png?rev=3420&root=Jive&r1=3419&r2=3420&view=diff
==============================================================================
Binary files - no diff available.
Modified:
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=3420&root=Jive&r1=3419&r2=3420&view=diff
==============================================================================
Binary files - no diff available.
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/squeezebox3.png
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/squeezebox3.png?rev=3420&root=Jive&r1=3419&r2=3420&view=diff
==============================================================================
Binary files - no diff available.
Added:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/squeezeplay.png
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/squeezeplay.png?rev=3420&root=Jive&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/squeezeplay.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/stream.png
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/stream.png?rev=3420&root=Jive&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/stream.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/transporter.png
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/transporter.png?rev=3420&root=Jive&r1=3419&r2=3420&view=diff
==============================================================================
Binary files - no diff available.
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=3420&root=Jive&r1=3419&r2=3420&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
Thu Nov 20 15:36:33 2008
@@ -185,10 +185,11 @@
receiver = true,
boom = true,
controller = true,
+ squeezeplay = true,
+ stream = true,
}
local playerModel = player:getModel()
-
if not validModel[playerModel] then
-- use a generic style when model lists as not valid
playerModel = 'softsqueeze'
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=3420&root=Jive&r1=3419&r2=3420&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
Thu Nov 20 15:36:33 2008
@@ -1122,7 +1122,31 @@
img = _loadImage(self,
"Icons/icon_check_selected.png")
}
})
-
+ s.squeezeplay = _uses(s.chooseplayer, {
+ icon = {
+ img = _loadImage(self,
"Icons/Players/squeezeplay.png"),
+ }
+ })
+ s.squeezeplaychecked = _uses(s.squeezeplay, {
+ order = { "icon", "text", "check" },
+ check = {
+ align = "right",
+ img = _loadImage(self,
"Icons/icon_check_selected.png")
+ }
+ })
+ s.stream = _uses(s.chooseplayer, {
+ icon = {
+ img = _loadImage(self,
"Icons/Players/stream.png"),
+ }
+ })
+ s.streamchecked = _uses(s.stream, {
+ order = { "icon", "text", "check" },
+ check = {
+ align = "right",
+ img = _loadImage(self,
"Icons/icon_check_selected.png")
+ }
+ })
+
s.albumitemplay = _uses(s.albumitem)
s.albumitemadd = _uses(s.albumitem)
@@ -1334,7 +1358,31 @@
img = _loadImage(self,
"Icons/icon_check_selected.png")
}
})
-
+ s.selected.squeezeplay = _uses(s.selected.chooseplayer, {
+ icon = {
+ img = _loadImage(self,
"Icons/Players/squeezeplay.png"),
+ }
+ })
+ s.selected.squeezeplaychecked = _uses(s.selected.squeezeplay, {
+ order = { "icon", "text", "check", "play" },
+ check = {
+ align = "right",
+ img = _loadImage(self,
"Icons/icon_check_selected.png")
+ }
+ })
+ s.selected.stream = _uses(s.selected.chooseplayer, {
+ icon = {
+ img = _loadImage(self,
"Icons/Players/stream.png"),
+ }
+ })
+ s.selected.streamchecked = _uses(s.selected.stream, {
+ order = { "icon", "text", "check", "play" },
+ check = {
+ align = "right",
+ img = _loadImage(self,
"Icons/icon_check_selected.png")
+ }
+ })
+
-- locked item with artwork and song info
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/boom.png
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/boom.png?rev=3420&root=Jive&r1=3419&r2=3420&view=diff
==============================================================================
Binary files - no diff available.
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/controller.png
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/controller.png?rev=3420&root=Jive&r1=3419&r2=3420&view=diff
==============================================================================
Binary files - no diff available.
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/receiver.png
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/receiver.png?rev=3420&root=Jive&r1=3419&r2=3420&view=diff
==============================================================================
Binary files - no diff available.
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/slimp3.png
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/slimp3.png?rev=3420&root=Jive&r1=3419&r2=3420&view=diff
==============================================================================
Binary files - no diff available.
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/softsqueeze.png
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/softsqueeze.png?rev=3420&root=Jive&r1=3419&r2=3420&view=diff
==============================================================================
Binary files - no diff available.
Modified:
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=3420&root=Jive&r1=3419&r2=3420&view=diff
==============================================================================
Binary files - no diff available.
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/squeezebox3.png
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/squeezebox3.png?rev=3420&root=Jive&r1=3419&r2=3420&view=diff
==============================================================================
Binary files - no diff available.
Added:
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/squeezeplay.png
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/squeezeplay.png?rev=3420&root=Jive&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/squeezeplay.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/stream.png
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/stream.png?rev=3420&root=Jive&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/stream.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/transporter.png
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/transporter.png?rev=3420&root=Jive&r1=3419&r2=3420&view=diff
==============================================================================
Binary files - no diff available.
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
