git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix ip address
[enigma2.git]
/
mytest.py
diff --git
a/mytest.py
b/mytest.py
index ea4913cc49ddcae4b94e37363d70f3d854c0651e..42bcd3eefe17fa91ae139b4581ec29afc5634ebd 100644
(file)
--- a/
mytest.py
+++ b/
mytest.py
@@
-16,7
+16,8
@@
from Navigation import Navigation
from skin import readSkin, applyAllAttributes
from Components.config import configfile
from skin import readSkin, applyAllAttributes
from Components.config import configfile
-from Screens.Wizard import listActiveWizards
+from Screens.Wizard import wizardManager
+from Screens.StartWizard import *
from Tools.BoundFunction import boundFunction
had = dict()
from Tools.BoundFunction import boundFunction
had = dict()
@@
-69,11
+70,12
@@
class Session:
self.execEnd()
callback = self.currentDialog.callback
self.execEnd()
callback = self.currentDialog.callback
+
retval = self.currentDialog.returnValue
retval = self.currentDialog.returnValue
-
+
if self.currentDialog.isTmp:
self.currentDialog.doClose()
if self.currentDialog.isTmp:
self.currentDialog.doClose()
-
+
del self.currentDialog.instance
# dump(self.currentDialog)
del self.currentDialog
del self.currentDialog.instance
# dump(self.currentDialog)
del self.currentDialog
@@
-85,12
+87,16
@@
class Session:
callback(*retval)
def execBegin(self):
callback(*retval)
def execBegin(self):
- self.currentDialog.execBegin()
- self.currentDialog.instance.show()
+ c = self.currentDialog
+ c.execBegin()
+
+ # when execBegin opened a new dialog, don't bother showing the old one.
+ if c == self.currentDialog:
+ c.instance.show()
def execEnd(self):
def execEnd(self):
-
self.currentDialog.execEnd()
-
self.currentDialog.instance.hide()
+ self.currentDialog.execEnd()
+ self.currentDialog.instance.hide()
def create(self, screen, arguments):
# creates an instance of 'screen' (which is a class)
def create(self, screen, arguments):
# creates an instance of 'screen' (which is a class)
@@
-148,15
+154,16
@@
class Session:
self.execBegin()
def openWithCallback(self, callback, screen, *arguments):
self.execBegin()
def openWithCallback(self, callback, screen, *arguments):
- self.open(screen, *arguments)
-
self.currentDialo
g.callback = callback
+
dlg =
self.open(screen, *arguments)
+
dl
g.callback = callback
def open(self, screen, *arguments):
self.pushCurrent()
def open(self, screen, *arguments):
self.pushCurrent()
- self.currentDialog = self.instantiateDialog(screen, *arguments)
-
self.currentDialo
g.isTmp = True
-
self.currentDialo
g.callback = None
+
dlg =
self.currentDialog = self.instantiateDialog(screen, *arguments)
+
dl
g.isTmp = True
+
dl
g.callback = None
self.execBegin()
self.execBegin()
+ return dlg
def keyEvent(self, code):
print "code " + str(code)
def keyEvent(self, code):
print "code " + str(code)
@@
-165,15
+172,13
@@
class Session:
self.currentDialog.returnValue = retval
self.delayTimer.start(0, 1)
self.currentDialog.returnValue = retval
self.delayTimer.start(0, 1)
-
-
def runScreenTest():
session = Session()
session.desktop = getDesktop()
session.nav = Navigation()
def runScreenTest():
session = Session()
session.desktop = getDesktop()
session.nav = Navigation()
- screensToRun =
listActive
Wizards()
+ screensToRun =
wizardManager.get
Wizards()
screensToRun.append(Screens.InfoBar.InfoBar)
def runNextScreen(session, screensToRun, *result):
screensToRun.append(Screens.InfoBar.InfoBar)
def runNextScreen(session, screensToRun, *result):