Author: mherger
Date: Thu Nov 13 01:17:49 2008
New Revision: 3354
URL: http://svn.slimdevices.com?rev=3354&root=Jive&view=rev
Log:
Bug: 9971
Description: fix player selection skin for SB2 vs. SB3
- SC 7.3 returns squeezebox3 for a SB3 -> create new skin style for this player
- rename squeezebox2.png to squeezebox3.png
- change squeezebox2 style to use squeezebox.png instead
-> please note that this change won't fix the wrong icons on SC 7.2, as it
returns squeezebox2 for SB3 too.
Added:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/squeezebox3.png
- copied unchanged from r3353,
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/squeezebox2.png
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/squeezebox3.png
- copied unchanged from r3353,
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/squeezebox2.png
Removed:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/squeezebox2.png
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/squeezebox2.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=3354&root=Jive&r1=3353&r2=3354&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 13 01:17:49 2008
@@ -1064,7 +1064,7 @@
s.squeezebox2 = _uses(s.chooseplayer, {
icon = {
- img = Surface:loadImage(imgpath ..
"Icons/Players/squeezebox2.png"),
+ img = Surface:loadImage(imgpath ..
"Icons/Players/squeezebox.png"),
}
})
s.squeezebox2checked = _uses(s.squeezebox2, {
@@ -1074,6 +1074,20 @@
img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
}
})
+
+ s.squeezebox3 = _uses(s.chooseplayer, {
+ icon = {
+ img = Surface:loadImage(imgpath ..
"Icons/Players/squeezebox3.png"),
+ }
+ })
+ s.squeezebox3checked = _uses(s.squeezebox3, {
+ order = { "icon", "text", "check" },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
+ }
+ })
+
s.boom = _uses(s.chooseplayer, {
icon = {
img = Surface:loadImage(imgpath ..
"Icons/Players/boom.png"),
@@ -1251,10 +1265,23 @@
s.selected.squeezebox2 = _uses(s.selected.chooseplayer, {
icon = {
- img = Surface:loadImage(imgpath ..
"Icons/Players/squeezebox2.png"),
+ img = Surface:loadImage(imgpath ..
"Icons/Players/squeezebox.png"),
}
})
s.selected.squeezebox2checked = _uses(s.selected.squeezebox2, {
+ order = { "icon", "text", "check", "play" },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
+ }
+ })
+
+ s.selected.squeezebox3 = _uses(s.selected.chooseplayer, {
+ icon = {
+ img = Surface:loadImage(imgpath ..
"Icons/Players/squeezebox3.png"),
+ }
+ })
+ s.selected.squeezebox3checked = _uses(s.selected.squeezebox3, {
order = { "icon", "text", "check", "play" },
check = {
align = "right",
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=3354&root=Jive&r1=3353&r2=3354&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 13 01:17:49 2008
@@ -176,6 +176,7 @@
softsqueeze = true,
transporter = true,
squeezebox2 = true,
+ squeezebox3 = true,
squeezebox = true,
slimp3 = true,
receiver = true,
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=3354&root=Jive&r1=3353&r2=3354&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 13 01:17:49 2008
@@ -1011,13 +1011,25 @@
}
})
-
s.squeezebox2 = _uses(s.chooseplayer, {
icon = {
- img = Surface:loadImage(imgpath ..
"Icons/Players/squeezebox2.png"),
+ img = Surface:loadImage(imgpath ..
"Icons/Players/squeezebox.png"),
}
})
s.squeezebox2checked = _uses(s.squeezebox2, {
+ order = { "icon", "text", "check" },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
+ }
+ })
+
+ s.squeezebox3 = _uses(s.chooseplayer, {
+ icon = {
+ img = Surface:loadImage(imgpath ..
"Icons/Players/squeezebox3.png"),
+ }
+ })
+ s.squeezebox3checked = _uses(s.squeezebox3, {
order = { "icon", "text", "check" },
check = {
align = "right",
@@ -1199,10 +1211,9 @@
}
})
-
s.selected.squeezebox2 = _uses(s.selected.chooseplayer, {
icon = {
- img = Surface:loadImage(imgpath ..
"Icons/Players/squeezebox2.png"),
+ img = Surface:loadImage(imgpath ..
"Icons/Players/squeezebox.png"),
}
})
s.selected.squeezebox2checked = _uses(s.selected.squeezebox2, {
@@ -1213,6 +1224,18 @@
}
})
+ s.selected.squeezebox3 = _uses(s.selected.chooseplayer, {
+ icon = {
+ img = Surface:loadImage(imgpath ..
"Icons/Players/squeezebox3.png"),
+ }
+ })
+ s.selected.squeezebox3checked = _uses(s.selected.squeezebox3, {
+ order = { "icon", "text", "check", "play" },
+ check = {
+ align = "right",
+ img = Surface:loadImage(imgpath ..
"Icons/icon_check_selected.png")
+ }
+ })
s.selected.boom = _uses(s.selected.chooseplayer, {
icon = {
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
