Author: bklaas
Date: Wed Mar 19 09:54:37 2008
New Revision: 2136
URL: http://svn.slimdevices.com?rev=2136&root=Jive&view=rev
Log:
Bug: 7034
Description: return an h:m:s string when track runs over 1hour in length,
otherwise return m:s string
layout had to be tweaked in order to make the progress elements fit across the
window alongside the progress bar slider.
This probably has room for some improvements yet. Noah mentioned to me months
ago that the elapsed/remaining weren't getting aligned like he wanted
them...will have to follow up on that separately.
Modified:
trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
Modified:
trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
URL:
http://svn.slimdevices.com/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua?rev=2136&root=Jive&r1=2135&r2=2136&view=diff
==============================================================================
---
trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
(original)
+++
trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
Wed Mar 19 09:54:37 2008
@@ -1316,8 +1316,8 @@
s.ssprogress.order = { "elapsed", "slider", "remain" }
s.ssprogress.text = {}
s.ssprogress.text.w = 50
- s.ssprogress.padding = { 0, 0, 0, 5 }
- s.ssprogress.text.padding = { 8, 0, 8, 5 }
+ s.ssprogress.padding = { 8, 0, 8, 5 }
+ s.ssprogress.text.padding = { 8, 0, 0, 5 }
s.ssprogress.text.font = Font:load(fontpath .. "FreeSansBold.ttf", 12)
s.ssprogress.text.fg = { 0xe7,0xe7, 0xe7 }
s.ssprogress.text.sh = { 0x37, 0x37, 0x37 }
@@ -1325,9 +1325,9 @@
-- browse has different positioning than ss windowStyle
s.browseprogress = _uses(s.ssprogress,
{
- padding = { 0, 0, 0, 25 },
+ padding = { 8, 0, 8, 25 },
text = {
- padding = { 8, 0, 8, 25 },
+ padding = { 8, 0, 0, 25 }
}
}
)
Modified:
trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
URL:
http://svn.slimdevices.com/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua?rev=2136&root=Jive&r1=2135&r2=2136&view=diff
==============================================================================
---
trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
(original)
+++
trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
Wed Mar 19 09:54:37 2008
@@ -126,10 +126,15 @@
end
local function _secondsToString(seconds)
- local min = math.floor(seconds / 60)
+ local hrs = math.floor(seconds / 3600)
+ local min = math.floor((seconds / 60) - (hrs*60))
local sec = math.floor(seconds - (min*60))
- return string.format("%d:%02d", min, sec)
+ if hrs > 0 then
+ return string.format("%d:%02d:%02d", hrs, min, sec)
+ else
+ return string.format("%d:%02d", min, sec)
+ end
end
local function _getIcon(self, item, icon, remote)
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
