diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2009-06-16 18:30:27 +0200 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2009-06-16 18:30:27 +0200 |
| commit | a9f871b933a8771d6946395df1e1f0569b3cf582 (patch) | |
| tree | fe48ffbc80ff077138281b6602492d8cbc902994 /lib/python | |
| parent | 9a2b8cd197039db5a4324149dcf6e817171166bf (diff) | |
| parent | 883a9c93798e01fc2825673799f48bf2a0a68d15 (diff) | |
| download | enigma2-a9f871b933a8771d6946395df1e1f0569b3cf582.tar.gz enigma2-a9f871b933a8771d6946395df1e1f0569b3cf582.zip | |
Merge branch 'master' of git.opendreambox.org:/git/enigma2
Diffstat (limited to 'lib/python')
| -rw-r--r-- | lib/python/Components/Converter/MovieInfo.py | 2 | ||||
| -rw-r--r-- | lib/python/Components/GUISkin.py | 3 | ||||
| -rw-r--r-- | lib/python/Plugins/SystemPlugins/Videomode/plugin.py | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/lib/python/Components/Converter/MovieInfo.py b/lib/python/Components/Converter/MovieInfo.py index 635cedc4..d5995fe8 100644 --- a/lib/python/Components/Converter/MovieInfo.py +++ b/lib/python/Components/Converter/MovieInfo.py @@ -41,7 +41,7 @@ class MovieInfo(Converter, object): rec_ref_str = info.getInfoString(service, iServiceInformation.sServiceref) return ServiceReference(rec_ref_str).getServiceName() elif self.type == self.MOVIE_REC_FILESIZE: - return "%d MB" % (info.getInfo(service, iServiceInformation.sFileSize) / (1024*1024)) + return "%d MB" % (info.getInfoObject(service, iServiceInformation.sFileSize) / (1024*1024)) return "" text = property(getText) diff --git a/lib/python/Components/GUISkin.py b/lib/python/Components/GUISkin.py index 9eb4a80b..1bd27297 100644 --- a/lib/python/Components/GUISkin.py +++ b/lib/python/Components/GUISkin.py @@ -85,6 +85,9 @@ class GUISkin: if not self.instance: from enigma import eWindow self.instance = eWindow(self.desktop, z) + + # we need to make sure that certain attributes come last + self.skinAttributes.sort(key=lambda a: {"position": 1}.get(a[0], 0)) self.title = title applyAllAttributes(self.instance, self.desktop, self.skinAttributes, self.scale) self.createGUIScreen(self.instance, self.desktop) diff --git a/lib/python/Plugins/SystemPlugins/Videomode/plugin.py b/lib/python/Plugins/SystemPlugins/Videomode/plugin.py index 6b6d5045..7a2127ac 100644 --- a/lib/python/Plugins/SystemPlugins/Videomode/plugin.py +++ b/lib/python/Plugins/SystemPlugins/Videomode/plugin.py @@ -139,7 +139,7 @@ class VideoSetup(Screen, ConfigListScreen): if (port, mode, rate) != self.last_good: self.hw.setMode(port, mode, rate) from Screens.MessageBox import MessageBox - self.session.openWithCallback(self.confirm, MessageBox, "Is this videomode ok?", MessageBox.TYPE_YESNO, timeout = 20, default = False) + self.session.openWithCallback(self.confirm, MessageBox, _("Is this videomode ok?"), MessageBox.TYPE_YESNO, timeout = 20, default = False) else: self.keySave() |