diff --git a/sources/appl/MainWindows.cpp b/sources/appl/MainWindows.cpp index 83f1b9c..c085749 100644 --- a/sources/appl/MainWindows.cpp +++ b/sources/appl/MainWindows.cpp @@ -22,8 +22,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -44,47 +44,47 @@ MainWindows::MainWindows(void) : m_subWidget(NULL), m_testName(NULL) { APPL_DEBUG("CREATE WINDOWS ... "); - widget::Sizer* mySizerHori = NULL; - widget::Button* myButton = NULL; + ewol::widget::Sizer* mySizerHori = NULL; + ewol::widget::Button* myButton = NULL; - m_sizerVert = new widget::Sizer(widget::Sizer::modeVert); + m_sizerVert = new ewol::widget::Sizer(ewol::widget::Sizer::modeVert); if (NULL == m_sizerVert) { APPL_DEBUG("Allocation error mySizerVert"); return; } setSubWidget(m_sizerVert); - mySizerHori = new widget::Sizer(widget::Sizer::modeHori); + mySizerHori = new ewol::widget::Sizer(ewol::widget::Sizer::modeHori); if (NULL == mySizerHori) { APPL_DEBUG("Allocation error mySizerHori"); return; } m_sizerVert->subWidgetAdd(mySizerHori); - myButton = new widget::Button(); + myButton = new ewol::widget::Button(); if (NULL != myButton) { - myButton->setSubWidget(new widget::Label("default theme (cube)")); - myButton->setSubWidgetToggle(new widget::Label("rounded theme")); + myButton->setSubWidget(new ewol::widget::Label("default theme (cube)")); + myButton->setSubWidgetToggle(new ewol::widget::Label("rounded theme")); myButton->setToggleMode(true); - myButton->registerOnEvent(this, widget::Button::eventValue, l_eventChangeTheme); + myButton->registerOnEvent(this, ewol::widget::Button::eventValue, l_eventChangeTheme); mySizerHori->subWidgetAdd(myButton); } - myButton = new widget::Button(); + myButton = new ewol::widget::Button(); if (NULL != myButton) { - myButton->setSubWidget(new widget::Label("Previous Widget test")); - myButton->registerOnEvent(this, widget::Button::eventPressed, l_eventChangeWidgetPrevious); + myButton->setSubWidget(new ewol::widget::Label("Previous Widget test")); + myButton->registerOnEvent(this, ewol::widget::Button::eventPressed, l_eventChangeWidgetPrevious); mySizerHori->subWidgetAdd(myButton); } - myButton = new widget::Button(); + myButton = new ewol::widget::Button(); if (NULL != myButton) { - myButton->setSubWidget(new widget::Label("Next Widget test")); - myButton->registerOnEvent(this, widget::Button::eventPressed, l_eventChangeWidgetNext); + myButton->setSubWidget(new ewol::widget::Label("Next Widget test")); + myButton->registerOnEvent(this, ewol::widget::Button::eventPressed, l_eventChangeWidgetNext); mySizerHori->subWidgetAdd(myButton); } - m_testName = new widget::Label("none"); + m_testName = new ewol::widget::Label("none"); if (NULL != m_testName) { mySizerHori->subWidgetAdd(m_testName); } - widget::Spacer* mySpacer = new widget::Spacer(); + ewol::widget::Spacer* mySpacer = new ewol::widget::Spacer(); if (NULL != mySpacer) { mySpacer->setExpand(bvec2(false,false)); mySpacer->setFill(bvec2(true,false)); @@ -93,7 +93,7 @@ MainWindows::MainWindows(void) : m_sizerVert->subWidgetAdd(mySpacer); } // add the basic widget with a strange methode ... - ewol::EMessage msg(NULL, NULL, ""); + ewol::object::Message msg(NULL, NULL, ""); onReceiveMessage(msg); } @@ -101,10 +101,10 @@ MainWindows::~MainWindows(void) { } -void MainWindows::onReceiveMessage(const ewol::EMessage& _msg) { +void MainWindows::onReceiveMessage(const ewol::object::Message& _msg) { if( _msg.getCaller() != this && _msg.getCaller() != NULL) { - ewol::Windows::onReceiveMessage(_msg); + ewol::widget::Windows::onReceiveMessage(_msg); } APPL_INFO("Receive Event from the main windows ... : " << _msg ); if (_msg.getMessage() == l_eventChangeTheme) { @@ -135,7 +135,7 @@ void MainWindows::onReceiveMessage(const ewol::EMessage& _msg) { default: m_idWidget = 0; case 0: - m_subWidget = (ewol::Widget*)new widget::Label("Test software for EWOL"); + m_subWidget = (ewol::Widget*)new ewol::widget::Label("Test software for EWOL"); if (NULL != m_subWidget) { m_subWidget->setExpand(bvec2(true,true)); m_sizerVert->subWidgetAdd(m_subWidget); @@ -193,8 +193,8 @@ void MainWindows::onReceiveMessage(const ewol::EMessage& _msg) { } } -void MainWindows::onObjectRemove(ewol::EObject* _removeObject) { - ewol::Windows::onObjectRemove(_removeObject); +void MainWindows::onObjectRemove(ewol::Object* _removeObject) { + ewol::widget::Windows::onObjectRemove(_removeObject); if (m_subWidget == _removeObject) { m_subWidget = NULL; } else if (m_sizerVert == _removeObject) { diff --git a/sources/appl/MainWindows.h b/sources/appl/MainWindows.h index 9e508c0..e51c86f 100644 --- a/sources/appl/MainWindows.h +++ b/sources/appl/MainWindows.h @@ -17,11 +17,11 @@ #include #include -class MainWindows : public ewol::Windows { +class MainWindows : public ewol::widget::Windows { private: - widget::Sizer* m_sizerVert; + ewol::widget::Sizer* m_sizerVert; ewol::Widget* m_subWidget; - widget::Label* m_testName; + ewol::widget::Label* m_testName; int32_t m_idWidget; public: // Constructeur @@ -31,8 +31,8 @@ class MainWindows : public ewol::Windows { const char * const getObjectType(void) { return "MainWindows"; }; - virtual void onReceiveMessage(const ewol::EMessage& _msg); - virtual void onObjectRemove(ewol::EObject* _removeObject); + virtual void onReceiveMessage(const ewol::object::Message& _msg); + virtual void onObjectRemove(ewol::Object* _removeObject); }; #endif diff --git a/sources/appl/TestButton.cpp b/sources/appl/TestButton.cpp index e90e426..fdb93d3 100644 --- a/sources/appl/TestButton.cpp +++ b/sources/appl/TestButton.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include static const char * l_eventChangeExpendX = "event-change-expend-X"; @@ -40,82 +40,82 @@ static const char * l_eventChangeImageToggle = "event-change-image-toggle"; #define __class__ "TestButton" TestButton::TestButton(void) : - widget::Sizer(widget::Sizer::modeVert), + ewol::widget::Sizer(ewol::widget::Sizer::modeVert), m_testWidget(NULL) { APPL_INFO("Create " __class__ " (start)"); - widget::Sizer* mySizerVert2 = NULL; - widget::Sizer* mySizerHori = NULL; - widget::Button* myButton = NULL; + ewol::widget::Sizer* mySizerVert2 = NULL; + ewol::widget::Sizer* mySizerHori = NULL; + ewol::widget::Button* myButton = NULL; - mySizerHori = new widget::Sizer(widget::Sizer::modeHori); + mySizerHori = new ewol::widget::Sizer(ewol::widget::Sizer::modeHori); if (NULL == mySizerHori) { APPL_DEBUG("Allocation error mySizerHori"); return; } subWidgetAdd(mySizerHori); - myButton = new widget::Button(); + myButton = new ewol::widget::Button(); if (NULL != myButton) { myButton->setToggleMode(true); - myButton->setSubWidget( new widget::Label("Expend X
(false)")); - myButton->setSubWidgetToggle(new widget::Label("Expend X
(true)")); - myButton->registerOnEvent(this, widget::Button::eventValue, l_eventChangeExpendX); + myButton->setSubWidget( new ewol::widget::Label("Expend X
(false)")); + myButton->setSubWidgetToggle(new ewol::widget::Label("Expend X
(true)")); + myButton->registerOnEvent(this, ewol::widget::Button::eventValue, l_eventChangeExpendX); mySizerHori->subWidgetAdd(myButton); } - myButton = new widget::Button(); + myButton = new ewol::widget::Button(); if (NULL != myButton) { myButton->setToggleMode(true); - myButton->setSubWidget( new widget::Label("Expend Y
(false)")); - myButton->setSubWidgetToggle(new widget::Label("Expend Y
(true)")); - myButton->registerOnEvent(this, widget::Button::eventValue, l_eventChangeExpendY); + myButton->setSubWidget( new ewol::widget::Label("Expend Y
(false)")); + myButton->setSubWidgetToggle(new ewol::widget::Label("Expend Y
(true)")); + myButton->registerOnEvent(this, ewol::widget::Button::eventValue, l_eventChangeExpendY); mySizerHori->subWidgetAdd(myButton); } - myButton = new widget::Button(); + myButton = new ewol::widget::Button(); if (NULL != myButton) { myButton->setToggleMode(true); - myButton->setSubWidget( new widget::Label("Toggle
(false)")); - myButton->setSubWidgetToggle(new widget::Label("Toggle
(true)")); - myButton->registerOnEvent(this, widget::Button::eventValue, l_eventChangeToggle); + myButton->setSubWidget( new ewol::widget::Label("Toggle
(false)")); + myButton->setSubWidgetToggle(new ewol::widget::Label("Toggle
(true)")); + myButton->registerOnEvent(this, ewol::widget::Button::eventValue, l_eventChangeToggle); mySizerHori->subWidgetAdd(myButton); } - myButton = new widget::Button(); + myButton = new ewol::widget::Button(); if (NULL != myButton) { myButton->setToggleMode(true); - myButton->setSubWidget( new widget::Label("Text On toggle state
(false)")); - myButton->setSubWidgetToggle(new widget::Label("Text On toggle state
(true)")); - myButton->registerOnEvent(this, widget::Button::eventValue, l_eventChangeTextToggle); + myButton->setSubWidget( new ewol::widget::Label("Text On toggle state
(false)")); + myButton->setSubWidgetToggle(new ewol::widget::Label("Text On toggle state
(true)")); + myButton->registerOnEvent(this, ewol::widget::Button::eventValue, l_eventChangeTextToggle); mySizerHori->subWidgetAdd(myButton); } - mySizerHori = new widget::Sizer(widget::Sizer::modeHori); + mySizerHori = new ewol::widget::Sizer(ewol::widget::Sizer::modeHori); if (NULL == mySizerHori) { APPL_DEBUG("Allocation error mySizerHori"); return; } subWidgetAdd(mySizerHori); - myButton = new widget::Button(); + myButton = new ewol::widget::Button(); if (NULL != myButton) { myButton->setToggleMode(true); - myButton->setSubWidget( new widget::Label("Fill X
(false)")); - myButton->setSubWidgetToggle(new widget::Label("Fill X
(true)")); - myButton->registerOnEvent(this, widget::Button::eventValue, l_eventChangeFillX); + myButton->setSubWidget( new ewol::widget::Label("Fill X
(false)")); + myButton->setSubWidgetToggle(new ewol::widget::Label("Fill X
(true)")); + myButton->registerOnEvent(this, ewol::widget::Button::eventValue, l_eventChangeFillX); mySizerHori->subWidgetAdd(myButton); } - myButton = new widget::Button(); + myButton = new ewol::widget::Button(); if (NULL != myButton) { myButton->setToggleMode(true); - myButton->setSubWidget( new widget::Label("Fill Y
(false)")); - myButton->setSubWidgetToggle(new widget::Label("Fill Y
(true)")); - myButton->registerOnEvent(this, widget::Button::eventValue, l_eventChangeFillY); + myButton->setSubWidget( new ewol::widget::Label("Fill Y
(false)")); + myButton->setSubWidgetToggle(new ewol::widget::Label("Fill Y
(true)")); + myButton->registerOnEvent(this, ewol::widget::Button::eventValue, l_eventChangeFillY); mySizerHori->subWidgetAdd(myButton); } - myButton = new widget::Button(); + myButton = new ewol::widget::Button(); if (NULL != myButton) { - myButton->setSubWidget(new widget::Label("Change Text
and other ...")); - myButton->registerOnEvent(this, widget::Button::eventPressed, l_eventChangeText); + myButton->setSubWidget(new ewol::widget::Label("Change Text
and other ...")); + myButton->registerOnEvent(this, ewol::widget::Button::eventPressed, l_eventChangeText); mySizerHori->subWidgetAdd(myButton); } - widget::Spacer* mySpacer = new widget::Spacer(); + ewol::widget::Spacer* mySpacer = new ewol::widget::Spacer(); if (NULL != mySpacer) { mySpacer->setExpand(bvec2(false,false)); mySpacer->setFill(bvec2(true,false)); @@ -124,14 +124,14 @@ TestButton::TestButton(void) : subWidgetAdd(mySpacer); } - mySizerHori = new widget::Sizer(widget::Sizer::modeHori); + mySizerHori = new ewol::widget::Sizer(ewol::widget::Sizer::modeHori); if (NULL == mySizerHori) { APPL_DEBUG("Allocation error mySizerHori"); return; } subWidgetAdd(mySizerHori); - mySpacer = new widget::Spacer(); + mySpacer = new ewol::widget::Spacer(); if (NULL != mySpacer) { mySpacer->setExpand(bvec2(false,false)); mySpacer->setFill(bvec2(false,true)); @@ -140,21 +140,21 @@ TestButton::TestButton(void) : mySizerHori->subWidgetAdd(mySpacer); } - m_testWidget = new widget::Button(); + m_testWidget = new ewol::widget::Button(); if (NULL != m_testWidget) { - m_testWidget->setSubWidget(new widget::Label("My Button
And Some under line
plop
and an other super long line ...")); + m_testWidget->setSubWidget(new ewol::widget::Label("My Button
And Some under line
plop
and an other super long line ...")); m_testWidget->setExpand(bvec2(false,false)); m_testWidget->setFill(bvec2(false,false)); - m_testWidget->registerOnEvent(this, widget::Button::eventPressed); - m_testWidget->registerOnEvent(this, widget::Button::eventDown); - m_testWidget->registerOnEvent(this, widget::Button::eventUp); - m_testWidget->registerOnEvent(this, widget::Button::eventEnter); - m_testWidget->registerOnEvent(this, widget::Button::eventLeave); - m_testWidget->registerOnEvent(this, widget::Button::eventValue); + m_testWidget->registerOnEvent(this, ewol::widget::Button::eventPressed); + m_testWidget->registerOnEvent(this, ewol::widget::Button::eventDown); + m_testWidget->registerOnEvent(this, ewol::widget::Button::eventUp); + m_testWidget->registerOnEvent(this, ewol::widget::Button::eventEnter); + m_testWidget->registerOnEvent(this, ewol::widget::Button::eventLeave); + m_testWidget->registerOnEvent(this, ewol::widget::Button::eventValue); mySizerHori->subWidgetAdd(m_testWidget); } - mySpacer = new widget::Spacer(); + mySpacer = new ewol::widget::Spacer(); if (NULL != mySpacer) { mySpacer->setExpand(bvec2(false,false)); mySpacer->setFill(bvec2(false,true)); @@ -163,7 +163,7 @@ TestButton::TestButton(void) : mySizerHori->subWidgetAdd(mySpacer); } - mySpacer = new widget::Spacer(); + mySpacer = new ewol::widget::Spacer(); if (NULL != mySpacer) { mySpacer->setExpand(bvec2(false,false)); mySpacer->setFill(bvec2(true,false)); @@ -180,8 +180,8 @@ TestButton::~TestButton(void) { } -void TestButton::onReceiveMessage(const ewol::EMessage& _msg) { - widget::Sizer::onReceiveMessage(_msg); +void TestButton::onReceiveMessage(const ewol::object::Message& _msg) { + ewol::widget::Sizer::onReceiveMessage(_msg); APPL_VERBOSE("Receive Event from the main windows ... : " << _msg ); if (m_testWidget == _msg.getCaller()) { APPL_WARNING("Receive Event from tested Button ... : " << _msg ); @@ -229,7 +229,7 @@ void TestButton::onReceiveMessage(const ewol::EMessage& _msg) { } else if (_msg.getMessage() == l_eventChangeTextToggle) { if (NULL!=m_testWidget) { if (_msg.getData()=="true") { - m_testWidget->setSubWidgetToggle(new widget::Label("A stupid very long text on toggle

and on multiple lines")); + m_testWidget->setSubWidgetToggle(new ewol::widget::Label("A stupid very long text on toggle

and on multiple lines")); } else { m_testWidget->setSubWidgetToggle(NULL); } @@ -257,45 +257,45 @@ void TestButton::onReceiveMessage(const ewol::EMessage& _msg) { switch (countTextID) { case 0: - m_testWidget->setSubWidget(new widget::Label("simple Text")); + m_testWidget->setSubWidget(new ewol::widget::Label("simple Text")); break; case 1: - m_testWidget->setSubWidget(new widget::Label("Align Left")); + m_testWidget->setSubWidget(new ewol::widget::Label("Align Left")); break; case 2: - m_testWidget->setSubWidget(new widget::Label("Align right")); + m_testWidget->setSubWidget(new ewol::widget::Label("Align right")); break; case 3: - m_testWidget->setSubWidget(new widget::Label("
Align center
")); + m_testWidget->setSubWidget(new ewol::widget::Label("
Align center
")); break; case 4: - m_testWidget->setSubWidget(new widget::Label("simple Text
With Some Other Lines
and more if you want ...
plop")); + m_testWidget->setSubWidget(new ewol::widget::Label("simple Text
With Some Other Lines
and more if you want ...
plop")); break; case 5: - m_testWidget->setSubWidget(new widget::Label("simple Text with bold")); + m_testWidget->setSubWidget(new ewol::widget::Label("simple Text with bold")); break; case 6: - m_testWidget->setSubWidget(new widget::Label("simple Text with italic")); + m_testWidget->setSubWidget(new ewol::widget::Label("simple Text with italic")); break; case 7: - m_testWidget->setSubWidget(new widget::Label("simple Text with italic bold")); + m_testWidget->setSubWidget(new ewol::widget::Label("simple Text with italic bold")); break; case 8: m_testWidget->setSubWidget(NULL); break; case 9: - m_testWidget->setSubWidget(new widget::Label("simple Text with colored text")); + m_testWidget->setSubWidget(new ewol::widget::Label("simple Text with colored text")); break; case 10: m_testWidget->setSubWidget( - new widget::Composer(widget::Composer::String, + new ewol::widget::Composer(ewol::widget::Composer::String, "\n" " \n" "setSubWidget( - new widget::Composer(widget::Composer::String, + new ewol::widget::Composer(ewol::widget::Composer::String, "\n" " \n" " \n" @@ -306,7 +306,7 @@ void TestButton::onReceiveMessage(const ewol::EMessage& _msg) { "setSubWidget(new widget::Label("My Button
And Some under line
plop
and an other super long line ...")); + m_testWidget->setSubWidget(new ewol::widget::Label("My Button
And Some under line
plop
and an other super long line ...")); countTextID=-1; break; } @@ -322,8 +322,8 @@ void TestButton::onReceiveMessage(const ewol::EMessage& _msg) { return; } -void TestButton::onObjectRemove(ewol::EObject* _removeObject) { - widget::Sizer::onObjectRemove(_removeObject); +void TestButton::onObjectRemove(ewol::Object* _removeObject) { + ewol::widget::Sizer::onObjectRemove(_removeObject); if (m_testWidget == _removeObject) { m_testWidget = NULL; } diff --git a/sources/appl/TestButton.h b/sources/appl/TestButton.h index dab3173..21c4be8 100644 --- a/sources/appl/TestButton.h +++ b/sources/appl/TestButton.h @@ -15,9 +15,9 @@ #include #include -class TestButton : public widget::Sizer { +class TestButton : public ewol::widget::Sizer { private: - widget::Button* m_testWidget; + ewol::widget::Button* m_testWidget; public: // Constructeur TestButton(void); @@ -26,8 +26,8 @@ class TestButton : public widget::Sizer { virtual const char * const getObjectType(void) { return "TestButton"; }; - virtual void onReceiveMessage(const ewol::EMessage& _msg); - virtual void onObjectRemove(ewol::EObject* _removeObject); + virtual void onReceiveMessage(const ewol::object::Message& _msg); + virtual void onObjectRemove(ewol::Object* _removeObject); }; #endif diff --git a/sources/appl/TestButtonColor.cpp b/sources/appl/TestButtonColor.cpp index 1536230..7c3ad4f 100644 --- a/sources/appl/TestButtonColor.cpp +++ b/sources/appl/TestButtonColor.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include static const char * l_eventChangeExpendX = "event-change-expend-X"; @@ -34,53 +34,53 @@ static const char * l_eventChangeFillY = "event-change-fill-Y"; #define __class__ "TestButton" TestButtonColor::TestButtonColor(void) : - widget::Sizer(widget::Sizer::modeVert), + ewol::widget::Sizer(ewol::widget::Sizer::modeVert), m_testWidget(NULL) { APPL_INFO("CREATE " __class__ " ... "); - widget::Sizer* mySizerVert2 = NULL; - widget::Sizer* mySizerHori = NULL; - widget::Button* myButton = NULL; + ewol::widget::Sizer* mySizerVert2 = NULL; + ewol::widget::Sizer* mySizerHori = NULL; + ewol::widget::Button* myButton = NULL; - mySizerHori = new widget::Sizer(widget::Sizer::modeHori); + mySizerHori = new ewol::widget::Sizer(ewol::widget::Sizer::modeHori); if (NULL == mySizerHori) { APPL_DEBUG("Allocation error mySizerHori"); return; } subWidgetAdd(mySizerHori); - myButton = new widget::Button(); + myButton = new ewol::widget::Button(); if (NULL != myButton) { myButton->setToggleMode(true); - myButton->setSubWidget( new widget::Label("Expand X (false)")); - myButton->setSubWidgetToggle(new widget::Label("Expand X (true)")); - myButton->registerOnEvent(this, widget::Button::eventValue, l_eventChangeExpendX); + myButton->setSubWidget( new ewol::widget::Label("Expand X (false)")); + myButton->setSubWidgetToggle(new ewol::widget::Label("Expand X (true)")); + myButton->registerOnEvent(this, ewol::widget::Button::eventValue, l_eventChangeExpendX); mySizerHori->subWidgetAdd(myButton); } - myButton = new widget::Button(); + myButton = new ewol::widget::Button(); if (NULL != myButton) { myButton->setToggleMode(true); - myButton->setSubWidget( new widget::Label("Expand Y (false)")); - myButton->setSubWidgetToggle(new widget::Label("Expand Y (true)")); - myButton->registerOnEvent(this, widget::Button::eventValue, l_eventChangeExpendY); + myButton->setSubWidget( new ewol::widget::Label("Expand Y (false)")); + myButton->setSubWidgetToggle(new ewol::widget::Label("Expand Y (true)")); + myButton->registerOnEvent(this, ewol::widget::Button::eventValue, l_eventChangeExpendY); mySizerHori->subWidgetAdd(myButton); } - myButton = new widget::Button(); + myButton = new ewol::widget::Button(); if (NULL != myButton) { myButton->setToggleMode(true); - myButton->setSubWidget( new widget::Label("Fill X (false)")); - myButton->setSubWidgetToggle(new widget::Label("Fill X (true)")); - myButton->registerOnEvent(this, widget::Button::eventValue, l_eventChangeFillX); + myButton->setSubWidget( new ewol::widget::Label("Fill X (false)")); + myButton->setSubWidgetToggle(new ewol::widget::Label("Fill X (true)")); + myButton->registerOnEvent(this, ewol::widget::Button::eventValue, l_eventChangeFillX); mySizerHori->subWidgetAdd(myButton); } - myButton = new widget::Button(); + myButton = new ewol::widget::Button(); if (NULL != myButton) { myButton->setToggleMode(true); - myButton->setSubWidget( new widget::Label("Fill Y (false)")); - myButton->setSubWidgetToggle(new widget::Label("Fill Y (true)")); - myButton->registerOnEvent(this, widget::Button::eventValue, l_eventChangeFillY); + myButton->setSubWidget( new ewol::widget::Label("Fill Y (false)")); + myButton->setSubWidgetToggle(new ewol::widget::Label("Fill Y (true)")); + myButton->registerOnEvent(this, ewol::widget::Button::eventValue, l_eventChangeFillY); mySizerHori->subWidgetAdd(myButton); } - widget::Spacer* mySpacer = new widget::Spacer(); + ewol::widget::Spacer* mySpacer = new ewol::widget::Spacer(); if (NULL != mySpacer) { mySpacer->setExpand(bvec2(false,false)); mySpacer->setFill(bvec2(true,false)); @@ -89,14 +89,14 @@ TestButtonColor::TestButtonColor(void) : subWidgetAdd(mySpacer); } - mySizerHori = new widget::Sizer(widget::Sizer::modeHori); + mySizerHori = new ewol::widget::Sizer(ewol::widget::Sizer::modeHori); if (NULL == mySizerHori) { APPL_DEBUG("Allocation error mySizerHori"); return; } subWidgetAdd(mySizerHori); - mySpacer = new widget::Spacer(); + mySpacer = new ewol::widget::Spacer(); if (NULL != mySpacer) { mySpacer->setExpand(bvec2(false,false)); mySpacer->setFill(bvec2(false,true)); @@ -104,14 +104,14 @@ TestButtonColor::TestButtonColor(void) : mySpacer->setColor(0x00FF0080); mySizerHori->subWidgetAdd(mySpacer); } - m_testWidget = new widget::ButtonColor(etk::color::olive); + m_testWidget = new ewol::widget::ButtonColor(etk::color::olive); if (NULL != m_testWidget) { m_testWidget->setExpand(bvec2(false,false)); m_testWidget->setFill(bvec2(false,false)); m_testWidget->registerOnEvent(this, ewolEventButtonColorChange); mySizerHori->subWidgetAdd(m_testWidget); } - mySpacer = new widget::Spacer(); + mySpacer = new ewol::widget::Spacer(); if (NULL != mySpacer) { mySpacer->setExpand(bvec2(false,false)); mySpacer->setFill(bvec2(false,true)); @@ -120,7 +120,7 @@ TestButtonColor::TestButtonColor(void) : mySizerHori->subWidgetAdd(mySpacer); } - mySpacer = new widget::Spacer(); + mySpacer = new ewol::widget::Spacer(); if (NULL != mySpacer) { mySpacer->setExpand(bvec2(false,false)); mySpacer->setFill(bvec2(true,false)); @@ -134,8 +134,8 @@ TestButtonColor::~TestButtonColor(void) { } -void TestButtonColor::onReceiveMessage(const ewol::EMessage& _msg) { - widget::Sizer::onReceiveMessage(_msg); +void TestButtonColor::onReceiveMessage(const ewol::object::Message& _msg) { + ewol::widget::Sizer::onReceiveMessage(_msg); //APPL_INFO("Receive Event from the main windows : " << _msg); if (m_testWidget == _msg.getCaller()) { APPL_WARNING("Receive Event from tested Button ... : " << _msg ); @@ -177,8 +177,8 @@ void TestButtonColor::onReceiveMessage(const ewol::EMessage& _msg) { return; } -void TestButtonColor::onObjectRemove(ewol::EObject* _removeObject) { - widget::Sizer::onObjectRemove(_removeObject); +void TestButtonColor::onObjectRemove(ewol::Object* _removeObject) { + ewol::widget::Sizer::onObjectRemove(_removeObject); if (m_testWidget == _removeObject) { m_testWidget = NULL; } diff --git a/sources/appl/TestButtonColor.h b/sources/appl/TestButtonColor.h index c7cca37..7f9891a 100644 --- a/sources/appl/TestButtonColor.h +++ b/sources/appl/TestButtonColor.h @@ -16,9 +16,9 @@ #include #include -class TestButtonColor : public widget::Sizer { +class TestButtonColor : public ewol::widget::Sizer { private: - widget::ButtonColor* m_testWidget; + ewol::widget::ButtonColor* m_testWidget; public: // Constructeur TestButtonColor(void); @@ -27,8 +27,8 @@ class TestButtonColor : public widget::Sizer { virtual const char * const getObjectType(void) { return "TestButton"; }; - virtual void onReceiveMessage(const ewol::EMessage& _msg); - virtual void onObjectRemove(ewol::EObject* _removeObject); + virtual void onReceiveMessage(const ewol::object::Message& _msg); + virtual void onObjectRemove(ewol::Object* _removeObject); }; #endif diff --git a/sources/appl/TestImage.cpp b/sources/appl/TestImage.cpp index e892a44..3d44cdc 100644 --- a/sources/appl/TestImage.cpp +++ b/sources/appl/TestImage.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include static const char * l_eventChangeExpendX = "event-change-expend-X"; @@ -36,66 +36,66 @@ static const char * l_eventChangeImage = "event-change-image"; #define __class__ "TestImage" TestImage::TestImage(void) : - widget::Sizer(widget::Sizer::modeVert), + ewol::widget::Sizer(ewol::widget::Sizer::modeVert), m_testWidget(NULL) { APPL_INFO("Create " __class__ " (start)"); - widget::Sizer* mySizerVert2 = NULL; - widget::Sizer* mySizerHori = NULL; - widget::Button* myButton = NULL; + ewol::widget::Sizer* mySizerVert2 = NULL; + ewol::widget::Sizer* mySizerHori = NULL; + ewol::widget::Button* myButton = NULL; - mySizerHori = new widget::Sizer(widget::Sizer::modeHori); + mySizerHori = new ewol::widget::Sizer(ewol::widget::Sizer::modeHori); if (NULL == mySizerHori) { APPL_DEBUG("Allocation error mySizerHori"); return; } subWidgetAdd(mySizerHori); - myButton = new widget::Button(); + myButton = new ewol::widget::Button(); if (NULL != myButton) { myButton->setToggleMode(true); - myButton->setSubWidget( new widget::Label("Expend X
(false)")); - myButton->setSubWidgetToggle(new widget::Label("Expend X
(true)")); - myButton->registerOnEvent(this, widget::Button::eventValue, l_eventChangeExpendX); + myButton->setSubWidget( new ewol::widget::Label("Expend X
(false)")); + myButton->setSubWidgetToggle(new ewol::widget::Label("Expend X
(true)")); + myButton->registerOnEvent(this, ewol::widget::Button::eventValue, l_eventChangeExpendX); mySizerHori->subWidgetAdd(myButton); } - myButton = new widget::Button(); + myButton = new ewol::widget::Button(); if (NULL != myButton) { myButton->setToggleMode(true); - myButton->setSubWidget( new widget::Label("Expend Y
(false)")); - myButton->setSubWidgetToggle(new widget::Label("Expend Y
(true)")); - myButton->registerOnEvent(this, widget::Button::eventValue, l_eventChangeExpendY); + myButton->setSubWidget( new ewol::widget::Label("Expend Y
(false)")); + myButton->setSubWidgetToggle(new ewol::widget::Label("Expend Y
(true)")); + myButton->registerOnEvent(this, ewol::widget::Button::eventValue, l_eventChangeExpendY); mySizerHori->subWidgetAdd(myButton); } - mySizerHori = new widget::Sizer(widget::Sizer::modeHori); + mySizerHori = new ewol::widget::Sizer(ewol::widget::Sizer::modeHori); if (NULL == mySizerHori) { APPL_DEBUG("Allocation error mySizerHori"); return; } subWidgetAdd(mySizerHori); - myButton = new widget::Button(); + myButton = new ewol::widget::Button(); if (NULL != myButton) { myButton->setToggleMode(true); - myButton->setSubWidget( new widget::Label("Fill X
(false)")); - myButton->setSubWidgetToggle(new widget::Label("Fill X
(true)")); - myButton->registerOnEvent(this, widget::Button::eventValue, l_eventChangeFillX); + myButton->setSubWidget( new ewol::widget::Label("Fill X
(false)")); + myButton->setSubWidgetToggle(new ewol::widget::Label("Fill X
(true)")); + myButton->registerOnEvent(this, ewol::widget::Button::eventValue, l_eventChangeFillX); mySizerHori->subWidgetAdd(myButton); } - myButton = new widget::Button(); + myButton = new ewol::widget::Button(); if (NULL != myButton) { myButton->setToggleMode(true); - myButton->setSubWidget( new widget::Label("Fill Y
(false)")); - myButton->setSubWidgetToggle(new widget::Label("Fill Y
(true)")); - myButton->registerOnEvent(this, widget::Button::eventValue, l_eventChangeFillY); + myButton->setSubWidget( new ewol::widget::Label("Fill Y
(false)")); + myButton->setSubWidgetToggle(new ewol::widget::Label("Fill Y
(true)")); + myButton->registerOnEvent(this, ewol::widget::Button::eventValue, l_eventChangeFillY); mySizerHori->subWidgetAdd(myButton); } - myButton = new widget::Button(); + myButton = new ewol::widget::Button(); if (NULL != myButton) { - myButton->setSubWidget(new widget::Label("Change Image")); - myButton->registerOnEvent(this, widget::Button::eventValue, l_eventChangeImage); + myButton->setSubWidget(new ewol::widget::Label("Change Image")); + myButton->registerOnEvent(this, ewol::widget::Button::eventValue, l_eventChangeImage); mySizerHori->subWidgetAdd(myButton); } - widget::Spacer* mySpacer = new widget::Spacer(); + ewol::widget::Spacer* mySpacer = new ewol::widget::Spacer(); if (NULL != mySpacer) { mySpacer->setExpand(bvec2(false,false)); mySpacer->setFill(bvec2(true,false)); @@ -104,14 +104,14 @@ TestImage::TestImage(void) : subWidgetAdd(mySpacer); } - mySizerHori = new widget::Sizer(widget::Sizer::modeHori); + mySizerHori = new ewol::widget::Sizer(ewol::widget::Sizer::modeHori); if (NULL == mySizerHori) { APPL_DEBUG("Allocation error mySizerHori"); return; } subWidgetAdd(mySizerHori); - mySpacer = new widget::Spacer(); + mySpacer = new ewol::widget::Spacer(); if (NULL != mySpacer) { mySpacer->setExpand(bvec2(false,false)); mySpacer->setFill(bvec2(false,true)); @@ -120,7 +120,7 @@ TestImage::TestImage(void) : mySizerHori->subWidgetAdd(mySpacer); } - m_testWidget = new widget::Image("DATA:sphere.png"); + m_testWidget = new ewol::widget::Image("DATA:sphere.png"); if (NULL != m_testWidget) { m_testWidget->setExpand(bvec2(false,false)); m_testWidget->setFill(bvec2(false,false)); @@ -128,7 +128,7 @@ TestImage::TestImage(void) : mySizerHori->subWidgetAdd(m_testWidget); } - mySpacer = new widget::Spacer(); + mySpacer = new ewol::widget::Spacer(); if (NULL != mySpacer) { mySpacer->setExpand(bvec2(false,false)); mySpacer->setFill(bvec2(false,true)); @@ -137,7 +137,7 @@ TestImage::TestImage(void) : mySizerHori->subWidgetAdd(mySpacer); } - mySpacer = new widget::Spacer(); + mySpacer = new ewol::widget::Spacer(); if (NULL != mySpacer) { mySpacer->setExpand(bvec2(false,false)); mySpacer->setFill(bvec2(true,false)); @@ -154,8 +154,8 @@ TestImage::~TestImage(void) { } -void TestImage::onReceiveMessage(const ewol::EMessage& _msg) { - widget::Sizer::onReceiveMessage(_msg); +void TestImage::onReceiveMessage(const ewol::object::Message& _msg) { + ewol::widget::Sizer::onReceiveMessage(_msg); //APPL_INFO("Receive Event from the main windows ... : \"" << eventId << "\" ==> data=\"" << data << "\"" ); if (m_testWidget == _msg.getCaller()) { APPL_WARNING("Receive Event from tested Button ... : " << _msg); @@ -213,8 +213,8 @@ void TestImage::onReceiveMessage(const ewol::EMessage& _msg) { return; } -void TestImage::onObjectRemove(ewol::EObject * _removeObject) { - widget::Sizer::onObjectRemove(_removeObject); +void TestImage::onObjectRemove(ewol::Object * _removeObject) { + ewol::widget::Sizer::onObjectRemove(_removeObject); if (m_testWidget == _removeObject) { m_testWidget = NULL; } diff --git a/sources/appl/TestImage.h b/sources/appl/TestImage.h index 3a10357..e27bdb9 100644 --- a/sources/appl/TestImage.h +++ b/sources/appl/TestImage.h @@ -16,9 +16,9 @@ #include #include -class TestImage : public widget::Sizer { +class TestImage : public ewol::widget::Sizer { private: - widget::Image* m_testWidget; + ewol::widget::Image* m_testWidget; public: // Constructeur TestImage(void); @@ -27,8 +27,8 @@ class TestImage : public widget::Sizer { virtual const char * const getObjectType(void) { return "appl::TestImage"; }; - virtual void onReceiveMessage(const ewol::EMessage& _msg); - virtual void onObjectRemove(ewol::EObject* _removeObject); + virtual void onReceiveMessage(const ewol::object::Message& _msg); + virtual void onObjectRemove(ewol::Object* _removeObject); }; #endif diff --git a/sources/appl/TestLabel.cpp b/sources/appl/TestLabel.cpp index 58ad706..1a1dc97 100644 --- a/sources/appl/TestLabel.cpp +++ b/sources/appl/TestLabel.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include static const char * l_eventChangeExpendX = "event-change-expend-X"; @@ -36,67 +36,67 @@ static const char * l_eventChangeLabel = "event-change-label"; #define __class__ "TestButton" TestLabel::TestLabel(void) : - widget::Sizer(widget::Sizer::modeVert), + ewol::widget::Sizer(ewol::widget::Sizer::modeVert), m_labelId(0) { APPL_DEBUG("CREATE " __class__ " ... "); - widget::Sizer* mySizerVert2 = NULL; - widget::Sizer* mySizerHori = NULL; - widget::Button* myButton = NULL; + ewol::widget::Sizer* mySizerVert2 = NULL; + ewol::widget::Sizer* mySizerHori = NULL; + ewol::widget::Button* myButton = NULL; - mySizerHori = new widget::Sizer(widget::Sizer::modeHori); + mySizerHori = new ewol::widget::Sizer(ewol::widget::Sizer::modeHori); if (NULL == mySizerHori) { APPL_DEBUG("Allocation error mySizerHori"); return; } subWidgetAdd(mySizerHori); - myButton = new widget::Button(); + myButton = new ewol::widget::Button(); if (NULL != myButton) { myButton->setToggleMode(true); - myButton->setSubWidget( new widget::Label("Expand X (false)")); - myButton->setSubWidgetToggle(new widget::Label("Expand X (true)")); - myButton->registerOnEvent(this, widget::Button::eventValue, l_eventChangeExpendX); + myButton->setSubWidget( new ewol::widget::Label("Expand X (false)")); + myButton->setSubWidgetToggle(new ewol::widget::Label("Expand X (true)")); + myButton->registerOnEvent(this, ewol::widget::Button::eventValue, l_eventChangeExpendX); mySizerHori->subWidgetAdd(myButton); } - myButton = new widget::Button(); + myButton = new ewol::widget::Button(); if (NULL != myButton) { myButton->setToggleMode(true); - myButton->setSubWidget( new widget::Label("Expand Y (false)")); - myButton->setSubWidgetToggle(new widget::Label("Expand Y (true)")); - myButton->registerOnEvent(this, widget::Button::eventValue, l_eventChangeExpendY); + myButton->setSubWidget( new ewol::widget::Label("Expand Y (false)")); + myButton->setSubWidgetToggle(new ewol::widget::Label("Expand Y (true)")); + myButton->registerOnEvent(this, ewol::widget::Button::eventValue, l_eventChangeExpendY); mySizerHori->subWidgetAdd(myButton); } - myButton = new widget::Button(); + myButton = new ewol::widget::Button(); if (NULL != myButton) { myButton->setToggleMode(true); - myButton->setSubWidget( new widget::Label("Fill X (false)")); - myButton->setSubWidgetToggle(new widget::Label("Fill X (true)")); - myButton->registerOnEvent(this, widget::Button::eventValue, l_eventChangeFillX); + myButton->setSubWidget( new ewol::widget::Label("Fill X (false)")); + myButton->setSubWidgetToggle(new ewol::widget::Label("Fill X (true)")); + myButton->registerOnEvent(this, ewol::widget::Button::eventValue, l_eventChangeFillX); mySizerHori->subWidgetAdd(myButton); } - myButton = new widget::Button(); + myButton = new ewol::widget::Button(); if (NULL != myButton) { myButton->setToggleMode(true); - myButton->setSubWidget( new widget::Label("Fill Y (false)")); - myButton->setSubWidgetToggle(new widget::Label("Fill Y (true)")); - myButton->registerOnEvent(this, widget::Button::eventValue, l_eventChangeFillY); + myButton->setSubWidget( new ewol::widget::Label("Fill Y (false)")); + myButton->setSubWidgetToggle(new ewol::widget::Label("Fill Y (true)")); + myButton->registerOnEvent(this, ewol::widget::Button::eventValue, l_eventChangeFillY); mySizerHori->subWidgetAdd(myButton); } - myButton = new widget::Button(); + myButton = new ewol::widget::Button(); if (NULL != myButton) { myButton->setToggleMode(true); - myButton->setSubWidget( new widget::Label("no Max size")); - myButton->setSubWidgetToggle(new widget::Label("maxSize (400,99999999)")); - myButton->registerOnEvent(this, widget::Button::eventValue, l_eventChangeMaxSize); + myButton->setSubWidget( new ewol::widget::Label("no Max size")); + myButton->setSubWidgetToggle(new ewol::widget::Label("maxSize (400,99999999)")); + myButton->registerOnEvent(this, ewol::widget::Button::eventValue, l_eventChangeMaxSize); mySizerHori->subWidgetAdd(myButton); } - myButton = new widget::Button(); + myButton = new ewol::widget::Button(); if (NULL != myButton) { - myButton->setSubWidget(new widget::Label("Next Label")); - myButton->registerOnEvent(this, widget::Button::eventPressed, l_eventChangeLabel); + myButton->setSubWidget(new ewol::widget::Label("Next Label")); + myButton->registerOnEvent(this, ewol::widget::Button::eventPressed, l_eventChangeLabel); mySizerHori->subWidgetAdd(myButton); } - widget::Spacer* mySpacer = new widget::Spacer(); + ewol::widget::Spacer* mySpacer = new ewol::widget::Spacer(); if (NULL != mySpacer) { mySpacer->setExpand(bvec2(false,false)); mySpacer->setFill(bvec2(true,false)); @@ -105,13 +105,13 @@ TestLabel::TestLabel(void) : subWidgetAdd(mySpacer); } - mySizerHori = new widget::Sizer(widget::Sizer::modeHori); + mySizerHori = new ewol::widget::Sizer(ewol::widget::Sizer::modeHori); if (NULL == mySizerHori) { APPL_DEBUG("Allocation error mySizerHori"); return; } subWidgetAdd(mySizerHori); - mySpacer = new widget::Spacer(); + mySpacer = new ewol::widget::Spacer(); if (NULL != mySpacer) { mySpacer->setExpand(bvec2(false,false)); mySpacer->setFill(bvec2(false,true)); @@ -120,7 +120,7 @@ TestLabel::TestLabel(void) : mySizerHori->subWidgetAdd(mySpacer); } - m_testWidget = new widget::Label("Basic label"); + m_testWidget = new ewol::widget::Label("Basic label"); if (NULL != m_testWidget) { m_testWidget->setExpand(bvec2(false,false)); m_testWidget->setFill(bvec2(false,false)); @@ -128,7 +128,7 @@ TestLabel::TestLabel(void) : mySizerHori->subWidgetAdd(m_testWidget); } - mySpacer = new widget::Spacer(); + mySpacer = new ewol::widget::Spacer(); if (NULL != mySpacer) { mySpacer->setExpand(bvec2(false,false)); mySpacer->setFill(bvec2(false,true)); @@ -137,7 +137,7 @@ TestLabel::TestLabel(void) : mySizerHori->subWidgetAdd(mySpacer); } - mySpacer = new widget::Spacer(); + mySpacer = new ewol::widget::Spacer(); if (NULL != mySpacer) { mySpacer->setExpand(bvec2(false,false)); mySpacer->setFill(bvec2(true,false)); @@ -153,8 +153,8 @@ TestLabel::~TestLabel(void) { } -void TestLabel::onReceiveMessage(const ewol::EMessage& _msg) { - widget::Sizer::onReceiveMessage(_msg); +void TestLabel::onReceiveMessage(const ewol::object::Message& _msg) { + ewol::widget::Sizer::onReceiveMessage(_msg); //APPL_INFO("Receive Event from the main windows ... : \"" << eventId << "\" ==> data=\"" << data << "\"" ); if (m_testWidget == _msg.getCaller()) { APPL_WARNING("Receive Event from tested Button ... : " << _msg ); @@ -239,8 +239,8 @@ void TestLabel::onReceiveMessage(const ewol::EMessage& _msg) { return; } -void TestLabel::onObjectRemove(ewol::EObject* _removeObject) { - widget::Sizer::onObjectRemove(_removeObject); +void TestLabel::onObjectRemove(ewol::Object* _removeObject) { + ewol::widget::Sizer::onObjectRemove(_removeObject); if (m_testWidget == _removeObject) { m_testWidget = NULL; } diff --git a/sources/appl/TestLabel.h b/sources/appl/TestLabel.h index 6db9fcd..2fdeebe 100644 --- a/sources/appl/TestLabel.h +++ b/sources/appl/TestLabel.h @@ -16,9 +16,9 @@ #include #include -class TestLabel : public widget::Sizer { +class TestLabel : public ewol::widget::Sizer { private: - widget::Label* m_testWidget; + ewol::widget::Label* m_testWidget; int32_t m_labelId; public: /** @@ -33,8 +33,8 @@ class TestLabel : public widget::Sizer { virtual const char * const getObjectType(void) { return "TestButton"; }; - virtual void onReceiveMessage(const ewol::EMessage& _msg); - virtual void onObjectRemove(ewol::EObject* _removeObject); + virtual void onReceiveMessage(const ewol::object::Message& _msg); + virtual void onObjectRemove(ewol::Object* _removeObject); }; #endif diff --git a/sources/appl/TestScene.cpp b/sources/appl/TestScene.cpp index 1862a01..2f9eecb 100644 --- a/sources/appl/TestScene.cpp +++ b/sources/appl/TestScene.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include static const char * l_eventAddBox = "event-add-box"; static const char * l_eventAddSphere = "event-add-sphere"; @@ -45,7 +45,7 @@ static const char * l_eventDown = "event-down"; #define __class__ "TestScene" TestScene::TestScene(void) : - widget::Sizer(widget::Sizer::modeVert) + ewol::widget::Sizer(ewol::widget::Sizer::modeVert) { /* m_ground = new game::Element("DATA:grass.obj"); @@ -56,89 +56,89 @@ TestScene::TestScene(void) : */ APPL_CRITICAL("Create "__class__" (start)"); - widget::Sizer* mySizerVert2 = NULL; - widget::Sizer* mySizerHori = NULL; - widget::Button* myButton = NULL; + ewol::widget::Sizer* mySizerVert2 = NULL; + ewol::widget::Sizer* mySizerHori = NULL; + ewol::widget::Button* myButton = NULL; /* - mySizerHori = new widget::SizerHori(); + mySizerHori = new ewol::widget::SizerHori(); if (NULL == mySizerHori) { APPL_DEBUG("Allocation error mySizerHori"); return; } SubWidgetAdd(mySizerHori); - myButton = new widget::Button("Add Box"); + myButton = new ewol::widget::Button("Add Box"); if (NULL != myButton) { myButton->RegisterOnEvent(this, ewolEventButtonPressed, l_eventAddBox); mySizerHori->SubWidgetAdd(myButton); } - myButton = new widget::Button("Add Sphere"); + myButton = new ewol::widget::Button("Add Sphere"); if (NULL != myButton) { myButton->RegisterOnEvent(this, ewolEventButtonPressed, l_eventAddSphere); mySizerHori->SubWidgetAdd(myButton); } - myButton = new widget::Button("Rotation X"); + myButton = new ewol::widget::Button("Rotation X"); if (NULL != myButton) { myButton->RegisterOnEvent(this, ewolEventButtonPressed, l_eventRotationX); mySizerHori->SubWidgetAdd(myButton); } - myButton = new widget::Button("Rotation Y"); + myButton = new ewol::widget::Button("Rotation Y"); if (NULL != myButton) { myButton->RegisterOnEvent(this, ewolEventButtonPressed, l_eventRotationY); mySizerHori->SubWidgetAdd(myButton); } - myButton = new widget::Button("Rotation Z"); + myButton = new ewol::widget::Button("Rotation Z"); if (NULL != myButton) { myButton->RegisterOnEvent(this, ewolEventButtonPressed, l_eventRotationZ); mySizerHori->SubWidgetAdd(myButton); } - myButton = new widget::Button("Rotation -"); + myButton = new ewol::widget::Button("Rotation -"); if (NULL != myButton) { myButton->RegisterOnEvent(this, ewolEventButtonPressed, l_eventRotation0); mySizerHori->SubWidgetAdd(myButton); } - myButton = new widget::Button("UP"); + myButton = new ewol::widget::Button("UP"); if (NULL != myButton) { myButton->RegisterOnEvent(this, ewolEventButtonPressed, l_eventUp); mySizerHori->SubWidgetAdd(myButton); } - myButton = new widget::Button("DOWN"); + myButton = new ewol::widget::Button("DOWN"); if (NULL != myButton) { myButton->RegisterOnEvent(this, ewolEventButtonPressed, l_eventDown); mySizerHori->SubWidgetAdd(myButton); } - mySizerHori = new widget::SizerHori(); + mySizerHori = new ewol::widget::SizerHori(); if (NULL == mySizerHori) { APPL_DEBUG("Allocation error mySizerHori"); return; } SubWidgetAdd(mySizerHori); - myButton = new widget::Button("lunch object"); + myButton = new ewol::widget::Button("lunch object"); if (NULL != myButton) { myButton->RegisterOnEvent(this, ewolEventButtonPressed, l_eventLunch); mySizerHori->SubWidgetAdd(myButton); } - myButton = new widget::Button("1x speed"); + myButton = new ewol::widget::Button("1x speed"); if (NULL != myButton) { myButton->RegisterOnEvent(this, ewolEventButtonPressed, l_eventChangeTimeSpeed1); mySizerHori->SubWidgetAdd(myButton); } - myButton = new widget::Button("0.5x speed"); + myButton = new ewol::widget::Button("0.5x speed"); if (NULL != myButton) { myButton->RegisterOnEvent(this, ewolEventButtonPressed, l_eventChangeTimeSpeed0); mySizerHori->SubWidgetAdd(myButton); } - myButton = new widget::Button("2x speed"); + myButton = new ewol::widget::Button("2x speed"); if (NULL != myButton) { myButton->RegisterOnEvent(this, ewolEventButtonPressed, l_eventChangeTimeSpeed2); mySizerHori->SubWidgetAdd(myButton); } - myButton = new widget::Button("4x speed"); + myButton = new ewol::widget::Button("4x speed"); if (NULL != myButton) { myButton->RegisterOnEvent(this, ewolEventButtonPressed, l_eventChangeTimeSpeed4); mySizerHori->SubWidgetAdd(myButton); } */ - widget::Spacer* mySpacer = new widget::Spacer(); + ewol::widget::Spacer* mySpacer = new widget::Spacer(); if (NULL != mySpacer) { mySpacer->setExpand(bvec2(false,false)); mySpacer->setFill(bvec2(true,false)); @@ -147,13 +147,13 @@ TestScene::TestScene(void) : subWidgetAdd(mySpacer); } - mySizerHori = new widget::Sizer(widget::Sizer::modeHori); + mySizerHori = new ewol::widget::Sizer(ewol::widget::Sizer::modeHori); if (NULL == mySizerHori) { APPL_DEBUG("Allocation error mySizerHori"); return; } subWidgetAdd(mySizerHori); - mySpacer = new widget::Spacer(); + mySpacer = new ewol::widget::Spacer(); if (NULL != mySpacer) { mySpacer->setExpand(bvec2(false,false)); mySpacer->setFill(bvec2(false,true)); @@ -162,14 +162,14 @@ TestScene::TestScene(void) : mySizerHori->subWidgetAdd(mySpacer); } - m_testWidget = new widget::Scene(/*&m_gameEngine*/ NULL); + m_testWidget = new ewol::widget::Scene(/*&m_gameEngine*/ NULL); if (NULL != m_testWidget) { m_testWidget->setExpand(bvec2(true,true)); m_testWidget->setFill(bvec2(true,true)); mySizerHori->subWidgetAdd(m_testWidget); } - mySpacer = new widget::Spacer(); + mySpacer = new ewol::widget::Spacer(); if (NULL != mySpacer) { mySpacer->setExpand(bvec2(false,false)); mySpacer->setFill(bvec2(false,true)); @@ -178,7 +178,7 @@ TestScene::TestScene(void) : mySizerHori->subWidgetAdd(mySpacer); } - mySpacer = new widget::Spacer(); + mySpacer = new ewol::widget::Spacer(); if (NULL != mySpacer) { mySpacer->setExpand(bvec2(false,false)); mySpacer->setFill(bvec2(true,false)); @@ -255,8 +255,8 @@ class stupidSphere : public game::Element -void TestScene::onReceiveMessage(const ewol::EMessage& _msg) { - widget::Sizer::onReceiveMessage(_msg); +void TestScene::onReceiveMessage(const ewol::object::Message& _msg) { + ewol::widget::Sizer::onReceiveMessage(_msg); /* //APPL_INFO("Receive Event from the main windows ... : \"" << eventId << "\" ==> data=\"" << data << "\"" ); if (m_testWidget == CallerObject) { @@ -337,8 +337,8 @@ void TestScene::onReceiveMessage(const ewol::EMessage& _msg) { return; } -void TestScene::onObjectRemove(ewol::EObject* _removeObject) { - widget::Sizer::OnObjectRemove(_removeObject); +void TestScene::onObjectRemove(ewol::Object* _removeObject) { + ewol::widget::Sizer::OnObjectRemove(_removeObject); if (m_testWidget == _removeObject) { m_testWidget = NULL; } diff --git a/sources/appl/TestScene.h b/sources/appl/TestScene.h index 0fea16a..58f61d8 100644 --- a/sources/appl/TestScene.h +++ b/sources/appl/TestScene.h @@ -14,9 +14,9 @@ #include #include -class TestScene : public widget::Sizer { +class TestScene : public ewol::widget::Sizer { private: - widget::Scene* m_testWidget; + ewol::widget::Scene* m_testWidget; public: // Constructeur TestScene(void); @@ -25,8 +25,8 @@ class TestScene : public widget::Sizer { virtual const char * const getObjectType(void) { return "TestButton"; }; - virtual void onReceiveMessage(const ewol::EMessage& _msg); - virtual void onObjectRemove(ewol::EObject* _removeObject); + virtual void onReceiveMessage(const ewol::object::Message& _msg); + virtual void onObjectRemove(ewol::Object* _removeObject); }; #endif diff --git a/sources/appl/init.cpp b/sources/appl/init.cpp index a105c85..f6e18f4 100644 --- a/sources/appl/init.cpp +++ b/sources/appl/init.cpp @@ -12,10 +12,10 @@ #include #include //#include -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -36,7 +36,7 @@ int main(int argc, const char *argv[]) { /** * @brief main application function Initialisation */ -bool APP_Init(ewol::eContext& _context) { +bool APP_Init(ewol::Context& _context) { APPL_INFO("==> Init " PROJECT_NAME " (START) [" << ewol::getBoardType() << "] (" << ewol::getCompilationMode() << ")"); etk::initDefaultFolder(PROJECT_NAME); @@ -76,10 +76,10 @@ bool APP_Init(ewol::eContext& _context) { /** * @brief main application function Un-Initialisation */ -void APP_UnInit(ewol::eContext& _context) { +void APP_UnInit(ewol::Context& _context) { APPL_INFO("==> Un-Init " PROJECT_NAME " (START)"); // Get the curent windows - ewol::Windows* tmpWindows = _context.getWindows(); + ewol::widget::Windows* tmpWindows = _context.getWindows(); // Remove windows : _context.setWindows(NULL);