diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2010-11-02 12:28:46 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2010-11-02 12:28:46 +0100 |
| commit | 2c862a6323b51e446270ee3b6845ed234ed8771d (patch) | |
| tree | 87ad8080ecd6c2fd66b9e5dec978a3aa3040a161 | |
| parent | fe6cea40c2bd4dcfe99193cbd54c39785ffa428f (diff) | |
| parent | c6bb1ba9c6759ea9b0f4f0f95a04b15d27ab9afb (diff) | |
| download | enigma2-2c862a6323b51e446270ee3b6845ed234ed8771d.tar.gz enigma2-2c862a6323b51e446270ee3b6845ed234ed8771d.zip | |
Merge branch 'bug_530_add_dm800se_support'
| -rwxr-xr-x | data/skin.xml | 29 | ||||
| -rwxr-xr-x | data/skin_default.xml | 30 | ||||
| -rw-r--r-- | lib/gui/ewindowstyle.cpp | 4 |
3 files changed, 33 insertions, 30 deletions
diff --git a/data/skin.xml b/data/skin.xml index 868fbc4b..b4b6cbcd 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 e5b31322..272fdcf9 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 68a74e0c..0ecdc2a2 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) |