make epixmap load images relative to enigma2 DATADIR

[enigma2.git] / lib / gui / epixmap.cpp

diff --git a/lib/gui/epixmap.cpp b/lib/gui/epixmap.cpp
index 797c675991f60ad4fc26d7169d11300cd2bd5bbf..ca3e456275de817cebab05c99da3d227bd663d61 100644 (file)
--- a/lib/gui/epixmap.cpp
+++ b/lib/gui/epixmap.cpp
@@ -14,8 +14,12 @@ void ePixmap::setPixmap(gPixmap *pixmap)
 
 void ePixmap::setPixmapFromFile(const char *filename)
 {
-       loadPNG(m_pixmap, filename);
-       
+       // use direct filename for absolute path or relative to enigma2 DATADIR otherwise
+       if (filename[0] == '/')
+               loadPNG(m_pixmap, filename);
+       else
+               loadPNG(m_pixmap, strcat(DATADIR "/enigma2/", filename));
+               
                // TODO
        getDesktop()->makeCompatiblePixmap(*m_pixmap);
        event(evtChangedPixmap);
@@ -31,7 +35,7 @@ int ePixmap::event(int event, void *data, void *data2)
                
                getStyle(style);
                
-               eWidget::event(event, data, data2);
+//             eWidget::event(event, data, data2);
                
                gPainter &painter = *(gPainter*)data2;
                if (m_pixmap)