Author: titmuss
Date: Fri Jan 18 07:33:25 2008
New Revision: 1502
URL: http://svn.slimdevices.com?rev=1502&root=Jive&view=rev
Log:
Bug: N/A
Description:
Handle failure case when switching music sources.
Modified:
trunk/jive/src/pkg/jive/share/applets/SetupSlimServers/SetupSlimServersApplet.lua
trunk/jive/src/pkg/jive/share/applets/SetupSlimServers/strings.txt
Modified:
trunk/jive/src/pkg/jive/share/applets/SetupSlimServers/SetupSlimServersApplet.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/applets/SetupSlimServers/SetupSlimServersApplet.lua?rev=1502&root=Jive&r1=1501&r2=1502&view=diff
==============================================================================
---
trunk/jive/src/pkg/jive/share/applets/SetupSlimServers/SetupSlimServersApplet.lua
(original)
+++
trunk/jive/src/pkg/jive/share/applets/SetupSlimServers/SetupSlimServersApplet.lua
Fri Jan 18 07:33:25 2008
@@ -54,6 +54,9 @@
module(...)
oo.class(_M, Applet)
+
+
+local CONNECT_TIMEOUT = 30
-- main setting menu
@@ -320,7 +323,7 @@
end
timeout = timeout + 1
- if timeout == 60 then
+ if timeout == CONNECT_TIMEOUT then
self:_connectPlayerFailed(player,
server)
end
end)
@@ -348,7 +351,35 @@
-- failed to connect player to server
function _connectPlayerFailed(self, player, server)
- log:warn("FAILED")
+ local window = Window("wireless", self:string("SQUEEZEBOX_PROBLEM"),
setupsqueezeboxTitleStyle)
+ window:setAllowScreensaver(false)
+
+ local menu = SimpleMenu("menu",
+ {
+ {
+ text =
self:string("SQUEEZEBOX_GO_BACK"),
+ sound = "WINDOWHIDE",
+ callback = function()
+ window:hide()
+ end
+ },
+ {
+ text =
self:string("SQUEEZEBOX_TRY_AGAIN"),
+ sound = "WINDOWSHOW",
+ callback = function()
+
self:connectPlayer(player, server)
+ window:hide()
+ end
+ },
+ })
+
+
+ local help = Textarea("help", self:string("SQUEEZEBOX_PROBLEM_HELP",
player:getName(), server:getName()))
+
+ window:addWidget(help)
+ window:addWidget(menu)
+
+ self:tieAndShowWindow(window)
end
Modified: trunk/jive/src/pkg/jive/share/applets/SetupSlimServers/strings.txt
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/applets/SetupSlimServers/strings.txt?rev=1502&root=Jive&r1=1501&r2=1502&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/applets/SetupSlimServers/strings.txt
(original)
+++ trunk/jive/src/pkg/jive/share/applets/SetupSlimServers/strings.txt Fri Jan
18 07:33:25 2008
@@ -83,4 +83,32 @@
NL Verbonden met\n%s
SLIMSERVER_CONNECT
- EN Use %s
+ EN Use %s
+
+
+SQUEEZEBOX_PROBLEM
+ DE Verbindungsproblem
+ EN Problem Connecting
+ ES Problema de conexión
+ FR Problème de connexion
+ IT Problema di connessione
+ NL Probleem bij verbinden
+
+SQUEEZEBOX_GO_BACK
+ DE Zurück
+ EN Go back
+ ES Regresar
+ FR Retour
+ IT Indietro
+ NL Terug
+
+SQUEEZEBOX_TRY_AGAIN
+ DE Erneut versuchen.
+ EN Try again
+ ES Vuelva a intentarlo
+ FR Réessayer
+ IT Riprova
+ NL Opnieuw proberen
+
+SQUEEZEBOX_PROBLEM_HELP
+ EN Could not connect %s to %s.
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
