add missing dm800se color oled screens. refs #530

4 files changed, 45 insertions, 13 deletions

diff --git a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
index e092e82f..64b4ae50 100755
--- a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
@@ -88,8 +88,8 @@ class FileBrowser(Screen):
 		self.close(None)
 
 class DVDSummary(Screen):
-	skin = """
-	<screen position="0,0" size="132,64">
+	skin = (
+	"""<screen name="DVDSummary" position="0,0" size="132,64" id="1">
 		<widget source="session.CurrentService" render="Label" position="5,4" size="120,28" font="Regular;12" transparent="1" >
 			<convert type="ServiceName">Name</convert>
 		</widget>
@@ -101,7 +101,20 @@ class DVDSummary(Screen):
 		<widget source="session.CurrentService" render="Progress" position="6,46" size="60,18" borderWidth="1" >
 			<convert type="ServicePosition">Position</convert>
 		</widget>
-	</screen>"""
+	</screen>""",
+	"""<screen name="DVDSummary" position="0,0" size="96,64" id="2">
+		<widget source="session.CurrentService" render="Label" position="0,0" size="96,25" font="Regular;12" transparent="1" >
+			<convert type="ServiceName">Name</convert>
+		</widget>
+		<widget name="DVDPlayer" position="0,26" size="96,12" font="Regular;10" transparent="1" />
+		<widget name="Chapter" position="0,40" size="66,12" font="Regular;10" transparent="1" halign="left" />
+		<widget source="session.CurrentService" render="Label" position="66,40" size="30,12" font="Regular;10" transparent="1" halign="right" >
+			<convert type="ServicePosition">Position</convert>
+		</widget>
+		<widget source="session.CurrentService" render="Progress" position="0,52" size="96,12" borderWidth="1" >
+			<convert type="ServicePosition">Position</convert>
+		</widget>
+	</screen>""")
 
 	def __init__(self, session, parent):
 		Screen.__init__(self, session, parent)
diff --git a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
index 15806e8c..e4bdba12 100755
--- a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
@@ -925,12 +925,17 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB
 					self.clear_playlist()
 
 class MediaPlayerLCDScreen(Screen):
-	skin = """
-	<screen position="0,0" size="132,64" title="LCD Text">
+	skin = (
+	"""<screen name="MediaPlayerLCDScreen" position="0,0" size="132,64" id="1">
 		<widget name="text1" position="4,0" size="132,35" font="Regular;16"/>
 		<widget name="text3" position="4,36" size="132,14" font="Regular;10"/>
 		<widget name="text4" position="4,49" size="132,14" font="Regular;10"/>
-	</screen>"""
+	</screen>""",
+	"""<screen name="MediaPlayerLCDScreen" position="0,0" size="96,64" id="2">
+		<widget name="text1" position="0,0" size="96,35" font="Regular;14"/>
+		<widget name="text3" position="0,36" size="96,14" font="Regular;10"/>
+		<widget name="text4" position="0,49" size="96,14" font="Regular;10"/>
+	</screen>""")
 
 	def __init__(self, session, parent):
 		Screen.__init__(self, session)
diff --git a/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py b/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py
index 8986560b..7a0da851 100644..100755
--- a/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py
+++ b/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py
@@ -39,13 +39,19 @@ class writeNAND(Task):
 			self.output_line = data
 
 class NFISummary(Screen):
-	skin = """
-	<screen position="0,0" size="132,64">
+	skin = (
+	"""<screen name="NFISummary" position="0,0" size="132,64" id="1">
 		<widget source="title" render="Label" position="2,0" size="120,14" valign="center" font="Regular;12" />
 		<widget source="content" render="Label" position="2,14" size="120,34" font="Regular;12" transparent="1" zPosition="1"  />
-		<widget source="job_progresslabel" render="Label" position="66,50" size="60,14" font="Regular;12" transparent="1" halign="right" zPosition="0" />
 		<widget source="job_progressbar" render="Progress" position="2,50" size="66,14" borderWidth="1" />
-	</screen>"""
+		<widget source="job_progresslabel" render="Label" position="66,50" size="60,14" font="Regular;12" transparent="1" halign="right" zPosition="0" />
+	</screen>""",
+	"""<screen name="NFISummary" position="0,0" size="96,64" id="2">
+		<widget source="title" render="Label" position="0,0" size="96,14" valign="center" font="Regular;10" />
+		<widget source="content" render="Label" position="0,14" size="96,34" font="Regular;10" transparent="1" zPosition="1"  />
+		<widget source="job_progressbar" render="Progress" position="0,50" size="50,14" borderWidth="1" />
+		<widget source="job_progresslabel" render="Label" position="50,50" size="46,14" font="Regular;10" transparent="1" halign="right" zPosition="0" />
+	</screen>""")
 
 	def __init__(self, session, parent):
 		Screen.__init__(self, session, parent)
diff --git a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
index 3c76685e..9b9044ee 100644..100755
--- a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
+++ b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
@@ -12,14 +12,22 @@ from Tools.HardwareInfo import HardwareInfo
 config.misc.showtestcard = ConfigBoolean(default = False)
 
 class VideoWizardSummary(WizardSummary):
-	skin = """
-	<screen position="0,0" size="132,64">
+	skin = (
+	"""<screen name="VideoWizardSummary" position="0,0" size="132,64" id="1">
 		<widget name="text" position="6,4" size="120,40" font="Regular;12" transparent="1" />
 		<widget source="parent.list" render="Label" position="6,40" size="120,21" font="Regular;14">
 			<convert type="StringListSelection" />
 		</widget>
 		<!--widget name="pic" pixmap="%s" position="6,22" zPosition="10" size="64,64" transparent="1" alphatest="on"/-->
-	</screen>""" #% (resolveFilename(SCOPE_PLUGINS, "SystemPlugins/Videomode/lcd_Scart.png"))
+	</screen>""",
+	"""<screen name="VideoWizardSummary" position="0,0" size="96,64" id="2">
+		<widget name="text" position="0,4" size="96,40" font="Regular;12" transparent="1" />
+		<widget source="parent.list" render="Label" position="0,40" size="96,21" font="Regular;14">
+			<convert type="StringListSelection" />
+		</widget>
+		<!--widget name="pic" pixmap="%s" position="0,22" zPosition="10" size="64,64" transparent="1" alphatest="on"/-->
+	</screen>""")
+	#% (resolveFilename(SCOPE_PLUGINS, "SystemPlugins/Videomode/lcd_Scart.png"))
 	
 	def __init__(self, session, parent):
 		WizardSummary.__init__(self, session, parent)