diff --git a/external/etk b/external/etk index 4de67305..b507f48e 160000 --- a/external/etk +++ b/external/etk @@ -1 +1 @@ -Subproject commit 4de67305e404900be7df09662f790bc29451c132 +Subproject commit b507f48e4733d1bde152435fd7997f788101cd7b diff --git a/sources/ewol/renderer/EObject.cpp b/sources/ewol/renderer/EObject.cpp index 179d61b1..9fb23aa6 100644 --- a/sources/ewol/renderer/EObject.cpp +++ b/sources/ewol/renderer/EObject.cpp @@ -340,16 +340,16 @@ std::string ewol::EObject::getConfig(const std::string& _config) const { return ""; } -bool ewol::EObject::setConfigNamed(const std::string& _name, const ewol::EConfig& _conf) { - ewol::EObject* object = getEObjectManager().get(_name); +bool ewol::EObject::setConfigNamed(const std::string& _objectName, const ewol::EConfig& _conf) { + ewol::EObject* object = getEObjectManager().get(_objectName); if (object == NULL) { return false; } return object->setConfig(_conf); } -bool ewol::EObject::setConfigNamed(const std::string& _name, const std::string& _config, const std::string& _value) { - ewol::EObject* object = getEObjectManager().get(_name); +bool ewol::EObject::setConfigNamed(const std::string& _objectName, const std::string& _config, const std::string& _value) { + ewol::EObject* object = getEObjectManager().get(_objectName); if (object == NULL) { return false; } diff --git a/sources/ewol/renderer/EObject.h b/sources/ewol/renderer/EObject.h index a0446099..58a8e3e9 100644 --- a/sources/ewol/renderer/EObject.h +++ b/sources/ewol/renderer/EObject.h @@ -219,8 +219,9 @@ namespace ewol { return onSetConfig(_conf); }; bool setConfig(const std::string& _config, const std::string& _value); // need a search ... - bool setConfigNamed(const std::string& _name, const std::string& _config, const std::string& _value); // need a search ... - bool setConfigNamed(const std::string& _name, const ewol::EConfig& _conf); + // TODO : Distingish global search and sub search ... + bool setConfigNamed(const std::string& _objectName, const std::string& _config, const std::string& _value); // need a search ... + bool setConfigNamed(const std::string& _objectName, const ewol::EConfig& _conf); /** * @brief Configuration get from the curent EObject (systrem mode) * @param[in] _config Configuration name. diff --git a/sources/ewol/widget/Button.cpp b/sources/ewol/widget/Button.cpp index 6452df19..9765808e 100644 --- a/sources/ewol/widget/Button.cpp +++ b/sources/ewol/widget/Button.cpp @@ -14,12 +14,12 @@ #define __class__ "Button" -const char* const widget::Button::eventPressed = "ewol-widget-button-event-Pressed"; -const char* const widget::Button::eventDown = "ewol-widget-button-event-down"; -const char* const widget::Button::eventUp = "ewol-widget-button-event-up"; -const char* const widget::Button::eventEnter = "ewol-widget-button-event-enter"; -const char* const widget::Button::eventLeave = "ewol-widget-button-event-leave"; -const char* const widget::Button::eventValue = "ewol-widget-button-event-value"; +const char* const widget::Button::eventPressed = "pressed"; +const char* const widget::Button::eventDown = "down"; +const char* const widget::Button::eventUp = "up"; +const char* const widget::Button::eventEnter = "enter"; +const char* const widget::Button::eventLeave = "leave"; +const char* const widget::Button::eventValue = "value"; const char* const widget::Button::configToggle = "toggle"; const char* const widget::Button::configLock = "lock"; diff --git a/sources/ewol/widget/Entry.cpp b/sources/ewol/widget/Entry.cpp index faa0957a..72acde81 100644 --- a/sources/ewol/widget/Entry.cpp +++ b/sources/ewol/widget/Entry.cpp @@ -36,9 +36,9 @@ void widget::Entry::init(ewol::WidgetManager& _widgetManager) { _widgetManager.addWidgetCreator(__class__,&create); } -const char * const widget::Entry::eventClick = "ewol-widget-entry-event-click"; -const char * const widget::Entry::eventEnter = "ewol-widget-entry-event-enter"; -const char * const widget::Entry::eventModify = "ewol-widget-entry-event-modify"; +const char * const widget::Entry::eventClick = "click"; +const char * const widget::Entry::eventEnter = "enter"; +const char * const widget::Entry::eventModify = "modify"; const char* const widget::Entry::configMaxChar = "max"; const char* const widget::Entry::configRegExp = "regExp";