Author: titmuss
Date: Thu Feb 14 04:21:39 2008
New Revision: 1953
URL: http://svn.slimdevices.com?rev=1953&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1945): titmuss | 2008-02-13 23:47:59 +0000
Bug: 7117
Description:
Multiple instances of the SqueezeboxJive applet could be created when using
some
settings windows. This caused power management problems, including the sound
effects
being turned off.
Modified:
trunk/ (props changed)
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Thu Feb 14 04:21:39 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1944
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1945
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua?rev=1953&root=Jive&r1=1952&r2=1953&view=diff
==============================================================================
---
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
(original)
+++
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
Thu Feb 14 04:21:39 2008
@@ -429,7 +429,7 @@
end
)
- self:tieAndShowWindow(window)
+ window:show()
return window
end
@@ -488,7 +488,7 @@
end
)
- self:tieAndShowWindow(window)
+ window:show()
return window
end
@@ -519,7 +519,7 @@
-- e.g. Bug 6641 during a firmware upgrade
-- XXXX this needs reviewing
local topWindow = Framework.windowStack[1]
- if oo.instanceof(topWindow, Popup) then
+ if oo.instanceof(topWindow, Popup) and not self.lockedPopup then
self:setPowerState("dimmed")
elseif self.powerState == "dimmed" then
@@ -644,9 +644,8 @@
popup:addWidget(Icon("iconLocked"))
popup:addWidget(Label("text", self:string("BSP_SCREEN_LOCKED")))
popup:addWidget(Textarea("help", self:string("BSP_SCREEN_LOCKED_HELP")))
- self:tieAndShowWindow(popup)
-
- self:setPowerState("locked")
+
+ popup:show()
self.lockedPopup = popup
self.lockedTimer = Timer(2000,
@@ -655,6 +654,8 @@
self:_setCPUSpeed(false)
end,
true)
+
+ self:setPowerState("locked")
self.lockedListener =
Framework:addListener(EVENT_KEY_DOWN | EVENT_KEY_PRESS,
@@ -728,7 +729,7 @@
-- make sure the display is on
self:setBrightness()
- self:tieAndShowWindow(popup)
+ popup:show()
end
@@ -767,7 +768,7 @@
}
menu:setItems(items)
- self:tieAndShowWindow(window)
+ window:show()
return window
end
@@ -801,7 +802,7 @@
true
)
- self:tieAndShowWindow(popup)
+ popup:show()
popup:playSound("SHUTDOWN")
end
@@ -887,7 +888,7 @@
end
)
- self:tieAndShowWindow(window)
+ window:show()
return window
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
