X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FPlugins%2FSystemPlugins%2FWirelessLanSetup%2Fplugin.py;h=3b6a2141a11a191de245d5a98f6ae90f051c6949;hp=cf3b83136edf1276fea53ba5902e85cf5158b78a;hb=b0a5901f005703d33b11651720e17bd4493f426e;hpb=207c6a99f6d162bba35a19da17a351c97f6be56d
diff --git a/lib/python/Plugins/SystemPlugins/WirelessLanSetup/plugin.py b/lib/python/Plugins/SystemPlugins/WirelessLanSetup/plugin.py
index cf3b831..3b6a214 100755
--- a/lib/python/Plugins/SystemPlugins/WirelessLanSetup/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/WirelessLanSetup/plugin.py
@@ -29,25 +29,37 @@ from Tools.Directories import fileExists
import time
class WlanSelection(Screen,HelpableScreen):
- skin = """
-
-
-
-
-
-
- Format:%H:%M
-
-
-
-
-
-
-
-
- """
-
def __init__(self, session):
+ if session.desktop.size().width() > 720:
+ self.skin = """
+
+
+
+
+
+
+ Format:%H:%M
+
+
+
+
+
+
+
+
+ """
+ else:
+ self.skin = """
+
+
+
+
+
+
+
+
+
+ """
Screen.__init__(self,session)
HelpableScreen.__init__(self)
self.mainmenu = self.getWlandevice()
@@ -125,24 +137,37 @@ class WlanSelection(Screen,HelpableScreen):
iNetwork.stopGetInterfacesConsole()
class WlanSetup(Screen,HelpableScreen):
- skin = """
-
-
-
-
-
-
- Format:%H:%M
-
-
-
-
-
-
-
-
- """
def __init__(self, session, ifaces):
+ if session.desktop.size().width() > 720:
+ self.skin = """
+
+
+
+
+
+
+ Format:%H:%M
+
+
+
+
+
+
+
+
+ """
+ else:
+ self.skin = """
+
+
+
+
+
+
+
+
+
+ """
Screen.__init__(self, session)
HelpableScreen.__init__(self)
self.session = session
@@ -297,34 +322,51 @@ wlanconfig.gateway = ConfigIP([0,0,0,0])
selectap = None
class WlanConfig(Screen, ConfigListScreen, HelpableScreen):
- skin = """
-
-
-
-
-
-
- Format:%H:%M
-
-
-
-
-
-
-
-
-
-
-
-
-
- """
-
def __init__(self, session, iface):
+ if session.desktop.size().width() > 720:
+ self.skin = """
+
+
+
+
+
+
+ Format:%H:%M
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ """
+ else:
+ self.skin = """
+
+
+
+
+
+
+
+
+
+
+
+
+
+ """
Screen.__init__(self,session)
self.session = session
self["key_red"] = StaticText(_("Close"))
- self["key_grean"] = StaticText(_("Ok"))
+ self["key_green"] = StaticText(_("Ok"))
self["ipaddress"] = StaticText(_("[ N/A ]"))
self["netmask"] = StaticText(_("[ N/A ]"))
self["gateway"] = StaticText(_("[ N/A ]"))
@@ -880,32 +922,51 @@ class WlanConfig(Screen, ConfigListScreen, HelpableScreen):
self.wpaphraseconsole.kill(name)
class WlanScanAp(Screen,HelpableScreen):
- skin = """
-
-
-
-
-
-
- Format:%H:%M
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- """
-
def __init__(self, session, iface):
+ if session.desktop.size().width() > 720:
+ self.skin = """
+
+
+
+
+
+
+ Format:%H:%M
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ """
+ else:
+ self.skin = """
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ """
Screen.__init__(self,session)
HelpableScreen.__init__(self)
self.session = session
@@ -1078,7 +1139,7 @@ class WlanScanAp(Screen,HelpableScreen):
if self.apList[index].has_key(key):
self[key].setText((key+": "+self.apList[index][key]))
else:
- self[key].setText(("None"))
+ self[key].setText((key+": None"))
else:
self.session.openWithCallback(self.ScanAPclose, MessageBox, _("No AP detected."), type = MessageBox.TYPE_INFO, timeout = 10)
@@ -1499,20 +1560,28 @@ class NetworkAdapterTest(Screen):
callback(self.apState)
class Wlanstatus(Screen):
- skin = """
-
-
-
-
-
-
- Format:%H:%M
-
-
-
-
- """
def __init__(self, session,iface):
+ if session.desktop.size().width() > 720:
+ self.skin = """
+
+
+
+
+
+
+ Format:%H:%M
+
+
+
+
+ """
+ else:
+ self.skin = """
+
+
+
+
+ """
Screen.__init__(self,session)
self.session = session
self.iface = iface