Author: bklaas
Date: Tue Oct 14 14:16:14 2008
New Revision: 3129
URL: http://svn.slimdevices.com?rev=3129&root=Jive&view=rev
Log:
Bug: n/a
Description: add progress bar back to FullscreenSkin applet
split elapsed and remaining for NowPlaying into different elements of the skin
so they can be laid out differently
use existing sliderBar and sliderBackground defined earlier in the skin, rather
than redundant progressBar and progressBackground
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectSkin/SelectSkinApplet.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=3129&root=Jive&r1=3128&r2=3129&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 Oct 14 14:16:14 2008
@@ -1643,36 +1643,27 @@
s.browsenpartwork = _uses(s.ssnpartwork, browsenpartwork)
-- Progress bar
- local progressBackground =
- Tile:loadHTiles({
- imgpath ..
"Screen_Formats/Song_Progress_Bar/SP_Bar_Remote/rem_progbar_bkgrd_l.png",
- imgpath ..
"Screen_Formats/Song_Progress_Bar/SP_Bar_Remote/rem_progbar_bkgrd.png",
- imgpath ..
"Screen_Formats/Song_Progress_Bar/SP_Bar_Remote/rem_progbar_bkgrd_r.png",
- })
-
- local progressBar =
- Tile:loadHTiles({
- imgpath ..
"Screen_Formats/Song_Progress_Bar/SP_Bar_Remote/rem_progbar_fill_l.png",
- imgpath ..
"Screen_Formats/Song_Progress_Bar/SP_Bar_Remote/rem_progbar_fill.png",
- imgpath ..
"Screen_Formats/Song_Progress_Bar/SP_Bar_Remote/rem_progbar_fill_r.png",
- })
-
s.ssprogress = {}
s.ssprogress.position = LAYOUT_SOUTH
s.ssprogress.order = { "elapsed", "slider", "remain" }
- s.ssprogress.text = {}
- s.ssprogress.text.w = 50
+
+ s.ssprogress.remain = {}
+ s.ssprogress.remain.w = 50
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 }
+ s.ssprogress.remain.padding = { 8, 0, 0, 5 }
+ s.ssprogress.remain.font = Font:load(fontpath .. "FreeSansBold.ttf", 12)
+ s.ssprogress.remain.fg = { 0xe7,0xe7, 0xe7 }
+ s.ssprogress.remain.sh = { 0x37, 0x37, 0x37 }
+ s.ssprogress.elapsed = _uses(s.ssprogress.remain)
-- browse has different positioning than ss windowStyle
s.browseprogress = _uses(s.ssprogress,
{
padding = { 8, 0, 8, 25 },
- text = {
+ elapsed = {
+ padding = { 8, 0, 0, 25 }
+ },
+ remain = {
padding = { 8, 0, 0, 25 }
}
}
@@ -1680,8 +1671,8 @@
s.ssprogressB = {}
s.ssprogressB.horizontal = 1
- s.ssprogressB.bgImg = progressBackground
- s.ssprogressB.img = progressBar
+ s.ssprogressB.bgImg = sliderBackground
+ s.ssprogressB.img = sliderBar
s.ssprogressB.position = LAYOUT_SOUTH
s.ssprogressB.padding = { 0, 0, 0, 5 }
@@ -1695,19 +1686,19 @@
s.ssprogressNB = {}
s.ssprogressNB.position = LAYOUT_SOUTH
s.ssprogressNB.order = { "elapsed" }
- s.ssprogressNB.text = {}
- s.ssprogressNB.text.w = WH_FILL
- s.ssprogressNB.text.align = "center"
+ s.ssprogressNB.elapsed = {}
+ s.ssprogressNB.elapsed.w = WH_FILL
+ s.ssprogressNB.elapsed.align = "center"
s.ssprogressNB.padding = { 0, 0, 0, 5 }
- s.ssprogressNB.text.padding = { 0, 0, 0, 5 }
- s.ssprogressNB.text.font = Font:load(fontpath .. "FreeSansBold.ttf", 12)
- s.ssprogressNB.text.fg = { 0xe7, 0xe7, 0xe7 }
- s.ssprogressNB.text.sh = { 0x37, 0x37, 0x37 }
+ s.ssprogressNB.elapsed.padding = { 0, 0, 0, 5 }
+ s.ssprogressNB.elapsed.font = Font:load(fontpath .. "FreeSansBold.ttf",
12)
+ s.ssprogressNB.elapsed.fg = { 0xe7, 0xe7, 0xe7 }
+ s.ssprogressNB.elapsed.sh = { 0x37, 0x37, 0x37 }
s.browseprogressNB = _uses(s.ssprogressNB,
{
padding = { 0, 0, 0, 25 },
- text = {
+ elapsed = {
padding = { 0, 0, 0, 25 },
}
}
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua?rev=3129&root=Jive&r1=3128&r2=3129&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
Tue Oct 14 14:16:14 2008
@@ -486,9 +486,9 @@
self[windowStyle].progressSlider:addTimer(1000, function()
self:_updatePosition() end)
self[windowStyle].progressGroup = Group(components.progress, {
- elapsed = Label("text", ""),
+ elapsed = Label("elapsed", ""),
slider =
self[windowStyle].progressSlider,
- remain = Label("text", "")
+ remain = Label("remain", "")
})
else
self[windowStyle].progressGroup = Group(components.progressNB, {
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectSkin/SelectSkinApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectSkin/SelectSkinApplet.lua?rev=3129&root=Jive&r1=3128&r2=3129&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectSkin/SelectSkinApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectSkin/SelectSkinApplet.lua
Tue Oct 14 14:16:14 2008
@@ -18,7 +18,7 @@
-- stuff we use
-local pairs = pairs
+local pairs, type = pairs, type
local table = require("table")
@@ -81,7 +81,6 @@
return window
end
-
--[[
=head1 LICENSE
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=3129&root=Jive&r1=3128&r2=3129&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 Oct 14 14:16:14 2008
@@ -69,6 +69,7 @@
local sndpath = "applets/FullscreenSkin/sounds/"
local fontpath = "fonts/"
local FONT_NAME = "FreeSans"
+local FIXED_FONT_NAME = "FreeMono"
local BOLD_PREFIX = "Bold"
-- define a local function to make it easier to create icons.
@@ -1424,8 +1425,6 @@
-- one for the Screensaver windowStyle (ss), one for the browse
windowStyle (browse)
-- a lot of it can be recycled from one to the other
- local npimgpath = "applets/NowPlaying/"
-
local screenWidth, screenHeight = Framework:getScreenSize()
local TEXT_COLOR = { 0xE7, 0xE7, 0xE7 }
@@ -1514,78 +1513,50 @@
--]]
---[[ leave this around in case it can be re-engineered for the
"mouse-toast-controls"
-- Progress bar
- local progressBackground =
- Tile:loadHTiles({
- npimgpath .. "progressbar_bkgrd_l.png",
- npimgpath .. "progressbar_bkgrd.png",
- npimgpath .. "progressbar_bkgrd_r.png",
- })
-
- local progressBar =
- Tile:loadHTiles({
- npimgpath .. "progressbar_fill_l.png",
- npimgpath .. "progressbar_fill.png",
- npimgpath .. "progressbar_fill_r.png",
- })
-
s.ssprogress = {}
s.ssprogress.position = LAYOUT_SOUTH
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.text.font = Font:load(fontpath .. "FreeSansBold.ttf", 12)
- s.ssprogress.text.fg = { 0xe7,0xe7, 0xe7 }
- s.ssprogress.text.sh = { 0x37, 0x37, 0x37 }
+ s.ssprogress.remain = {}
+ s.ssprogress.remain.w = 200
+ --s.ssprogress.text.w = 100
+
+ s.ssprogress.padding = { 25, 0, 25, 25 }
+ s.ssprogress.remain.padding = { 35, 0, 8, 25 }
+ s.ssprogress.remain.font = _boldfont(24)
+ s.ssprogress.remain.fg = { 0xe7,0xe7, 0xe7 }
+ s.ssprogress.remain.sh = { 0x37, 0x37, 0x37 }
+
+ s.ssprogress.elapsed = _uses(s.ssprogress.remain, {
+ padding = { 100, 0, 8, 25 }
+ })
-- browse has different positioning than ss windowStyle
- s.browseprogress = _uses(s.ssprogress,
- {
- padding = { 0, 0, 0, 25 },
- text = {
- padding = { 8, 0, 8, 25 },
- }
- }
- )
+ s.browseprogress = _uses(s.ssprogress)
s.ssprogressB = {}
s.ssprogressB.horizontal = 1
- s.ssprogressB.bgImg = progressBackground
- s.ssprogressB.img = progressBar
+ s.ssprogressB.bgImg = sliderBackground
+ s.ssprogressB.img = sliderBar
s.ssprogressB.position = LAYOUT_SOUTH
- s.ssprogressB.padding = { 0, 0, 0, 5 }
-
- s.browseprogressB = _uses(s.ssprogressB,
- {
- padding = { 0, 0, 0, 25 }
- }
- )
+ s.ssprogressB.padding = { 0, 0, 0, 25 }
+
+ s.browseprogressB = _uses(s.ssprogressB)
-- special style for when there shouldn't be a progress bar (e.g.,
internet radio streams)
s.ssprogressNB = {}
s.ssprogressNB.position = LAYOUT_SOUTH
s.ssprogressNB.order = { "elapsed" }
- s.ssprogressNB.text = {}
- s.ssprogressNB.text.w = WH_FILL
- s.ssprogressNB.text.align = "center"
- s.ssprogressNB.padding = { 0, 0, 0, 5 }
- s.ssprogressNB.text.padding = { 0, 0, 0, 5 }
- s.ssprogressNB.text.font = Font:load(fontpath .. "FreeSansBold.ttf", 12)
- s.ssprogressNB.text.fg = { 0xe7, 0xe7, 0xe7 }
- s.ssprogressNB.text.sh = { 0x37, 0x37, 0x37 }
-
- s.browseprogressNB = _uses(s.ssprogressNB,
- {
- padding = { 0, 0, 0, 25 },
- text = {
- padding = { 0, 0, 0, 25 },
- }
- }
- )
---]]
+ s.ssprogressNB.elapsed = {}
+ s.ssprogressNB.elapsed.w = WH_FILL
+ s.ssprogressNB.elapsed.align = "center"
+ s.ssprogressNB.padding = { 0, 0, 0, 25 }
+ s.ssprogressNB.elapsed.padding = { 0, 0, 0, 25 }
+ s.ssprogressNB.elapsed.font = _boldfont(24)
+ s.ssprogressNB.elapsed.fg = { 0xe7, 0xe7, 0xe7 }
+ s.ssprogressNB.elapsed.sh = { 0x37, 0x37, 0x37 }
+
+ s.browseprogressNB = _uses(s.ssprogressNB)
-- background style should start at x,y = 0,0
s.iconbg = {}
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
