Author: titmuss
Date: Thu Apr 17 05:09:25 2008
New Revision: 2262
URL: http://svn.slimdevices.com?rev=2262&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r2243): bklaas | 2008-04-16 14:46:26 +0100
Bug: 5465
Description: Screen dims too quickly to read the help message. Add a comma to
help string.
[EMAIL PROTECTED] (orig r2244): bklaas | 2008-04-16 14:49:59 +0100
Bug: 5412
Description: put downloading software screen into Test applet for later work
on this bug
[EMAIL PROTECTED] (orig r2245): bklaas | 2008-04-16 16:03:08 +0100
Bug: 7846
Description: shorter strings for some langs in BSP_SCREEN_LOCKED
[EMAIL PROTECTED] (orig r2246): adrian | 2008-04-16 18:56:40 +0100
Bug: 7837
Description: only show Applet Installer when connected to SC and have
a player as this allows the server to be found
Modified:
7.1/trunk/ (props changed)
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SetupAppletInstaller/SetupAppletInstallerMeta.lua
7.1/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/Test/TestApplet.lua
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/strings.txt
Propchange: 7.1/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Thu Apr 17 05:09:25 2008
@@ -1,4 +1,4 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.0/trunk:2237
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.0/trunk:2246
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.1/trunk/squeezeplay/src/squeezeplay/share/applets/SetupAppletInstaller/SetupAppletInstallerMeta.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SetupAppletInstaller/SetupAppletInstallerMeta.lua?rev=2262&root=Jive&r1=2261&r2=2262&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SetupAppletInstaller/SetupAppletInstallerMeta.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SetupAppletInstaller/SetupAppletInstallerMeta.lua
Thu Apr 17 05:09:25 2008
@@ -23,7 +23,7 @@
local jul = require("jive.utils.log")
local appletManager = appletManager
-
+local jnt = jnt
module(...)
oo.class(_M, AppletMeta)
@@ -38,6 +38,14 @@
end
function registerApplet(self)
- jiveMain:addItem(self:menuItem('appletSetupAppletInstaller',
'advancedSettings', "APPLET_INSTALLER", function(applet, ...) applet:menu(...)
end))
+ jnt:subscribe(self)
+ self.menu = self:menuItem('appletSetupAppletInstaller',
'advancedSettings', self:string("APPLET_INSTALLER"), function(applet, ...)
applet:menu(...) end)
end
+function notify_playerCurrent(self, player)
+ if player == nil or player.slimServer:isSqueezeNetwork() then
+ jiveMain:removeItem(self.menu)
+ else
+ jiveMain:addItem(self.menu)
+ end
+end
Modified:
7.1/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/Test/TestApplet.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/Test/TestApplet.lua?rev=2262&root=Jive&r1=2261&r2=2262&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/Test/TestApplet.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/Test/TestApplet.lua
Thu Apr 17 05:09:25 2008
@@ -152,6 +152,11 @@
self:lockedScreen(menuItem)
end
},
+ { text = "Downloading Software",
+ sound = "WINDOWSHOW",
+ callback = function(event, menuItem)
+ self:downloadingSoftware(menuItem)
+ end },
{ text = "Connecting Popup",
sound = "WINDOWSHOW",
callback = function(event, menuItem)
@@ -454,6 +459,49 @@
self:tieAndShowWindow(popup)
return popup
end
+
+function downloadingSoftware(self, menuItem)
+
+ local popup = Popup("popupIcon")
+
+ --FIXME, this window does not layout correctly (Bug 5412)
+ local icon = Icon("iconConnecting")
+ local text = Label("text", "\nDownloading Firmware")
+ local label = Label("downloading", "0%")
+
+ popup:addWidget(label)
+ popup:addWidget(icon)
+ popup:addWidget(text)
+
+
+ local state = 1
+ popup:addTimer(1000, function()
+ if state == 1 then
+ label:setValue("5%")
+ elseif state == 2 then
+ label:setValue("10%")
+ elseif state == 3 then
+ label:setValue("27%")
+ elseif state == 4 then
+ label:setValue("43%")
+ elseif state == 5 then
+ label:setValue("52%")
+ elseif state == 6 then
+ label:setValue("74%")
+ elseif state == 7 then
+ icon:setStyle("iconConnected")
+ label:setValue("100%")
+ text:setValue("\nDownloading
Complete!")
+ else
+ popup:hide()
+ end
+ state = state + 1
+ end)
+
+ self:tieAndShowWindow(popup)
+ return popup
+end
+
function connectingPopup(self, menuItem)
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=2262&root=Jive&r1=2261&r2=2262&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
Thu Apr 17 05:09:25 2008
@@ -688,7 +688,7 @@
popup:show()
self.lockedPopup = popup
- self.lockedTimer = Timer(2000,
+ self.lockedTimer = Timer(5000,
function()
self:_setBrightness(true, 0, 0)
self:_setCPUSpeed(false)
Modified:
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/strings.txt
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/strings.txt?rev=2262&root=Jive&r1=2261&r2=2262&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/strings.txt
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/strings.txt
Thu Apr 17 05:09:25 2008
@@ -6,17 +6,17 @@
BSP_SCREEN_LOCKED
DA LÃ¥st
- DE LCD gesperrt. Drücken Sie HINZUFÃGEN und WIEDERGABE.
+ DE Gesperrt
EN Locked
- ES Pantalla bloqueada. Pulse AGREGAR y REPRODUCIR para desbloquear.
- FR Ecran verrouillé. Appuyez sur ADD et PLAY pour le
déverrouiller.
- IT Schermo bloccato. Premere AGGIUNGI e RIPRODUCI per sbloccarlo.
- NL Scherm vergrendeld. Druk op TOEVOEGEN en AFSPELEN om het te
ontgrendelen.
+ ES Bloqueda
+ FR Verrouillé
+ IT Bloccato
+ NL Vergrendeld
BSP_SCREEN_LOCKED_HELP
DA For at låse op, tryk ADD og PLAY på samme tid.
DE Drücken Sie zum Aufheben der Sperre gleichzeitig ADD und PLAY.
- EN To unlock press the ADD and PLAY buttons at the same time.
+ EN To unlock, press the ADD and PLAY buttons at the same time.
ES Para desbloquear, pulse los botones ADD y PLAY simultáneamente.
FR Pour déverrouiller, appuyez sur les boutons ADD et PLAY
simultanément.
IT Per sbloccare premere contemporaneamente i pulsanti ADD e PLAY.
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
