Author: bklaas
Date: Tue Oct 21 11:27:07 2008
New Revision: 3173
URL: http://svn.slimdevices.com?rev=3173&root=Jive&view=rev
Log:
Bug: 9680
Description: add nowplaying and back buttons to slimbrowse windows sending a
title style, which causes the whole title widget to be redone
remove an errant log:warn() from NowPlaying
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
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=3173&root=Jive&r1=3172&r2=3173&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 21 11:27:07 2008
@@ -206,7 +206,7 @@
return
end
- log:warn("Player mode has been changed to: ", mode)
+ log:debug("Player mode has been changed to: ", mode)
self:_updateMode(mode)
end
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=3173&root=Jive&r1=3172&r2=3173&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
Tue Oct 21 11:27:07 2008
@@ -111,6 +111,7 @@
stop = "SLIMBROWSER_STOPPED",
off = "SLIMBROWSER_OFF"
}
+
--==============================================================================
-- Local functions
--==============================================================================
@@ -978,7 +979,25 @@
else
titleIcon = Icon("icon")
end
- local newTitleWidget =
Group(titleStyle, { text = Label("text", titleText), icon = titleIcon })
+ local newTitleWidget =
+ Group(titleStyle, {
+ text = Label("text",
titleText),
+ icon = titleIcon,
+ back = Button(
+ Icon("back"),
+ function()
+
step.window:dispatchNewEvent(EVENT_KEY_PRESS, KEY_BACK)
+ return
EVENT_CONSUME
+ end
+ ),
+ nowplaying = Button(
+
Icon("nowplaying"),
+ function()
+
step.window:dispatchNewEvent(EVENT_KEY_PRESS,
appletManager:callService('goNowPlaying', 'browse'))
+ return
EVENT_CONSUME
+ end
+ ),
+ })
step.window:setTitleWidget(newTitleWidget)
-- change the text as specified if no
titleStyle param was also sent
elseif data.window.text then
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
