From b22014b3f6419de3361cd15ef0eb260446e4e7cc Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Fri, 19 Feb 2016 23:33:00 +0100 Subject: [PATCH] [DEV] update new esignal (not build) --- ewol/event/Time.cpp | 2 +- ewol/object/Manager.cpp | 6 +++--- ewol/object/Manager.h | 4 ++-- ewol/object/Object.h | 10 +++++----- ewol/resource/Colored3DObject.cpp | 5 +++-- ewol/widget/Button.h | 14 +++++++------- ewol/widget/ButtonColor.cpp | 2 +- ewol/widget/ButtonColor.h | 4 ++-- ewol/widget/CheckBox.h | 12 ++++++------ ewol/widget/ColorBar.h | 4 ++-- ewol/widget/Entry.cpp | 2 +- ewol/widget/Entry.h | 8 ++++---- ewol/widget/Image.h | 4 ++-- ewol/widget/Joystick.h | 8 ++++---- ewol/widget/Label.h | 4 ++-- ewol/widget/ListFileSystem.h | 10 +++++----- ewol/widget/Menu.cpp | 4 ++-- ewol/widget/Menu.h | 2 +- ewol/widget/Select.cpp | 6 +++--- ewol/widget/Select.h | 2 +- ewol/widget/Slider.h | 4 ++-- ewol/widget/Spin.cpp | 4 ++-- ewol/widget/Spin.h | 4 ++-- ewol/widget/WSlider.h | 6 +++--- ewol/widget/Widget.cpp | 6 +++--- ewol/widget/Widget.h | 11 ++++++----- ewol/widget/meta/ColorChooser.cpp | 10 +++++----- ewol/widget/meta/ColorChooser.h | 4 ++-- ewol/widget/meta/FileChooser.h | 10 +++++----- ewol/widget/meta/Parameter.cpp | 6 +++--- ewol/widget/meta/Parameter.h | 2 +- ewol/widget/meta/ParameterList.h | 2 +- ewol/widget/meta/StdPopUp.cpp | 2 +- 33 files changed, 93 insertions(+), 91 deletions(-) diff --git a/ewol/event/Time.cpp b/ewol/event/Time.cpp index 856f8e06..bc8a6c7f 100644 --- a/ewol/event/Time.cpp +++ b/ewol/event/Time.cpp @@ -34,5 +34,5 @@ namespace etk { } // declare for signal event -template class esignal::Signal; +template class esignal::ISignal; diff --git a/ewol/object/Manager.cpp b/ewol/object/Manager.cpp index 34e5d9bf..f08fcc08 100644 --- a/ewol/object/Manager.cpp +++ b/ewol/object/Manager.cpp @@ -17,7 +17,7 @@ ewol::object::Manager::Manager(ewol::Context& _context) : m_context(_context), - periodicCall(*this, "periodic", "Call every time system render", true), + periodicCall(*this, "periodic", "Call every time system render"), m_applWakeUpTime(0), m_lastPeriodicCallTime(0) { EWOL_DEBUG(" == > init Object-Manager"); @@ -133,7 +133,7 @@ void ewol::object::Manager::workerRemove(const std::shared_ptr& _w void ewol::object::Manager::timeCall(int64_t _localTime) { int64_t previousTime = m_lastPeriodicCallTime; m_lastPeriodicCallTime = _localTime; - if (periodicCall.getNumberConnected() <= 0) { + if (periodicCall.size() <= 0) { return; } float deltaTime = (float)(_localTime - previousTime)/1000000.0; @@ -146,5 +146,5 @@ void ewol::object::Manager::timeCallResume(int64_t _localTime) { } bool ewol::object::Manager::timeCallHave() { - return periodicCall.getNumberConnected() > 0; + return periodicCall.size() > 0; } diff --git a/ewol/object/Manager.h b/ewol/object/Manager.h index 44eac064..13b09d65 100644 --- a/ewol/object/Manager.h +++ b/ewol/object/Manager.h @@ -9,7 +9,7 @@ #include #include -#include +#include #include namespace ewol { @@ -76,7 +76,7 @@ namespace ewol { */ void workerRemove(const std::shared_ptr& _worker); public: - esignal::Signal periodicCall; + esignal::ISignal periodicCall; private: int64_t m_applWakeUpTime; //!< Time of the application initialize int64_t m_lastPeriodicCallTime; //!< last call time ... diff --git a/ewol/object/Object.h b/ewol/object/Object.h index 6fa00a62..8f50f598 100644 --- a/ewol/object/Object.h +++ b/ewol/object/Object.h @@ -255,7 +255,7 @@ namespace ewol { #define subBind(_type, _name, _event, _shared_ptr, _func, ...) do {\ std::shared_ptr<_type> myObject = std::dynamic_pointer_cast<_type>(getSubObjectNamed(_name)); \ if (myObject != nullptr) { \ - myObject->_event.bind(_shared_ptr, _func, ##__VA_ARGS__); \ + myObject->_event.connect(_shared_ptr, _func, ##__VA_ARGS__); \ } else { \ EWOL_ERROR("object named='" << _name << "' not exit or can not be cast in : " << #_type); \ } \ @@ -264,10 +264,10 @@ namespace ewol { template void subBind(std::shared_ptr _obj, void (TYPE::*_func)()) { std::shared_ptr obj2 = std::dynamic_pointer_cast(_obj); if (obj2 == nullptr) { - EWOL_ERROR("Can not bind signal ..."); + EWOL_ERROR("Can not connect signal ..."); return; } - m_callerList.push_back(std::make_pair(std::weak_ptr(_obj), std::bind(_func, obj2.get()))); + m_callerList.push_back(std::make_pair(std::weak_ptr(_obj), std::connect(_func, obj2.get()))); } */ }; @@ -280,7 +280,7 @@ namespace ewol { #define globalBind(_type, _name, _event, _obj, _func, ...) do {\ std::shared_ptr<_type> myObject = std::dynamic_pointer_cast<_type>(ewol::getContext().getEObjectManager().getObjectNamed(_name)); \ if (myObject != nullptr) { \ - myObject->_event.bind(_obj, _func, ##__VA_ARGS__); \ + myObject->_event.connect(_obj, _func, ##__VA_ARGS__); \ } else { \ EWOL_ERROR("object named='" << _name << "' not exit or can not be cast in : " << #_type); \ } \ @@ -292,7 +292,7 @@ namespace ewol { #define externSubBind(_object, _type, _name, _event, _obj, _func, ...) do {\ std::shared_ptr<_type> myObject = std::dynamic_pointer_cast<_type>(_object->getObjectNamed(_name)); \ if (myObject != nullptr) { \ - myObject->_event.bind(_obj, _func, ##__VA_ARGS__); \ + myObject->_event.connect(_obj, _func, ##__VA_ARGS__); \ } else { \ EWOL_ERROR("object named='" << _name << "' not exit or can not be cast in : " << #_type); \ } \ diff --git a/ewol/resource/Colored3DObject.cpp b/ewol/resource/Colored3DObject.cpp index 572b5ca6..99d17284 100644 --- a/ewol/resource/Colored3DObject.cpp +++ b/ewol/resource/Colored3DObject.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #undef __class__ #define __class__ "resource::Colored3DObject" @@ -235,6 +236,6 @@ template<> std::string etk::to_string(ewol::resource::Colored3DObject const&) { } // declare for signal event -template class esignal::Signal; -template class esignal::Signal>; +template class esignal::ISignal; +template class esignal::ISignal>; diff --git a/ewol/widget/Button.h b/ewol/widget/Button.h index 59ca00aa..ecbcc9c0 100644 --- a/ewol/widget/Button.h +++ b/ewol/widget/Button.h @@ -14,7 +14,7 @@ #include #include #include -#include +#include @@ -33,12 +33,12 @@ namespace ewol { lockAccess, //!< all event are trashed == > acctivity of the button is disable }; public: // Event list - esignal::Signal signalPressed; - esignal::Signal signalDown; - esignal::Signal signalUp; - esignal::Signal signalEnter; - esignal::Signal signalLeave; - esignal::Signal signalValue; + esignal::ISignal<> signalPressed; + esignal::ISignal<> signalDown; + esignal::ISignal<> signalUp; + esignal::ISignal<> signalEnter; + esignal::ISignal<> signalLeave; + esignal::ISignal signalValue; public: // propertie list eproperty::Value propertyShape; //!< shaper name property eproperty::Value propertyValue; //!< Current state of the button. diff --git a/ewol/widget/ButtonColor.cpp b/ewol/widget/ButtonColor.cpp index 23c26f88..536612db 100644 --- a/ewol/widget/ButtonColor.cpp +++ b/ewol/widget/ButtonColor.cpp @@ -177,7 +177,7 @@ bool ewol::widget::ButtonColor::onEventInput(const ewol::event::Input& _event) { myColorChooser->propertyValue.set(propertyValue.get()); // set it in the pop-up-system : m_widgetContextMenu->setSubWidget(myColorChooser); - myColorChooser->signalChange.bind(shared_from_this(), &ewol::widget::ButtonColor::onCallbackColorChange); + myColorChooser->signalChange.connect(shared_from_this(), &ewol::widget::ButtonColor::onCallbackColorChange); std::shared_ptr currentWindows = getWindows(); if (currentWindows == nullptr) { EWOL_ERROR("Can not get the curent Windows..."); diff --git a/ewol/widget/ButtonColor.h b/ewol/widget/ButtonColor.h index 530c8e7b..df188890 100644 --- a/ewol/widget/ButtonColor.h +++ b/ewol/widget/ButtonColor.h @@ -15,13 +15,13 @@ #include #include #include -#include +#include namespace ewol { namespace widget { class ButtonColor : public ewol::Widget { public: // signals - esignal::Signal> signalChange; + esignal::ISignal> signalChange; public: // properties eproperty::Value> propertyValue; //!< Current color. eproperty::Value propertyShape; //!< Current color. diff --git a/ewol/widget/CheckBox.h b/ewol/widget/CheckBox.h index e0de93d6..64e66743 100644 --- a/ewol/widget/CheckBox.h +++ b/ewol/widget/CheckBox.h @@ -12,18 +12,18 @@ #include #include #include -#include +#include namespace ewol { namespace widget { class CheckBox : public ewol::widget::Container2 { public: // Event list - esignal::Signal signalPressed; - esignal::Signal signalDown; - esignal::Signal signalUp; - esignal::Signal signalEnter; - esignal::Signal signalValue; + esignal::ISignal<> signalPressed; + esignal::ISignal<> signalDown; + esignal::ISignal<> signalUp; + esignal::ISignal<> signalEnter; + esignal::ISignal signalValue; public: // propertie list eproperty::Value propertyValue; //!< Current state of the checkbox. eproperty::Value propertyShape; //!< shape of the widget diff --git a/ewol/widget/ColorBar.h b/ewol/widget/ColorBar.h index d2de74d5..7898e4b7 100644 --- a/ewol/widget/ColorBar.h +++ b/ewol/widget/ColorBar.h @@ -12,14 +12,14 @@ #include #include #include -#include +#include namespace ewol { namespace widget { class ColorBar : public ewol::Widget { public: // signals - esignal::Signal> signalChange; + esignal::ISignal> signalChange; public: eproperty::Value> propertyValue; protected: diff --git a/ewol/widget/Entry.cpp b/ewol/widget/Entry.cpp index 78ee6ff6..abd9df3c 100644 --- a/ewol/widget/Entry.cpp +++ b/ewol/widget/Entry.cpp @@ -57,7 +57,7 @@ void ewol::widget::Entry::init(const std::string& _newData, const std::string& _ shortCutAdd("ctrl+v", "paste"); shortCutAdd("ctrl+a", "select:all"); shortCutAdd("ctrl+shift+a", "select:none"); - signalShortcut.bind(shared_from_this(), &ewol::widget::Entry::onCallbackShortCut); + signalShortcut.connect(shared_from_this(), &ewol::widget::Entry::onCallbackShortCut); } diff --git a/ewol/widget/Entry.h b/ewol/widget/Entry.h index 786294c7..c2d000ee 100644 --- a/ewol/widget/Entry.h +++ b/ewol/widget/Entry.h @@ -16,7 +16,7 @@ #include #include #include -#include +#include namespace ewol { namespace widget { @@ -32,9 +32,9 @@ namespace ewol { */ class Entry : public ewol::Widget { public: // Event list - esignal::Signal signalClick; //!< bang on click the entry box - esignal::Signal signalEnter; //!< Enter key is pressed - esignal::Signal signalModify; //!< data change + esignal::ISignal<> signalClick; //!< bang on click the entry box + esignal::ISignal signalEnter; //!< Enter key is pressed + esignal::ISignal signalModify; //!< data change public: // propertie list eproperty::Value propertyShaper; eproperty::Value propertyValue; //!< string that must be displayed diff --git a/ewol/widget/Image.h b/ewol/widget/Image.h index 7ac65e34..1cda81d9 100644 --- a/ewol/widget/Image.h +++ b/ewol/widget/Image.h @@ -13,7 +13,7 @@ #include #include #include -#include +#include namespace ewol { namespace widget { @@ -22,7 +22,7 @@ namespace ewol { */ class Image :public ewol::Widget { public: // signals - esignal::Signal signalPressed; + esignal::ISignal<> signalPressed; public: // properties eproperty::Value propertySource; //!< file name of the image. eproperty::Value propertyBorder; //!< border to add at the image. diff --git a/ewol/widget/Joystick.h b/ewol/widget/Joystick.h index 04520b90..4a94fb79 100644 --- a/ewol/widget/Joystick.h +++ b/ewol/widget/Joystick.h @@ -11,7 +11,7 @@ #include #include #include -#include +#include // TODO : Rework ==> use property and shaper ... @@ -23,9 +23,9 @@ namespace ewol { class Joystick :public ewol::Widget { public: // Event list of properties - esignal::Signal signalEnable; - esignal::Signal signalDisable; - esignal::Signal signalMove; + esignal::ISignal<> signalEnable; + esignal::ISignal<> signalDisable; + esignal::ISignal signalMove; public: enum joystickMode { modeNormal, diff --git a/ewol/widget/Label.h b/ewol/widget/Label.h index fc33013e..6ac45233 100644 --- a/ewol/widget/Label.h +++ b/ewol/widget/Label.h @@ -13,7 +13,7 @@ #include #include #include -#include +#include namespace ewol { namespace widget { @@ -22,7 +22,7 @@ namespace ewol { */ class Label : public ewol::Widget { public: // signals - esignal::Signal signalPressed; + esignal::ISignal<> signalPressed; public: // properties eproperty::Value propertyValue; //!< decorated text to display. private: diff --git a/ewol/widget/ListFileSystem.h b/ewol/widget/ListFileSystem.h index 945e245e..1da07dbe 100644 --- a/ewol/widget/ListFileSystem.h +++ b/ewol/widget/ListFileSystem.h @@ -10,7 +10,7 @@ #include #include #include -#include +#include namespace ewol { namespace widget { @@ -19,10 +19,10 @@ namespace ewol { */ class ListFileSystem : public ewol::widget::List { public: // signals - esignal::Signal signalFileSelect; //!< @event "file-select" Generated when a file is selected. - esignal::Signal signalFileValidate; //!< @event "file-validate" Generate when the user validate (return) or double click on the element - esignal::Signal signalFolderSelect; - esignal::Signal signalFolderValidate; + esignal::ISignal signalFileSelect; //!< @event "file-select" Generated when a file is selected. + esignal::ISignal signalFileValidate; //!< @event "file-validate" Generate when the user validate (return) or double click on the element + esignal::ISignal signalFolderSelect; + esignal::ISignal signalFolderValidate; public: // properties eproperty::Value propertyPath; //!< Current folder that display point on. eproperty::Value propertyFile; //!< current selected file diff --git a/ewol/widget/Menu.cpp b/ewol/widget/Menu.cpp index bb572f28..449b5cfc 100644 --- a/ewol/widget/Menu.cpp +++ b/ewol/widget/Menu.cpp @@ -108,7 +108,7 @@ int32_t ewol::widget::Menu::add(int32_t _parent, // add it in the widget list ewol::widget::Sizer::subWidgetAdd(myButton); // keep the specific event ... - myButton->signalPressed.bind(shared_from_this(), &ewol::widget::Menu::onButtonPressed, std::weak_ptr(myButton)); + myButton->signalPressed.connect(shared_from_this(), &ewol::widget::Menu::onButtonPressed, std::weak_ptr(myButton)); tmpObject.m_widgetPointer = myButton; } m_listElement.push_back(tmpObject); @@ -206,7 +206,7 @@ void ewol::widget::Menu::onButtonPressed(std::weak_ptr _bu myButton->propertyExpand.set(bvec2(true,true)); myButton->propertyFill.set(bvec2(true,true)); // set callback - myButton->signalPressed.bind(shared_from_this(), &ewol::widget::Menu::onButtonPressed, std::weak_ptr(myButton)); + myButton->signalPressed.connect(shared_from_this(), &ewol::widget::Menu::onButtonPressed, std::weak_ptr(myButton)); // add it in the widget list mySizer->subWidgetAdd(myButton); if (it2->m_image.size() != 0) { diff --git a/ewol/widget/Menu.h b/ewol/widget/Menu.h index da7f8dda..0133b07a 100644 --- a/ewol/widget/Menu.h +++ b/ewol/widget/Menu.h @@ -32,7 +32,7 @@ namespace ewol { */ class Menu :public ewol::widget::Sizer { public: - esignal::Signal signalSelect; // event on a menu button or ... + esignal::ISignal signalSelect; // event on a menu button or ... protected: Menu(); void init(); diff --git a/ewol/widget/Select.cpp b/ewol/widget/Select.cpp index 21c7fb8e..8200d81d 100644 --- a/ewol/widget/Select.cpp +++ b/ewol/widget/Select.cpp @@ -151,7 +151,7 @@ void ewol::widget::Select::updateGui() { } if (m_widgetButtonUp != nullptr) { m_widgetButtonUp->signalUnBindAll(shared_from_this()); - m_widgetButtonUp->signalPressed.bind(shared_from_this(), &ewol::widget::Select::onCallbackOpenMenu); + m_widgetButtonUp->signalPressed.connect(shared_from_this(), &ewol::widget::Select::onCallbackOpenMenu); } } @@ -194,8 +194,8 @@ void ewol::widget::Select::onCallbackOpenMenu() { myLabel->propertyExpand.set(bvec2(true,true)); myLabel->propertyFill.set(bvec2(true,true)); // set callback - myLabel->signalPressed.bind(shared_from_this(), &ewol::widget::Select::onCallbackLabelPressed, it.m_value); - myLabel->signalPressed.bind(tmpContext, &ewol::widget::ContextMenu::destroy); + myLabel->signalPressed.connect(shared_from_this(), &ewol::widget::Select::onCallbackLabelPressed, it.m_value); + myLabel->signalPressed.connect(tmpContext, &ewol::widget::ContextMenu::destroy); // add it in the widget list mySizer->subWidgetAddStart(myLabel); } diff --git a/ewol/widget/Select.h b/ewol/widget/Select.h index d501c935..b5f25581 100644 --- a/ewol/widget/Select.h +++ b/ewol/widget/Select.h @@ -19,7 +19,7 @@ namespace ewol { */ class Select : public ewol::widget::SpinBase { public: // signals - esignal::Signal signalValue; + esignal::ISignal signalValue; public: // properties eproperty::Value propertyValue; //!< Current state of the Select. protected: diff --git a/ewol/widget/Slider.h b/ewol/widget/Slider.h index 9c46e75d..9d1c05ea 100644 --- a/ewol/widget/Slider.h +++ b/ewol/widget/Slider.h @@ -12,7 +12,7 @@ #include #include #include -#include +#include namespace ewol { namespace widget { @@ -21,7 +21,7 @@ namespace ewol { */ class Slider : public ewol::Widget { public: // signals - esignal::Signal signalChange; + esignal::ISignal signalChange; public: //eproperty::Value propertyShape; //!< name of the shape used eproperty::Value propertyValue; //!< current value of the Slider diff --git a/ewol/widget/Spin.cpp b/ewol/widget/Spin.cpp index 5f4d2aee..4726b0b4 100644 --- a/ewol/widget/Spin.cpp +++ b/ewol/widget/Spin.cpp @@ -67,11 +67,11 @@ void ewol::widget::Spin::updateGui() { } if (m_widgetButtonUp != nullptr) { m_widgetButtonUp->signalUnBindAll(shared_from_this()); - m_widgetButtonUp->signalPressed.bind(shared_from_this(), &ewol::widget::Spin::onCallbackUp); + m_widgetButtonUp->signalPressed.connect(shared_from_this(), &ewol::widget::Spin::onCallbackUp); } if (m_widgetButtonDown != nullptr) { m_widgetButtonDown->signalUnBindAll(shared_from_this()); - m_widgetButtonDown->signalPressed.bind(shared_from_this(), &ewol::widget::Spin::onCallbackDown); + m_widgetButtonDown->signalPressed.connect(shared_from_this(), &ewol::widget::Spin::onCallbackDown); } EWOL_WARNING("updateGui [STOP]"); diff --git a/ewol/widget/Spin.h b/ewol/widget/Spin.h index 01273e69..f7305a81 100644 --- a/ewol/widget/Spin.h +++ b/ewol/widget/Spin.h @@ -20,8 +20,8 @@ namespace ewol { class Spin : public ewol::widget::SpinBase { public: // Event list of properties - esignal::Signal signalValue; - esignal::Signal signalValueDouble; + esignal::ISignal signalValue; + esignal::ISignal signalValueDouble; public: eproperty::Value propertyValue; //!< Current value of the Spin. eproperty::Value propertyMin; //!< Minimum value diff --git a/ewol/widget/WSlider.h b/ewol/widget/WSlider.h index d07718c4..0e516c8e 100644 --- a/ewol/widget/WSlider.h +++ b/ewol/widget/WSlider.h @@ -11,7 +11,7 @@ #include #include #include -#include +#include namespace ewol { namespace widget { @@ -26,8 +26,8 @@ namespace ewol { sladingTransition_count, }; public: // signals: - esignal::Signal signalStartSlide; - esignal::Signal signalStopSlide; + esignal::ISignal<> signalStartSlide; + esignal::ISignal<> signalStopSlide; public: // properties: eproperty::Range propertyTransitionSpeed; //!< speed of the transition (default 1 == > 1s) eproperty::List propertyTransitionMode; //!< mode to slide the widgets diff --git a/ewol/widget/Widget.cpp b/ewol/widget/Widget.cpp index 6d50b0c1..70bac3bc 100644 --- a/ewol/widget/Widget.cpp +++ b/ewol/widget/Widget.cpp @@ -239,17 +239,17 @@ void ewol::Widget::systemDraw(const ewol::DrawProperty& _displayProp) { void ewol::Widget::periodicCallDisable() { EWOL_VERBOSE("Perodic call disable " << propertyName); - getObjectManager().periodicCall.release(shared_from_this()); + m_periodicCallHandle.disconnect(); } void ewol::Widget::periodicCallEnable() { - if (getObjectManager().periodicCall.isRegistered(shared_from_this()) == true) { + if (m_periodicCallHandle.isConnected() == true) { EWOL_VERBOSE("Perodic call enable " << propertyName << " ==> rejected"); return; } else { EWOL_VERBOSE("Perodic call enable " << propertyName); } - getObjectManager().periodicCall.bind(shared_from_this(), &ewol::Widget::periodicCall); + m_periodicCallHandle = getObjectManager().periodicCall.connect(this, &ewol::Widget::periodicCall); } void ewol::Widget::markToRedraw() { diff --git a/ewol/widget/Widget.h b/ewol/widget/Widget.h index 99599630..4b3dd2cd 100644 --- a/ewol/widget/Widget.h +++ b/ewol/widget/Widget.h @@ -30,7 +30,7 @@ namespace ewol { #include #include #include -#include +#include #include #include @@ -324,6 +324,7 @@ namespace ewol { // ---------------------------------------------------------------------------------------------------------------- protected: // TODO : Remove this API ==> deprecated since 28/10/2014 + esignal::Connection m_periodicCallHandle; /** * @brief disable the periodic call. */ @@ -408,7 +409,7 @@ namespace ewol { // -- Shortcut : management of the shortcut // ---------------------------------------------------------------------------------------------------------------- public: - esignal::Signal signalShortcut; //!< signal handle of the message + esignal::ISignal signalShortcut; //!< signal handle of the message private: std::vector m_localShortcut; //!< list of all shortcut in the widget protected: @@ -534,9 +535,9 @@ namespace ewol { */ public: // event generated : - esignal::Signal signalAnnimationStart; //!< event when start annimation - esignal::Signal signalAnnimationRatio; //!< event when % of annimation change (integer) - esignal::Signal signalAnnimationStop; //!< event when stop annimation + esignal::ISignal<> signalAnnimationStart; //!< event when start annimation + esignal::ISignal signalAnnimationRatio; //!< event when % of annimation change (integer) + esignal::ISignal<> signalAnnimationStop; //!< event when stop annimation protected: enum annimationMode { annimationModeEnableAdd, diff --git a/ewol/widget/meta/ColorChooser.cpp b/ewol/widget/meta/ColorChooser.cpp index 3ed4d71d..d4d794b0 100644 --- a/ewol/widget/meta/ColorChooser.cpp +++ b/ewol/widget/meta/ColorChooser.cpp @@ -35,7 +35,7 @@ void ewol::widget::ColorChooser::init() { ewol::widget::Sizer::init(ewol::widget::Sizer::modeVert); propertyLockExpand.set(bvec2(true,true)); m_widgetColorBar = ewol::widget::ColorBar::create(); - m_widgetColorBar->signalChange.bind(shared_from_this(), &ewol::widget::ColorChooser::onCallbackColorChange); + m_widgetColorBar->signalChange.connect(shared_from_this(), &ewol::widget::ColorChooser::onCallbackColorChange); m_widgetColorBar->propertyFill.set(bvec2(true,true)); subWidgetAdd(m_widgetColorBar); @@ -43,7 +43,7 @@ void ewol::widget::ColorChooser::init() { sliderColor = etk::color::black; m_widgetRed = ewol::widget::Slider::create(); - m_widgetRed->signalChange.bind(shared_from_this(), &ewol::widget::ColorChooser::onCallbackColorChangeRed); + m_widgetRed->signalChange.connect(shared_from_this(), &ewol::widget::ColorChooser::onCallbackColorChangeRed); m_widgetRed->propertyExpand.set(bvec2(true,false)); m_widgetRed->propertyFill.set(bvec2(true,false)); m_widgetRed->propertyMinimum.set(0); @@ -52,7 +52,7 @@ void ewol::widget::ColorChooser::init() { m_widgetRed->setColor(sliderColor); subWidgetAdd(m_widgetRed); m_widgetGreen = ewol::widget::Slider::create(); - m_widgetGreen->signalChange.bind(shared_from_this(), &ewol::widget::ColorChooser::onCallbackColorChangeGreen); + m_widgetGreen->signalChange.connect(shared_from_this(), &ewol::widget::ColorChooser::onCallbackColorChangeGreen); m_widgetGreen->propertyExpand.set(bvec2(true,false)); m_widgetGreen->propertyFill.set(bvec2(true,false)); m_widgetGreen->propertyMinimum.set(0); @@ -61,7 +61,7 @@ void ewol::widget::ColorChooser::init() { m_widgetGreen->setColor(sliderColor); subWidgetAdd(m_widgetGreen); m_widgetBlue = ewol::widget::Slider::create(); - m_widgetBlue->signalChange.bind(shared_from_this(), &ewol::widget::ColorChooser::onCallbackColorChangeBlue); + m_widgetBlue->signalChange.connect(shared_from_this(), &ewol::widget::ColorChooser::onCallbackColorChangeBlue); m_widgetBlue->propertyExpand.set(bvec2(true,false)); m_widgetBlue->propertyFill.set(bvec2(true,false)); m_widgetBlue->propertyMinimum.set(0); @@ -70,7 +70,7 @@ void ewol::widget::ColorChooser::init() { m_widgetBlue->setColor(sliderColor); subWidgetAdd(m_widgetBlue); m_widgetAlpha = ewol::widget::Slider::create(); - m_widgetAlpha->signalChange.bind(shared_from_this(), &ewol::widget::ColorChooser::onCallbackColorChangeAlpha); + m_widgetAlpha->signalChange.connect(shared_from_this(), &ewol::widget::ColorChooser::onCallbackColorChangeAlpha); m_widgetAlpha->propertyExpand.set(bvec2(true,false)); m_widgetAlpha->propertyFill.set(bvec2(true,false)); m_widgetAlpha->propertyMinimum.set(0); diff --git a/ewol/widget/meta/ColorChooser.h b/ewol/widget/meta/ColorChooser.h index 04b72391..db3520a0 100644 --- a/ewol/widget/meta/ColorChooser.h +++ b/ewol/widget/meta/ColorChooser.h @@ -16,7 +16,7 @@ #include #include #include -#include +#include namespace ewol { namespace widget { @@ -25,7 +25,7 @@ namespace ewol { */ class ColorChooser : public ewol::widget::Sizer { public: // signals - esignal::Signal> signalChange; + esignal::ISignal> signalChange; public: eproperty::Value> propertyValue; protected: diff --git a/ewol/widget/meta/FileChooser.h b/ewol/widget/meta/FileChooser.h index 3ed0ae08..64e38925 100644 --- a/ewol/widget/meta/FileChooser.h +++ b/ewol/widget/meta/FileChooser.h @@ -10,7 +10,7 @@ #include #include #include -#include +#include namespace ewol { namespace widget { @@ -32,9 +32,9 @@ namespace ewol { * return -1; * } * // register on the Validate event: - * tmpWidget->signalValidate.bind(shared_from_this(), &****::onCallbackOpenFile); + * tmpWidget->signalValidate.connect(shared_from_this(), &****::onCallbackOpenFile); * // no need of this event watching ... - * tmpWidget->signalCancel.bind(shared_from_this(), &****::onCallbackClosePopUp); + * tmpWidget->signalCancel.connect(shared_from_this(), &****::onCallbackClosePopUp); * // set the title: * tmpWidget->setTitle("Open files ..."); * // Set the validate Label: @@ -64,8 +64,8 @@ namespace ewol { */ class FileChooser : public ewol::widget::Composer { public: // signals - esignal::Signal signalCancel; - esignal::Signal signalValidate; + esignal::ISignal<> signalCancel; + esignal::ISignal signalValidate; public: // properties eproperty::Value propertyPath; eproperty::Value propertyFile; diff --git a/ewol/widget/meta/Parameter.cpp b/ewol/widget/meta/Parameter.cpp index 92ec4e8e..86570cb3 100644 --- a/ewol/widget/meta/Parameter.cpp +++ b/ewol/widget/meta/Parameter.cpp @@ -77,7 +77,7 @@ void ewol::widget::Parameter::init() { " \n" " \n" "\n")); - tmpButton->signalPressed.bind(shared_from_this(), &ewol::widget::Parameter::onCallbackParameterSave); + tmpButton->signalPressed.connect(shared_from_this(), &ewol::widget::Parameter::onCallbackParameterSave); mySizerHori->subWidgetAdd(tmpButton); } @@ -101,7 +101,7 @@ void ewol::widget::Parameter::init() { " \n" " \n" "\n")); - tmpButton->signalPressed.bind(shared_from_this(), &ewol::widget::Parameter::onCallbackMenuclosed); + tmpButton->signalPressed.connect(shared_from_this(), &ewol::widget::Parameter::onCallbackMenuclosed); mySizerHori->subWidgetAdd(tmpButton); } } @@ -117,7 +117,7 @@ void ewol::widget::Parameter::init() { EWOL_ERROR("Can not allocate widget == > display might be in error"); } else { - m_paramList->signalSelect.bind(shared_from_this(), &ewol::widget::Parameter::onCallbackMenuSelected); + m_paramList->signalSelect.connect(shared_from_this(), &ewol::widget::Parameter::onCallbackMenuSelected); m_paramList->propertyFill.set(bvec2(false,true)); m_paramList->propertyExpand.set(bvec2(false,true)); mySizerHori->subWidgetAdd(m_paramList); diff --git a/ewol/widget/meta/Parameter.h b/ewol/widget/meta/Parameter.h index 9e4bd018..e08ade29 100644 --- a/ewol/widget/meta/Parameter.h +++ b/ewol/widget/meta/Parameter.h @@ -26,7 +26,7 @@ namespace ewol { */ class Parameter : public ewol::widget::PopUp { public: // signals - esignal::Signal signalClose; + esignal::ISignal<> signalClose; public: // properties eproperty::Value propertyLabelTitle; protected: diff --git a/ewol/widget/meta/ParameterList.h b/ewol/widget/meta/ParameterList.h index b08b3ec6..4eb9afcf 100644 --- a/ewol/widget/meta/ParameterList.h +++ b/ewol/widget/meta/ParameterList.h @@ -37,7 +37,7 @@ namespace ewol { */ class ParameterList :public ewol::widget::WidgetScrolled { public: //signals - esignal::Signal signalSelect; + esignal::ISignal signalSelect; public: // properties private: diff --git a/ewol/widget/meta/StdPopUp.cpp b/ewol/widget/meta/StdPopUp.cpp index 4f16bbe7..d16f8237 100644 --- a/ewol/widget/meta/StdPopUp.cpp +++ b/ewol/widget/meta/StdPopUp.cpp @@ -105,7 +105,7 @@ std::shared_ptr ewol::widget::StdPopUp::addButton(const st } myButton->setSubWidget(ewol::widget::Label::create(_text)); if(_autoExit == true) { - myButton->signalPressed.bind(shared_from_this(), &ewol::widget::StdPopUp::onCallBackButtonExit); + myButton->signalPressed.connect(shared_from_this(), &ewol::widget::StdPopUp::onCallBackButtonExit); } m_subBar->subWidgetAdd(myButton); markToRedraw();