HeeroYui/edn
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] update externalisation of signal and property

Browse Source
This commit is contained in:
Edouard DUPIN 2016-02-11 21:45:21 +01:00
parent 2d4aac44fb
commit aed62ff58b
10 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sources/appl/Buffer.h
View File

@ -16,7 +16,7 @@
#include <ewol/widget/Widget.h> #include <ewol/widget/Widget.h>
#include <ewol/compositing/Text.h> #include <ewol/compositing/Text.h>
#include <appl/Highlight.h> #include <appl/Highlight.h>
#include <ewol/signal/Signal.h> #include <esignal/Signal.h>
namespace appl { namespace appl {
@ -288,10 +288,10 @@ namespace appl {
friend class Buffer; friend class Buffer;
}; };
public: public:
ewol::Signal<void> signalIsModify; esignal::Signal<void> signalIsModify;
ewol::Signal<void> signalIsSave; esignal::Signal<void> signalIsSave;
ewol::Signal<void> signalSelectChange; esignal::Signal<void> signalSelectChange;
ewol::Signal<void> signalChangeName; esignal::Signal<void> signalChangeName;
protected: protected:
Buffer(); Buffer();
void init(); void init();

16
sources/appl/BufferManager.cpp
View File

@ -13,7 +13,7 @@
#include <appl/BufferManager.h> #include <appl/BufferManager.h>
#include <ewol/object/Object.h> #include <ewol/object/Object.h>
#include <ewol/object/Manager.h> #include <ewol/object/Manager.h>
#include <ewol/signal/Signal.h> #include <esignal/Signal.h>
#include <gale/resource/Manager.h> #include <gale/resource/Manager.h>
#undef __class__ #undef __class__
@ -89,12 +89,12 @@ void appl::BufferManager::setBufferSelected(std::shared_ptr<appl::Buffer> _buffe
m_bufferSelected = _bufferSelected; m_bufferSelected = _bufferSelected;
if (m_bufferSelected == nullptr) { if (m_bufferSelected == nullptr) {
APPL_ERROR("select a NULL buffer ..."); APPL_ERROR("select a NULL buffer ...");
parameterSetOnWidgetNamed("appl-widget-display-name", "value", "---"); propertySetOnWidgetNamed("appl-widget-display-name", "value", "---");
return; return;
} }
APPL_INFO("Set buffer selected"); APPL_INFO("Set buffer selected");
//signalSelectFile.emit(m_bufferSelected->getName()); //signalSelectFile.emit(m_bufferSelected->getName());
//parameterSetOnWidgetNamed("appl-widget-display-name", "value", m_bufferSelected->getName()); //propertySetOnWidgetNamed("appl-widget-display-name", "value", m_bufferSelected->getName());
APPL_INFO("Set buffer selected (done)"); APPL_INFO("Set buffer selected (done)");
} }
@ -125,7 +125,7 @@ void appl::BufferManager::open(const std::string& _fileName) {
if (exist(_fileName) == true) { if (exist(_fileName) == true) {
APPL_WARNING(" the element '" << _fileName << "' already exist ... just reselect it ..."); APPL_WARNING(" the element '" << _fileName << "' already exist ... just reselect it ...");
signalSelectFile.emit(_fileName); signalSelectFile.emit(_fileName);
parameterSetOnWidgetNamed("appl-widget-display-name", "value", etk::FSNodeGetRealName(_fileName)); propertySetOnWidgetNamed("appl-widget-display-name", "value", etk::FSNodeGetRealName(_fileName));
return; return;
} }
if (get(_fileName, true) == nullptr) { if (get(_fileName, true) == nullptr) {
@ -133,7 +133,7 @@ void appl::BufferManager::open(const std::string& _fileName) {
return; return;
} }
signalSelectFile.emit(_fileName); signalSelectFile.emit(_fileName);
parameterSetOnWidgetNamed("appl-widget-display-name", "value", etk::FSNodeGetRealName(_fileName)); propertySetOnWidgetNamed("appl-widget-display-name", "value", etk::FSNodeGetRealName(_fileName));
} }
void appl::BufferManager::requestDestroyFromChild(const std::shared_ptr<Object>& _child) { void appl::BufferManager::requestDestroyFromChild(const std::shared_ptr<Object>& _child) {
@ -162,7 +162,7 @@ void appl::BufferManager::requestDestroyFromChild(const std::shared_ptr<Object>&
&& *it != nullptr) { && *it != nullptr) {
APPL_VERBOSE("Remove buffer select new one"); APPL_VERBOSE("Remove buffer select new one");
signalSelectFile.emit((*it)->getFileName()); signalSelectFile.emit((*it)->getFileName());
parameterSetOnWidgetNamed("appl-widget-display-name", "value", etk::FSNodeGetRealName((*it)->getFileName())); propertySetOnWidgetNamed("appl-widget-display-name", "value", etk::FSNodeGetRealName((*it)->getFileName()));
APPL_VERBOSE("Remove buffer select new one (done)"); APPL_VERBOSE("Remove buffer select new one (done)");
return; return;
} }
@ -170,12 +170,12 @@ void appl::BufferManager::requestDestroyFromChild(const std::shared_ptr<Object>&
&& m_list.back() != nullptr) { && m_list.back() != nullptr) {
APPL_VERBOSE("Remove buffer select new one (last)"); APPL_VERBOSE("Remove buffer select new one (last)");
signalSelectFile.emit(m_list.back()->getFileName()); signalSelectFile.emit(m_list.back()->getFileName());
parameterSetOnWidgetNamed("appl-widget-display-name", "value", etk::FSNodeGetRealName(m_list.back()->getFileName())); propertySetOnWidgetNamed("appl-widget-display-name", "value", etk::FSNodeGetRealName(m_list.back()->getFileName()));
APPL_VERBOSE("Remove buffer select new one (done)"); APPL_VERBOSE("Remove buffer select new one (done)");
return; return;
} }
signalSelectFile.emit(""); signalSelectFile.emit("");
parameterSetOnWidgetNamed("appl-widget-display-name", "value", "---"); propertySetOnWidgetNamed("appl-widget-display-name", "value", "---");
m_bufferSelected = nullptr; m_bufferSelected = nullptr;
} }
} }

