From 9cdd8e620b90bcd8af2d95aaac46bfc84c930c39 Mon Sep 17 00:00:00 2001 From: Edouard Dupin Date: Fri, 9 Nov 2012 09:59:31 +0100 Subject: [PATCH] [DEV] update to the new tree of data --- Sources/appl/Colorize/ColorizeManager.cpp | 2 +- Sources/appl/Gui/Search.cpp | 18 ++++++++-------- Sources/appl/Highlight/HighlightManager.cpp | 24 ++++++++++----------- Sources/appl/init.cpp | 3 +-- Sources/file.mk | 16 ++++++++++++-- 5 files changed, 37 insertions(+), 26 deletions(-) diff --git a/Sources/appl/Colorize/ColorizeManager.cpp b/Sources/appl/Colorize/ColorizeManager.cpp index 2c6f5cd..38d24b9 100644 --- a/Sources/appl/Colorize/ColorizeManager.cpp +++ b/Sources/appl/Colorize/ColorizeManager.cpp @@ -144,7 +144,7 @@ void classColorManager::LoadFile(const char * xmlFilename) // allocate the document in the stack TiXmlDocument XmlDocument; // 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()) { APPL_ERROR("File Does not exist : " << fileName); return; diff --git a/Sources/appl/Gui/Search.cpp b/Sources/appl/Gui/Search.cpp index c10da13..da6ab10 100644 --- a/Sources/appl/Gui/Search.cpp +++ b/Sources/appl/Gui/Search.cpp @@ -56,7 +56,7 @@ Search::Search(void) : ewol::ButtonImage * myButtonImage = NULL; - myButtonImage = new ewol::ButtonImage("icon/Remove.svg"); + myButtonImage = new ewol::ButtonImage("THEME:GUI:Remove.svg"); if (NULL == myButtonImage) { APPL_ERROR("Widget allocation error ==> it will missing in the display"); } else { @@ -76,7 +76,7 @@ Search::Search(void) : SubWidgetAdd(m_searchEntry); } - myButtonImage = new ewol::ButtonImage("icon/Search.svg"); + myButtonImage = new ewol::ButtonImage("THEME:GUI:Search.svg"); if (NULL == myButtonImage) { APPL_ERROR("Widget allocation error ==> it will missing in the display"); } else { @@ -96,7 +96,7 @@ Search::Search(void) : SubWidgetAdd(m_replaceEntry); } - myButtonImage = new ewol::ButtonImage("icon/Replace.svg"); + myButtonImage = new ewol::ButtonImage("THEME:GUI:Replace.svg"); if (NULL == myButtonImage) { APPL_ERROR("Widget allocation error ==> it will missing in the display"); } else { @@ -105,11 +105,11 @@ Search::Search(void) : SubWidgetAdd(myButtonImage); } - myButtonImage = new ewol::ButtonImage("icon/CaseSensitive.svg"); + myButtonImage = new ewol::ButtonImage("THEME:GUI:CaseSensitive.svg"); if (NULL == myButtonImage) { APPL_ERROR("Widget allocation error ==> it will missing in the display"); } else { - myButtonImage->SetImageSelected("icon/CaseSensitive.svg", 0xFFFFFF5F); + myButtonImage->SetImageSelected("THEME:GUI:CaseSensitive.svg", 0xFFFFFF5F); myButtonImage->SetMinSize(32,32); myButtonImage->SetToggleMode(true); myButtonImage->SetValue(SearchData::GetCase()); @@ -117,11 +117,11 @@ Search::Search(void) : SubWidgetAdd(myButtonImage); } - myButtonImage = new ewol::ButtonImage("icon/WrapAround.svg"); + myButtonImage = new ewol::ButtonImage("THEME:GUI:WrapAround.svg"); if (NULL == myButtonImage) { APPL_ERROR("Widget allocation error ==> it will missing in the display"); } else { - myButtonImage->SetImageSelected("icon/WrapAround.svg", 0xFFFFFF5F); + myButtonImage->SetImageSelected("THEME:GUI:WrapAround.svg", 0xFFFFFF5F); myButtonImage->SetMinSize(32,32); myButtonImage->SetToggleMode(true); myButtonImage->SetValue(SearchData::GetWrap()); @@ -129,11 +129,11 @@ Search::Search(void) : SubWidgetAdd(myButtonImage); } - myButtonImage = new ewol::ButtonImage("icon/Up.svg"); + myButtonImage = new ewol::ButtonImage("THEME:GUI:Up.svg"); if (NULL == myButtonImage) { APPL_ERROR("Widget allocation error ==> it will missing in the display"); } else { - myButtonImage->SetImageSelected("icon/Down.svg"); + myButtonImage->SetImageSelected("THEME:GUI:Down.svg"); myButtonImage->SetMinSize(32,32); myButtonImage->SetToggleMode(true); myButtonImage->SetValue(m_forward); diff --git a/Sources/appl/Highlight/HighlightManager.cpp b/Sources/appl/Highlight/HighlightManager.cpp index 8e15b28..d1955a6 100644 --- a/Sources/appl/Highlight/HighlightManager.cpp +++ b/Sources/appl/Highlight/HighlightManager.cpp @@ -111,51 +111,51 @@ class localClassHighlightManager: public ewol::EObject void loadLanguages(void) { - etk::UString xmlFilename = "lang_c.xml"; + etk::UString xmlFilename = "languages/c/highlight.xml"; Highlight *myHightline = new Highlight(xmlFilename); listHighlight.PushBack(myHightline); - xmlFilename = "lang_boo.xml"; + xmlFilename = "languages/boo/highlight.xml"; myHightline = new Highlight(xmlFilename); listHighlight.PushBack(myHightline); - xmlFilename = "lang_Makefile.xml"; + xmlFilename = "languages/makefile/highlight.xml"; myHightline = new Highlight(xmlFilename); listHighlight.PushBack(myHightline); - xmlFilename = "lang_asm.xml"; + xmlFilename = "languages/asm/highlight.xml"; myHightline = new Highlight(xmlFilename); listHighlight.PushBack(myHightline); - xmlFilename = "lang_xml.xml"; + xmlFilename = "languages/xml/highlight.xml"; myHightline = new Highlight(xmlFilename); listHighlight.PushBack(myHightline); - xmlFilename = "lang_php.xml"; + xmlFilename = "languages/php/highlight.xml"; myHightline = new Highlight(xmlFilename); listHighlight.PushBack(myHightline); - xmlFilename = "lang_bash.xml"; + xmlFilename = "languages/bash/highlight.xml"; myHightline = new Highlight(xmlFilename); listHighlight.PushBack(myHightline); - xmlFilename = "lang_matlab.xml"; + xmlFilename = "languages/matlab/highlight.xml"; myHightline = new Highlight(xmlFilename); listHighlight.PushBack(myHightline); - xmlFilename = "lang_java.xml"; + xmlFilename = "languages/java/highlight.xml"; myHightline = new Highlight(xmlFilename); listHighlight.PushBack(myHightline); - xmlFilename = "lang_lua.xml"; + xmlFilename = "languages/lua/highlight.xml"; myHightline = new Highlight(xmlFilename); listHighlight.PushBack(myHightline); - xmlFilename = "lang_in.xml"; + xmlFilename = "languages/in/highlight.xml"; myHightline = new Highlight(xmlFilename); listHighlight.PushBack(myHightline); - xmlFilename = "lang_glsl.xml"; + xmlFilename = "languages/glsl/highlight.xml"; myHightline = new Highlight(xmlFilename); listHighlight.PushBack(myHightline); diff --git a/Sources/appl/init.cpp b/Sources/appl/init.cpp index 851b439..208d4fc 100644 --- a/Sources/appl/init.cpp +++ b/Sources/appl/init.cpp @@ -85,8 +85,7 @@ void APP_Init(void) // set color and other trucs... ColorizeManager::Init(); - etk::UString corlorFile = "color_white.xml"; - ColorizeManager::LoadFile( corlorFile.c_str() ); + ColorizeManager::LoadFile( "white" ); ColorizeManager::DisplayListOfColor(); HighlightManager::Init(); diff --git a/Sources/file.mk b/Sources/file.mk index 8833821..227597f 100644 --- a/Sources/file.mk +++ b/Sources/file.mk @@ -52,7 +52,19 @@ LOCAL_COPY_FILES := \ ../share/Font/freefont/FreeSerif.ttf:Font/freefont/FreeSerif.ttf LOCAL_COPY_FOLDERS := \ - ../share/*.xml: \ - ../share/icon/*.svg:icon \ + ../share/color/*.xml:color/ \ + ../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