Merge branch 'obi/master' into experimental

[enigma2.git] / main / enigma-gdi.cpp

diff --git a/main/enigma-gdi.cpp b/main/enigma-gdi.cpp
index 003a3cc81ee48cecb788b91f6ddb9201a39b255d..f21c8701e96bfcfc6b8937caedbb54376d223218 100644 (file)
--- a/main/enigma-gdi.cpp
+++ b/main/enigma-gdi.cpp
@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <libsig_comp.h>
 #include <lib/base/ebase.h>
+#include <lib/base/eenv.h>
 #include <lib/base/eerror.h>
 #include <lib/base/init.h>
 #include <lib/base/init_num.h>
@@ -8,7 +9,7 @@
 #include <unistd.h>
 
 #include <lib/gdi/grc.h>
-#include <lib/gdi/gfbdc.h>
+#include <lib/gdi/gmaindc.h>
 #include <lib/gdi/font.h> 
 
 #include <lib/gui/ewidget.h>
@@ -52,9 +53,8 @@ int main()
        eInit init;
 
        init.setRunlevel(eAutoInitNumbers::main);
-       ePtr<gFBDC> my_dc;
-       gFBDC::getInstance(my_dc);
-#if 1
+       ePtr<gMainDC> my_dc;
+       gMainDC::getInstance(my_dc);
 
        gPainter p(my_dc);
        
@@ -68,7 +68,7 @@ int main()
                pal[a | 0x10] = (0x111111 * a) | 0xFF;
        p.setPalette(pal, 0, 256);
 
-       fontRenderClass::getInstance()->AddFont("/usr/share/fonts/arial.ttf", "Arial", 100);
+       fontRenderClass::getInstance()->AddFont(eEnv::resolve("${datadir}/fonts/arial.ttf"), "Regular", 100);
 
        p.resetClip(gRegion(eRect(0, 0, 720, 576)));
        
@@ -102,7 +102,7 @@ int main()
        p.setBackgroundColor(gColor(0x1f));
        p.setForegroundColor(gColor(0x10));
 
-       ePtr<gFont> fnt = new gFont("Arial", 70);
+       ePtr<gFont> fnt = new gFont("Regular", 70);
        p.setFont(fnt);
        p.renderText(eRect(100, 100, 500, 200), "Hello welt!");