From dd6c331e2a83af4e911fecc70c47b74256ea3419 Mon Sep 17 00:00:00 2001
From: Acid Burn <acid-burn@ACIDNET.(none)>
Date: Tue, 10 Nov 2009 13:18:26 +0100
Subject: 
 Enigma2-{Wizard.py,Networksetup.py,ConfigList.py,skin_default.xml,NetworkWizard.py}:
 -add possibility to use the VirtualKeyboard globally with every ConfigText
 and ConfigPassword ConfigEntry inside ConfigListScreens and WizardScreens.
 -add possibility to globally move the NumericalHelpInputWindow shown from a
 ConfigListScreen or a Wizard Screen to a inside the Skin defined Position
 This currently still needs following Skin entries defined in your Screens
 Skin: "<widget source="VKeyIcon" render="Pixmap"
 pixmap="skin_default/buttons/key_text.png" position="10,380" zPosition="10"
 size="35,25" transparent="1" alphatest="on" > 	<convert
 type="ConditionalShowHide" /> </widget>" used for Showing/hiding the TEXT
 Icon if the VirtualKeyboard is available. and: "<widget name="HelpWindow"
 pixmap="skin_default/vkey_icon.png" position="160,315" zPosition="1"
 size="1,1" transparent="1" alphatest="on" />" used to position the
 NumericalTextInputHelpWIndow inside your Screen as defined by your Screens
 Skin.

also you need currently:
from Components.Sources.Boolean import Boolean
self["VKeyIcon"] = Boolean(False)
self["HelpWindow"] = Pixmap()
self["HelpWindow"].hide()
inside your Screens sourcecode so we know that these items should be handled globally from Enigma2.
- remove own Helpwindow/Vkey handling from NetworkSetup.py
- include new VirtualKeyboardhandling inside NetworkWizard
This fixes #157
---
 .../SystemPlugins/NetworkWizard/NetworkWizard.py        | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py')

diff --git a/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py b/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py
index 4d361157..b158cde1 100755
--- a/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py
+++ b/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py
@@ -4,15 +4,11 @@ from Screens.Rc import Rc
 from Screens.MessageBox import MessageBox
 
 from Components.Pixmap import Pixmap, MovingPixmap, MultiPixmap
+from Components.Sources.Boolean import Boolean
 from Components.config import config, ConfigBoolean, configfile, ConfigYesNo, NoSave, ConfigSubsection, ConfigText, getConfigListEntry, ConfigSelection, ConfigPassword
 from Components.Network import iNetwork
 
-#from Components.Label import Label
-#from Components.MenuList import MenuList
-#from Components.PluginComponent import plugins
-#from Plugins.Plugin import PluginDescriptor
 from Tools.Directories import resolveFilename, SCOPE_PLUGINS, SCOPE_SKIN_IMAGE
-#import time, os, re
 
 
 config.misc.firstrun = ConfigBoolean(default = True)
@@ -39,7 +35,7 @@ config.plugins.wlan.encryption.psk = NoSave(ConfigPassword(default = "mysecurewl
 class NetworkWizard(WizardLanguage, Rc):
 	skin = """
 		<screen position="0,0" size="720,576" title="Welcome..." flags="wfNoBorder" >
-			<widget name="text" position="153,40" size="340,330" font="Regular;22" />
+			<widget name="text" position="153,40" size="340,300" font="Regular;22" />
 			<widget source="list" render="Listbox" position="53,340" size="440,180" scrollbarMode="showOnDemand" >
 				<convert type="StringList" />
 			</widget>
@@ -52,6 +48,10 @@ class NetworkWizard(WizardLanguage, Rc):
 			<widget name="arrowdown2" pixmap="skin_default/arrowdown.png" position="-100,-100" zPosition="11" size="37,70" alphatest="on" />
 			<widget name="arrowup" pixmap="skin_default/arrowup.png" position="-100,-100" zPosition="11" size="37,70" alphatest="on" />
 			<widget name="arrowup2" pixmap="skin_default/arrowup.png" position="-100,-100" zPosition="11" size="37,70" alphatest="on" />
+			<widget source="VKeyIcon" render="Pixmap" pixmap="skin_default/buttons/key_text.png" position="40,260" zPosition="0" size="35,25" transparent="1" alphatest="on" >
+				<convert type="ConditionalShowHide" />
+			</widget>
+			<widget name="HelpWindow" pixmap="skin_default/buttons/key_text.png" position="125,170" zPosition="1" size="1,1" transparent="1" alphatest="on" />	
 		</screen>"""
 	def __init__(self, session):
 		self.xmlfile = resolveFilename(SCOPE_PLUGINS, "SystemPlugins/NetworkWizard/networkwizard.xml")
@@ -59,7 +59,10 @@ class NetworkWizard(WizardLanguage, Rc):
 		Rc.__init__(self)
 		self.session = session
 		self["wizard"] = Pixmap()
-		
+		self["HelpWindow"] = Pixmap()
+		self["HelpWindow"].hide()
+		self["VKeyIcon"] = Boolean(False)
+
 		self.InterfaceState = None
 		self.isInterfaceUp = None
 		self.WlanPluginInstalled = None
-- 
cgit v1.2.3