atria-soft/ewol
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] update to the nex exml API

Browse Source
This commit is contained in:
Edouard DUPIN 2013-06-28 22:27:29 +02:00
parent cad47bd419
commit 774e743271
10 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/esvg vendored

@ -1 +1 @@
Subproject commit 18832b2305675e930e775332a7c3ba6f1aa8eaa4
Subproject commit b8bb3aebf2cbf3baee2b11ce94249294d657bca3

2
external/etk vendored

@ -1 +1 @@
Subproject commit c60fe0326dd06a8750494ee995f90209537049ce
Subproject commit 090d2023a01af24b331df6e7c93489a12196e074

2
external/exml vendored

@ -1 +1 @@
Subproject commit 5fce0e9ef26a8c161d10bbef21abb0faac6a2d8c
Subproject commit 2f5856ca2f20ab830a144599550251c70f61229b

2
sources/ewol/UserConfig.cpp
View File

@ -128,7 +128,7 @@ bool ewol::userConfig::Load(void)
}
}
if (elementFound==false) {
EWOL_ERROR("(l "<<child->Pos()<<") node not suported : \""<<child->GetValue());
EWOL_ERROR("(l "<<child->GetPos()<<") node not suported : \""<<child->GetValue());
}
}
return true;

4
sources/ewol/compositing/Text.cpp
View File

@ -454,7 +454,7 @@ void ewol::Text::ParseHtmlNode(exml::Element* _element)
EWOL_VERBOSE("XML Add : " << child->GetValue());
continue;
} else if (_element->GetType(iii)!=exml::typeElement) {
EWOL_ERROR("(l "<< _element->GetNode(iii)->Pos() << ") node not suported type : " << _element->GetType(iii) << " val=\""<< _element->GetNode(iii)->GetValue() << "\"" );
EWOL_ERROR("(l "<< _element->GetNode(iii)->GetPos() << ") node not suported type : " << _element->GetType(iii) << " val=\""<< _element->GetNode(iii)->GetValue() << "\"" );
continue;
}
exml::Element* elem = _element->GetElement(iii);
@ -534,7 +534,7 @@ void ewol::Text::ParseHtmlNode(exml::Element* _element)
m_alignement = ewol::Text::alignJustify;
ParseHtmlNode(elem);
} else {
EWOL_ERROR("(l "<< elem->Pos() << ") node not suported type : " << elem->GetType() << " val=\""<< elem->GetValue() << "\"" );
EWOL_ERROR("(l "<< elem->GetPos() << ") node not suported type : " << elem->GetType() << " val=\""<< elem->GetValue() << "\"" );
}
}
}

44
sources/ewol/renderer/audio/audio.cpp
View File

@ -103,72 +103,72 @@ void ewol::audio::music::Fading(int32_t timeMs)
}
erreurCode_te ewol::audio::music::ListAdd(etk::UString file)
bool ewol::audio::music::ListAdd(etk::UString file)
{
return ERR_FAIL;
return false;
}
erreurCode_te ewol::audio::music::ListRm(etk::UString file)
bool ewol::audio::music::ListRm(etk::UString file)
{
return ERR_FAIL;
return false;
}
erreurCode_te ewol::audio::music::ListClean(void)
bool ewol::audio::music::ListClean(void)
{
return ERR_FAIL;
return false;
}
erreurCode_te ewol::audio::music::ListPrevious(void)
bool ewol::audio::music::ListPrevious(void)
{
return ERR_FAIL;
return false;
}
erreurCode_te ewol::audio::music::ListNext(void)
bool ewol::audio::music::ListNext(void)
{
return ERR_FAIL;
return false;
}
erreurCode_te ewol::audio::music::ListFirst(void)
bool ewol::audio::music::ListFirst(void)
{
return ERR_FAIL;
return false;
}
erreurCode_te ewol::audio::music::ListLast(void)
bool ewol::audio::music::ListLast(void)
{
return ERR_FAIL;
return false;
}
erreurCode_te ewol::audio::music::ListPlay(void)
bool ewol::audio::music::ListPlay(void)
{
return ERR_FAIL;
return false;
}
erreurCode_te ewol::audio::music::ListStop(void)
bool ewol::audio::music::ListStop(void)
{
return ERR_FAIL;
return false;
}
erreurCode_te ewol::audio::music::Play(etk::UString file)
bool ewol::audio::music::Play(etk::UString file)
{
return ERR_FAIL;
return false;
}
erreurCode_te ewol::audio::music::Stop(void)
bool ewol::audio::music::Stop(void)
{
return ERR_FAIL;
return false;
}

