fix deathscreen when opening wlan network list (ssid list) and the currently

[enigma2.git] / lib / python / Screens / NetworkSetup.py

diff --git a/lib/python/Screens/NetworkSetup.py b/lib/python/Screens/NetworkSetup.py
index 9dd6e286b4869ae3711e7829eb674d729e0b06c1..a3f39d67d6f47a4570eafa4c6a6e06c711262109 100644 (file)
--- a/lib/python/Screens/NetworkSetup.py
+++ b/lib/python/Screens/NetworkSetup.py
@@ -17,9 +17,6 @@ from enigma import eTimer, eConsoleAppContainer,gRGB
 import time, os, re
 from Tools.Directories import resolveFilename, SCOPE_PLUGINS
 
 import time, os, re
 from Tools.Directories import resolveFilename, SCOPE_PLUGINS
 

-def getColor(str):
-       return gRGB(int(str[1:], 0x10))
-

 class NetworkAdapterSelection(Screen):
        def __init__(self, session):
                Screen.__init__(self, session)
 class NetworkAdapterSelection(Screen):
        def __init__(self, session):
                Screen.__init__(self, session)


@@ -130,10 +127,12 @@ class NameserverSetup(Screen, ConfigListScreen):
                        self.createSetup()
 
 class AdapterSetup(Screen, ConfigListScreen):
                        self.createSetup()
 
 class AdapterSetup(Screen, ConfigListScreen):

-       def __init__(self, session, iface):
+       def __init__(self, session, iface,essid=None, aplist=None):

                Screen.__init__(self, session)
                self.session = session
                iNetwork.getInterfaces()
                Screen.__init__(self, session)
                self.session = session
                iNetwork.getInterfaces()

+               self.essid = essid
+               self.aplist = aplist

                ## FIXME , workaround against current wizzard not able to send arguments
                if iface == 0:
                        self.iface = "eth0"
                ## FIXME , workaround against current wizzard not able to send arguments
                if iface == 0:
                        self.iface = "eth0"


@@ -149,33 +148,38 @@ class AdapterSetup(Screen, ConfigListScreen):
                        list.append(_("WEP"))
                        list.append(_("WPA"))
                        list.append(_("WPA2"))
                        list.append(_("WEP"))
                        list.append(_("WPA"))
                        list.append(_("WPA2"))

