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 'canvas' gui element where you can draw into a pixmap from python
[enigma2.git]
/
lib
/
python
/
Components
/
ServiceList.py
diff --git
a/lib/python/Components/ServiceList.py
b/lib/python/Components/ServiceList.py
index 8525ade3398105cb92a6568cad9c8c2d200a1040..7dfcd05d51c700de02efa76d8a929e29d3eb8ef9 100644
(file)
--- a/
lib/python/Components/ServiceList.py
+++ b/
lib/python/Components/ServiceList.py
@@
-1,7
+1,7
@@
from HTMLComponent import *
from GUIComponent import *
from HTMLComponent import *
from GUIComponent import *
-from enigma import
*
+from enigma import
loadPNG, eListboxServiceContent, eListbox, eServiceCenter, eServiceReference, gFont, eRect
from string import upper
from string import upper
@@
-19,6
+19,10
@@
class ServiceList(HTMLComponent, GUIComponent):
if pic:
self.l.setPixmap(self.l.picFolder, pic)
if pic:
self.l.setPixmap(self.l.picFolder, pic)
+ pic = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "marker-fs8.png"))
+ if pic:
+ self.l.setPixmap(self.l.picMarker, pic)
+
pic = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "ico_dvb_s-fs8.png"))
if pic:
self.l.setPixmap(self.l.picDVB_S, pic)
pic = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "ico_dvb_s-fs8.png"))
if pic:
self.l.setPixmap(self.l.picDVB_S, pic)
@@
-66,6
+70,14
@@
class ServiceList(HTMLComponent, GUIComponent):
self.instance.moveSelectionTo(index)
print "Moving to character " + str(char)
self.instance.moveSelectionTo(index)
print "Moving to character " + str(char)
+ def moveToNextMarker(self):
+ idx = self.l.getNextMarkerPos()
+ self.instance.moveSelectionTo(idx)
+
+ def moveToPrevMarker(self):
+ idx = self.l.getPrevMarkerPos()
+ self.instance.moveSelectionTo(idx)
+
def moveToIndex(self, index):
self.instance.moveSelectionTo(index)
def moveToIndex(self, index):
self.instance.moveSelectionTo(index)
@@
-107,8
+119,11
@@
class ServiceList(HTMLComponent, GUIComponent):
if not justSet:
self.l.sort()
if not justSet:
self.l.sort()
- def addService(self, service):
- self.l.addService(service)
+ def removeCurrent(self):
+ self.l.removeCurrent()
+
+ def addService(self, service, beforeCurrent=False):
+ self.l.addService(service, beforeCurrent)
def finishFill(self):
self.l.FillFinished()
def finishFill(self):
self.l.FillFinished()
@@
-145,15
+160,16
@@
class ServiceList(HTMLComponent, GUIComponent):
self.mode = mode
if mode == self.MODE_NORMAL:
self.mode = mode
if mode == self.MODE_NORMAL:
- self.
instance
.setItemHeight(28)
- self.l.setVisualMode(eListboxServiceContent.visMode
Simple
)
+ self.
l
.setItemHeight(28)
+ self.l.setVisualMode(eListboxServiceContent.visMode
Complex
)
self.l.setElementFont(self.l.celServiceName, gFont("Regular", 22))
self.l.setElementPosition(self.l.celServiceName, eRect(0, 0, self.instance.size().width(), 28))
self.l.setElementFont(self.l.celServiceName, gFont("Regular", 22))
self.l.setElementPosition(self.l.celServiceName, eRect(0, 0, self.instance.size().width(), 28))
+ self.l.setElementFont(self.l.celServiceInfo, gFont("Regular", 18))
else:
else:
- self.instance.setItemHeight(28)
+ self.l.setItemHeight(28)
+ self.l.setVisualMode(eListboxServiceContent.visModeComplex)
self.l.setElementFont(self.l.celServiceNumber, gFont("Regular", 20))
self.l.setElementFont(self.l.celServiceNumber, gFont("Regular", 20))
- self.l.setElementPosition(self.l.celServiceNumber, eRect(0, 0,
4
0, 28))
+ self.l.setElementPosition(self.l.celServiceNumber, eRect(0, 0,
5
0, 28))
self.l.setElementFont(self.l.celServiceName, gFont("Regular", 22))
self.l.setElementFont(self.l.celServiceName, gFont("Regular", 22))
- self.l.setElementPosition(self.l.celServiceName, eRect(
50, 0, self.instance.size().width()-5
0, 28))
+ self.l.setElementPosition(self.l.celServiceName, eRect(
60, 0, self.instance.size().width()-6
0, 28))
self.l.setElementFont(self.l.celServiceInfo, gFont("Regular", 18))
self.l.setElementFont(self.l.celServiceInfo, gFont("Regular", 18))
- self.l.setVisualMode(eListboxServiceContent.visModeComplex)