8
sources/appl/BufferManager.h
View File

@ -18,10 +18,10 @@
namespace appl { namespace appl {
class BufferManager : public ewol::Object { class BufferManager : public ewol::Object {
public: public:
ewol::Signal<std::string> signalNewBuffer; esignal::Signal<std::string> signalNewBuffer;
ewol::Signal<std::string> signalSelectFile; esignal::Signal<std::string> signalSelectFile;
ewol::Signal<void> signalTextSelectionChange; esignal::Signal<void> signalTextSelectionChange;
ewol::Signal<std::shared_ptr<appl::Buffer>> signalRemoveBuffer; esignal::Signal<std::shared_ptr<appl::Buffer>> signalRemoveBuffer;
protected: protected:
BufferManager(); BufferManager();
void init(const std::string& _uniqueName); void init(const std::string& _uniqueName);

8
sources/appl/Gui/MainWindows.cpp
View File

@ -340,13 +340,13 @@ void MainWindows::onCallbackMenuEvent(const std::string& _value) {
ewol::getContext().getResourcesManager().reLoadResources(); ewol::getContext().getResourcesManager().reLoadResources();
ewol::getContext().forceRedrawAll(); ewol::getContext().forceRedrawAll();
} else if (_value == "menu:split:enable") { } else if (_value == "menu:split:enable") {
parameterSetOnWidgetNamed("appl-text-viewer2", "hide", "false"); propertySetOnWidgetNamed("appl-text-viewer2", "hide", "false");
} else if (_value == "menu:split:disable") { } else if (_value == "menu:split:disable") {
parameterSetOnWidgetNamed("appl-text-viewer2", "hide", "true"); propertySetOnWidgetNamed("appl-text-viewer2", "hide", "true");
} else if (_value == "menu:split:vert") { } else if (_value == "menu:split:vert") {
parameterSetOnWidgetNamed("appl-view-code-sizer", "mode", "vert"); propertySetOnWidgetNamed("appl-view-code-sizer", "mode", "vert");
} else if (_value == "menu:split:hori") { } else if (_value == "menu:split:hori") {
parameterSetOnWidgetNamed("appl-view-code-sizer", "mode", "hori"); propertySetOnWidgetNamed("appl-view-code-sizer", "mode", "hori");
} else { } else {
APPL_ERROR("Event from Menu UNKNOW : '" << _value << "'"); APPL_ERROR("Event from Menu UNKNOW : '" << _value << "'");
} }

6
sources/appl/Gui/Search.cpp
View File

@ -51,9 +51,9 @@ void appl::widget::Search::init() {
subBind(ewol::widget::Button, "SEARCH:wrap", signalValue, shared_from_this(), &appl::widget::Search::OnCallbackWrap); subBind(ewol::widget::Button, "SEARCH:wrap", signalValue, shared_from_this(), &appl::widget::Search::OnCallbackWrap);
subBind(ewol::widget::Button, "SEARCH:up-down", signalValue, shared_from_this(), &appl::widget::Search::OnCallbackForward); subBind(ewol::widget::Button, "SEARCH:up-down", signalValue, shared_from_this(), &appl::widget::Search::OnCallbackForward);
// set default properties // set default properties
parameterSetOnWidgetNamed("SEARCH:case", "value", etk::to_string(m_caseSensitive)); propertySetOnWidgetNamed("SEARCH:case", "value", etk::to_string(m_caseSensitive));
parameterSetOnWidgetNamed("SEARCH:wrap", "value", etk::to_string(m_wrap)); propertySetOnWidgetNamed("SEARCH:wrap", "value", etk::to_string(m_wrap));
parameterSetOnWidgetNamed("SEARCH:up-down", "value", etk::to_string(m_forward)); propertySetOnWidgetNamed("SEARCH:up-down", "value", etk::to_string(m_forward));
// get widget // get widget
m_searchEntry = std::dynamic_pointer_cast<ewol::widget::Entry>(getSubObjectNamed("SEARCH:search-entry")); m_searchEntry = std::dynamic_pointer_cast<ewol::widget::Entry>(getSubObjectNamed("SEARCH:search-entry"));
m_replaceEntry = std::dynamic_pointer_cast<ewol::widget::Entry>(getSubObjectNamed("SEARCH:replace-entry")); m_replaceEntry = std::dynamic_pointer_cast<ewol::widget::Entry>(getSubObjectNamed("SEARCH:replace-entry"));

6
sources/appl/Gui/TagFileList.h
View File

@ -29,9 +29,9 @@ namespace appl {
}; };
class TagFileList : public ewol::widget::List { class TagFileList : public ewol::widget::List {
public: public:
ewol::Signal<std::string> signalSelect; esignal::Signal<std::string> signalSelect;
ewol::Signal<std::string> signalValidate; esignal::Signal<std::string> signalValidate;
ewol::Signal<void> signalUnSelect; esignal::Signal<void> signalUnSelect;
private: private:
int32_t m_selectedLine; int32_t m_selectedLine;
std::vector<appl::TagListElement*> m_list; std::vector<appl::TagListElement*> m_list;

4
sources/appl/Gui/TagFileSelection.h
View File

@ -16,8 +16,8 @@
namespace appl { namespace appl {
class TagFileSelection : public ewol::widget::PopUp { class TagFileSelection : public ewol::widget::PopUp {
public: public:
ewol::Signal<std::string> signalSelect; esignal::Signal<std::string> signalSelect;
ewol::Signal<void> signalCancel; esignal::Signal<void> signalCancel;
private: private:
std::shared_ptr<appl::TagFileList> m_listTag; std::shared_ptr<appl::TagFileList> m_listTag;
std::string m_eventNamed; std::string m_eventNamed;

4
sources/appl/Gui/WorkerCloseFile.h
View File

@ -17,8 +17,8 @@
namespace appl { namespace appl {
class WorkerCloseFile : public ewol::object::Worker { class WorkerCloseFile : public ewol::object::Worker {
public: public:
ewol::Signal<void> signalCloseDone; esignal::Signal<void> signalCloseDone;
ewol::Signal<void> signalAbort; esignal::Signal<void> signalAbort;
protected: protected:
// note : if == "" ==> current ... // note : if == "" ==> current ...
WorkerCloseFile(); WorkerCloseFile();

4
sources/appl/Gui/WorkerSaveFile.h
View File

@ -16,8 +16,8 @@
namespace appl { namespace appl {
class WorkerSaveFile : public ewol::object::Worker { class WorkerSaveFile : public ewol::object::Worker {
public: public:
ewol::Signal<void> signalSaveDone; esignal::Signal<void> signalSaveDone;
ewol::Signal<void> signalAbort; esignal::Signal<void> signalAbort;
protected: protected:
WorkerSaveFile(); WorkerSaveFile();
void init(const std::string& _bufferName, bool _forceSaveAs=true); void init(const std::string& _bufferName, bool _forceSaveAs=true);

8
sources/appl/global.cpp
View File

@ -18,10 +18,10 @@
class myParamGlobal : public ewol::Object { class myParamGlobal : public ewol::Object {
public: public:
ewol::parameter::Value<bool> m_displayEOL; eproperty::Value<bool> m_displayEOL;
ewol::parameter::Value<bool> m_AutoIndent; eproperty::Value<bool> m_AutoIndent;
ewol::parameter::Value<bool> m_displayTabChar; eproperty::Value<bool> m_displayTabChar;
ewol::parameter::Value<bool> m_displaySpaceChar; eproperty::Value<bool> m_displaySpaceChar;
public : public :
myParamGlobal() : myParamGlobal() :
m_displayEOL(*this, "eol", false, "Display end of line character"), m_displayEOL(*this, "eol", false, "Display end of line character"),