-                       if iNetwork.getAdapterAttribute('wlan0', 'up') is True:
-                               try:
-                                       self.w = Wlan('wlan0')
-                                       aps = self.w.getNetworkList()
-                                       nwlist = []
-                                       if aps is not None:
-                                               print "[Wlan.py] got Accespoints!"
-                                               for ap in aps:
-                                                       a = aps[ap]
-                                                       if a['active']:
-                                                               if a['essid'] == "":
-                                                                       a['essid'] = a['bssid']
-                                                               nwlist.append( a['essid'])
-                                       nwlist.sort(key = lambda x: x[0])
-                               except:
-                                       nwlist = []
-                                       nwlist.append("No Networks found")
-                                       
-                       if nwlist is None:
-                               nwlist = []
-                               nwlist.append("No Networks found")
-                       
-                       config.plugins.wlan.essid = NoSave(ConfigSelection(nwlist, default = nwlist[0]))
-                       config.plugins.wlan.encryption.enabled = NoSave(ConfigYesNo(default = False))
-                       config.plugins.wlan.encryption.type = NoSave(ConfigSelection(list, default = _("WPA")))
-                       config.plugins.wlan.encryption.psk = NoSave(ConfigText(default = "mysecurewlan", fixed_size = False))
-                       self.ws.loadConfig()
+                       if self.aplist is not None:
+                               self.nwlist = self.aplist
+                               self.nwlist.sort(key = lambda x: x[0])
+                       else:
+                               if iNetwork.getAdapterAttribute('wlan0', 'up') is True:
+                                       self.nwlist = []
+                                       try:
+                                               self.w = Wlan('wlan0')
+                                               aps = self.w.getNetworkList()
+                                               if aps is not None:
+                                                       print "[Wlan.py] got Accespoints!"
+                                                       for ap in aps:
+                                                               a = aps[ap]
+                                                               if a['active']:
+                                                                       if a['essid'] == "":
+                                                                               a['essid'] = a['bssid']
+                                                                       self.nwlist.append( a['essid'])
+                                               self.nwlist.sort(key = lambda x: x[0])
+                                       except:
+                                               self.nwlist.append("No Networks found")
+                               else:
+                                       self.nwlist.append("No Networks found")
+                               
+                       wsconfig = self.ws.loadConfig()
+                       default = self.essid or wsconfig['ssid']
+                       if default not in self.nwlist:
+                               self.nwlist.append(default)
+                       config.plugins.wlan.essid = NoSave(ConfigSelection(self.nwlist, default = default ))
+                       config.plugins.wlan.encryption.enabled = NoSave(ConfigYesNo(default = wsconfig['encryption'] ))
+                       config.plugins.wlan.encryption.type = NoSave(ConfigSelection(list, default = wsconfig['encryption_type'] ))
+                       config.plugins.wlan.encryption.psk = NoSave(ConfigText(default = wsconfig['key'], fixed_size = False,visible_width = 30))
+                       #self.ws.loadConfig()

                
                self.dhcpConfigEntry = NoSave(ConfigYesNo(default=iNetwork.getAdapterAttribute(self.iface, "dhcp") or False))
                self.hasGatewayConfigEntry = NoSave(ConfigYesNo(default=True))
                
                self.dhcpConfigEntry = NoSave(ConfigYesNo(default=iNetwork.getAdapterAttribute(self.iface, "dhcp") or False))
                self.hasGatewayConfigEntry = NoSave(ConfigYesNo(default=True))


@@ -375,7 +379,7 @@ class AdapterSetupConfiguration(Screen):
                        self.wlanresponse = ifobj.getStatistics()
                        if self.wlanresponse[0] != 19:
                                from Plugins.SystemPlugins.WirelessLan.plugin import WlanScan
                        self.wlanresponse = ifobj.getStatistics()
                        if self.wlanresponse[0] != 19:
                                from Plugins.SystemPlugins.WirelessLan.plugin import WlanScan

-                               self.session.open(WlanScan,self.iface)
+                               self.session.openWithCallback(self.WlanScanClosed, WlanScan, self.iface)

                        else:
                                # Display Wlan not available Message
                                self.showErrorMessage()
                        else:
                                # Display Wlan not available Message
                                self.showErrorMessage()


@@ -447,7 +451,7 @@ class AdapterSetupConfiguration(Screen):
                
                if self.iface == 'wlan0':
                        try:
                
                if self.iface == 'wlan0':
                        try:

-                               from Plugins.SystemPlugins.WirelessLan.Wlan import Wlan, WlanList, wpaSupplicant
+                               from Plugins.SystemPlugins.WirelessLan.Wlan import Wlan

                                w = Wlan(self.iface)
                                stats = w.getStatus()
                                if stats['BSSID'] == "00:00:00:00:00:00":
                                w = Wlan(self.iface)
                                stats = w.getStatus()
                                if stats['BSSID'] == "00:00:00:00:00:00":


@@ -491,6 +495,13 @@ class AdapterSetupConfiguration(Screen):
        def AdapterSetupClosed(self, *ret):
                self.mainmenu = self.genMainMenu()
                self["menulist"].l.setList(self.mainmenu)
        def AdapterSetupClosed(self, *ret):
                self.mainmenu = self.genMainMenu()
                self["menulist"].l.setList(self.mainmenu)

