From ea5d5b86384696cd8553dfb874d54d5201409457 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Sat, 28 Dec 2013 15:26:21 +0100 Subject: [PATCH] [DEV] update new message API --- sources/appl/MainWindows.cpp | 6 +++--- sources/appl/TestButton.cpp | 21 ++++++++------------- sources/appl/TestButtonColor.cpp | 10 +++++----- sources/appl/TestImage.cpp | 10 +++++----- sources/appl/TestLabel.cpp | 12 ++++++------ 5 files changed, 27 insertions(+), 32 deletions(-) diff --git a/sources/appl/MainWindows.cpp b/sources/appl/MainWindows.cpp index c085749..bae6865 100644 --- a/sources/appl/MainWindows.cpp +++ b/sources/appl/MainWindows.cpp @@ -65,19 +65,19 @@ MainWindows::MainWindows(void) : myButton->setSubWidget(new ewol::widget::Label("default theme (cube)")); myButton->setSubWidgetToggle(new ewol::widget::Label("rounded theme")); myButton->setToggleMode(true); - myButton->registerOnEvent(this, ewol::widget::Button::eventValue, l_eventChangeTheme); + myButton->registerOnEvent(this, "value", l_eventChangeTheme); mySizerHori->subWidgetAdd(myButton); } myButton = new ewol::widget::Button(); if (NULL != myButton) { myButton->setSubWidget(new ewol::widget::Label("Previous Widget test")); - myButton->registerOnEvent(this, ewol::widget::Button::eventPressed, l_eventChangeWidgetPrevious); + myButton->registerOnEvent(this, "value", l_eventChangeWidgetPrevious); mySizerHori->subWidgetAdd(myButton); } myButton = new ewol::widget::Button(); if (NULL != myButton) { myButton->setSubWidget(new ewol::widget::Label("Next Widget test")); - myButton->registerOnEvent(this, ewol::widget::Button::eventPressed, l_eventChangeWidgetNext); + myButton->registerOnEvent(this, "value", l_eventChangeWidgetNext); mySizerHori->subWidgetAdd(myButton); } m_testName = new ewol::widget::Label("none"); diff --git a/sources/appl/TestButton.cpp b/sources/appl/TestButton.cpp index fdb93d3..c82d87b 100644 --- a/sources/appl/TestButton.cpp +++ b/sources/appl/TestButton.cpp @@ -58,7 +58,7 @@ TestButton::TestButton(void) : myButton->setToggleMode(true); 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); + myButton->registerOnEvent(this, "value", l_eventChangeExpendX); mySizerHori->subWidgetAdd(myButton); } myButton = new ewol::widget::Button(); @@ -66,7 +66,7 @@ TestButton::TestButton(void) : myButton->setToggleMode(true); 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); + myButton->registerOnEvent(this, "value", l_eventChangeExpendY); mySizerHori->subWidgetAdd(myButton); } myButton = new ewol::widget::Button(); @@ -74,7 +74,7 @@ TestButton::TestButton(void) : myButton->setToggleMode(true); 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); + myButton->registerOnEvent(this, "value", l_eventChangeToggle); mySizerHori->subWidgetAdd(myButton); } myButton = new ewol::widget::Button(); @@ -82,7 +82,7 @@ TestButton::TestButton(void) : myButton->setToggleMode(true); 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); + myButton->registerOnEvent(this, "value", l_eventChangeTextToggle); mySizerHori->subWidgetAdd(myButton); } @@ -98,7 +98,7 @@ TestButton::TestButton(void) : myButton->setToggleMode(true); 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); + myButton->registerOnEvent(this, "value", l_eventChangeFillX); mySizerHori->subWidgetAdd(myButton); } myButton = new ewol::widget::Button(); @@ -106,13 +106,13 @@ TestButton::TestButton(void) : myButton->setToggleMode(true); 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); + myButton->registerOnEvent(this, "value", l_eventChangeFillY); mySizerHori->subWidgetAdd(myButton); } myButton = new ewol::widget::Button(); if (NULL != myButton) { myButton->setSubWidget(new ewol::widget::Label("Change Text
and other ...")); - myButton->registerOnEvent(this, ewol::widget::Button::eventPressed, l_eventChangeText); + myButton->registerOnEvent(this, "value", l_eventChangeText); mySizerHori->subWidgetAdd(myButton); } ewol::widget::Spacer* mySpacer = new ewol::widget::Spacer(); @@ -145,12 +145,7 @@ TestButton::TestButton(void) : 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, 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); + m_testWidget->registerOnEvent(this, "*"); mySizerHori->subWidgetAdd(m_testWidget); } diff --git a/sources/appl/TestButtonColor.cpp b/sources/appl/TestButtonColor.cpp index 7c3ad4f..1d5b98e 100644 --- a/sources/appl/TestButtonColor.cpp +++ b/sources/appl/TestButtonColor.cpp @@ -52,7 +52,7 @@ TestButtonColor::TestButtonColor(void) : myButton->setToggleMode(true); 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); + myButton->registerOnEvent(this, "value", l_eventChangeExpendX); mySizerHori->subWidgetAdd(myButton); } myButton = new ewol::widget::Button(); @@ -60,7 +60,7 @@ TestButtonColor::TestButtonColor(void) : myButton->setToggleMode(true); 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); + myButton->registerOnEvent(this, "value", l_eventChangeExpendY); mySizerHori->subWidgetAdd(myButton); } myButton = new ewol::widget::Button(); @@ -68,7 +68,7 @@ TestButtonColor::TestButtonColor(void) : myButton->setToggleMode(true); 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); + myButton->registerOnEvent(this, "value", l_eventChangeFillX); mySizerHori->subWidgetAdd(myButton); } myButton = new ewol::widget::Button(); @@ -76,7 +76,7 @@ TestButtonColor::TestButtonColor(void) : myButton->setToggleMode(true); 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); + myButton->registerOnEvent(this, "value", l_eventChangeFillY); mySizerHori->subWidgetAdd(myButton); } @@ -108,7 +108,7 @@ TestButtonColor::TestButtonColor(void) : if (NULL != m_testWidget) { m_testWidget->setExpand(bvec2(false,false)); m_testWidget->setFill(bvec2(false,false)); - m_testWidget->registerOnEvent(this, ewolEventButtonColorChange); + m_testWidget->registerOnEvent(this, "*"); mySizerHori->subWidgetAdd(m_testWidget); } mySpacer = new ewol::widget::Spacer(); diff --git a/sources/appl/TestImage.cpp b/sources/appl/TestImage.cpp index 3d44cdc..f87b262 100644 --- a/sources/appl/TestImage.cpp +++ b/sources/appl/TestImage.cpp @@ -54,7 +54,7 @@ TestImage::TestImage(void) : myButton->setToggleMode(true); 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); + myButton->registerOnEvent(this, "value", l_eventChangeExpendX); mySizerHori->subWidgetAdd(myButton); } myButton = new ewol::widget::Button(); @@ -62,7 +62,7 @@ TestImage::TestImage(void) : myButton->setToggleMode(true); 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); + myButton->registerOnEvent(this, "value", l_eventChangeExpendY); mySizerHori->subWidgetAdd(myButton); } @@ -78,7 +78,7 @@ TestImage::TestImage(void) : myButton->setToggleMode(true); 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); + myButton->registerOnEvent(this, "value", l_eventChangeFillX); mySizerHori->subWidgetAdd(myButton); } myButton = new ewol::widget::Button(); @@ -86,13 +86,13 @@ TestImage::TestImage(void) : myButton->setToggleMode(true); 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); + myButton->registerOnEvent(this, "value", l_eventChangeFillY); mySizerHori->subWidgetAdd(myButton); } myButton = new ewol::widget::Button(); if (NULL != myButton) { myButton->setSubWidget(new ewol::widget::Label("Change Image")); - myButton->registerOnEvent(this, ewol::widget::Button::eventValue, l_eventChangeImage); + myButton->registerOnEvent(this, "value", l_eventChangeImage); mySizerHori->subWidgetAdd(myButton); } ewol::widget::Spacer* mySpacer = new ewol::widget::Spacer(); diff --git a/sources/appl/TestLabel.cpp b/sources/appl/TestLabel.cpp index 1a1dc97..22fa8a7 100644 --- a/sources/appl/TestLabel.cpp +++ b/sources/appl/TestLabel.cpp @@ -54,7 +54,7 @@ TestLabel::TestLabel(void) : myButton->setToggleMode(true); 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); + myButton->registerOnEvent(this, "value", l_eventChangeExpendX); mySizerHori->subWidgetAdd(myButton); } myButton = new ewol::widget::Button(); @@ -62,7 +62,7 @@ TestLabel::TestLabel(void) : myButton->setToggleMode(true); 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); + myButton->registerOnEvent(this, "value", l_eventChangeExpendY); mySizerHori->subWidgetAdd(myButton); } myButton = new ewol::widget::Button(); @@ -70,7 +70,7 @@ TestLabel::TestLabel(void) : myButton->setToggleMode(true); 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); + myButton->registerOnEvent(this, "value", l_eventChangeFillX); mySizerHori->subWidgetAdd(myButton); } myButton = new ewol::widget::Button(); @@ -78,7 +78,7 @@ TestLabel::TestLabel(void) : myButton->setToggleMode(true); 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); + myButton->registerOnEvent(this, "value", l_eventChangeFillY); mySizerHori->subWidgetAdd(myButton); } myButton = new ewol::widget::Button(); @@ -86,13 +86,13 @@ TestLabel::TestLabel(void) : myButton->setToggleMode(true); 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); + myButton->registerOnEvent(this, "value", l_eventChangeMaxSize); mySizerHori->subWidgetAdd(myButton); } myButton = new ewol::widget::Button(); if (NULL != myButton) { myButton->setSubWidget(new ewol::widget::Label("Next Label")); - myButton->registerOnEvent(this, ewol::widget::Button::eventPressed, l_eventChangeLabel); + myButton->registerOnEvent(this, "value", l_eventChangeLabel); mySizerHori->subWidgetAdd(myButton); }