git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PluginComponent.py: better alignment of icons and texts. Thx. Mike Looijmans
[enigma2.git]
/
lib
/
python
/
Components
/
PluginComponent.py
diff --git
a/lib/python/Components/PluginComponent.py
b/lib/python/Components/PluginComponent.py
old mode 100644
(file)
new mode 100755
(executable)
index
44fe896
..
c91d6ad
--- a/
lib/python/Components/PluginComponent.py
+++ b/
lib/python/Components/PluginComponent.py
@@
-63,7
+63,7
@@
class PluginComponent:
continue
# allow single entry not to be a list
continue
# allow single entry not to be a list
- if
type(plugins) is not list
:
+ if
not isinstance(plugins, list)
:
plugins = [ plugins ]
for p in plugins:
plugins = [ plugins ]
for p in plugins:
@@
-80,7
+80,7
@@
class PluginComponent:
# build a diff between the old list of plugins and the new one
# internally, the "fnc" argument will be compared with __eq__
plugins_added = [p for p in new_plugins if p not in self.pluginList]
# build a diff between the old list of plugins and the new one
# internally, the "fnc" argument will be compared with __eq__
plugins_added = [p for p in new_plugins if p not in self.pluginList]
- plugins_removed = [p for p in self.pluginList if p not in new_plugins]
+ plugins_removed = [p for p in self.pluginList if
not p.internal and
p not in new_plugins]
for p in plugins_removed:
self.removePlugin(p)
for p in plugins_removed:
self.removePlugin(p)
@@
-91,17
+91,18
@@
class PluginComponent:
def getPlugins(self, where):
"""Get list of plugins in a specific category"""
def getPlugins(self, where):
"""Get list of plugins in a specific category"""
- if
type(where) is not list
:
+ if
not isinstance(where, list)
:
where = [ where ]
res = [ ]
where = [ where ]
res = [ ]
+
for x in where:
for x in where:
- for p in self.plugins.get(x, [ ]):
- res.append(p)
- return res
+ res.extend(self.plugins.get(x, [ ]))
+
+ return
res
def getPluginsForMenu(self, menuid):
res = [ ]
def getPluginsForMenu(self, menuid):
res = [ ]
- for p in self.getPlugins(PluginDescriptor.WHERE_
SETUP
):
+ for p in self.getPlugins(PluginDescriptor.WHERE_
MENU
):
res += p(menuid)
return res
res += p(menuid)
return res
@@
-116,4
+117,12
@@
class PluginComponent:
def resetWarnings(self):
self.warnings = [ ]
def resetWarnings(self):
self.warnings = [ ]
+ def getNextWakeupTime(self):
+ wakeup = -1
+ for p in self.pluginList:
+ current = p.getWakeupTime()
+ if current > -1 and (wakeup > current or wakeup == -1):
+ wakeup = current
+ return int(wakeup)
+
plugins = PluginComponent()
plugins = PluginComponent()