+               self.updateStatusbar()
+
+       def WlanScanClosed(self,*ret):
+               if ret[0] is not None:
+                       self.session.openWithCallback(self.AdapterSetupClosed, AdapterSetup, 'wlan0',ret[0],ret[1])
+               else:
+                       self.session.openWithCallback(self.AdapterSetupClosed, AdapterSetup, 'wlan0',None,ret[0])

 
        def enableWlan(self, ret = False):
                if (ret == True):
 
        def enableWlan(self, ret = False):
                if (ret == True):


@@ -498,7 +509,12 @@ class AdapterSetupConfiguration(Screen):
                        iNetwork.getInterfaces()
                        if iNetwork.getAdapterAttribute('wlan0', 'up') is True:
                                self.iface = 'wlan0'
                        iNetwork.getInterfaces()
                        if iNetwork.getAdapterAttribute('wlan0', 'up') is True:
                                self.iface = 'wlan0'

-                               self.session.openWithCallback(self.AdapterSetupClosed, AdapterSetup, 'wlan0')
+                               try:
+                                       from Plugins.SystemPlugins.WirelessLan.plugin import WlanScan
+                               except ImportError:
+                                       self.session.open(MessageBox, _("The wireless LAN plugin is not installed!\nPlease install it."), type = MessageBox.TYPE_INFO,timeout = 10 )
+                               else:   
+                                       self.session.openWithCallback(self.WlanScanClosed, WlanScan, self.iface)

                        else:
                                self.session.openWithCallback(self.restartDreambox, MessageBox, _("Your wireless LAN Adapter could not be started.\nDo you want to reboot your Dreambox to apply the new configuration?\n"))
 
                        else:
                                self.session.openWithCallback(self.restartDreambox, MessageBox, _("Your wireless LAN Adapter could not be started.\nDo you want to reboot your Dreambox to apply the new configuration?\n"))
 


@@ -621,31 +637,49 @@ class NetworkAdapterTest(Screen):
        def setActiveButton(self,button):
                if button == 1:
                        self["EditSettingsButton"].setPixmapNum(0)
        def setActiveButton(self,button):
                if button == 1:
                        self["EditSettingsButton"].setPixmapNum(0)

+                       self["EditSettings_Text"].setForegroundColorNum(0)

                        self["NetworkInfo"].setPixmapNum(0)
                        self["NetworkInfo"].setPixmapNum(0)

-                       self["AdapterInfo"].setPixmapNum(1)
+                       self["NetworkInfo_Text"].setForegroundColorNum(1)
+                       self["AdapterInfo"].setPixmapNum(1)               # active
+                       self["AdapterInfo_Text"].setForegroundColorNum(2) # active

                if button == 2:
                if button == 2:

+                       self["AdapterInfo_Text"].setForegroundColorNum(1)

                        self["AdapterInfo"].setPixmapNum(0)
                        self["DhcpInfo"].setPixmapNum(0)
                        self["AdapterInfo"].setPixmapNum(0)
                        self["DhcpInfo"].setPixmapNum(0)

-                       self["NetworkInfo"].setPixmapNum(1)
+                       self["DhcpInfo_Text"].setForegroundColorNum(1)
+                       self["NetworkInfo"].setPixmapNum(1)               # active
+                       self["NetworkInfo_Text"].setForegroundColorNum(2) # active

                if button == 3:
                        self["NetworkInfo"].setPixmapNum(0)
                if button == 3:
                        self["NetworkInfo"].setPixmapNum(0)

+                       self["NetworkInfo_Text"].setForegroundColorNum(1)

                        self["IPInfo"].setPixmapNum(0)
                        self["IPInfo"].setPixmapNum(0)

-                       self["DhcpInfo"].setPixmapNum(1)
+                       self["IPInfo_Text"].setForegroundColorNum(1)
+                       self["DhcpInfo"].setPixmapNum(1)                  # active
+                       self["DhcpInfo_Text"].setForegroundColorNum(2)    # active

                if button == 4:
                        self["DhcpInfo"].setPixmapNum(0)
                if button == 4:
                        self["DhcpInfo"].setPixmapNum(0)

