Author: titmuss
Date: Fri Mar 14 05:51:30 2008
New Revision: 2117
URL: http://svn.slimdevices.com?rev=2117&root=Jive&view=rev
Log:
Bug: 7419
Description:
Display an error message on boot if the mac address or uuid are not set.
Modified:
trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/strings.txt
Modified:
trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
URL:
http://svn.slimdevices.com/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua?rev=2117&root=Jive&r1=2116&r2=2117&view=diff
==============================================================================
---
trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
(original)
+++
trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
Fri Mar 14 05:51:30 2008
@@ -105,6 +105,30 @@
log:info("uuid=", uuid)
log:info("mac=", mac)
+
+ if not uuid or string.match(mac, "^00:40:20") then
+ local popup = Popup("errorWindow",
self:string("INVALID_MAC_TITLE"))
+
+ popup:setAllowScreensaver(false)
+ popup:setAlwaysOnTop(true)
+ popup:setAutoHide(false)
+
+ local text = Textarea("textarea",
self:string("INVALID_MAC_TEXT"))
+ local menu = SimpleMenu("menu", {
+ {
+ text = self:string("INVALID_MAC_CONTINUE"),
+ sound = "WINDOWHIDE",
+ callback = function()
+ window:hide()
+ end
+ },
+ })
+
+ popup:addWidget(text)
+ popup:addWidget(menu)
+ popup:show()
+ end
+
jnt:setUUID(uuid, mac)
Modified:
trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/strings.txt
URL:
http://svn.slimdevices.com/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/strings.txt?rev=2117&root=Jive&r1=2116&r2=2117&view=diff
==============================================================================
---
trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/strings.txt
(original)
+++
trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/strings.txt
Fri Mar 14 05:51:30 2008
@@ -245,3 +245,12 @@
FR \nConnexion
IT \nConnessione...
NL \nBezig met verbinden
+
+INVALID_MAC_TITLE
+ EN Error
+
+INVALID_MAC_TEXT
+ EN Invalid mac address or uuid. Please contact support.
+
+INVALID_MAC_CONTINUE
+ EN Continue
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
