Author: bklaas
Date: Thu Mar 17 15:48:43 2011
New Revision: 9387
URL: http://svn.slimdevices.com/jive?rev=9387&view=rev
Log:
r49772@DaddyMac (orig r9386): bklaas | 2011-03-17 17:48:17 -0500
Bug: 17072
Description: add type = 'alertWindow' on displaystatus handler
see bug for details on feature
Modified:
7.6/branches/new-setup/ (props changed)
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
Propchange: 7.6/branches/new-setup/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Thu Mar 17 15:48:43 2011
@@ -15,7 +15,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:8423
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/private-branches/7.5.3-rc:9282
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/trunk:9376
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.6/trunk:9382
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.6/trunk:9386
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/jive/7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua?rev=9387&r1=9386&r2=9387&view=diff
==============================================================================
---
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
(original)
+++
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
Thu Mar 17 15:48:43 2011
@@ -1316,6 +1316,20 @@
self:updateIconbar()
end
+function _alertWindow(self, textValue)
+
+ local window = Window('help_list', ' ')
+ window:setAllowScreensaver(false)
+ window:showAfterScreensaver()
+ local text = Textarea("text", textValue)
+ window:addWidget(text)
+
+ local s = {}
+ s.window = window
+ self:tieWindow(window)
+ return s
+end
+
-- _process_displaystatus
-- receives the display status data
@@ -1328,6 +1342,7 @@
local display = data.display
local type = display["type"] or 'text'
local special = display and (type == 'icon' and display.style)
+ local alertWindow = display and type == 'alertWindow'
local playMode = display["play-mode"]
local isRemote = display["is-remote"] and (display["is-remote"]
== 1) or false
@@ -1342,7 +1357,10 @@
-- this showBriefly should be displayed unless there's a good
reason not to
local showMe = true
- if special then
+ if alertWindow then
+ s = self:_alertWindow(textValue)
+
+ elseif special then
s = self.popupIcon
local style = 'icon_popup_' .. special
s.icon:setStyle(style)
@@ -1387,7 +1405,7 @@
s.textarea:setValue(textValue)
end
if showMe then
- if tonumber(duration) == -1 then
+ if alertWindow or tonumber(duration) == -1 then
s.window:show()
else
s.window:showBriefly(duration, nil,
transitionOn, transitionOff)
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
