Author: bklaas
Date: Tue Nov 25 07:50:24 2008
New Revision: 3437
URL: http://svn.slimdevices.com?rev=3437&root=Jive&view=rev
Log:
Bug: 9639, 10131
Description: change stream.png to http.png, style from s.stream to s.http, and
add support in SelectPlayer to ide
ntify http as a valid player model
Added:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/http.png
(with props)
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/http.png
(with props)
Removed:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/stream.png
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/stream.png
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=3437&root=Jive&r1=3436&r2=3437&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
Tue Nov 25 07:50:24 2008
@@ -1188,12 +1188,12 @@
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, {
+ s.http = _uses(s.chooseplayer, {
+ icon = {
+ img = _loadImage(self,
"Icons/Players/http.png"),
+ }
+ })
+ s.httpchecked = _uses(s.http, {
order = { "icon", "text", "check" },
check = {
align = "right",
@@ -1423,12 +1423,12 @@
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, {
+ s.selected.http = _uses(s.selected.chooseplayer, {
+ icon = {
+ img = _loadImage(self,
"Icons/Players/http.png"),
+ }
+ })
+ s.selected.httpchecked = _uses(s.selected.http, {
order = { "icon", "text", "check", "play" },
check = {
align = "right",
Added:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/http.png
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/http.png?rev=3437&root=Jive&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/http.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=3437&root=Jive&r1=3436&r2=3437&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
Tue Nov 25 07:50:24 2008
@@ -186,7 +186,7 @@
boom = true,
controller = true,
squeezeplay = true,
- stream = true,
+ http = true,
}
local playerModel = player:getModel()
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=3437&root=Jive&r1=3436&r2=3437&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
Tue Nov 25 07:50:24 2008
@@ -1134,12 +1134,12 @@
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, {
+ s.http = _uses(s.chooseplayer, {
+ icon = {
+ img = _loadImage(self,
"Icons/Players/http.png"),
+ }
+ })
+ s.httpchecked = _uses(s.http, {
order = { "icon", "text", "check" },
check = {
align = "right",
@@ -1370,12 +1370,12 @@
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, {
+ s.selected.http = _uses(s.selected.chooseplayer, {
+ icon = {
+ img = _loadImage(self,
"Icons/Players/http.png"),
+ }
+ })
+ s.selected.httpchecked = _uses(s.selected.http, {
order = { "icon", "text", "check", "play" },
check = {
align = "right",
Added:
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/http.png
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/http.png?rev=3437&root=Jive&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/http.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
