From f51ea408fa9235296e441999f3db5f0f43bddcc1 Mon Sep 17 00:00:00 2001 From: Edouard Dupin Date: Sun, 26 Aug 2012 22:44:33 +0200 Subject: [PATCH] change the resources manager system --- Sources/appl/Gui/CodeView.h | 2 +- Sources/appl/Gui/MainWindows.cpp | 8 ++++---- Sources/appl/init.cpp | 3 +-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Sources/appl/Gui/CodeView.h b/Sources/appl/Gui/CodeView.h index 517d935..b15878b 100644 --- a/Sources/appl/Gui/CodeView.h +++ b/Sources/appl/Gui/CodeView.h @@ -33,7 +33,7 @@ #include #include -#include +#include class CodeView :public ewol::WidgetScrooled { diff --git a/Sources/appl/Gui/MainWindows.cpp b/Sources/appl/Gui/MainWindows.cpp index dcfacc6..ee695d8 100644 --- a/Sources/appl/Gui/MainWindows.cpp +++ b/Sources/appl/Gui/MainWindows.cpp @@ -149,10 +149,10 @@ MainWindows::MainWindows(void) myCodeView->SetFillX(true); myCodeView->SetFillY(true); myCodeView->SetFontSize(11); - myCodeView->SetFontNameNormal( "freefont/FreeMono.ttf"); - myCodeView->SetFontNameBold( "freefont/FreeMonoBold.ttf"); - myCodeView->SetFontNameItalic( "freefont/FreeMonoOblique.ttf"); - myCodeView->SetFontNameBoldItalic("freefont/FreeMonoBoldOblique.ttf"); + myCodeView->SetFontNameNormal( "Font/freefont/FreeMono.ttf"); + myCodeView->SetFontNameBold( "Font/freefont/FreeMonoBold.ttf"); + myCodeView->SetFontNameItalic( "Font/freefont/FreeMonoOblique.ttf"); + myCodeView->SetFontNameBoldItalic("Font/freefont/FreeMonoBoldOblique.ttf"); mySizerVert2->SubWidgetAdd(myCodeView); // search area : diff --git a/Sources/appl/init.cpp b/Sources/appl/init.cpp index 54c938d..71a93b3 100644 --- a/Sources/appl/init.cpp +++ b/Sources/appl/init.cpp @@ -67,8 +67,7 @@ void APP_Init(void) ewol::ChangeSize(Vector2D(800, 600)); etk::InitDefaultFolder(PROJECT_NAME); - ewol::font::SetFontFolder("Font"); - ewol::font::SetDefaultFont("freefont/FreeSerif.ttf"); + ewol::font::SetDefaultFont("Font/freefont/FreeSerif.ttf"); #ifdef __TARGET_OS__Android ewol::font::SetDefaultSize(19); #else