22
sources/ewol/renderer/audio/audio.h
View File

@ -26,18 +26,18 @@ namespace ewol {
namespace music {
void Fading(int32_t timeMs);
// list playing system : is cyclic ...
erreurCode_te ListAdd(etk::UString file);
erreurCode_te ListRm(etk::UString file);
erreurCode_te ListClean(void);
erreurCode_te ListPrevious(void);
erreurCode_te ListNext(void);
erreurCode_te ListFirst(void);
erreurCode_te ListLast(void);
erreurCode_te ListPlay(void); // List playing
erreurCode_te ListStop(void); // List stopping
bool ListAdd(etk::UString file);
bool ListRm(etk::UString file);
bool ListClean(void);
bool ListPrevious(void);
bool ListNext(void);
bool ListFirst(void);
bool ListLast(void);
bool ListPlay(void); // List playing
bool ListStop(void); // List stopping
erreurCode_te Play(etk::UString file); // play specific file ... pause the list element;
erreurCode_te Stop(void);
bool Play(etk::UString file); // play specific file ... pause the list element;
bool Stop(void);
// in db
float VolumeGet(void);

8
sources/ewol/widget/Button.cpp
View File

@ -450,21 +450,21 @@ bool widget::Button::LoadXML(exml::Element* _element)
}
etk::UString widgetName = pNode->GetValue();
if (ewol::widgetManager::Exist(widgetName) == false) {
EWOL_ERROR("(l "<<pNode->Pos()<<") Unknown basic node=\"" << widgetName << "\" not in : [" << ewol::widgetManager::List() << "]" );
EWOL_ERROR("(l "<<pNode->GetPos()<<") Unknown basic node=\"" << widgetName << "\" not in : [" << ewol::widgetManager::List() << "]" );
continue;
}
bool toogleMode=false;
if (NULL != GetSubWidget()) {
toogleMode=true;
if (NULL != GetSubWidgetToggle()) {
EWOL_ERROR("(l "<<pNode->Pos()<<") " << __class__ << " Can only have one subWidget ??? node=\"" << widgetName << "\"" );
EWOL_ERROR("(l "<<pNode->GetPos()<<") " << __class__ << " Can only have one subWidget ??? node=\"" << widgetName << "\"" );
continue;
}
}
EWOL_DEBUG("try to create subwidget : '" << widgetName << "'");
ewol::Widget* tmpWidget = ewol::widgetManager::Create(widgetName);
if (tmpWidget == NULL) {
EWOL_ERROR ("(l "<<pNode->Pos()<<") Can not create the widget : \"" << widgetName << "\"");
EWOL_ERROR ("(l "<<pNode->GetPos()<<") Can not create the widget : \"" << widgetName << "\"");
continue;
}
// add widget :
@ -475,7 +475,7 @@ bool widget::Button::LoadXML(exml::Element* _element)
SetSubWidgetToggle(tmpWidget);
}
if (false == tmpWidget->LoadXML(pNode)) {
EWOL_ERROR ("(l "<<pNode->Pos()<<") can not load widget properties : \"" << widgetName << "\"");
EWOL_ERROR ("(l "<<pNode->GetPos()<<") can not load widget properties : \"" << widgetName << "\"");
return false;
}
}

