projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
simplify GUIcreate/createWidget, fix base class order
[vuplus_dvbapp]
/
lib
/
python
/
Components
/
ServiceList.py
diff --git
a/lib/python/Components/ServiceList.py
b/lib/python/Components/ServiceList.py
index
2cef35c
..
85f004c
100644
(file)
--- a/
lib/python/Components/ServiceList.py
+++ b/
lib/python/Components/ServiceList.py
@@
-6,7
+6,6
@@
from enigma import *
from string import upper
class ServiceList(HTMLComponent, GUIComponent):
from string import upper
class ServiceList(HTMLComponent, GUIComponent):
-
MODE_NORMAL = 0
MODE_FAVOURITES = 1
MODE_NORMAL = 0
MODE_FAVOURITES = 1
@@
-14,7
+13,6
@@
class ServiceList(HTMLComponent, GUIComponent):
GUIComponent.__init__(self)
self.l = eListboxServiceContent()
self.root = None
GUIComponent.__init__(self)
self.l = eListboxServiceContent()
self.root = None
-
self.mode = self.MODE_NORMAL
def setCurrent(self, ref):
self.mode = self.MODE_NORMAL
def setCurrent(self, ref):
@@
-25,12
+23,18
@@
class ServiceList(HTMLComponent, GUIComponent):
self.l.getCurrent(r)
return r
self.l.getCurrent(r)
return r
+ def atBegin(self):
+ return self.instance.atBegin()
+
+ def atEnd(self):
+ return self.instance.atEnd()
+
def moveUp(self):
self.instance.moveSelection(self.instance.moveUp)
def moveDown(self):
self.instance.moveSelection(self.instance.moveDown)
def moveUp(self):
self.instance.moveSelection(self.instance.moveUp)
def moveDown(self):
self.instance.moveSelection(self.instance.moveDown)
-
+
def moveToChar(self, char):
# TODO fill with life
print "Next char: "
def moveToChar(self, char):
# TODO fill with life
print "Next char: "
@@
-49,13
+53,12
@@
class ServiceList(HTMLComponent, GUIComponent):
def getCurrentIndex(self):
return self.instance.getCurrentIndex()
def getCurrentIndex(self):
return self.instance.getCurrentIndex()
- def GUIcreate(self, parent):
- self.instance = eListbox(parent)
- self.instance.setContent(self.l)
- self.setMode(self.mode)
+ GUI_WIDGET = eListbox
- def GUIdelete(self):
- self.instance = None
+ def postWidgetCreate(self, instance):
+ instance.setWrapAround(True)
+ instance.setContent(self.l)
+ self.setMode(self.mode)
def getRoot(self):
return self.root
def getRoot(self):
return self.root
@@
-122,11
+125,6
@@
class ServiceList(HTMLComponent, GUIComponent):
def setMode(self, mode):
self.mode = mode
def setMode(self, mode):
self.mode = mode
- try:
- self.instance
- except:
- return
-
if mode == self.MODE_NORMAL:
self.instance.setItemHeight(28)
self.l.setVisualMode(eListboxServiceContent.visModeSimple)
if mode == self.MODE_NORMAL:
self.instance.setItemHeight(28)
self.l.setVisualMode(eListboxServiceContent.visModeSimple)