git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- add sendSignal to eThread
[enigma2.git]
/
mytest.py
diff --git
a/mytest.py
b/mytest.py
index a40e263556ba6baaca6a4a2f691c82c259183300..1a4b03630fed5769acd189c5599d31e8b397041e 100644
(file)
--- a/
mytest.py
+++ b/
mytest.py
@@
-75,20
+75,20
@@
class Session:
if self.currentDialog.isTmp:
self.currentDialog.doClose()
if self.currentDialog.isTmp:
self.currentDialog.doClose()
- dump(self.currentDialog)
print sys.getrefcount(self.currentDialog)
print sys.getrefcount(self.currentDialog)
+ del self.currentDialog.instance
+ dump(self.currentDialog)
del self.currentDialog
del self.currentDialog
- del self.currentWindow
self.popCurrent()
def execBegin(self):
self.currentDialog.execBegin()
self.popCurrent()
def execBegin(self):
self.currentDialog.execBegin()
- self.current
Window
.show()
+ self.current
Dialog.instance
.show()
def execEnd(self):
self.currentDialog.execEnd()
def execEnd(self):
self.currentDialog.execEnd()
- self.current
Window
.hide()
+ self.current
Dialog.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)
@@
-97,35
+97,35
@@
class Session:
def instantiateDialog(self, screen, *arguments):
dlg = self.create(screen, arguments)
assert self.desktop != None
def instantiateDialog(self, screen, *arguments):
dlg = self.create(screen, arguments)
assert self.desktop != None
-
wnd
= eWindow(self.desktop)
+
dlg.instance
= eWindow(self.desktop)
gui = GUIOutputDevice()
gui = GUIOutputDevice()
- gui.parent =
wnd
+ gui.parent =
dlg.instance
gui.create(dlg)
gui.create(dlg)
- applyGUIskin(dlg,
wnd, None, dlg.skinName
)
+ applyGUIskin(dlg,
None, dlg.skinName, self.desktop
)
- return
(dlg, wnd)
+ return
dlg
def pushCurrent(self):
if self.currentDialog:
def pushCurrent(self):
if self.currentDialog:
- self.dialogStack.append(
(self.currentDialog, self.currentWindow)
)
+ self.dialogStack.append(
self.currentDialog
)
self.execEnd()
def popCurrent(self):
if len(self.dialogStack):
self.execEnd()
def popCurrent(self):
if len(self.dialogStack):
-
(self.currentDialog, self.currentWindow)
= self.dialogStack.pop()
+
self.currentDialog
= self.dialogStack.pop()
self.execBegin()
def execDialog(self, dialog):
self.pushCurrent()
self.execBegin()
def execDialog(self, dialog):
self.pushCurrent()
-
(self.currentDialog, self.currentWindow)
= dialog
+
self.currentDialog
= dialog
self.currentDialog.isTmp = False
self.execBegin()
def open(self, screen, *arguments):
self.pushCurrent()
self.currentDialog.isTmp = False
self.execBegin()
def open(self, screen, *arguments):
self.pushCurrent()
-
(self.currentDialog, self.currentWindow)
= self.instantiateDialog(screen, *arguments)
+
self.currentDialog
= self.instantiateDialog(screen, *arguments)
self.currentDialog.isTmp = True
self.execBegin()
self.currentDialog.isTmp = True
self.execBegin()
@@
-162,6
+162,8
@@
def runScreenTest():
import keymapparser
keymapparser.readKeymap()
import keymapparser
keymapparser.readKeymap()
+import skin
+skin.loadSkin()
# first, setup a screen
runScreenTest()
# first, setup a screen
runScreenTest()