git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ability to set color in multi content lists
[enigma2.git]
/
lib
/
python
/
Screens
/
MovieSelection.py
diff --git
a/lib/python/Screens/MovieSelection.py
b/lib/python/Screens/MovieSelection.py
index 9e1879ceba9b8c52cd98b43582d61089662a081b..c70627bb253856be412126166a150c9aafd4d673 100644
(file)
--- a/
lib/python/Screens/MovieSelection.py
+++ b/
lib/python/Screens/MovieSelection.py
@@
-5,11
+5,14
@@
from Components.ActionMap import ActionMap
from Components.MovieList import MovieList
from Components.DiskInfo import DiskInfo
from Components.Label import Label
from Components.MovieList import MovieList
from Components.DiskInfo import DiskInfo
from Components.Label import Label
+from Components.PluginComponent import plugins
+from Plugins.Plugin import PluginDescriptor
from Screens.MessageBox import MessageBox
from Screens.FixedMenu import FixedMenu
from Tools.Directories import *
from Screens.MessageBox import MessageBox
from Screens.FixedMenu import FixedMenu
from Tools.Directories import *
+from Tools.BoundFunction import boundFunction
from enigma import eServiceReference, eServiceCenter, eTimer
from enigma import eServiceReference, eServiceCenter, eTimer
@@
-20,8
+23,14
@@
class ChannelContextMenu(FixedMenu):
menu = [(_("back"), self.close), (_("delete..."), self.delete)]
menu = [(_("back"), self.close), (_("delete..."), self.delete)]
+ for p in plugins.getPlugins(PluginDescriptor.WHERE_MOVIELIST):
+ menu.append((p.description, boundFunction(self.execPlugin, p)))
+
FixedMenu.__init__(self, session, _("Movie Menu"), menu)
self.skinName = "Menu"
FixedMenu.__init__(self, session, _("Movie Menu"), menu)
self.skinName = "Menu"
+
+ def execPlugin(self, plugin):
+ plugin(self.session, self.service)
def delete(self):
serviceHandler = eServiceCenter.getInstance()
def delete(self):
serviceHandler = eServiceCenter.getInstance()
@@
-52,13
+61,7
@@
class ChannelContextMenu(FixedMenu):
if result == False:
self.session.openWithCallback(self.close, MessageBox, _("Delete failed!"), MessageBox.TYPE_ERROR)
else:
if result == False:
self.session.openWithCallback(self.close, MessageBox, _("Delete failed!"), MessageBox.TYPE_ERROR)
else:
- list = self.csel["list"]
- currentIndex = list.getCurrentIndex()
- list.moveDown()
- if list.getCurrentIndex() == currentIndex:
- currentIndex -= 1
- list.reload()
- list.moveToIndex(currentIndex)
+ list = self.csel["list"].removeService(self.service)
self.close()
class MovieSelection(Screen):
self.close()
class MovieSelection(Screen):
@@
-70,7
+73,6
@@
class MovieSelection(Screen):
self.delayTimer = eTimer()
self.delayTimer.timeout.get().append(self.updateHDDData)
self.delayTimer = eTimer()
self.delayTimer.timeout.get().append(self.updateHDDData)
- self.delayTimer.start(0, 1)
self["waitingtext"] = Label(_("Please wait... Loading list..."))
self["waitingtext"] = Label(_("Please wait... Loading list..."))
@@
-80,13
+82,19
@@
class MovieSelection(Screen):
#self["okbutton"] = Button("ok", [self.channelSelected])
self["freeDiskSpace"] = DiskInfo(resolveFilename(SCOPE_HDD), DiskInfo.FREE, update=False)
#self["okbutton"] = Button("ok", [self.channelSelected])
self["freeDiskSpace"] = DiskInfo(resolveFilename(SCOPE_HDD), DiskInfo.FREE, update=False)
- self["actions"] = ActionMap(["OkCancelActions", "
ContextMenu
Actions"],
+ self["actions"] = ActionMap(["OkCancelActions", "
MovieSelection
Actions"],
{
"cancel": self.abort,
"ok": self.movieSelected,
"contextMenu": self.doContext,
})
self["actions"].csel = self
{
"cancel": self.abort,
"ok": self.movieSelected,
"contextMenu": self.doContext,
})
self["actions"].csel = self
+ self.onShown.append(self.go)
+
+ def go(self):
+ # ouch. this should redraw our "Please wait..."-text.
+ # this is of course not the right way to do this.
+ self.delayTimer.start(10, 1)
def updateHDDData(self):
self["list"].reload(eServiceReference("2:0:1:0:0:0:0:0:0:0:" + resolveFilename(SCOPE_HDD)))
def updateHDDData(self):
self["list"].reload(eServiceReference("2:0:1:0:0:0:0:0:0:0:" + resolveFilename(SCOPE_HDD)))
@@
-100,13
+108,18
@@
class MovieSelection(Screen):
self["list"].moveTo(self.selectedmovie)
def getCurrent(self):
self["list"].moveTo(self.selectedmovie)
def getCurrent(self):
- return self["list"].getCurrent()[0]
+ l = self["list"].getCurrent()
+ return l and l[0]
def movieSelected(self):
def movieSelected(self):
- self.close(self.getCurrent())
+ current = self.getCurrent()
+ if current is not None:
+ self.close(current)
def doContext(self):
def doContext(self):
- self.session.open(ChannelContextMenu, self, self.getCurrent())
+ current = self.getCurrent()
+ if current is not None:
+ self.session.open(ChannelContextMenu, self, current)
def abort(self):
self.close(None)
def abort(self):
self.close(None)