HeeroYui-deprecated/test_ewol
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] update new system

Browse Source
This commit is contained in:
Edouard DUPIN 2013-05-12 21:09:20 +02:00
parent 4bdac87cd6
commit e630ee12fb
13 changed files with 146 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sources/appl/MainWindows.cpp
View File

@ -93,7 +93,8 @@ MainWindows::MainWindows(void) :
m_sizerVert->SubWidgetAdd(mySpacer);
}
// add the basic widget with a strange methode ...
OnReceiveMessage(NULL, NULL, "");
ewol::EMessage msg(NULL, NULL, "");
OnReceiveMessage(msg);
}
@ -103,15 +104,15 @@ MainWindows::~MainWindows(void)
}
void MainWindows::OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, const etk::UString& data)
void MainWindows::OnReceiveMessage(const ewol::EMessage& _msg)
{
if( CallerObject != this
&& CallerObject != NULL) {
ewol::Windows::OnReceiveMessage(CallerObject, eventId, data);
if( _msg.GetCaller() != this
&& _msg.GetCaller() != NULL) {
ewol::Windows::OnReceiveMessage(_msg);
}
APPL_INFO("Receive Event from the main windows ... : \"" << eventId << "\" ==> data=\"" << data << "\"" );
if (eventId == l_eventChangeTheme) {
if (data=="1") {
APPL_INFO("Receive Event from the main windows ... : " << _msg );
if (_msg.GetMessage() == l_eventChangeTheme) {
if (_msg.GetData()=="1") {
etk::theme::SetName("GUI", "rounded");
} else {
etk::theme::SetName("GUI", "default");
@ -119,9 +120,9 @@ void MainWindows::OnReceiveMessage(ewol::EObject * CallerObject, const char * ev
// Reload shaders and graphic system ...
ewol::resource::ReLoadResources();
return;
} else if (eventId == l_eventChangeWidgetPrevious) {
} else if (_msg.GetMessage() == l_eventChangeWidgetPrevious) {
m_idWidget--;
} else if (eventId == l_eventChangeWidgetNext) {
} else if (_msg.GetMessage() == l_eventChangeWidgetNext) {
m_idWidget++;
}
@ -131,7 +132,7 @@ void MainWindows::OnReceiveMessage(ewol::EObject * CallerObject, const char * ev
m_subWidget = NULL;
}
// special init forcing ...
if(CallerObject == NULL) {
if(_msg.GetCaller() == NULL) {
m_idWidget = 1;
}
switch(m_idWidget)

2
sources/appl/MainWindows.h
View File

@ -31,7 +31,7 @@ class MainWindows : public ewol::Windows
// Derived function
const char * const GetObjectType(void) { return "MainWindows"; };
// Derived function
virtual void OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, const etk::UString& data);
virtual void OnReceiveMessage(const ewol::EMessage& _msg);
// Derived function
virtual void OnObjectRemove(ewol::EObject * removeObject);
};

42
sources/appl/TestButton.cpp
View File

@ -182,80 +182,80 @@ TestButton::~TestButton(void)
}
void TestButton::OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, const etk::UString& data)
void TestButton::OnReceiveMessage(const ewol::EMessage& _msg)
{
widget::Sizer::OnReceiveMessage(CallerObject, eventId, data);
widget::Sizer::OnReceiveMessage(_msg);
//APPL_INFO("Receive Event from the main windows ... : \"" << eventId << "\" ==> data=\"" << data << "\"" );
if (m_testWidget == CallerObject) {
APPL_WARNING("Receive Event from tested Button ... : \"" << eventId << "\" ==> data=\"" << data << "\"" );
if (m_testWidget == _msg.GetCaller()) {
APPL_WARNING("Receive Event from tested Button ... : " << _msg );
}
if (eventId == l_eventChangeExpendX) {
if (_msg.GetMessage() == l_eventChangeExpendX) {
if (NULL!=m_testWidget) {
if (data=="1") {
if (_msg.GetData()=="1") {
m_testWidget->SetExpand(bvec2(true,m_testWidget->GetExpand().y()));
} else {
m_testWidget->SetExpand(bvec2(false,m_testWidget->GetExpand().y()));
}
}
} else if (eventId == l_eventChangeExpendY) {
} else if (_msg.GetMessage() == l_eventChangeExpendY) {
if (NULL!=m_testWidget) {
if (data=="1") {
if (_msg.GetData()=="1") {
m_testWidget->SetExpand(bvec2(m_testWidget->GetExpand().x(),true));
} else {
m_testWidget->SetExpand(bvec2(m_testWidget->GetExpand().x(),false));
}
}
} else if (eventId == l_eventChangeFillX) {
} else if (_msg.GetMessage() == l_eventChangeFillX) {
if (NULL!=m_testWidget) {
if (data=="1") {
if (_msg.GetData()=="1") {
m_testWidget->SetFill(bvec2(true,m_testWidget->GetFill().y()));
} else {
m_testWidget->SetFill(bvec2(false,m_testWidget->GetFill().y()));
}
}
} else if (eventId == l_eventChangeFillY) {
} else if (_msg.GetMessage() == l_eventChangeFillY) {
if (NULL!=m_testWidget) {
if (data=="1") {
if (_msg.GetData()=="1") {
m_testWidget->SetFill(bvec2(m_testWidget->GetFill().x(),true));
} else {
m_testWidget->SetFill(bvec2(m_testWidget->GetFill().x(),false));
}
}
} else if (eventId == l_eventChangeToggle) {
} else if (_msg.GetMessage() == l_eventChangeToggle) {
if (NULL!=m_testWidget) {
if (data=="1") {
if (_msg.GetData()=="1") {
m_testWidget->SetToggleMode(true);
} else {
m_testWidget->SetToggleMode(false);
}
}
} else if (eventId == l_eventChangeTextToggle) {
} else if (_msg.GetMessage() == l_eventChangeTextToggle) {
if (NULL!=m_testWidget) {
if (data=="1") {
if (_msg.GetData()=="1") {
m_testWidget->SetSubWidgetToggle(new widget::Label("A stupid very long text on toggle <br/><br/> and on multiple lines"));
} else {
m_testWidget->SetSubWidgetToggle(NULL);
}
}
} else if (eventId == l_eventChangeImage) {
} else if (_msg.GetMessage() == l_eventChangeImage) {
if (NULL!=m_testWidget) {
if (data=="1") {
if (_msg.GetData()=="1") {
//m_testWidget->SetImage("THEME:GUI:icon.png");
//m_testWidget->SetImageSize(50);
} else {
//m_testWidget->SetImage("");
}
}
} else if (eventId == l_eventChangeImageToggle) {
} else if (_msg.GetMessage() == l_eventChangeImageToggle) {
if (NULL!=m_testWidget) {
if (data=="1") {
if (_msg.GetData()=="1") {
//m_testWidget->SetImageToggle("THEME:GUI:icon.png");
} else {
//m_testWidget->SetImageToggle("");
}
}
} else if (eventId == l_eventChangeText) {
} else if (_msg.GetMessage() == l_eventChangeText) {
if (NULL!=m_testWidget) {
static int32_t countTextID = 1;
switch (countTextID)

2
sources/appl/TestButton.h
View File

@ -26,7 +26,7 @@ class TestButton : public widget::Sizer
public:
// Derived function
virtual const char * const GetObjectType(void) { return "TestButton"; };
virtual void OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, const etk::UString& data);
virtual void OnReceiveMessage(const ewol::EMessage& _msg);
virtual void OnObjectRemove(ewol::EObject * removeObject);
};

24
sources/appl/TestButtonColor.cpp
View File

@ -140,41 +140,41 @@ TestButtonColor::~TestButtonColor(void)
}
void TestButtonColor::OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, const etk::UString& data)
void TestButtonColor::OnReceiveMessage(const ewol::EMessage& _msg)
{
widget::Sizer::OnReceiveMessage(CallerObject, eventId, data);
widget::Sizer::OnReceiveMessage(_msg);
//APPL_INFO("Receive Event from the main windows ... : \"" << eventId << "\" ==> data=\"" << data << "\"" );
if (m_testWidget == CallerObject) {
APPL_WARNING("Receive Event from tested Button ... : \"" << eventId << "\" ==> data=\"" << data << "\"" );
if (m_testWidget == _msg.GetCaller()) {
APPL_WARNING("Receive Event from tested Button ... : " << _msg );
}
if (eventId == l_eventChangeExpendX) {
if (_msg.GetMessage() == l_eventChangeExpendX) {
if (NULL!=m_testWidget) {
if (data=="1") {
if (_msg.GetData()=="1") {
m_testWidget->SetExpand(bvec2(true,m_testWidget->GetExpand().y()));
} else {
m_testWidget->SetExpand(bvec2(true,m_testWidget->GetExpand().y()));
}
}
} else if (eventId == l_eventChangeExpendY) {
} else if (_msg.GetMessage() == l_eventChangeExpendY) {
if (NULL!=m_testWidget) {
if (data=="1") {
if (_msg.GetData()=="1") {
m_testWidget->SetExpand(bvec2(m_testWidget->GetExpand().x(),true));
} else {
m_testWidget->SetExpand(bvec2(m_testWidget->GetExpand().x(),false));
}
}
} else if (eventId == l_eventChangeFillX) {
} else if (_msg.GetMessage() == l_eventChangeFillX) {
if (NULL!=m_testWidget) {
if (data=="1") {
if (_msg.GetData()=="1") {
m_testWidget->SetFill(bvec2(true,m_testWidget->GetFill().y()));
} else {
m_testWidget->SetFill(bvec2(false,m_testWidget->GetFill().y()));
}
}
} else if (eventId == l_eventChangeFillY) {
} else if (_msg.GetMessage() == l_eventChangeFillY) {
if (NULL!=m_testWidget) {
if (data=="1") {
if (_msg.GetData()=="1") {
m_testWidget->SetFill(bvec2(m_testWidget->GetFill().x(),true));
} else {
m_testWidget->SetFill(bvec2(m_testWidget->GetFill().x(),false));

2
sources/appl/TestButtonColor.h
View File

@ -27,7 +27,7 @@ class TestButtonColor : public widget::Sizer
public:
// Derived function
virtual const char * const GetObjectType(void) { return "TestButton"; };
virtual void OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, const etk::UString& data);
virtual void OnReceiveMessage(const ewol::EMessage& _msg);
virtual void OnObjectRemove(ewol::EObject * removeObject);
};

26
sources/appl/TestImage.cpp
View File

@ -156,47 +156,47 @@ TestImage::~TestImage(void)
}
void TestImage::OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, const etk::UString& data)
void TestImage::OnReceiveMessage(const ewol::EMessage& _msg)
{
widget::Sizer::OnReceiveMessage(CallerObject, eventId, data);
widget::Sizer::OnReceiveMessage(_msg);
//APPL_INFO("Receive Event from the main windows ... : \"" << eventId << "\" ==> data=\"" << data << "\"" );
if (m_testWidget == CallerObject) {
APPL_WARNING("Receive Event from tested Button ... : \"" << eventId << "\" ==> data=\"" << data << "\"" );
if (m_testWidget == _msg.GetCaller()) {
APPL_WARNING("Receive Event from tested Button ... : " << _msg);
}
if (eventId == l_eventChangeExpendX) {
if (_msg.GetMessage() == l_eventChangeExpendX) {
if (NULL!=m_testWidget) {
if (data=="1") {
if (_msg.GetData()=="1") {
m_testWidget->SetExpand(bvec2(true,m_testWidget->GetExpand().y()));
} else {
m_testWidget->SetExpand(bvec2(false,m_testWidget->GetExpand().y()));
}
}
} else if (eventId == l_eventChangeExpendY) {
} else if (_msg.GetMessage() == l_eventChangeExpendY) {
if (NULL!=m_testWidget) {
if (data=="1") {
if (_msg.GetData()=="1") {
m_testWidget->SetExpand(bvec2(m_testWidget->GetExpand().x(),true));
} else {
m_testWidget->SetExpand(bvec2(m_testWidget->GetExpand().x(),false));
}
}
} else if (eventId == l_eventChangeFillX) {
} else if (_msg.GetMessage() == l_eventChangeFillX) {
if (NULL!=m_testWidget) {
if (data=="1") {
if (_msg.GetData()=="1") {
m_testWidget->SetFill(bvec2(true,m_testWidget->GetFill().y()));
} else {
m_testWidget->SetFill(bvec2(false,m_testWidget->GetFill().y()));
}
}
} else if (eventId == l_eventChangeFillY) {
} else if (_msg.GetMessage() == l_eventChangeFillY) {
if (NULL!=m_testWidget) {
if (data=="1") {
if (_msg.GetData()=="1") {
m_testWidget->SetFill(bvec2(m_testWidget->GetFill().x(),true));
} else {
m_testWidget->SetFill(bvec2(m_testWidget->GetFill().x(),false));
}
}
} else if (eventId == l_eventChangeImage) {
} else if (_msg.GetMessage() == l_eventChangeImage) {
if (NULL!=m_testWidget) {
static int32_t countID = 1;
switch (countID)

2
sources/appl/TestImage.h
View File

@ -27,7 +27,7 @@ class TestImage : public widget::Sizer
public:
// Derived function
virtual const char * const GetObjectType(void) { return "appl::TestImage"; };
virtual void OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, const etk::UString& data);
virtual void OnReceiveMessage(const ewol::EMessage& _msg);
virtual void OnObjectRemove(ewol::EObject * removeObject);
};

30
sources/appl/TestLabel.cpp
View File

@ -156,56 +156,56 @@ TestLabel::~TestLabel(void)
}
void TestLabel::OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, const etk::UString& data)
void TestLabel::OnReceiveMessage(const ewol::EMessage& _msg)
{
widget::Sizer::OnReceiveMessage(CallerObject, eventId, data);
widget::Sizer::OnReceiveMessage(_msg);
//APPL_INFO("Receive Event from the main windows ... : \"" << eventId << "\" ==> data=\"" << data << "\"" );
if (m_testWidget == CallerObject) {
APPL_WARNING("Receive Event from tested Button ... : \"" << eventId << "\" ==> data=\"" << data << "\"" );
if (m_testWidget == _msg.GetCaller()) {
APPL_WARNING("Receive Event from tested Button ... : " << _msg );
}
if (eventId == l_eventChangeExpendX) {
if (_msg.GetMessage() == l_eventChangeExpendX) {
if (NULL!=m_testWidget) {
if (data=="1") {
if (_msg.GetData()=="1") {
m_testWidget->SetExpand(bvec2(true,m_testWidget->GetExpand().y()));
} else {
m_testWidget->SetExpand(bvec2(true,m_testWidget->GetExpand().y()));
}
}
} else if (eventId == l_eventChangeExpendY) {
} else if (_msg.GetMessage() == l_eventChangeExpendY) {
if (NULL!=m_testWidget) {
if (data=="1") {
if (_msg.GetData()=="1") {
m_testWidget->SetExpand(bvec2(m_testWidget->GetExpand().x(),true));
} else {
m_testWidget->SetExpand(bvec2(m_testWidget->GetExpand().x(),false));
}
}
} else if (eventId == l_eventChangeFillX) {
} else if (_msg.GetMessage() == l_eventChangeFillX) {
if (NULL!=m_testWidget) {
if (data=="1") {
if (_msg.GetData()=="1") {
m_testWidget->SetFill(bvec2(true,m_testWidget->GetFill().y()));
} else {
m_testWidget->SetFill(bvec2(false,m_testWidget->GetFill().y()));
}
}
} else if (eventId == l_eventChangeFillY) {
} else if (_msg.GetMessage() == l_eventChangeFillY) {
if (NULL!=m_testWidget) {
if (data=="1") {
if (_msg.GetData()=="1") {
m_testWidget->SetFill(bvec2(m_testWidget->GetFill().x(),true));
} else {
m_testWidget->SetFill(bvec2(m_testWidget->GetFill().x(),false));
}
}
} else if (eventId == l_eventChangeMaxSize) {
} else if (_msg.GetMessage() == l_eventChangeMaxSize) {
if (NULL!=m_testWidget) {
if (data=="1") {
if (_msg.GetData()=="1") {
m_testWidget->SetMaxSize(vec2(400,9999999999));
} else {
m_testWidget->SetNoMaxSize();
}
}
} else if (eventId == l_eventChangeLabel) {
} else if (_msg.GetMessage() == l_eventChangeLabel) {
if (NULL!=m_testWidget) {
m_labelId++;
switch(m_labelId)

2
sources/appl/TestLabel.h
View File

@ -33,7 +33,7 @@ class TestLabel : public widget::Sizer
// Derived function
virtual const char * const GetObjectType(void) { return "TestButton"; };
// Derived function
virtual void OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, const etk::UString& data);
virtual void OnReceiveMessage(const ewol::EMessage& _msg);
// Derived function
virtual void OnObjectRemove(ewol::EObject * removeObject);
};

6
sources/appl/TestScene.cpp
View File

@ -258,15 +258,15 @@ class stupidSphere : public game::Element
void TestScene::OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, const etk::UString& data)
void TestScene::OnReceiveMessage(const ewol::EMessage& _msg)
{
widget::Sizer::OnReceiveMessage(CallerObject, eventId, data);
widget::Sizer::OnReceiveMessage(_msg);
/*
//APPL_INFO("Receive Event from the main windows ... : \"" << eventId << "\" ==> data=\"" << data << "\"" );
if (m_testWidget == CallerObject) {
APPL_WARNING("Receive Event from tested Scene ... : \"" << eventId << "\" ==> data=\"" << data << "\"" );
}
/*
if (eventId == l_eventAddBox) {
static bool firstTime = true;
if (firstTime==false) {

2
sources/appl/TestScene.h
View File

@ -25,7 +25,7 @@ class TestScene : public widget::Sizer
// Derived function
virtual const char * const GetObjectType(void) { return "TestButton"; };
// Derived function
virtual void OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, const etk::UString& data);
virtual void OnReceiveMessage(const ewol::EMessage& _msg);
// Derived function
virtual void OnObjectRemove(ewol::EObject * removeObject);
};

64
sources/lutin_test_ewol.py Executable file
View File

@ -0,0 +1,64 @@
#!/usr/bin/python
import lutinModule
import lutinTools
import datetime
def Create(target):
# module name is 'edn' and type binary.
myModule = lutinModule.module(__file__, 'test_ewol', 'PACKAGE')
# add the file to compile:
myModule.AddSrcFile([
'appl/Debug.cpp',
'appl/init.cpp',
'appl/MainWindows.cpp',
'appl/TestButton.cpp',
'appl/TestImage.cpp',
'appl/TestButtonColor.cpp',
'appl/TestLabel.cpp'])
# 'appl/TestScene.cpp'
myModule.AddModuleDepend(['ewol', 'bullet'])
now = datetime.datetime.now()
versionID=str(now.year-2013)+"."+str(now.month)+"."+str(now.day)
myModule.CompileFlags_CC([
"-DPROJECT_NAME=\"\\\""+myModule.name+"\\\"\"",
"-DAPPL_VERSION_TAG_NAME=\"\\\""+versionID+"\\\"\"",
"-DBUILD_TIME=\"\\\""+str(now.day)+"/"+str(now.month)+"/"+str(now.year)+"\\\"\""])
myModule.CopyFile('../data/icon.png','icon.png')
myModule.CopyFolder('../data/icon.*','')
myModule.CopyFolder('../data/cube.*','')
myModule.CopyFolder('../data/grass.*','')
myModule.CopyFolder('../data/stone*','')
myModule.CopyFolder('../data/sphere.png','')
myModule.CopyFolder('../data/sphere.obj','')
myModule.AddPath(lutinTools.GetCurrentPath(__file__))
myModule.CopyFile("../data/FreeSerif*","fonts/FreeSerif.ttf")
# set the package properties :
myModule.pkgSet("VERSION", versionID)
myModule.pkgSet("COMPAGNY_TYPE", "org")
myModule.pkgSet("COMPAGNY_NAME", "Edouard DUPIN")
myModule.pkgSet("MAINTAINER", ["Mr DUPIN Edouard <yui.heero@gmail.com>"])
myModule.pkgSet("ICON", lutinTools.GetCurrentPath(__file__) + "/../data/icon.png")
myModule.pkgSet("SECTION", ["Development"])
myModule.pkgSet("PRIORITY", "optional")
myModule.pkgSet("DESCRIPTION", "ewol test software")
myModule.pkgSet("NAME", "test software")
myModule.pkgAddRight("SET_ORIENTATION")
myModule.pkgAddRight("VIBRATE")
# add the currrent module at the
return myModule