git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove no more exist isTop argument
[enigma2.git]
/
lib
/
python
/
Plugins
/
Extensions
/
GraphMultiEPG
/
GraphMultiEpg.py
diff --git
a/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py
b/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py
index 80a07df4918d014f62506c0c76f1d068b6ba037f..036cb7a6fd7a88f50abbd8761ba63fd32de9fe6e 100644
(file)
--- a/
lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py
+++ b/
lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py
@@
-7,7
+7,6
@@
from Components.HTMLComponent import HTMLComponent
from Components.GUIComponent import GUIComponent
from Components.EpgList import Rect
from Components.Sources.Event import Event
from Components.GUIComponent import GUIComponent
from Components.EpgList import Rect
from Components.Sources.Event import Event
-from Components.Sources.Source import ObsoleteSource
from Components.MultiContent import MultiContentEntryText, MultiContentEntryPixmapAlphaTest
from Screens.Screen import Screen
from Screens.EventView import EventViewSimple
from Components.MultiContent import MultiContentEntryText, MultiContentEntryPixmapAlphaTest
from Screens.Screen import Screen
from Screens.EventView import EventViewSimple
@@
-39,7
+38,7
@@
class EPGList(HTMLComponent, GUIComponent):
if overjump_empty:
self.l.setSelectableFunc(self.isSelectable)
self.epgcache = eEPGCache.getInstance()
if overjump_empty:
self.l.setSelectableFunc(self.isSelectable)
self.epgcache = eEPGCache.getInstance()
- self.clock_pixmap = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, '
epgclock-fs8
.png'))
+ self.clock_pixmap = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, '
skin_default/icons/epgclock
.png'))
self.time_base = None
self.time_epoch = time_epoch
self.list = None
self.time_base = None
self.time_epoch = time_epoch
self.list = None
@@
-53,7
+52,7
@@
class EPGList(HTMLComponent, GUIComponent):
self.foreColorService = None
self.backColorService = None
self.foreColorService = None
self.backColorService = None
- def applySkin(self, desktop):
+ def applySkin(self, desktop
, screen
):
if self.skinAttributes is not None:
attribs = [ ]
for (attrib, value) in self.skinAttributes:
if self.skinAttributes is not None:
attribs = [ ]
for (attrib, value) in self.skinAttributes:
@@
-74,7
+73,7
@@
class EPGList(HTMLComponent, GUIComponent):
else:
attribs.append((attrib,value))
self.skinAttributes = attribs
else:
attribs.append((attrib,value))
self.skinAttributes = attribs
- return GUIComponent.applySkin(self, desktop)
+ return GUIComponent.applySkin(self, desktop
, screen
)
def isSelectable(self, service, sname, event_list):
return (event_list and len(event_list) and True) or False
def isSelectable(self, service, sname, event_list):
return (event_list and len(event_list) and True) or False
@@
-170,6
+169,10
@@
class EPGList(HTMLComponent, GUIComponent):
self.l.setFont(1, gFont("Regular", 14))
self.l.setSelectionClip(eRect(0,0,0,0), False)
self.l.setFont(1, gFont("Regular", 14))
self.l.setSelectionClip(eRect(0,0,0,0), False)
+ def preWidgetRemove(self, instance):
+ instance.selectionChanged.get().remove(self.serviceChanged)
+ instance.setContent(None)
+
def recalcEntrySize(self):
esize = self.l.getItemSize()
width = esize.width()
def recalcEntrySize(self):
esize = self.l.getItemSize()
width = esize.width()
@@
-343,7
+346,6
@@
class GraphMultiEPG(Screen):
self["key_green"] = Button(_("Add timer"))
self["timeline_text"] = TimelineText()
self["Event"] = Event()
self["key_green"] = Button(_("Add timer"))
self["timeline_text"] = TimelineText()
self["Event"] = Event()
- self["Clock"] = ObsoleteSource(new_source = "global.CurrentTime", removal_date = "2008-01")
self.time_lines = [ ]
for x in (0,1,2,3,4,5):
pm = Pixmap()
self.time_lines = [ ]
for x in (0,1,2,3,4,5):
pm = Pixmap()
@@
-496,7
+498,7
@@
class GraphMultiEPG(Screen):
serviceref = cur[1]
if event is None:
return
serviceref = cur[1]
if event is None:
return
- newEntry = RecordTimerEntry(serviceref, checkOldTimers = True, *parseEvent(event))
+ newEntry = RecordTimerEntry(serviceref, checkOldTimers = True,
dirname = config.movielist.last_timer_videodir.value,
*parseEvent(event))
self.session.openWithCallback(self.timerEditFinished, TimerEntry, newEntry)
def timerEditFinished(self, answer):
self.session.openWithCallback(self.timerEditFinished, TimerEntry, newEntry)
def timerEditFinished(self, answer):