* don't count the hidden network helper entry as found network.
* some small optimizations.
refs #204
self["statuspic"].setPixmapNum(0)
self["statuspic"].show()
self["statuspic"].setPixmapNum(0)
self["statuspic"].show()
class WlanScan(Screen):
skin = """
<screen name="WlanScan" position="center,center" size="560,400" title="Choose a Wireless Network" >
class WlanScan(Screen):
skin = """
<screen name="WlanScan" position="center,center" size="560,400" title="Choose a Wireless Network" >
self.WlanList = None
self.cleanList = None
self.oldlist = None
self.WlanList = None
self.cleanList = None
self.oldlist = None
self.rescanTimer = eTimer()
self.rescanTimer.callback.append(self.rescanTimerFired)
self.rescanTimer = eTimer()
self.rescanTimer.callback.append(self.rescanTimerFired)
self.rescanTimer.stop()
del self.rescanTimer
if cur[1] is not None:
self.rescanTimer.stop()
del self.rescanTimer
if cur[1] is not None:
+ if cur[1] == 'hidden...':
+ essid = cur[1]
+ else:
+ essid = cur[0]
self.close(essid,self.getWlanList())
else:
self.close(None,None)
self.close(essid,self.getWlanList())
else:
self.close(None,None)
self['list'].setList(self.newAPList)
self["list"].setIndex(newListIndex)
self["list"].updateList(self.newAPList)
self['list'].setList(self.newAPList)
self["list"].setIndex(newListIndex)
self["list"].updateList(self.newAPList)
- self.listLenght = len(self.newAPList)
+ self.listLength = len(self.newAPList)
self.buildWlanList()
self.setInfo()
self.buildWlanList()
self.setInfo()
self.w = Wlan(self.iface)
aps = self.w.getNetworkList()
if aps is not None:
self.w = Wlan(self.iface)
aps = self.w.getNetworkList()
if aps is not None:
- print "[NetworkWizard.py] got Accespoints!"
+ print "[WirelessLan.py] got Accespoints!"
tmpList = []
compList = []
for ap in aps:
tmpList = []
compList = []
for ap in aps:
if refresh is False:
self['list'].setList(self.APList)
if refresh is False:
self['list'].setList(self.APList)
- self.listLenght = len(self.APList)
+ self.listLength = len(self.APList)
self.setInfo()
self.rescanTimer.start(5000)
return self.cleanList
def setInfo(self):
length = self.getLength()
self.setInfo()
self.rescanTimer.start(5000)
return self.cleanList
def setInfo(self):
length = self.getLength()
self["info"].setText(_("No wireless networks found! Please refresh."))
self["info"].setText(_("No wireless networks found! Please refresh."))
self["info"].setText(_("1 wireless network found!"))
else:
self["info"].setText(_("1 wireless network found!"))
else:
- self["info"].setText(str(length)+_(" wireless networks found!"))
+ self["info"].setText(str(length-1)+_(" wireless networks found!"))
def buildWlanList(self):
self.WlanList = []
def buildWlanList(self):
self.WlanList = []
- currList = []
- currList = self['list'].list
- for entry in currList:
- self.WlanList.append( (entry[1], entry[0]) )
+ for entry in self['list'].list:
+ if entry[1] == "hidden...":
+ self.WlanList.append(( "hidden...",_("enter hidden network SSID") ))#continue
+ else:
+ self.WlanList.append( (entry[0], entry[0]) )
+ if self.WlanList is None:
+ self.buildWlanList()