From: ghost <andreas.monzner@multimedia-labs.de>
Date: Tue, 2 Nov 2010 11:29:16 +0000 (+0100)
Subject: Merge branch 'bug_530_add_dm800se_support' into experimental
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=e246e0ded446974b388f1e819bdbdb446ae4429f;hp=728b14cc9eeac4ff583cbc4dc5cefeb04b3b9ff3

Merge branch 'bug_530_add_dm800se_support' into experimental
---

diff --git a/data/skin.xml b/data/skin.xml
index 868fbc4..b4b6cbc 100755
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -46,35 +46,6 @@
 			<pixmap pos="bpBottomRight" filename="skin_default/b_br.png" />
 		</borderset>
 	</windowstyle>
-	<!-- Main screen colors (id=1 LCD) -->
-	<windowstyle type="skinned" id="1">
-		<color name="Background" color="#000000" />
-		<color name="LabelForeground" color="#ffffff" />
-		<color name="ListboxBackground" color="#000000" />
-		<color name="ListboxForeground" color="#ffffff" />
-		<color name="ListboxSelectedBackground" color="#000000" />
-		<color name="ListboxSelectedForeground" color="#ffffff" />
-		<color name="ListboxMarkedBackground" color="#000000" />
-		<color name="ListboxMarkedForeground" color="#ffffff" />
-		<color name="ListboxMarkedAndSelectedBackground" color="#000000" />
-		<color name="ListboxMarkedAndSelectedForeground" color="#ffffff" />
-		<color name="WindowTitleForeground" color="#ffffff" />
-		<color name="WindowTitleBackground" color="#000000" />
-	</windowstyle>
-	<windowstyle type="skinned" id="2">
-		<color name="Background" color="#000000" />
-		<color name="LabelForeground" color="#ffffff" />
-		<color name="ListboxBackground" color="#000000" />
-		<color name="ListboxForeground" color="#ffffff" />
-		<color name="ListboxSelectedBackground" color="#000000" />
-		<color name="ListboxSelectedForeground" color="#ffffff" />
-		<color name="ListboxMarkedBackground" color="#000000" />
-		<color name="ListboxMarkedForeground" color="#ffffff" />
-		<color name="ListboxMarkedAndSelectedBackground" color="#000000" />
-		<color name="ListboxMarkedAndSelectedForeground" color="#ffffff" />
-		<color name="WindowTitleForeground" color="#ffffff" />
-		<color name="WindowTitleBackground" color="#000000" />
-	</windowstyle>
 	<!-- Fonts -->
 	<fonts>
 		<!-- <font filename="md_khmurabi_10.ttf" name="Regular" scale="90" /> -->
diff --git a/data/skin_default.xml b/data/skin_default.xml
index e5b3132..272fdcf 100755
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -1,4 +1,34 @@
 <skin>
+	<!-- Main screen colors (id=1 LCD) -->
+	<windowstyle type="skinned" id="1">
+		<color name="Background" color="#000000" />
+		<color name="LabelForeground" color="#ffffff" />
+		<color name="ListboxBackground" color="#000000" />
+		<color name="ListboxForeground" color="#ffffff" />
+		<color name="ListboxSelectedBackground" color="#000000" />
+		<color name="ListboxSelectedForeground" color="#ffffff" />
+		<color name="ListboxMarkedBackground" color="#000000" />
+		<color name="ListboxMarkedForeground" color="#ffffff" />
+		<color name="ListboxMarkedAndSelectedBackground" color="#000000" />
+		<color name="ListboxMarkedAndSelectedForeground" color="#ffffff" />
+		<color name="WindowTitleForeground" color="#ffffff" />
+		<color name="WindowTitleBackground" color="#000000" />
+	</windowstyle>
+	<!-- Main screen colors (id=2 Color OLED (dm800se)) -->
+	<windowstyle type="skinned" id="2">
+		<color name="Background" color="#000000" />
+		<color name="LabelForeground" color="#ffffff" />
+		<color name="ListboxBackground" color="#000000" />
+		<color name="ListboxForeground" color="#ffffff" />
+		<color name="ListboxSelectedBackground" color="#000000" />
+		<color name="ListboxSelectedForeground" color="#ffffff" />
+		<color name="ListboxMarkedBackground" color="#000000" />
+		<color name="ListboxMarkedForeground" color="#ffffff" />
+		<color name="ListboxMarkedAndSelectedBackground" color="#000000" />
+		<color name="ListboxMarkedAndSelectedForeground" color="#ffffff" />
+		<color name="WindowTitleForeground" color="#ffffff" />
+		<color name="WindowTitleBackground" color="#000000" />
+	</windowstyle>
 	<!-- Screwed Stone II skin (skin_default.xml) /Nemesis -->
 	<!-- About screen -->
 	<screen name="About" position="center,center" size="420,350" title="About">
diff --git a/lib/gui/ewindowstyle.cpp b/lib/gui/ewindowstyle.cpp
index 68a74e0..0ecdc2a 100644
--- a/lib/gui/ewindowstyle.cpp
+++ b/lib/gui/ewindowstyle.cpp
@@ -28,7 +28,9 @@ eWindowStyleManager::~eWindowStyleManager()
 
 void eWindowStyleManager::getStyle(int style_id, ePtr<eWindowStyle> &style)
 {
-	style = m_current_style[style_id];
+	std::map<int, ePtr<eWindowStyle> >::iterator it = m_current_style.find(style_id);
+	ASSERT(it != m_current_style.end());
+	style = it->second;
 }
 
 void eWindowStyleManager::setStyle(int style_id, eWindowStyle *style)