Author: titmuss
Date: Mon Feb 4 06:34:13 2008
New Revision: 1782
URL: http://svn.slimdevices.com?rev=1782&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1777): titmuss | 2008-02-04 14:29:36 +0000
Bug: 6896
Description:
Added Forget this network, for the current network. (Some of this change got
accidentally checked in r1775).
Modified:
trunk/ (props changed)
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupWireless/SetupWirelessApplet.lua
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Mon Feb 4 06:34:13 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1776
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1777
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupWireless/SetupWirelessApplet.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupWireless/SetupWirelessApplet.lua?rev=1782&root=Jive&r1=1781&r2=1782&view=diff
==============================================================================
---
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupWireless/SetupWirelessApplet.lua
(original)
+++
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupWireless/SetupWirelessApplet.lua
Mon Feb 4 06:34:13 2008
@@ -1282,7 +1282,9 @@
-- popup confirmation
local window = Popup("popupIcon")
- local text = Textarea("text", self:string("NETWORK_FORGOTTEN_NETWORK",
ssid))
+ window:addWidget(Icon("iconConnected"))
+
+ local text = Label("text", self:string("NETWORK_FORGOTTEN_NETWORK",
ssid))
window:addWidget(text)
self:tieWindow(window)
@@ -1418,7 +1420,7 @@
text =
self:string("NETWORK_FORGET_NETWORK"), nil,
sound = "WINDOWSHOW",
callback = function()
-
deleteConfirm(self, ssid)
+
deleteConfirm(self, self.currentSSID)
end
},
})
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins