Author: fmueller
Date: Mon Aug 9 04:25:42 2010
New Revision: 9030
URL: http://svn.slimdevices.com/jive?rev=9030&view=rev
Log:
Bug: 16408
Description:
- Make sure to show 'cannot connect to server' icon (blue) after reboot / power
on. (i.e. serverError not yet set to OK or ERROR)
- Handle ethernet cases (ok, disabled, cannot connect)
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/jive/Iconbar.lua
Modified: 7.6/trunk/squeezeplay/src/squeezeplay/share/jive/Iconbar.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/jive/Iconbar.lua?rev=9030&r1=9029&r2=9030&view=diff
==============================================================================
--- 7.6/trunk/squeezeplay/src/squeezeplay/share/jive/Iconbar.lua (original)
+++ 7.6/trunk/squeezeplay/src/squeezeplay/share/jive/Iconbar.lua Mon Aug 9
04:25:42 2010
@@ -142,7 +142,10 @@
=head2 Iconbar:setWirelessSignal(val)
-Set the state of the network icon of the iconbar. Values are nil (no network),
ERROR or 1-3.
+Set the state of the network icon of the iconbar.
+Wireless val: ERROR or 0, 1, 2, 3, 4
+Ethernet val: ETHERNET_ERROR or ETHERNET
+self.serverError: ERROR, nil or OK
=cut
--]]
@@ -151,12 +154,22 @@
self.wirelessSignal = val
- if val == "ERROR" then
- self.iconWireless:setStyle("button_wireless_" .. val)
- elseif val == 0 then
+ -- No ethernet link, ip, gateway or dns
+ if val == "ETHERNET_ERROR" then
+ self.iconWireless:setStyle("button_ethernet_ERROR")
+ -- No wireless link, ip, gateway or dns
+ elseif (val == "ERROR") or (val == 0) then
self.iconWireless:setStyle("button_wireless_ERROR")
- elseif self.serverError == "ERROR" then
+ -- Ethernet ok, but no server connection
+ elseif (val == "ETHERNET") and (self.serverError == "ERROR" or
self.serverError == nil) then
+ self.iconWireless:setStyle("button_ethernet_SERVERERROR")
+ -- Wireless ok, but no server connection
+ elseif (val ~= "ETHERNET") and (self.serverError == "ERROR" or
self.serverError == nil) then
self.iconWireless:setStyle("button_wireless_SERVERERROR")
+ -- Etherent and server connection ok
+ elseif val == "ETHERNET" then
+ self.iconWireless:setStyle("button_ethernet")
+ -- Wireless and server connection ok, show signal strength
else
self.iconWireless:setStyle("button_wireless_" .. (val or
"NONE"))
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
