git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bug_387_small_spinner_fix'
[enigma2.git]
/
lib
/
python
/
Plugins
/
SystemPlugins
/
WirelessLan
/
plugin.py
diff --git
a/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
b/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
index c71037c53d2946a8dfe393bfbe1cd9d404adba7d..a9f7bf439d2d7ac845fdf898bf04f55ff71a1f94 100755
(executable)
--- a/
lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
+++ b/
lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
@@
-151,6
+151,7
@@
class WlanStatus(Screen):
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" >
@@
-190,7
+191,7
@@
class WlanScan(Screen):
self.WlanList = None
self.cleanList = None
self.oldlist = None
self.WlanList = None
self.cleanList = None
self.oldlist = None
- self.listLeng
ht
= None
+ self.listLeng
th
= None
self.rescanTimer = eTimer()
self.rescanTimer.callback.append(self.rescanTimerFired)
self.rescanTimer = eTimer()
self.rescanTimer.callback.append(self.rescanTimerFired)
@@
-226,7
+227,10
@@
class WlanScan(Screen):
self.rescanTimer.stop()
del self.rescanTimer
if cur[1] is not None:
self.rescanTimer.stop()
del self.rescanTimer
if cur[1] is not None:
- essid = cur[1]
+ 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)
@@
-262,11
+266,6
@@
class WlanScan(Screen):
self.updateAPList()
def buildEntryComponent(self, essid, bssid, encrypted, iface, maxrate, signal):
self.updateAPList()
def buildEntryComponent(self, essid, bssid, encrypted, iface, maxrate, signal):
-<<<<<<< HEAD:lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
- print "buildEntryComponent",essid
- print "buildEntryComponent",bssid
-=======
->>>>>>> bug_203_fix_wrong_networkstate:lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
divpng = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/div-h.png"))
encryption = encrypted and _("Yes") or _("No")
if bssid == 'hidden...':
divpng = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/div-h.png"))
encryption = encrypted and _("Yes") or _("No")
if bssid == 'hidden...':
@@
-310,7
+309,7
@@
class WlanScan(Screen):
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.listLeng
ht
= len(self.newAPList)
+ self.listLeng
th
= len(self.newAPList)
self.buildWlanList()
self.setInfo()
self.buildWlanList()
self.setInfo()
@@
-320,7
+319,7
@@
class WlanScan(Screen):
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:
@@
-345,31
+344,34
@@
class WlanScan(Screen):
if refresh is False:
self['list'].setList(self.APList)
if refresh is False:
self['list'].setList(self.APList)
- self.listLeng
ht
= len(self.APList)
+ self.listLeng
th
= 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()
- if length
== 0
:
+ if length
<= 1
:
self["info"].setText(_("No wireless networks found! Please refresh."))
self["info"].setText(_("No wireless networks found! Please refresh."))
- elif length ==
1
:
+ elif length ==
2
:
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]) )
def getLength(self):
def getLength(self):
- return self.listLeng
ht
+ return self.listLeng
th
def getWlanList(self):
def getWlanList(self):
+ if self.WlanList is None:
+ self.buildWlanList()
return self.WlanList
return self.WlanList