git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2241481
)
show plugin description in plugin list
author
Stefan Pluecken
<stefan.pluecken@multimedia-labs.de>
Wed, 11 Jan 2006 15:35:15 +0000
(15:35 +0000)
committer
Stefan Pluecken
<stefan.pluecken@multimedia-labs.de>
Wed, 11 Jan 2006 15:35:15 +0000
(15:35 +0000)
lib/python/Components/PluginComponent.py
patch
|
blob
|
history
lib/python/Components/PluginList.py
patch
|
blob
|
history
lib/python/Plugins/tuxboxplugins/plugin.py
patch
|
blob
|
history
lib/python/Plugins/update/plugin.py
patch
|
blob
|
history
lib/python/Screens/PluginBrowser.py
patch
|
blob
|
history
diff --git
a/lib/python/Components/PluginComponent.py
b/lib/python/Components/PluginComponent.py
index 960043d68d98c624d6aacc626670032e94ee182a..e0cc90a4a4a7eded8ede68388086fb8ea46790c8 100644
(file)
--- a/
lib/python/Components/PluginComponent.py
+++ b/
lib/python/Components/PluginComponent.py
@@
-40,10
+40,10
@@
class PluginComponent:
pass
for y in range(len(plugins)):
pass
for y in range(len(plugins)):
- if len(plugins[y]) <
4
:
- list.append((path + picturepaths[y], plugins[y][0] , x, plugins[y][
1], plugins[y][2], None
))
+ if len(plugins[y]) <
5
:
+ list.append((path + picturepaths[y], plugins[y][0] , x, plugins[y][
2], plugins[y][3], None, plugins[y][1]
))
else:
else:
- list.append((path + picturepaths[y], plugins[y][0] , x, plugins[y][
1], plugins[y][2], plugins[y][3
]))
+ list.append((path + picturepaths[y], plugins[y][0] , x, plugins[y][
2], plugins[y][3], plugins[y][4], plugins[y][1
]))
if runAutostartPlugins:
try: plugin.autostart()
except: pass
if runAutostartPlugins:
try: plugin.autostart()
except: pass
diff --git
a/lib/python/Components/PluginList.py
b/lib/python/Components/PluginList.py
index f456ac4660921654cad011391b55b331b68bf8f9..93edf5ba11cf767d4ba232767436cd2438717dcf 100644
(file)
--- a/
lib/python/Components/PluginList.py
+++ b/
lib/python/Components/PluginList.py
@@
-16,9
+16,10
@@
RT_VALIGN_TOP = 0
RT_VALIGN_CENTER = 8
RT_VALIGN_BOTTOM = 16
RT_VALIGN_CENTER = 8
RT_VALIGN_BOTTOM = 16
-def PluginEntryComponent(picture, name):
+def PluginEntryComponent(picture, name
, desc = "Plugin"
):
res = [ None ]
res = [ None ]
- res.append((eListboxPythonMultiContent.TYPE_TEXT, 80, 10, 200, 50, 0, RT_HALIGN_LEFT , name))
+ res.append((eListboxPythonMultiContent.TYPE_TEXT, 80, 5, 200, 25, 0, RT_HALIGN_LEFT , name))
+ res.append((eListboxPythonMultiContent.TYPE_TEXT, 80, 26, 200, 17, 1, RT_HALIGN_LEFT , desc))
png = loadPNG(picture)
if png == None:
png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "/plugin.png"))
png = loadPNG(picture)
if png == None:
png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "/plugin.png"))
@@
-34,7
+35,7
@@
class PluginList(HTMLComponent, GUIComponent, MenuList):
self.list = list
self.l.setList(list)
self.l.setFont(0, gFont("Regular", 20))
self.list = list
self.l.setList(list)
self.l.setFont(0, gFont("Regular", 20))
- self.l.setFont(1, gFont("Regular", 1
0
))
+ self.l.setFont(1, gFont("Regular", 1
4
))
def GUIcreate(self, parent):
self.instance = eListbox(parent)
def GUIcreate(self, parent):
self.instance = eListbox(parent)
diff --git
a/lib/python/Plugins/tuxboxplugins/plugin.py
b/lib/python/Plugins/tuxboxplugins/plugin.py
index 65f7a86336f9f800274a3a395a9ccdf505737e6b..b2b3efd93b945ae1d6344369d9179a77bd19569c 100644
(file)
--- a/
lib/python/Plugins/tuxboxplugins/plugin.py
+++ b/
lib/python/Plugins/tuxboxplugins/plugin.py
@@
-13,20
+13,22
@@
def getPlugins():
for x in dir:
try:
if x[-3:] == "cfg":
for x in dir:
try:
if x[-3:] == "cfg":
- pluginlist.append((getPluginParams(x)["name"], "function", "main", x))
+ params = getPluginParams(x)
+ pluginlist.append((params["name"], params["desc"], "function", "main", x))
except:
pass
return pluginlist
def getPluginParams(file):
except:
pass
return pluginlist
def getPluginParams(file):
- file = open("/usr/lib/tuxbox/plugins/" + file, "r")
- lines = file.readlines()
- file.close()
params = {}
params = {}
- for x in lines:
+ file = open("/usr/lib/tuxbox/plugins/" + file, "r")
+ for x in file.readlines():
split = x.split("=")
params[split[0]] = split[1]
split = x.split("=")
params[split[0]] = split[1]
+ file.close()
+
return params
def main(session, args):
return params
def main(session, args):
- print "Running plugin with number", args
\ No newline at end of file
+ print "Running plugin " + args[:-4] + ".so with config file", args
+ print getPluginParams(args)
\ No newline at end of file
diff --git
a/lib/python/Plugins/update/plugin.py
b/lib/python/Plugins/update/plugin.py
index 8fa21cb3f8c0e89678abcddf0c7bd3b0e28954b2..7942821c6ad777682d01e3456f9d4d69167decfe 100644
(file)
--- a/
lib/python/Plugins/update/plugin.py
+++ b/
lib/python/Plugins/update/plugin.py
@@
-60,7
+60,7
@@
def getPicturePaths():
return ["update.png"]
def getPlugins():
return ["update.png"]
def getPlugins():
- return [("Softwareupdate", "screen", "Example")]
+ return [("Softwareupdate", "
Updates your receiver's software", "
screen", "Example")]
def getMenuRegistrationList():
list = []
def getMenuRegistrationList():
list = []
diff --git
a/lib/python/Screens/PluginBrowser.py
b/lib/python/Screens/PluginBrowser.py
index c03aa910ad97e1ce2feeadbc8eee31ad0bce7399..6d3ce66a05f5d743bdb85c5f5089991cc6bdad9e 100644
(file)
--- a/
lib/python/Screens/PluginBrowser.py
+++ b/
lib/python/Screens/PluginBrowser.py
@@
-35,7
+35,7
@@
class PluginBrowser(Screen):
self.list = []
self.pluginlist = plugins.getPluginList()
for x in self.pluginlist:
self.list = []
self.pluginlist = plugins.getPluginList()
for x in self.pluginlist:
- self.list.append(PluginEntryComponent(x[0], x[1]))
+ self.list.append(PluginEntryComponent(x[0], x[1]
, x[6]
))
self["list"].l.setList(self.list)
self["list"].l.setList(self.list)