+                       self["DhcpInfo_Text"].setForegroundColorNum(1)

                        self["DNSInfo"].setPixmapNum(0)
                        self["DNSInfo"].setPixmapNum(0)

-                       self["IPInfo"].setPixmapNum(1)
+                       self["DNSInfo_Text"].setForegroundColorNum(1)
+                       self["IPInfo"].setPixmapNum(1)                  # active
+                       self["IPInfo_Text"].setForegroundColorNum(2)    # active                

                if button == 5:
                        self["IPInfo"].setPixmapNum(0)
                if button == 5:
                        self["IPInfo"].setPixmapNum(0)

+                       self["IPInfo_Text"].setForegroundColorNum(1)

                        self["EditSettingsButton"].setPixmapNum(0)
                        self["EditSettingsButton"].setPixmapNum(0)

-                       self["DNSInfo"].setPixmapNum(1)
+                       self["EditSettings_Text"].setForegroundColorNum(0)
+                       self["DNSInfo"].setPixmapNum(1)                 # active
+                       self["DNSInfo_Text"].setForegroundColorNum(2)   # active

                if button == 6:
                        self["DNSInfo"].setPixmapNum(0)
                if button == 6:
                        self["DNSInfo"].setPixmapNum(0)

-                       self["EditSettingsButton"].setPixmapNum(1)
+                       self["DNSInfo_Text"].setForegroundColorNum(1)
+                       self["EditSettingsButton"].setPixmapNum(1)         # active
+                       self["EditSettings_Text"].setForegroundColorNum(2) # active

                        self["AdapterInfo"].setPixmapNum(0)
                        self["AdapterInfo"].setPixmapNum(0)

-
+                       self["AdapterInfo_Text"].setForegroundColorNum(1)
+                       

        def runTest(self):
        def runTest(self):

-               self.nextstep += 1
+               next = self.nextstep

                if next == 0:
                        self.doStep1()
                elif next == 1:
                if next == 0:
                        self.doStep1()
                elif next == 1:


@@ -658,6 +692,7 @@ class NetworkAdapterTest(Screen):
                        self.doStep5()
                elif next == 5:
                        self.doStep6()
                        self.doStep5()
                elif next == 5:
                        self.doStep6()

+               self.nextstep += 1

 
        def doStep1(self):
                self.steptimer = True
 
        def doStep1(self):
                self.steptimer = True


@@ -728,6 +763,7 @@ class NetworkAdapterTest(Screen):
                
                self["EditSettings_Text"].show()
                self["EditSettingsButton"].setPixmapNum(1)
                
                self["EditSettings_Text"].show()
                self["EditSettingsButton"].setPixmapNum(1)

+               self["EditSettings_Text"].setForegroundColorNum(2) # active

                self["EditSettingsButton"].show()
                self["ButtonYellow_Check"].setPixmapNum(1)
                self["ButtonGreentext"].setText(_("Restart test"))
                self["EditSettingsButton"].show()
                self["ButtonYellow_Check"].setPixmapNum(1)
                self["ButtonGreentext"].setText(_("Restart test"))


@@ -858,7 +894,7 @@ class NetworkAdapterTest(Screen):
                self["DNSInfo_Text"] = MultiColorLabel(_("Show Info"))
                self["DNSInfo_Check"] = MultiPixmap()
                
                self["DNSInfo_Text"] = MultiColorLabel(_("Show Info"))
                self["DNSInfo_Check"] = MultiPixmap()
                

-               self["EditSettings_Text"] = Label(_("Edit settings"))
+               self["EditSettings_Text"] = MultiColorLabel(_("Edit settings"))

                self["EditSettingsButton"] = MultiPixmap()
                
                self["ButtonRedtext"] = Label(_("Close"))
                self["EditSettingsButton"] = MultiPixmap()
                
                self["ButtonRedtext"] = Label(_("Close"))