HeeroYui/edn
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] update to the new tree of data

Browse Source
This commit is contained in:
Edouard Dupin 2012-11-09 09:59:31 +01:00
parent c6210d8c7e
commit 9cdd8e620b
5 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/appl/Colorize/ColorizeManager.cpp
View File

@ -144,7 +144,7 @@ void classColorManager::LoadFile(const char * xmlFilename)
// allocate the document in the stack // allocate the document in the stack
TiXmlDocument XmlDocument; TiXmlDocument XmlDocument;
// open the curent File // open the curent File
etk::FSNode fileName(etk::UString("DATA:") + xmlFilename); etk::FSNode fileName(etk::UString("DATA:color/") + xmlFilename + etk::UString(".xml"));
if (false == fileName.Exist()) { if (false == fileName.Exist()) {
APPL_ERROR("File Does not exist : " << fileName); APPL_ERROR("File Does not exist : " << fileName);
return; return;

18
Sources/appl/Gui/Search.cpp
View File

@ -56,7 +56,7 @@ Search::Search(void) :
ewol::ButtonImage * myButtonImage = NULL; ewol::ButtonImage * myButtonImage = NULL;
myButtonImage = new ewol::ButtonImage("icon/Remove.svg"); myButtonImage = new ewol::ButtonImage("THEME:GUI:Remove.svg");
if (NULL == myButtonImage) { if (NULL == myButtonImage) {
APPL_ERROR("Widget allocation error ==> it will missing in the display"); APPL_ERROR("Widget allocation error ==> it will missing in the display");
} else { } else {
@ -76,7 +76,7 @@ Search::Search(void) :
SubWidgetAdd(m_searchEntry); SubWidgetAdd(m_searchEntry);
} }
myButtonImage = new ewol::ButtonImage("icon/Search.svg"); myButtonImage = new ewol::ButtonImage("THEME:GUI:Search.svg");
if (NULL == myButtonImage) { if (NULL == myButtonImage) {
APPL_ERROR("Widget allocation error ==> it will missing in the display"); APPL_ERROR("Widget allocation error ==> it will missing in the display");
} else { } else {
@ -96,7 +96,7 @@ Search::Search(void) :
SubWidgetAdd(m_replaceEntry); SubWidgetAdd(m_replaceEntry);
} }
myButtonImage = new ewol::ButtonImage("icon/Replace.svg"); myButtonImage = new ewol::ButtonImage("THEME:GUI:Replace.svg");
if (NULL == myButtonImage) { if (NULL == myButtonImage) {
APPL_ERROR("Widget allocation error ==> it will missing in the display"); APPL_ERROR("Widget allocation error ==> it will missing in the display");
} else { } else {
@ -105,11 +105,11 @@ Search::Search(void) :
SubWidgetAdd(myButtonImage); SubWidgetAdd(myButtonImage);
} }
myButtonImage = new ewol::ButtonImage("icon/CaseSensitive.svg"); myButtonImage = new ewol::ButtonImage("THEME:GUI:CaseSensitive.svg");
if (NULL == myButtonImage) { if (NULL == myButtonImage) {
APPL_ERROR("Widget allocation error ==> it will missing in the display"); APPL_ERROR("Widget allocation error ==> it will missing in the display");
} else { } else {
myButtonImage->SetImageSelected("icon/CaseSensitive.svg", 0xFFFFFF5F); myButtonImage->SetImageSelected("THEME:GUI:CaseSensitive.svg", 0xFFFFFF5F);
myButtonImage->SetMinSize(32,32); myButtonImage->SetMinSize(32,32);
myButtonImage->SetToggleMode(true); myButtonImage->SetToggleMode(true);
myButtonImage->SetValue(SearchData::GetCase()); myButtonImage->SetValue(SearchData::GetCase());
@ -117,11 +117,11 @@ Search::Search(void) :
SubWidgetAdd(myButtonImage); SubWidgetAdd(myButtonImage);
} }
myButtonImage = new ewol::ButtonImage("icon/WrapAround.svg"); myButtonImage = new ewol::ButtonImage("THEME:GUI:WrapAround.svg");
if (NULL == myButtonImage) { if (NULL == myButtonImage) {
APPL_ERROR("Widget allocation error ==> it will missing in the display"); APPL_ERROR("Widget allocation error ==> it will missing in the display");
} else { } else {
myButtonImage->SetImageSelected("icon/WrapAround.svg", 0xFFFFFF5F); myButtonImage->SetImageSelected("THEME:GUI:WrapAround.svg", 0xFFFFFF5F);
myButtonImage->SetMinSize(32,32); myButtonImage->SetMinSize(32,32);
myButtonImage->SetToggleMode(true); myButtonImage->SetToggleMode(true);
myButtonImage->SetValue(SearchData::GetWrap()); myButtonImage->SetValue(SearchData::GetWrap());
@ -129,11 +129,11 @@ Search::Search(void) :
SubWidgetAdd(myButtonImage); SubWidgetAdd(myButtonImage);
} }
myButtonImage = new ewol::ButtonImage("icon/Up.svg"); myButtonImage = new ewol::ButtonImage("THEME:GUI:Up.svg");
if (NULL == myButtonImage) { if (NULL == myButtonImage) {
APPL_ERROR("Widget allocation error ==> it will missing in the display"); APPL_ERROR("Widget allocation error ==> it will missing in the display");
} else { } else {
myButtonImage->SetImageSelected("icon/Down.svg"); myButtonImage->SetImageSelected("THEME:GUI:Down.svg");
myButtonImage->SetMinSize(32,32); myButtonImage->SetMinSize(32,32);
myButtonImage->SetToggleMode(true); myButtonImage->SetToggleMode(true);
myButtonImage->SetValue(m_forward); myButtonImage->SetValue(m_forward);

24
Sources/appl/Highlight/HighlightManager.cpp
View File

@ -111,51 +111,51 @@ class localClassHighlightManager: public ewol::EObject
void loadLanguages(void) void loadLanguages(void)
{ {
etk::UString xmlFilename = "lang_c.xml"; etk::UString xmlFilename = "languages/c/highlight.xml";
Highlight *myHightline = new Highlight(xmlFilename); Highlight *myHightline = new Highlight(xmlFilename);
listHighlight.PushBack(myHightline); listHighlight.PushBack(myHightline);
xmlFilename = "lang_boo.xml"; xmlFilename = "languages/boo/highlight.xml";
myHightline = new Highlight(xmlFilename); myHightline = new Highlight(xmlFilename);
listHighlight.PushBack(myHightline); listHighlight.PushBack(myHightline);
xmlFilename = "lang_Makefile.xml"; xmlFilename = "languages/makefile/highlight.xml";
myHightline = new Highlight(xmlFilename); myHightline = new Highlight(xmlFilename);
listHighlight.PushBack(myHightline); listHighlight.PushBack(myHightline);
xmlFilename = "lang_asm.xml"; xmlFilename = "languages/asm/highlight.xml";
myHightline = new Highlight(xmlFilename); myHightline = new Highlight(xmlFilename);
listHighlight.PushBack(myHightline); listHighlight.PushBack(myHightline);
xmlFilename = "lang_xml.xml"; xmlFilename = "languages/xml/highlight.xml";
myHightline = new Highlight(xmlFilename); myHightline = new Highlight(xmlFilename);
listHighlight.PushBack(myHightline); listHighlight.PushBack(myHightline);
xmlFilename = "lang_php.xml"; xmlFilename = "languages/php/highlight.xml";
myHightline = new Highlight(xmlFilename); myHightline = new Highlight(xmlFilename);
listHighlight.PushBack(myHightline); listHighlight.PushBack(myHightline);
xmlFilename = "lang_bash.xml"; xmlFilename = "languages/bash/highlight.xml";
myHightline = new Highlight(xmlFilename); myHightline = new Highlight(xmlFilename);
listHighlight.PushBack(myHightline); listHighlight.PushBack(myHightline);
xmlFilename = "lang_matlab.xml"; xmlFilename = "languages/matlab/highlight.xml";
myHightline = new Highlight(xmlFilename); myHightline = new Highlight(xmlFilename);
listHighlight.PushBack(myHightline); listHighlight.PushBack(myHightline);
xmlFilename = "lang_java.xml"; xmlFilename = "languages/java/highlight.xml";
myHightline = new Highlight(xmlFilename); myHightline = new Highlight(xmlFilename);
listHighlight.PushBack(myHightline); listHighlight.PushBack(myHightline);
xmlFilename = "lang_lua.xml"; xmlFilename = "languages/lua/highlight.xml";
myHightline = new Highlight(xmlFilename); myHightline = new Highlight(xmlFilename);
listHighlight.PushBack(myHightline); listHighlight.PushBack(myHightline);
xmlFilename = "lang_in.xml"; xmlFilename = "languages/in/highlight.xml";
myHightline = new Highlight(xmlFilename); myHightline = new Highlight(xmlFilename);
listHighlight.PushBack(myHightline); listHighlight.PushBack(myHightline);
xmlFilename = "lang_glsl.xml"; xmlFilename = "languages/glsl/highlight.xml";
myHightline = new Highlight(xmlFilename); myHightline = new Highlight(xmlFilename);
listHighlight.PushBack(myHightline); listHighlight.PushBack(myHightline);

3
Sources/appl/init.cpp
View File

@ -85,8 +85,7 @@ void APP_Init(void)
// set color and other trucs... // set color and other trucs...
ColorizeManager::Init(); ColorizeManager::Init();
etk::UString corlorFile = "color_white.xml"; ColorizeManager::LoadFile( "white" );
ColorizeManager::LoadFile( corlorFile.c_str() );
ColorizeManager::DisplayListOfColor(); ColorizeManager::DisplayListOfColor();
HighlightManager::Init(); HighlightManager::Init();

16
Sources/file.mk
View File

@ -52,7 +52,19 @@ LOCAL_COPY_FILES := \
../share/Font/freefont/FreeSerif.ttf:Font/freefont/FreeSerif.ttf ../share/Font/freefont/FreeSerif.ttf:Font/freefont/FreeSerif.ttf
LOCAL_COPY_FOLDERS := \ LOCAL_COPY_FOLDERS := \
../share/*.xml: \ ../share/color/*.xml:color/ \
../share/icon/*.svg:icon \ ../share/languages/asm/*.xml:languages/asm/ \
../share/languages/bash/*.xml:languages/bash/ \
../share/languages/boo/*.xml:languages/boo/ \
../share/languages/c/*.xml:languages/c/ \
../share/languages/glsl/*.xml:languages/glsl/ \
../share/languages/in/*.xml:languages/in/ \
../share/languages/java/*.xml:languages/java/ \
../share/languages/lua/*.xml:languages/lua/ \
../share/languages/makefile/*.xml:languages/makefile/ \
../share/languages/matlab/*.xml:languages/matlab/ \
../share/languages/php/*.xml:languages/php/ \
../share/languages/xml/*.xml:languages/xml/ \
../share/theme/default/*.svg:theme/default/ \
../share/Font/freefont/FreeMon*.ttf:Font/freefont ../share/Font/freefont/FreeMon*.ttf:Font/freefont