Author: titmuss
Date: Sun Feb 10 16:33:24 2008
New Revision: 1895
URL: http://svn.slimdevices.com?rev=1895&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1884): titmuss | 2008-02-10 11:55:58 +0000
Bug: 6641, 6580
Description:
Don't enter sleep or suspend mode when a popup is visible on the screen. Doing
this
made the firmware upgrade take a very long time, as the CPU was reduced to
50MHz
during the upgrade.
The change needs reviewing (as part of bug 6641) post 7.0.
Modified:
trunk/ (props changed)
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/strings.txt
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Sun Feb 10 16:33:24 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1883
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1884
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=1895&root=Jive&r1=1894&r2=1895&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
Sun Feb 10 16:33:24 2008
@@ -512,12 +512,21 @@
self:setPowerState("dimmed")
elseif self.powerState == "locked" then
self:setPowerState("sleep")
- elseif self.powerState == "dimmed" then
- self:setPowerState("sleep")
- elseif self.powerState == "sleep" then
- self:setPowerState("suspend")
- elseif self.powerState == "suspend" then
- -- we can't go to sleep anymore
+ 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) then
+ self:setPowerState("dimmed")
+
+ elseif self.powerState == "dimmed" then
+ self:setPowerState("sleep")
+ elseif self.powerState == "sleep" then
+ self:setPowerState("suspend")
+ elseif self.powerState == "suspend" then
+ -- we can't go to sleep anymore
+ end
end
end
Modified:
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/strings.txt
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/strings.txt?rev=1895&root=Jive&r1=1894&r2=1895&view=diff
==============================================================================
---
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/strings.txt
(original)
+++
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/strings.txt
Sun Feb 10 16:33:24 2008
@@ -239,9 +239,9 @@
NL Annuleer of bevestig het uitzetten van je controller
PLEASE_WAIT
- DE Verbindung
- EN Please wait
- ES Conectando
- FR Connexion
- IT Connessione...
- NL Bezig met verbinden
+ DE \nVerbindung
+ EN \nPlease wait
+ ES \nConectando
+ FR \nConnexion
+ IT \nConnessione...
+ NL \nBezig met verbinden
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
