Author: titmuss
Date: Thu Apr 17 06:29:43 2008
New Revision: 2266
URL: http://svn.slimdevices.com?rev=2266&root=Jive&view=rev
Log:
Bug: 7834
Description:
Fix setup in non-EN languages, by removing some debug code to slow down loading
languages
on the desktop. That never meant to get checked in, doh. Also hardened the
loading
language popup so keypresses can't hide the window.
Modified:
7.0/trunk/squeezeplay/src/squeezeplay/share/applets/SetupLanguage/SetupLanguageApplet.lua
7.0/trunk/squeezeplay/src/squeezeplay/share/jive/utils/locale.lua
Modified:
7.0/trunk/squeezeplay/src/squeezeplay/share/applets/SetupLanguage/SetupLanguageApplet.lua
URL:
http://svn.slimdevices.com/7.0/trunk/squeezeplay/src/squeezeplay/share/applets/SetupLanguage/SetupLanguageApplet.lua?rev=2266&root=Jive&r1=2265&r2=2266&view=diff
==============================================================================
---
7.0/trunk/squeezeplay/src/squeezeplay/share/applets/SetupLanguage/SetupLanguageApplet.lua
(original)
+++
7.0/trunk/squeezeplay/src/squeezeplay/share/applets/SetupLanguage/SetupLanguageApplet.lua
Thu Apr 17 06:29:43 2008
@@ -41,6 +41,7 @@
local debug = require("jive.utils.debug")
local appletManager = appletManager
+local EVENT_ALL_INPUT = jive.ui.EVENT_ALL_INPUT
local EVENT_KEY_PRESS = jive.ui.EVENT_KEY_PRESS
local EVENT_SCROLL = jive.ui.EVENT_SCROLL
local EVENT_CONSUME = jive.ui.EVENT_CONSUME
@@ -184,11 +185,22 @@
-- changing the locale is slow, do this in a task with a spinny
self.popup = Popup("popupIcon")
self.popup:setAllowScreensaver(false)
+ self.popup:setAlwaysOnTop(true)
+ self.popup:setAutoHide(false)
+
self.popup:addWidget(Icon("iconConnecting"))
local stringChoice = "LOADING_LANGUAGE"
self.popup:addWidget(Label("text", self:string(stringChoice)))
- self.popup:show()
-
+ self.popup:show()
+
+ -- no way to exit this popup
+ local listener =
+ Framework:addListener(EVENT_ALL_INPUT,
+ function()
+ return EVENT_CONSUME
+ end,
+ true)
+
self.task = Task('setLang', self,
function(self)
locale:setLocale(choice, true)
@@ -197,6 +209,7 @@
jiveMain:jiveMainNodes()
Framework:styleChanged()
+ Framework:removeListener(listener)
self.popup:hide()
if next then
Modified: 7.0/trunk/squeezeplay/src/squeezeplay/share/jive/utils/locale.lua
URL:
http://svn.slimdevices.com/7.0/trunk/squeezeplay/src/squeezeplay/share/jive/utils/locale.lua?rev=2266&root=Jive&r1=2265&r2=2266&view=diff
==============================================================================
--- 7.0/trunk/squeezeplay/src/squeezeplay/share/jive/utils/locale.lua (original)
+++ 7.0/trunk/squeezeplay/src/squeezeplay/share/jive/utils/locale.lua Thu Apr
17 06:29:43 2008
@@ -56,7 +56,6 @@
globalLocale = newLocale or "EN"
readGlobalStringsFile(self)
-for i=1,100 do
-- reload existing strings files
for k, v in pairs(loadedFiles) do
if doYield then
@@ -64,7 +63,6 @@
end
_parseStringsFile(self, newLocale, k, v)
end
-end
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
