Author: bklaas
Date: Wed Oct 15 06:22:20 2008
New Revision: 3135
URL: http://svn.slimdevices.com?rev=3135&root=Jive&view=rev
Log:
Bug: n/a
Description: Working left arrow on NowPlaying and current playlist windows in
FullscreenSkin without affecting DefaultSkin
Layout fix for title bar in NowPlaying
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/SlimBrowser/SlimBrowserApplet.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=3135&root=Jive&r1=3134&r2=3135&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
Wed Oct 15 06:22:20 2008
@@ -339,8 +339,8 @@
s.title.position = LAYOUT_NORTH
s.title.bgImg = titleBox
--FIXME: bug 8866
- --s.title.order = { "back", "text" }
- s.title.order = { "text" }
+ s.title.order = { "back", "text" }
+ --s.title.order = { "text" }
s.title.text = {}
s.title.text.padding = { 10, 8, 8, 8 }
s.title.text.align = "top-left"
@@ -1578,7 +1578,7 @@
s.ssnptitle.border = { 4, 4, 4, 0 }
s.ssnptitle.position = LAYOUT_NORTH
s.ssnptitle.bgImg = nptitleBox
- s.ssnptitle.order = { "title", "playlist" }
+ s.ssnptitle.order = { "text", "playlist" }
s.ssnptitle.text = {}
s.ssnptitle.text.w = WH_FILL
s.ssnptitle.text.padding = { 10, 7, 10, 9 }
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=3135&root=Jive&r1=3134&r2=3135&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
Wed Oct 15 06:22:20 2008
@@ -10,6 +10,7 @@
local Font = require("jive.ui.Font")
local Framework = require("jive.ui.Framework")
local Icon = require("jive.ui.Icon")
+local Button = require("jive.ui.Button")
local Choice = require("jive.ui.Choice")
local Label = require("jive.ui.Label")
local Group = require("jive.ui.Group")
@@ -148,17 +149,17 @@
-- hide this window if the player is turned off
if not power then
if self['browse'] and self['browse'].window then
- self['browse'].titleGroup:setWidgetValue("title",
self:string(modeTokens['off']))
+ self['browse'].titleGroup:setWidgetValue("text",
self:string(modeTokens['off']))
end
if self['ss'] and self['ss'].window then
- self['ss'].titleGroup:setWidgetValue("title",
self:string(modeTokens['off']))
+ self['ss'].titleGroup:setWidgetValue("text",
self:string(modeTokens['off']))
end
else
if self['browse'] and self['browse'].window then
- self['browse'].titleGroup:setWidgetValue("title",
self:string(modeTokens[mode]))
+ self['browse'].titleGroup:setWidgetValue("text",
self:string(modeTokens[mode]))
end
if self['ss'] and self['ss'].window then
- self['ss'].titleGroup:setWidgetValue("title",
self:string(modeTokens[mode]))
+ self['ss'].titleGroup:setWidgetValue("text",
self:string(modeTokens[mode]))
end
end
end
@@ -385,7 +386,7 @@
token = 'off'
end
if ws.titleGroup then
- ws.titleGroup:setWidgetValue("title",
self:string(modeTokens[token]))
+ ws.titleGroup:setWidgetValue("text",
self:string(modeTokens[token]))
end
end
@@ -465,15 +466,24 @@
progress = "progress",
progressNB = "progressNB",
npartwork = "npartwork"
- }
+ }
+
for k, v in pairs(components) do
local new = windowStyle .. v
components[k] = new
end
+
self[windowStyle].titleGroup = Group(components.nptitle, {
- title = Label("text",
self:string("SCREENSAVER_NOWPLAYING")),
- playlist = Label("playlist", "")
- })
+ back = Button(
+ Icon("back"),
+ function()
+
window:dispatchNewEvent(EVENT_KEY_PRESS, KEY_BACK)
+ return EVENT_CONSUME
+ end
+ ),
+ text = Label("text", self:string("SCREENSAVER_NOWPLAYING")),
+ playlist = Label("playlist", "")
+ })
self[windowStyle].trackGroup = Group(components.nptrack, {
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=3135&root=Jive&r1=3134&r2=3135&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Wed Oct 15 06:22:20 2008
@@ -2066,7 +2066,6 @@
if not _player:isPowerOn() then
_statusStep.window:setTitle(_string(modeTokens['off']))
- _statusStep.window:setTitleStyle("currentplaylisttitle")
end
if playlistSize == 0 then
@@ -2132,7 +2131,6 @@
if not power then
if step.window then
step.window:setTitle(_string("SLIMBROWSER_OFF"))
-
step.window:setTitleStyle("currentplaylisttitle")
end
else
if step.window then
@@ -2140,7 +2138,6 @@
step.window:replace(emptyStep.window,
Window.transitionFadeIn)
end
step.window:setTitle(_string(modeTokens[mode]))
-
step.window:setTitleStyle("currentplaylisttitle")
end
end
end
@@ -2158,8 +2155,7 @@
token = 'off'
end
- local newTitleWidget = Group('currentplaylisttitle', { text =
Label("text", _string(modeTokens[token])), icon = Icon("icon") })
- step.window:setTitleWidget(newTitleWidget)
+ step.window:setTitle(_string(modeTokens[token]))
end
@@ -2312,7 +2308,8 @@
window = {
["menuStyle"] = "album",
}
- }
+ },
+ 'currentplaylist'
),
_statusSink
)
@@ -2333,7 +2330,6 @@
if not _player:isPowerOn() then
if _statusStep.window then
_statusStep.window:setTitle(_string("SLIMBROWSER_OFF"))
- _statusStep.window:setTitleStyle("currentplaylisttitle")
end
end
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=3135&root=Jive&r1=3134&r2=3135&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
Wed Oct 15 06:22:20 2008
@@ -1435,7 +1435,25 @@
-- Title
- s.ssnptitle = _uses(s.title)
+ --s.ssnptitle = _uses(s.minititle)
+
+ -- Title
+ s.ssnptitle = {}
+
+ setmetatable(s.ssnptitle, { __index = s.title })
+
+ s.ssnptitle.order = { "back", "text", "playlist" }
+
+ s.ssnptitle.back = {}
+ s.ssnptitle.back.img = Surface:loadImage(imgpath ..
"pointer_selector_L.png")
+ s.ssnptitle.back.align = "left"
+
+ s.ssnptitle.playlist = {}
+ s.ssnptitle.playlist.padding = TITLE_PADDING
+ s.ssnptitle.playlist.font = _font(26)
+ s.ssnptitle.playlist.fg = TEXT_COLOR_BLACK
+ s.ssnptitle.playlist.text = {}
+ s.ssnptitle.playlist.text.align = "top-right"
-- nptitle style is the same for both windowStyles
s.browsenptitle = _uses(s.ssnptitle)
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