8
sources/ewol/widget/Container.cpp
View File

@ -185,23 +185,23 @@ bool widget::Container::LoadXML(exml::Element* _node)
}
etk::UString widgetName = pNode->GetValue();
if (ewol::widgetManager::Exist(widgetName) == false) {
EWOL_ERROR("(l "<<pNode->Pos()<<") Unknown basic node=\"" << widgetName << "\" not in : [" << ewol::widgetManager::List() << "]" );
EWOL_ERROR("(l "<<pNode->GetPos()<<") Unknown basic node=\"" << widgetName << "\" not in : [" << ewol::widgetManager::List() << "]" );
continue;
}
if (NULL != GetSubWidget()) {
EWOL_ERROR("(l "<<pNode->Pos()<<") " << __class__ << " Can only have one subWidget ??? node=\"" << widgetName << "\"" );
EWOL_ERROR("(l "<<pNode->GetPos()<<") " << __class__ << " Can only have one subWidget ??? node=\"" << widgetName << "\"" );
continue;
}
EWOL_DEBUG("try to create subwidget : '" << widgetName << "'");
ewol::Widget* tmpWidget = ewol::widgetManager::Create(widgetName);
if (tmpWidget == NULL) {
EWOL_ERROR ("(l "<<pNode->Pos()<<") Can not create the widget : \"" << widgetName << "\"");
EWOL_ERROR ("(l "<<pNode->GetPos()<<") Can not create the widget : \"" << widgetName << "\"");
continue;
}
// add widget :
SetSubWidget(tmpWidget);
if (false == tmpWidget->LoadXML(pNode)) {
EWOL_ERROR ("(l "<<pNode->Pos()<<") can not load widget properties : \"" << widgetName << "\"");
EWOL_ERROR ("(l "<<pNode->GetPos()<<") can not load widget properties : \"" << widgetName << "\"");
return false;
}
}

6
sources/ewol/widget/ContainerN.cpp
View File

@ -311,13 +311,13 @@ bool widget::ContainerN::LoadXML(exml::Element* _node)
}
etk::UString widgetName = pNode->GetValue();
if (ewol::widgetManager::Exist(widgetName) == false) {
EWOL_ERROR("[" << GetId() << "] {" << GetObjectType() << "} (l "<<pNode->Pos()<<") Unknown basic node=\"" << widgetName << "\" not in : [" << ewol::widgetManager::List() << "]" );
EWOL_ERROR("[" << GetId() << "] {" << GetObjectType() << "} (l "<<pNode->GetPos()<<") Unknown basic node=\"" << widgetName << "\" not in : [" << ewol::widgetManager::List() << "]" );
continue;
}
EWOL_DEBUG("[" << GetId() << "] {" << GetObjectType() << "} load new element : \"" << widgetName << "\"");
ewol::Widget *subWidget = ewol::widgetManager::Create(widgetName);
if (subWidget == NULL) {
EWOL_ERROR ("[" << GetId() << "] {" << GetObjectType() << "} (l "<<pNode->Pos()<<") Can not create the widget : \"" << widgetName << "\"");
EWOL_ERROR ("[" << GetId() << "] {" << GetObjectType() << "} (l "<<pNode->GetPos()<<") Can not create the widget : \"" << widgetName << "\"");
continue;
}
// add sub element :
@ -327,7 +327,7 @@ bool widget::ContainerN::LoadXML(exml::Element* _node)
SubWidgetAddStart(subWidget);
}
if (false == subWidget->LoadXML(pNode)) {
EWOL_ERROR ("[" << GetId() << "] {" << GetObjectType() << "} (l "<<pNode->Pos()<<") can not load widget properties : \"" << widgetName << "\"");
EWOL_ERROR ("[" << GetId() << "] {" << GetObjectType() << "} (l "<<pNode->GetPos()<<") can not load widget properties : \"" << widgetName << "\"");
return false;
}
}