From df1a17b12cb9535832a8db9bcbcf213210ddca81 Mon Sep 17 00:00:00 2001 From: acid-burn Date: Fri, 18 Feb 2011 16:32:40 +0100 Subject: PluginComponent.py/Plugin.py: better way to react on a language change. refs #670 --- lib/python/Components/PluginComponent.py | 18 +++++++++++++----- lib/python/Plugins/Plugin.py | 1 + 2 files changed, 14 insertions(+), 5 deletions(-) (limited to 'lib/python') diff --git a/lib/python/Components/PluginComponent.py b/lib/python/Components/PluginComponent.py index e5194b28..93b08900 100755 --- a/lib/python/Components/PluginComponent.py +++ b/lib/python/Components/PluginComponent.py @@ -14,6 +14,7 @@ class PluginComponent: def __init__(self): self.plugins = {} self.pluginList = [ ] + self.installedPluginList = [ ] self.setPluginPrefix("Plugins.") self.resetWarnings() @@ -73,6 +74,7 @@ class PluginComponent: plugins = [ plugins ] for p in plugins: + p.path = path p.updateIcon(path) new_plugins.append(p) @@ -91,17 +93,25 @@ class PluginComponent: #ignore already installed but reloaded plugins for p in plugins_removed: for pa in plugins_added: - if pa.name == p.name and pa.where == p.where: + if pa.path == p.path and pa.where == p.where: pa.needsRestart = False for p in plugins_removed: self.removePlugin(p) for p in plugins_added: - self.addPlugin(p) - + if self.firstRun or p.needsRestart is False: + self.addPlugin(p) + else: + for installed_plugin in self.installedPluginList: + if installed_plugin.path == p.path: + if installed_plugin.where == p.where: + p.needsRestart = False + self.addPlugin(p) + if self.firstRun: self.firstRun = False + self.installedPluginList = self.pluginList def getPlugins(self, where): """Get list of plugins in a specific category""" @@ -124,8 +134,6 @@ class PluginComponent: def clearPluginList(self): self.pluginList = [] self.plugins = {} - self.firstRun = True - self.restartRequired = False def shutdown(self): for p in self.pluginList[:]: diff --git a/lib/python/Plugins/Plugin.py b/lib/python/Plugins/Plugin.py index 9ecdbc26..e26174a1 100755 --- a/lib/python/Plugins/Plugin.py +++ b/lib/python/Plugins/Plugin.py @@ -65,6 +65,7 @@ class PluginDescriptor: self.name = name self.internal = internal self.needsRestart = needsRestart + self.path = None if isinstance(where, list): self.where = where else: -- cgit v1.2.3 From 281453adb0ff8b3e86eb47aca241284d0cfd7313 Mon Sep 17 00:00:00 2001 From: ghost Date: Fri, 18 Feb 2011 16:37:35 +0100 Subject: fixed oled/lcd clear on enigma2 shutdown fixes bug #690 --- lib/python/Screens/Standby.py | 9 +-------- main/enigma.cpp | 3 ++- 2 files changed, 3 insertions(+), 9 deletions(-) (limited to 'lib/python') diff --git a/lib/python/Screens/Standby.py b/lib/python/Screens/Standby.py index 1a7ebbd1..c93dd008 100644 --- a/lib/python/Screens/Standby.py +++ b/lib/python/Screens/Standby.py @@ -160,14 +160,7 @@ class TryQuitMainloop(MessageBox): self.conntected=False self.session.nav.record_event.remove(self.getRecordEvent) if value: - # hack .. we dont like to show any other screens when this screen has closed - self.onClose = [self.__closed] - self.session.dialog_stack = [] - self.session.summary_stack = [None] - MessageBox.close(self, True) - - def __closed(self): - quitMainloop(self.retval) + quitMainloop(self.retval) def __onShow(self): global inTryQuitMainloop diff --git a/main/enigma.cpp b/main/enigma.cpp index 1cdd867b..91645d89 100644 --- a/main/enigma.cpp +++ b/main/enigma.cpp @@ -251,8 +251,9 @@ int main(int argc, char **argv) { gPainter p(my_lcd_dc); - p.resetClip(eRect(0, 0, 132, 64)); + p.resetClip(eRect(ePoint(0, 0), my_lcd_dc->size())); p.clear(); + p.flush(); } return exit_code; -- cgit v1.2.3 From dd8a62a39c055230364641b7413ca34b2f00e51c Mon Sep 17 00:00:00 2001 From: ghost Date: Fri, 18 Feb 2011 16:46:25 +0100 Subject: Standby.py: re-add remove MessageBox.close refs #690 --- lib/python/Screens/Standby.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib/python') diff --git a/lib/python/Screens/Standby.py b/lib/python/Screens/Standby.py index c93dd008..94a56ee4 100644 --- a/lib/python/Screens/Standby.py +++ b/lib/python/Screens/Standby.py @@ -161,6 +161,8 @@ class TryQuitMainloop(MessageBox): self.session.nav.record_event.remove(self.getRecordEvent) if value: quitMainloop(self.retval) + else: + MessageBox.close(self, True) def __onShow(self): global inTryQuitMainloop -- cgit v1.2.3