Author: titmuss
Date: Wed Jul 2 01:44:46 2008
New Revision: 2649
URL: http://svn.slimdevices.com?rev=2649&root=Jive&view=rev
Log:
Bug: 6641, 8249
Description:
Don't block the screensaver when in Show Artwork, by enabling it for that popup
window.
Sleep and suspend were disabled for all popup windows, instead add a new window
attribute (that should be used sparingly),
to disable sleep and suspend. Enabled this during firmware upgrades.
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
7.1/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=2649&root=Jive&r1=2648&r2=2649&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Wed Jul 2 01:44:46 2008
@@ -630,6 +630,8 @@
log:debug("Rendering artwork")
local popup = Popup("popupArt")
+ popup:setAllowScreensaver(true)
+
local icon = Icon("artwork")
local screenW, screenH = Framework:getScreenSize()
Modified: 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua?rev=2649&root=Jive&r1=2648&r2=2649&view=diff
==============================================================================
--- 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua (original)
+++ 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua Wed Jul 2
01:44:46 2008
@@ -693,6 +693,29 @@
end
+function getAllowPowersave(self)
+ return self.allowPowersave
+end
+
+
+function setAllowScreensaver(self, allowPowersave)
+ _assert(type(allowPowersave) == "boolean" or type(allowPowersave) ==
"function")
+
+ self.allowPowersave = allowPowersave
+end
+
+
+function canActivatePowersave(self)
+ if self.allowPowersave == nil then
+ return true
+ elseif self.allowPowersave == "function" then
+ return self.allowPowersave()
+ else
+ return self.allowPowersave
+ end
+end
+
+
function getAlwaysOnTop(self)
return self.alwaysOnTop
end
Modified:
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua?rev=2649&root=Jive&r1=2648&r2=2649&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
Wed Jul 2 01:44:46 2008
@@ -271,6 +271,9 @@
self.popup = Popup("popupIcon")
+ -- don't allow power saving during upgrades
+ self.popup:setAllowPowersave(false)
+
self.icon = Icon("iconConnecting")
self.popup:addWidget(self.icon)
Modified:
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua?rev=2649&root=Jive&r1=2648&r2=2649&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
Wed Jul 2 01:44:46 2008
@@ -554,9 +554,8 @@
else
-- don't sleep or suspend with a popup visible
-- e.g. Bug 6641 during a firmware upgrade
- -- XXXX this needs reviewing
local topWindow = Framework.windowStack[1]
- if oo.instanceof(topWindow, Popup) and not self.lockedPopup then
+ if not topWindow:canActivatePowersave()then
self:setPowerState("dimmed")
elseif self.powerState == "dimmed" then
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
