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

[DEV] update on EWOL 0.8.1

Browse Source
This commit is contained in:
Edouard DUPIN 2013-12-13 21:50:40 +01:00
parent edb2ab58f2
commit 90b766d2c7
51 changed files with 277 additions and 274 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sources/appl/Buffer.cpp
View File

@ -9,7 +9,7 @@
#include <appl/Buffer.h> #include <appl/Buffer.h>
#include <appl/debug.h> #include <appl/debug.h>
#include <ewol/clipBoard.h> #include <ewol/context/clipBoard.h>
#include <appl/HighlightManager.h> #include <appl/HighlightManager.h>

4
sources/appl/Buffer.h
View File

@ -14,7 +14,7 @@
#include <etk/unicode.h> #include <etk/unicode.h>
#include <ewol/ewol.h> #include <ewol/ewol.h>
#include <etk/Buffer.h> #include <etk/Buffer.h>
#include <ewol/renderer/EObject.h> #include <ewol/object/Object.h>
#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>
@ -27,7 +27,7 @@ namespace appl {
int64_t posHLPass1; int64_t posHLPass1;
int64_t posHLPass2; int64_t posHLPass2;
}; };
class Buffer : public ewol::EObject { class Buffer : public ewol::Object {
public: public:
class Iterator { class Iterator {
// Private data : // Private data :

10
sources/appl/BufferManager.cpp
View File

@ -9,8 +9,10 @@
#include <appl/debug.h> #include <appl/debug.h>
#include <appl/global.h> #include <appl/global.h>
#include <appl/BufferManager.h> #include <appl/BufferManager.h>
#include <ewol/renderer/EObject.h> #include <etk/UString.h>
#include <ewol/renderer/EObjectManager.h> #include <ewol/object/Object.h>
#include <ewol/object/Manager.h>
#include <ewol/resource/Manager.h>
#undef __class__ #undef __class__
#define __class__ "BufferManager" #define __class__ "BufferManager"
@ -78,7 +80,7 @@ void appl::BufferManager::setBufferSelected(appl::Buffer* _bufferSelected) {
sendMultiCast(appl::MsgSelectChange, ""); sendMultiCast(appl::MsgSelectChange, "");
} }
void appl::BufferManager::onObjectRemove(ewol::EObject * _removeObject) { void appl::BufferManager::onObjectRemove(ewol::Object * _removeObject) {
if (m_bufferSelected == _removeObject) { if (m_bufferSelected == _removeObject) {
setBufferSelected(NULL); setBufferSelected(NULL);
} }
@ -114,7 +116,7 @@ void appl::BufferManager::open(const std::string& _fileName) {
sendMultiCast(appl::MsgSelectNewFile, _fileName); sendMultiCast(appl::MsgSelectNewFile, _fileName);
} }
void appl::BufferManager::onReceiveMessage(const ewol::EMessage& _msg) { void appl::BufferManager::onReceiveMessage(const ewol::object::Message& _msg) {
APPL_DEBUG("receive message !!! " << _msg); APPL_DEBUG("receive message !!! " << _msg);
} }

6
sources/appl/BufferManager.h
View File

@ -12,7 +12,7 @@
#include <appl/Buffer.h> #include <appl/Buffer.h>
#include <appl/globalMsg.h> #include <appl/globalMsg.h>
#include <ewol/widget/Widget.h> #include <ewol/widget/Widget.h>
#include <ewol/resources/Resource.h> #include <ewol/resource/Resource.h>
namespace appl { namespace appl {
class BufferManager : public ewol::Resource { class BufferManager : public ewol::Resource {
@ -76,8 +76,8 @@ namespace appl {
return m_bufferSelected; return m_bufferSelected;
}; };
public: // herited function public: // herited function
void onReceiveMessage(const ewol::EMessage& _msg); void onReceiveMessage(const ewol::object::Message& _msg);
void onObjectRemove(ewol::EObject * _removeObject); void onObjectRemove(ewol::Object * _removeObject);
public: // resource manager public: // resource manager
/** /**
* @brief keep the resource pointer. * @brief keep the resource pointer.

2
sources/appl/GlyphPainting.cpp
View File

@ -11,7 +11,7 @@
#include <appl/GlyphPainting.h> #include <appl/GlyphPainting.h>
#include <ejson/ejson.h> #include <ejson/ejson.h>
#include <etk/os/FSNode.h> #include <etk/os/FSNode.h>
#include <ewol/resources/ResourceManager.h> #include <ewol/resource/Manager.h>
#undef __class__ #undef __class__
#define __class__ "GlyphPainting" #define __class__ "GlyphPainting"

2
sources/appl/GlyphPainting.h
View File

@ -11,7 +11,7 @@
#include <etk/types.h> #include <etk/types.h>
#include <ewol/debug.h> #include <ewol/debug.h>
#include <ewol/resources/Resource.h> #include <ewol/resource/Resource.h>
#include <appl/GlyphDecoration.h> #include <appl/GlyphDecoration.h>
namespace appl { namespace appl {

14
sources/appl/Gui/BufferView.cpp
View File

@ -12,7 +12,7 @@
#include <appl/BufferManager.h> #include <appl/BufferManager.h>
//#include <ColorizeManager.h> //#include <ColorizeManager.h>
#include <appl/Gui/MainWindows.h> #include <appl/Gui/MainWindows.h>
#include <ewol/renderer/EObject.h> #include <ewol/object/Object.h>
#undef __class__ #undef __class__
#define __class__ "BufferView" #define __class__ "BufferView"
@ -107,8 +107,8 @@ void BufferView::insertAlphabetic(appl::dataBufferStruct* _dataStruct, bool _sel
} }
void BufferView::onReceiveMessage(const ewol::EMessage& _msg) { void BufferView::onReceiveMessage(const ewol::object::Message& _msg) {
widget::List::onReceiveMessage(_msg); ewol::widget::List::onReceiveMessage(_msg);
if (_msg.getMessage() == appl::MsgSelectNewFile) { if (_msg.getMessage() == appl::MsgSelectNewFile) {
appl::Buffer* buffer = m_bufferManager->get(_msg.getData()); appl::Buffer* buffer = m_bufferManager->get(_msg.getData());
if (buffer == NULL) { if (buffer == NULL) {
@ -221,8 +221,8 @@ void BufferView::onReceiveMessage(const ewol::EMessage& _msg) {
} }
} }
void BufferView::onObjectRemove(ewol::EObject* _removeObject) { void BufferView::onObjectRemove(ewol::Object* _removeObject) {
widget::List::onObjectRemove(_removeObject); ewol::widget::List::onObjectRemove(_removeObject);
for (int32_t iii=0; iii<m_list.size(); iii++) { for (int32_t iii=0; iii<m_list.size(); iii++) {
if (m_list[iii] == NULL) { if (m_list[iii] == NULL) {
continue; continue;
@ -281,9 +281,9 @@ bool BufferView::getElement(int32_t _colomn, int32_t _raw, std::string& _myTextT
return true; return true;
} }
bool BufferView::onItemEvent(int32_t _IdInput, enum ewol::keyEvent::status _typeEvent, int32_t _colomn, int32_t _raw, float _x, float _y) bool BufferView::onItemEvent(int32_t _IdInput, enum ewol::key::status _typeEvent, int32_t _colomn, int32_t _raw, float _x, float _y)
{ {
if (1 == _IdInput && _typeEvent == ewol::keyEvent::statusSingle) { if (1 == _IdInput && _typeEvent == ewol::key::statusSingle) {
APPL_INFO("Event on List : IdInput=" << _IdInput << " colomn=" << _colomn << " raw=" << _raw ); APPL_INFO("Event on List : IdInput=" << _IdInput << " colomn=" << _colomn << " raw=" << _raw );
if( _raw >= 0 if( _raw >= 0
&& _raw<m_list.size() && _raw<m_list.size()

8
sources/appl/Gui/BufferView.h
View File

@ -31,7 +31,7 @@ namespace appl
}; };
}; };
class BufferView : public widget::List class BufferView : public ewol::widget::List
{ {
private: private:
appl::BufferManager* m_bufferManager; //!< handle on the buffer manager appl::BufferManager* m_bufferManager; //!< handle on the buffer manager
@ -56,8 +56,8 @@ class BufferView : public widget::List
BufferView(void); BufferView(void);
~BufferView(void); ~BufferView(void);
// Derived function // Derived function
virtual void onReceiveMessage(const ewol::EMessage& _msg); virtual void onReceiveMessage(const ewol::object::Message& _msg);
virtual void onObjectRemove(ewol::EObject* _removeObject); virtual void onObjectRemove(ewol::Object* _removeObject);
private: private:
bool m_openOrderMode; //!< true if the order is the opening order mode, otherwise, Alphabetic order bool m_openOrderMode; //!< true if the order is the opening order mode, otherwise, Alphabetic order
protected: protected:
@ -69,7 +69,7 @@ class BufferView : public widget::List
virtual bool getTitle(int32_t _colomn, std::string& _myTitle, etk::Color<>& _fg, etk::Color<>& _bg); virtual bool getTitle(int32_t _colomn, std::string& _myTitle, etk::Color<>& _fg, etk::Color<>& _bg);
virtual uint32_t getNuberOfRaw(void); virtual uint32_t getNuberOfRaw(void);
virtual bool getElement(int32_t _colomn, int32_t _raw, std::string& _myTextToWrite, etk::Color<>& _fg, etk::Color<>& _bg); virtual bool getElement(int32_t _colomn, int32_t _raw, std::string& _myTextToWrite, etk::Color<>& _fg, etk::Color<>& _bg);
virtual bool onItemEvent(int32_t _IdInput, enum ewol::keyEvent::status _typeEvent, int32_t _colomn, int32_t _raw, float _x, float _y); virtual bool onItemEvent(int32_t _IdInput, enum ewol::key::status _typeEvent, int32_t _colomn, int32_t _raw, float _x, float _y);
}; };

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

@ -27,9 +27,9 @@
#include <ewol/widget/Menu.h> #include <ewol/widget/Menu.h>
#include <ewol/widget/meta/FileChooser.h> #include <ewol/widget/meta/FileChooser.h>
#include <ewol/widget/meta/Parameter.h> #include <ewol/widget/meta/Parameter.h>
#include <ewol/widget/WidgetManager.h> #include <ewol/widget/Manager.h>
#include <ewol/renderer/EObject.h> #include <ewol/object/Object.h>
#include <ewol/renderer/eContext.h> #include <ewol/context/Context.h>
#include <date/date.h> #include <date/date.h>
#include <ewol/widget/meta/StdPopUp.h> #include <ewol/widget/meta/StdPopUp.h>
#include <appl/Gui/WorkerSaveFile.h> #include <appl/Gui/WorkerSaveFile.h>
@ -57,13 +57,13 @@ namespace appl {
#include <ewol/widget/Label.h> #include <ewol/widget/Label.h>
#include <ewol/widget/Spacer.h> #include <ewol/widget/Spacer.h>
class ParameterAboutGui : public widget::Sizer { class ParameterAboutGui : public ewol::widget::Sizer {
public : public :
ParameterAboutGui(void) : ParameterAboutGui(void) :
widget::Sizer(widget::Sizer::modeVert) { ewol::widget::Sizer(ewol::widget::Sizer::modeVert) {
widget::Spacer* mySpacer = NULL; ewol::widget::Spacer* mySpacer = NULL;
mySpacer = new widget::Spacer(); mySpacer = new ewol::widget::Spacer();
if (NULL == mySpacer) { if (NULL == mySpacer) {
APPL_ERROR("Can not allocate widget == > display might be in error"); APPL_ERROR("Can not allocate widget == > display might be in error");
} else { } else {
@ -93,7 +93,7 @@ class ParameterAboutGui : public widget::Sizer {
tmpLabel += " libPng, ogg-tremor, portaudio, libZip<br/>"; tmpLabel += " libPng, ogg-tremor, portaudio, libZip<br/>";
tmpLabel += " tinyXml, freetype, agg2.4, etk<br/>"; tmpLabel += " tinyXml, freetype, agg2.4, etk<br/>";
tmpLabel += "</left>"; tmpLabel += "</left>";
widget::Label* myLabel = new widget::Label(tmpLabel); ewol::widget::Label* myLabel = new ewol::widget::Label(tmpLabel);
if (NULL == myLabel) { if (NULL == myLabel) {
APPL_ERROR("Can not allocate widget == > display might be in error"); APPL_ERROR("Can not allocate widget == > display might be in error");
} else { } else {
@ -121,28 +121,28 @@ const char* l_smoothMax = "tmpEvent_maxChange";
MainWindows::MainWindows(void) { MainWindows::MainWindows(void) {
addObjectType("appl::MainWindows"); addObjectType("appl::MainWindows");
APPL_DEBUG("CREATE WINDOWS ... "); APPL_DEBUG("CREATE WINDOWS ... ");
widget::Sizer * mySizerVert = NULL; ewol::widget::Sizer * mySizerVert = NULL;
widget::Sizer * mySizerVert2 = NULL; ewol::widget::Sizer * mySizerVert2 = NULL;
widget::Sizer * mySizerHori = NULL; ewol::widget::Sizer * mySizerHori = NULL;
//ewol::Button * myButton = NULL; //ewol::Button * myButton = NULL;
appl::TextViewer * myTextView = NULL; appl::TextViewer * myTextView = NULL;
BufferView * myBufferView = NULL; BufferView * myBufferView = NULL;
widget::Menu * myMenu = NULL; ewol::widget::Menu * myMenu = NULL;
// load buffer manager: // load buffer manager:
m_bufferManager = appl::BufferManager::keep(); m_bufferManager = appl::BufferManager::keep();
mySizerVert = new widget::Sizer(widget::Sizer::modeVert); mySizerVert = new ewol::widget::Sizer(ewol::widget::Sizer::modeVert);
setSubWidget(mySizerVert); setSubWidget(mySizerVert);
mySizerHori = new widget::Sizer(widget::Sizer::modeHori); mySizerHori = new ewol::widget::Sizer(ewol::widget::Sizer::modeHori);
mySizerVert->subWidgetAdd(mySizerHori); mySizerVert->subWidgetAdd(mySizerHori);
myBufferView = new BufferView(); myBufferView = new BufferView();
myBufferView->setExpand(bvec2(false,true)); myBufferView->setExpand(bvec2(false,true));
myBufferView->setFill(bvec2(true,true)); myBufferView->setFill(bvec2(true,true));
mySizerHori->subWidgetAdd(myBufferView); mySizerHori->subWidgetAdd(myBufferView);
mySizerVert2 = new widget::Sizer(widget::Sizer::modeVert); mySizerVert2 = new ewol::widget::Sizer(ewol::widget::Sizer::modeVert);
mySizerHori->subWidgetAdd(mySizerVert2); mySizerHori->subWidgetAdd(mySizerVert2);
// main buffer Area : // main buffer Area :
@ -161,14 +161,14 @@ MainWindows::MainWindows(void) {
mySizerVert2->subWidgetAdd(mySearch); mySizerVert2->subWidgetAdd(mySearch);
#ifdef APPL_BUFFER_FONT_DISTANCE_FIELD #ifdef APPL_BUFFER_FONT_DISTANCE_FIELD
{ {
widget::Sizer * mySizerHori2 = new widget::Sizer(widget::Sizer::modeHori); ewol::widget::Sizer * mySizerHori2 = new widget::Sizer(ewol::widget::Sizer::modeHori);
mySizerVert2->subWidgetAdd(mySizerHori2); mySizerVert2->subWidgetAdd(mySizerHori2);
widget::CheckBox* tmpCheck = new widget::CheckBox("smooth"); ewol::widget::CheckBox* tmpCheck = new widget::CheckBox("smooth");
mySizerHori2->subWidgetAdd(tmpCheck); mySizerHori2->subWidgetAdd(tmpCheck);
tmpCheck->registerOnEvent(this, ewolEventCheckBoxClicked, l_smoothChick); tmpCheck->registerOnEvent(this, ewolEventCheckBoxClicked, l_smoothChick);
widget::Slider* tmpSlider = new widget::Slider(); ewol::widget::Slider* tmpSlider = new widget::Slider();
mySizerHori2->subWidgetAdd(tmpSlider); mySizerHori2->subWidgetAdd(tmpSlider);
tmpSlider->registerOnEvent(this, ewolEventSliderChange, l_smoothMin); tmpSlider->registerOnEvent(this, ewolEventSliderChange, l_smoothMin);
tmpSlider->setExpand(bvec2(true,false)); tmpSlider->setExpand(bvec2(true,false));
@ -177,7 +177,7 @@ MainWindows::MainWindows(void) {
tmpSlider->setValue(0450); tmpSlider->setValue(0450);
tmpSliderMin = tmpSlider; tmpSliderMin = tmpSlider;
tmpSlider = new widget::Slider(); tmpSlider = new ewol::widget::Slider();
mySizerHori2->subWidgetAdd(tmpSlider); mySizerHori2->subWidgetAdd(tmpSlider);
tmpSlider->registerOnEvent(this, ewolEventSliderChange, l_smoothMax); tmpSlider->registerOnEvent(this, ewolEventSliderChange, l_smoothMax);
tmpSlider->setExpand(bvec2(true,false)); tmpSlider->setExpand(bvec2(true,false));
@ -188,10 +188,10 @@ MainWindows::MainWindows(void) {
} }
#endif #endif
mySizerHori = new widget::Sizer(widget::Sizer::modeHori); mySizerHori = new ewol::widget::Sizer(ewol::widget::Sizer::modeHori);
mySizerVert->subWidgetAdd(mySizerHori); mySizerVert->subWidgetAdd(mySizerHori);
myMenu = new widget::Menu(); myMenu = new ewol::widget::Menu();
mySizerHori->subWidgetAdd(myMenu); mySizerHori->subWidgetAdd(myMenu);
int32_t idMenuFile = myMenu->addTitle("File"); int32_t idMenuFile = myMenu->addTitle("File");
(void)myMenu->add(idMenuFile, "New", "", ednMsgGuiNew); (void)myMenu->add(idMenuFile, "New", "", ednMsgGuiNew);
@ -238,7 +238,7 @@ MainWindows::MainWindows(void) {
(void)myMenu->addSpacer(); (void)myMenu->addSpacer();
(void)myMenu->add(idMenugDisplay, "Reload openGl Shader", "", ednMsgGuiReloadShader); (void)myMenu->add(idMenugDisplay, "Reload openGl Shader", "", ednMsgGuiReloadShader);
m_widgetLabelFileName = new widget::Label("FileName"); m_widgetLabelFileName = new ewol::widget::Label("FileName");
m_widgetLabelFileName->setExpand(bvec2(true,false)); m_widgetLabelFileName->setExpand(bvec2(true,false));
m_widgetLabelFileName->setFill(bvec2(true,false));; m_widgetLabelFileName->setFill(bvec2(true,false));;
mySizerHori->subWidgetAdd(m_widgetLabelFileName); mySizerHori->subWidgetAdd(m_widgetLabelFileName);
@ -292,13 +292,13 @@ const char *const ednEventPopUpFileSelected = "edn-mainWindows-openSelected";
const char *const ednEventPopUpFileSaveAs = "edn-mainWindows-saveAsSelected"; const char *const ednEventPopUpFileSaveAs = "edn-mainWindows-saveAsSelected";
void MainWindows::onReceiveMessage(const ewol::EMessage& _msg) { void MainWindows::onReceiveMessage(const ewol::object::Message& _msg) {
ewol::Windows::onReceiveMessage(_msg); ewol::widget::Windows::onReceiveMessage(_msg);
APPL_VERBOSE("Receive Event from the main windows: " << _msg ); APPL_VERBOSE("Receive Event from the main windows: " << _msg );
// open file Section ... // open file Section ...
if (_msg.getMessage() == ednMsgGuiOpen) { if (_msg.getMessage() == ednMsgGuiOpen) {
widget::FileChooser* tmpWidget = new widget::FileChooser(); ewol::widget::FileChooser* tmpWidget = new ewol::widget::FileChooser();
if (tmpWidget == NULL) { if (tmpWidget == NULL) {
APPL_ERROR("Can not open File chooser !!! "); APPL_ERROR("Can not open File chooser !!! ");
return; return;
@ -317,10 +317,10 @@ void MainWindows::onReceiveMessage(const ewol::EMessage& _msg) {
} }
// apply widget pop-up ... // apply widget pop-up ...
popUpWidgetPush(tmpWidget); popUpWidgetPush(tmpWidget);
tmpWidget->registerOnEvent(this, widget::FileChooser::eventValidate, ednEventPopUpFileSelected); tmpWidget->registerOnEvent(this, ewol::widget::FileChooser::eventValidate, ednEventPopUpFileSelected);
} else if (_msg.getMessage() == ednMsgProperties) { } else if (_msg.getMessage() == ednMsgProperties) {
// Request the parameter GUI // Request the parameter GUI
widget::Parameter* tmpWidget = new widget::Parameter(); ewol::widget::Parameter* tmpWidget = new ewol::widget::Parameter();
if (NULL == tmpWidget) { if (NULL == tmpWidget) {
APPL_ERROR("Can not allocate widget == > display might be in error"); APPL_ERROR("Can not allocate widget == > display might be in error");
} else { } else {
@ -459,7 +459,7 @@ void MainWindows::closeNotSavedFile(appl::Buffer* _buffer) {
APPL_ERROR("Call With NULL input..."); APPL_ERROR("Call With NULL input...");
return; return;
} }
widget::StdPopUp* tmpPopUp = new widget::StdPopUp(); ewol::widget::StdPopUp* tmpPopUp = new ewol::widget::StdPopUp();
if (tmpPopUp == NULL) { if (tmpPopUp == NULL) {
APPL_ERROR("Can not create a simple pop-up"); APPL_ERROR("Can not create a simple pop-up");
return; return;
@ -471,27 +471,27 @@ void MainWindows::closeNotSavedFile(appl::Buffer* _buffer) {
bt = tmpPopUp->addButton("Save", true); bt = tmpPopUp->addButton("Save", true);
if (bt != NULL) { if (bt != NULL) {
// TODO : The element is removed before beeing pressed // TODO : The element is removed before beeing pressed
bt->registerOnEvent(this, widget::Button::eventPressed, mainWindowsRequestSaveFile, _buffer->getFileName()); bt->registerOnEvent(this, ewol::widget::Button::eventPressed, mainWindowsRequestSaveFile, _buffer->getFileName());
bt->registerOnEvent(this, widget::Button::eventPressed, mainWindowsRequestcloseFileNoCheck, _buffer->getFileName()); bt->registerOnEvent(this, ewol::widget::Button::eventPressed, mainWindowsRequestcloseFileNoCheck, _buffer->getFileName());
} }
} }
bt = tmpPopUp->addButton("Save As", true); bt = tmpPopUp->addButton("Save As", true);
if (bt != NULL) { if (bt != NULL) {
bt->registerOnEvent(this, widget::Button::eventPressed, mainWindowsRequestSaveFileAs, _buffer->getFileName()); bt->registerOnEvent(this, ewol::widget::Button::eventPressed, mainWindowsRequestSaveFileAs, _buffer->getFileName());
//bt->registerOnEvent(this, widget::Button::eventPressed, mainWindowsRequestcloseFileNoCheck, _buffer->getFileName()); //bt->registerOnEvent(this, ewol::widget::Button::eventPressed, mainWindowsRequestcloseFileNoCheck, _buffer->getFileName());
// TODO : Request the close when saved ... // TODO : Request the close when saved ...
} }
bt = tmpPopUp->addButton("Close", true); bt = tmpPopUp->addButton("Close", true);
if (bt != NULL) { if (bt != NULL) {
bt->registerOnEvent(this, widget::Button::eventPressed, mainWindowsRequestcloseFileNoCheck, _buffer->getFileName()); bt->registerOnEvent(this, ewol::widget::Button::eventPressed, mainWindowsRequestcloseFileNoCheck, _buffer->getFileName());
} }
tmpPopUp->addButton("Cancel", true); tmpPopUp->addButton("Cancel", true);
tmpPopUp->setRemoveOnExternClick(true); tmpPopUp->setRemoveOnExternClick(true);
popUpWidgetPush(tmpPopUp); popUpWidgetPush(tmpPopUp);
} }
void MainWindows::onObjectRemove(ewol::EObject* _removeObject) { void MainWindows::onObjectRemove(ewol::Object* _removeObject) {
ewol::Windows::onObjectRemove(_removeObject); ewol::widget::Windows::onObjectRemove(_removeObject);
if (m_widgetLabelFileName == _removeObject) { if (m_widgetLabelFileName == _removeObject) {
m_widgetLabelFileName = NULL; m_widgetLabelFileName = NULL;
} }

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

@ -17,10 +17,10 @@
#include <ewol/widget/Label.h> #include <ewol/widget/Label.h>
#include <appl/BufferManager.h> #include <appl/BufferManager.h>
class MainWindows : public ewol::Windows { class MainWindows : public ewol::widget::Windows {
private: private:
int32_t m_currentSavingAsIdBuffer; int32_t m_currentSavingAsIdBuffer;
widget::Label* m_widgetLabelFileName; ewol::widget::Label* m_widgetLabelFileName;
public: public:
// Constructeur // Constructeur
MainWindows(void); MainWindows(void);
@ -38,8 +38,8 @@ class MainWindows : public ewol::Windows {
*/ */
void closeNotSavedFile(appl::Buffer* _buffer); void closeNotSavedFile(appl::Buffer* _buffer);
public: // Derived function public: // Derived function
virtual void onReceiveMessage(const ewol::EMessage& _msg); virtual void onReceiveMessage(const ewol::object::Message& _msg);
virtual void onObjectRemove(ewol::EObject * _removeObject); virtual void onObjectRemove(ewol::Object * _removeObject);
}; };

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

@ -29,7 +29,7 @@ const char* const l_eventForwardCb = "appl-forward-CheckBox";
const char* const l_eventHideBt = "appl-hide-button"; const char* const l_eventHideBt = "appl-hide-button";
Search::Search(void) : Search::Search(void) :
widget::Composer(widget::Composer::file, "DATA:GUI-Search.xml"), ewol::widget::Composer(ewol::widget::Composer::file, "DATA:GUI-Search.xml"),
m_viewerManager(NULL), m_viewerManager(NULL),
m_forward(true), m_forward(true),
m_caseSensitive(false), m_caseSensitive(false),
@ -55,8 +55,8 @@ Search::Search(void) :
setConfigNamed("SEARCH:wrap", "value", std::to_string(m_wrap)); setConfigNamed("SEARCH:wrap", "value", std::to_string(m_wrap));
setConfigNamed("SEARCH:up-down", "value", std::to_string(m_forward)); setConfigNamed("SEARCH:up-down", "value", std::to_string(m_forward));
// get widget // get widget
m_searchEntry = dynamic_cast<widget::Entry*>(getWidgetNamed("SEARCH:search-entry")); m_searchEntry = dynamic_cast<ewol::widget::Entry*>(getWidgetNamed("SEARCH:search-entry"));
m_replaceEntry = dynamic_cast<widget::Entry*>(getWidgetNamed("SEARCH:replace-entry")); m_replaceEntry = dynamic_cast<ewol::widget::Entry*>(getWidgetNamed("SEARCH:replace-entry"));
// Display and hide event: // Display and hide event:
registerMultiCast(ednMsgGuiSearch); registerMultiCast(ednMsgGuiSearch);
// basicly hiden ... // basicly hiden ...
@ -121,8 +121,8 @@ void Search::replace(void) {
} }
void Search::onReceiveMessage(const ewol::EMessage& _msg) { void Search::onReceiveMessage(const ewol::object::Message& _msg) {
widget::Composer::onReceiveMessage(_msg); ewol::widget::Composer::onReceiveMessage(_msg);
APPL_INFO("Search receive message : " << _msg); APPL_INFO("Search receive message : " << _msg);
if ( _msg.getMessage() == l_eventSearchEntry) { if ( _msg.getMessage() == l_eventSearchEntry) {
m_searchData = to_u32string(_msg.getData()); m_searchData = to_u32string(_msg.getData());
@ -162,8 +162,8 @@ void Search::onReceiveMessage(const ewol::EMessage& _msg) {
} }
} }
void Search::onObjectRemove(ewol::EObject * _removeObject) { void Search::onObjectRemove(ewol::Object * _removeObject) {
widget::Composer::onObjectRemove(_removeObject); ewol::widget::Composer::onObjectRemove(_removeObject);
if (_removeObject == m_searchEntry) { if (_removeObject == m_searchEntry) {
m_searchEntry = NULL; m_searchEntry = NULL;
} }

10
sources/appl/Gui/Search.h
View File

@ -15,14 +15,14 @@
#include <appl/Buffer.h> #include <appl/Buffer.h>
#include <appl/Gui/ViewerManager.h> #include <appl/Gui/ViewerManager.h>
class Search : public widget::Composer { class Search : public ewol::widget::Composer {
private: private:
appl::ViewerManager* m_viewerManager; //!< handle on the buffer manager appl::ViewerManager* m_viewerManager; //!< handle on the buffer manager
bool m_forward; bool m_forward;
bool m_caseSensitive; bool m_caseSensitive;
bool m_wrap; bool m_wrap;
widget::Entry* m_searchEntry; ewol::widget::Entry* m_searchEntry;
widget::Entry* m_replaceEntry; ewol::widget::Entry* m_replaceEntry;
std::u32string m_searchData; std::u32string m_searchData;
std::u32string m_replaceData; std::u32string m_replaceData;
public: public:
@ -39,8 +39,8 @@ class Search : public widget::Composer {
*/ */
void replace(void); void replace(void);
public: // derived function public: // derived function
virtual void onReceiveMessage(const ewol::EMessage& _msg); virtual void onReceiveMessage(const ewol::object::Message& _msg);
virtual void onObjectRemove(ewol::EObject * _removeObject); virtual void onObjectRemove(ewol::Object * _removeObject);
}; };
#endif #endif

4
sources/appl/Gui/TagFileList.cpp
View File

@ -86,8 +86,8 @@ bool appl::TagFileList::getElement(int32_t _colomn, int32_t _raw, std::string& _
}; };
bool appl::TagFileList::onItemEvent(int32_t _IdInput, enum ewol::keyEvent::status _typeEvent, int32_t _colomn, int32_t _raw, float _x, float _y) { bool appl::TagFileList::onItemEvent(int32_t _IdInput, enum ewol::key::status _typeEvent, int32_t _colomn, int32_t _raw, float _x, float _y) {
if (_typeEvent == ewol::keyEvent::statusSingle) { if (_typeEvent == ewol::key::statusSingle) {
EWOL_INFO("Event on List : IdInput=" << _IdInput << " colomn=" << _colomn << " raw=" << _raw ); EWOL_INFO("Event on List : IdInput=" << _IdInput << " colomn=" << _colomn << " raw=" << _raw );
if (_IdInput == 1) { if (_IdInput == 1) {
int32_t previousRaw = m_selectedLine; int32_t previousRaw = m_selectedLine;

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

@ -31,7 +31,7 @@ namespace appl {
}; };
}; };
class TagFileList : public widget::List { class TagFileList : public ewol::widget::List {
private: private:
int32_t m_selectedLine; int32_t m_selectedLine;
std::vector<appl::TagListElement*> m_list; std::vector<appl::TagListElement*> m_list;
@ -44,7 +44,7 @@ namespace appl {
bool getTitle(int32_t _colomn, std::string& _myTitle, etk::Color<>& _fg, etk::Color<>& _bg); bool getTitle(int32_t _colomn, std::string& _myTitle, etk::Color<>& _fg, etk::Color<>& _bg);
uint32_t getNuberOfRaw(void); uint32_t getNuberOfRaw(void);
bool getElement(int32_t _colomn, int32_t _raw, std::string& _myTextToWrite, etk::Color<>& _fg, etk::Color<>& _bg); bool getElement(int32_t _colomn, int32_t _raw, std::string& _myTextToWrite, etk::Color<>& _fg, etk::Color<>& _bg);
bool onItemEvent(int32_t _IdInput, enum ewol::keyEvent::status _typeEvent, int32_t _colomn, int32_t _raw, float _x, float _y); bool onItemEvent(int32_t _IdInput, enum ewol::key::status _typeEvent, int32_t _colomn, int32_t _raw, float _x, float _y);
public: public:
/** /**
* @brief add a Ctags item on the curent list * @brief add a Ctags item on the curent list

26
sources/appl/Gui/TagFileSelection.cpp
View File

@ -11,7 +11,7 @@
#include <ewol/widget/List.h> #include <ewol/widget/List.h>
#include <ewol/widget/Spacer.h> #include <ewol/widget/Spacer.h>
#include <ewol/widget/Image.h> #include <ewol/widget/Image.h>
#include <ewol/widget/WidgetManager.h> #include <ewol/widget/Manager.h>
#include <vector> #include <vector>
#include <etk/tool.h> #include <etk/tool.h>
#include <ewol/widget/Button.h> #include <ewol/widget/Button.h>
@ -35,13 +35,13 @@ appl::TagFileSelection::TagFileSelection(void) {
addEventId(applEventctagsSelection); addEventId(applEventctagsSelection);
addEventId(applEventctagsCancel); addEventId(applEventctagsCancel);
widget::Label* myWidgetTitle = NULL; ewol::widget::Label* myWidgetTitle = NULL;
widget::Button* myWidgetValidate = NULL; ewol::widget::Button* myWidgetValidate = NULL;
widget::Button* myWidgetCancel = NULL; ewol::widget::Button* myWidgetCancel = NULL;
widget::Sizer * mySizerVert = NULL; ewol::widget::Sizer * mySizerVert = NULL;
widget::Sizer * mySizerHori = NULL; ewol::widget::Sizer * mySizerHori = NULL;
widget::Spacer * mySpacer = NULL; ewol::widget::Spacer * mySpacer = NULL;
#if defined(__TARGET_OS__Android) #if defined(__TARGET_OS__Android)
setMinSize(ewol::Dimension(vec2(90,90),ewol::Dimension::Pourcent)); setMinSize(ewol::Dimension(vec2(90,90),ewol::Dimension::Pourcent));
#elif defined(__TARGET_OS__Windows) #elif defined(__TARGET_OS__Windows)
@ -50,7 +50,7 @@ appl::TagFileSelection::TagFileSelection(void) {
setMinSize(ewol::Dimension(vec2(80,80),ewol::Dimension::Pourcent)); setMinSize(ewol::Dimension(vec2(80,80),ewol::Dimension::Pourcent));
#endif #endif
mySizerVert = new widget::Sizer(widget::Sizer::modeVert); mySizerVert = new ewol::widget::Sizer(ewol::widget::Sizer::modeVert);
if (NULL == mySizerVert) { if (NULL == mySizerVert) {
EWOL_ERROR("Can not allocate widget == > display might be in error"); EWOL_ERROR("Can not allocate widget == > display might be in error");
} else { } else {
@ -58,7 +58,7 @@ appl::TagFileSelection::TagFileSelection(void) {
mySizerVert->setExpand(bvec2(true,true)); mySizerVert->setExpand(bvec2(true,true));
// set it in the pop-up-system : // set it in the pop-up-system :
setSubWidget(mySizerVert); setSubWidget(mySizerVert);
widget::Composer* compose = new widget::Composer(widget::Composer::String, ewol::widget::Composer* compose = new ewol::widget::Composer(ewol::widget::Composer::String,
"<sizer mode=\"hori\" expand=\"true,false\" lock=\"false,true\">\n" "<sizer mode=\"hori\" expand=\"true,false\" lock=\"false,true\">\n"
" <spacer expand=\"true,false\"/>\n" " <spacer expand=\"true,false\"/>\n"
" <button name=\"PLUGIN-CTAGS-jump\" expand=\"false\" fill=\"true\">" " <button name=\"PLUGIN-CTAGS-jump\" expand=\"false\" fill=\"true\">"
@ -92,7 +92,7 @@ appl::TagFileSelection::TagFileSelection(void) {
mySizerVert->subWidgetAdd(m_listTag); mySizerVert->subWidgetAdd(m_listTag);
} }
myWidgetTitle = new widget::Label("Ctags Jump Selection ..."); myWidgetTitle = new ewol::widget::Label("Ctags Jump Selection ...");
if (NULL == myWidgetTitle) { if (NULL == myWidgetTitle) {
EWOL_ERROR("Can not allocate widget == > display might be in error"); EWOL_ERROR("Can not allocate widget == > display might be in error");
} else { } else {
@ -106,7 +106,7 @@ appl::TagFileSelection::~TagFileSelection(void) {
} }
void appl::TagFileSelection::onReceiveMessage(const ewol::EMessage& _msg) { void appl::TagFileSelection::onReceiveMessage(const ewol::object::Message& _msg) {
EWOL_INFO("ctags LIST ... : " << _msg ); EWOL_INFO("ctags LIST ... : " << _msg );
if (_msg.getMessage() == applEventctagsSelection) { if (_msg.getMessage() == applEventctagsSelection) {
if (m_eventNamed!="") { if (m_eventNamed!="") {
@ -143,9 +143,9 @@ void appl::TagFileSelection::addCtagsNewItem(std::string _file, int32_t _line) {
} }
} }
void appl::TagFileSelection::onObjectRemove(ewol::EObject * _removeObject) { void appl::TagFileSelection::onObjectRemove(ewol::Object * _removeObject) {
// First step call parrent : // First step call parrent :
widget::PopUp::onObjectRemove(_removeObject); ewol::widget::PopUp::onObjectRemove(_removeObject);
// second step find if in all the elements ... // second step find if in all the elements ...
if(_removeObject == m_listTag) { if(_removeObject == m_listTag) {
m_listTag = NULL; m_listTag = NULL;

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

@ -17,7 +17,7 @@ extern const char * const applEventctagsSelection;
extern const char * const applEventctagsCancel; extern const char * const applEventctagsCancel;
namespace appl { namespace appl {
class TagFileSelection : public widget::PopUp { class TagFileSelection : public ewol::widget::PopUp {
private: private:
appl::TagFileList* m_listTag; appl::TagFileList* m_listTag;
std::string m_eventNamed; std::string m_eventNamed;
@ -31,8 +31,8 @@ namespace appl {
*/ */
void addCtagsNewItem(std::string file, int32_t line); void addCtagsNewItem(std::string file, int32_t line);
public: // herited function public: // herited function
void onReceiveMessage(const ewol::EMessage& _msg); void onReceiveMessage(const ewol::object::Message& _msg);
void onObjectRemove(ewol::EObject * _removeObject); void onObjectRemove(ewol::Object * _removeObject);
}; };
}; };

84
sources/appl/Gui/TextViewer.cpp
View File

@ -10,11 +10,11 @@
#include <appl/global.h> #include <appl/global.h>
#include <appl/Gui/TextViewer.h> #include <appl/Gui/TextViewer.h>
#include <appl/BufferManager.h> #include <appl/BufferManager.h>
#include <ewol/clipBoard.h> #include <ewol/context/clipBoard.h>
#include <ewol/widget/WidgetManager.h> #include <ewol/widget/Manager.h>
#include <appl/Gui/ViewerManager.h> #include <appl/Gui/ViewerManager.h>
#include <ewol/renderer/EObject.h> #include <ewol/object/Object.h>
#include <appl/TextPluginManager.h> #include <appl/TextPluginManager.h>
#undef __class__ #undef __class__
@ -98,7 +98,7 @@ void appl::TextViewer::onRegenerateDisplay(void) {
if (m_buffer == NULL) { if (m_buffer == NULL) {
m_maxSize.setX(256); m_maxSize.setX(256);
m_maxSize.setY(256); m_maxSize.setY(256);
m_displayText.setTextAlignement(10, m_size.x()-20, ewol::Text::alignLeft); m_displayText.setTextAlignement(10, m_size.x()-20, ewol::compositing::Text::alignLeft);
m_displayText.setRelPos(vec3(10, 0, 0)); m_displayText.setRelPos(vec3(10, 0, 0));
std::string tmpString("<br/>\n" std::string tmpString("<br/>\n"
"<font color=\"red\">\n" "<font color=\"red\">\n"
@ -213,7 +213,7 @@ void appl::TextViewer::onRegenerateDisplay(void) {
// Display the end line position only if we have the focus ... // Display the end line position only if we have the focus ...
if (DisplayCursorAndSelection == true) { if (DisplayCursorAndSelection == true) {
if (it >= selectPosStart && it < selectPosStop) { if (it >= selectPosStart && it < selectPosStop) {
ewol::Drawing& draw = m_displayText.getDrawing(); ewol::compositing::Drawing& draw = m_displayText.getDrawing();
draw.setColor(etk::Color<>(0xFF0000FF)); draw.setColor(etk::Color<>(0xFF0000FF));
draw.setPos(m_displayText.getPos() + tmpLetterSize/4.0f); draw.setPos(m_displayText.getPos() + tmpLetterSize/4.0f);
draw.rectangle(m_displayText.getPos() + tmpLetterSize*3.0f/4.0f); draw.rectangle(m_displayText.getPos() + tmpLetterSize*3.0f/4.0f);
@ -301,7 +301,7 @@ void appl::TextViewer::onRegenerateDisplay(void) {
WidgetScrooled::onRegenerateDisplay(); WidgetScrooled::onRegenerateDisplay();
} }
bool appl::TextViewer::onEventEntry(const ewol::EventEntry& _event) { bool appl::TextViewer::onEventEntry(const ewol::event::Entry& _event) {
if (m_buffer == NULL) { if (m_buffer == NULL) {
return false; return false;
} }
@ -311,14 +311,14 @@ bool appl::TextViewer::onEventEntry(const ewol::EventEntry& _event) {
return true; return true;
} }
// just forward event == > manage directly in the buffer // just forward event == > manage directly in the buffer
if (_event.getType() == ewol::keyEvent::keyboardChar) { if (_event.getType() == ewol::key::keyboardChar) {
//APPL_DEBUG("KB EVENT : \"" << UTF8_data << "\" size=" << strlen(UTF8_data) << "type=" << (int32_t)typeEvent); //APPL_DEBUG("KB EVENT : \"" << UTF8_data << "\" size=" << strlen(UTF8_data) << "type=" << (int32_t)typeEvent);
if (_event.getStatus() != ewol::keyEvent::statusDown) { if (_event.getStatus() != ewol::key::statusDown) {
return false; return false;
} }
char32_t localValue = _event.getChar(); char32_t localValue = _event.getChar();
if (localValue == etk::UChar::Return) { if (localValue == etk::UChar::Return) {
if (true == _event.getSpecialKey().isSetShift()) { if (true == _event.getSpecialKey().getShift()) {
localValue = etk::UChar::CarrierReturn; localValue = etk::UChar::CarrierReturn;
} }
} else if (localValue == etk::UChar::Suppress ) { } else if (localValue == etk::UChar::Suppress ) {
@ -349,7 +349,7 @@ bool appl::TextViewer::onEventEntry(const ewol::EventEntry& _event) {
char output[5]; char output[5];
int32_t nbElement = etk::getUtf8(localValue, output); int32_t nbElement = etk::getUtf8(localValue, output);
if ( m_buffer->hasTextSelected() == false if ( m_buffer->hasTextSelected() == false
&& _event.getSpecialKey().isSetInsert() == true) { && _event.getSpecialKey().getInsert() == true) {
appl::Buffer::Iterator pos = m_buffer->cursor(); appl::Buffer::Iterator pos = m_buffer->cursor();
appl::Buffer::Iterator posEnd = pos; appl::Buffer::Iterator posEnd = pos;
++posEnd; ++posEnd;
@ -362,45 +362,45 @@ bool appl::TextViewer::onEventEntry(const ewol::EventEntry& _event) {
return true; return true;
} }
// move events ... // move events ...
if (_event.getStatus() == ewol::keyEvent::statusDown) { if (_event.getStatus() == ewol::key::statusDown) {
bool needUpdatePosition = true; bool needUpdatePosition = true;
// selection when shift is set: // selection when shift is set:
m_buffer->setSelectMode(_event.getSpecialKey().isSetShift()); m_buffer->setSelectMode(_event.getSpecialKey().getShift());
// check selection event ... // check selection event ...
switch(_event.getType()) { switch(_event.getType()) {
case ewol::keyEvent::keyboardInsert: case ewol::key::keyboardInsert:
m_insertMode = m_insertMode==true?false:true; m_insertMode = m_insertMode==true?false:true;
markToRedraw(); markToRedraw();
break; break;
case ewol::keyEvent::keyboardLeft: case ewol::key::keyboardLeft:
//APPL_INFO("keyEvent : <LEFT>"); //APPL_INFO("keyEvent : <LEFT>");
moveCursorLeft(); moveCursorLeft();
break; break;
case ewol::keyEvent::keyboardRight: case ewol::key::keyboardRight:
//APPL_INFO("keyEvent : <RIGHT>"); //APPL_INFO("keyEvent : <RIGHT>");
moveCursorRight(); moveCursorRight();
break; break;
case ewol::keyEvent::keyboardUp: case ewol::key::keyboardUp:
//APPL_INFO("keyEvent : <UP>"); //APPL_INFO("keyEvent : <UP>");
moveCursorUp(1); moveCursorUp(1);
break; break;
case ewol::keyEvent::keyboardDown: case ewol::key::keyboardDown:
//APPL_INFO("keyEvent : <DOWN>"); //APPL_INFO("keyEvent : <DOWN>");
moveCursorDown(1); moveCursorDown(1);
break; break;
case ewol::keyEvent::keyboardPageUp: case ewol::key::keyboardPageUp:
//APPL_INFO("keyEvent : <PAGE-UP>"); //APPL_INFO("keyEvent : <PAGE-UP>");
moveCursorUp(15); // TODO : Set the real number of line ... moveCursorUp(15); // TODO : Set the real number of line ...
break; break;
case ewol::keyEvent::keyboardPageDown: case ewol::key::keyboardPageDown:
//APPL_INFO("keyEvent : <PAGE-DOWN>"); //APPL_INFO("keyEvent : <PAGE-DOWN>");
moveCursorDown(15); // TODO : Set the real number of line ... moveCursorDown(15); // TODO : Set the real number of line ...
break; break;
case ewol::keyEvent::keyboardStart: case ewol::key::keyboardStart:
//APPL_INFO("keyEvent : <Start of line>"); //APPL_INFO("keyEvent : <Start of line>");
moveCursorLeft(moveEnd); moveCursorLeft(moveEnd);
break; break;
case ewol::keyEvent::keyboardEnd: case ewol::key::keyboardEnd:
//APPL_INFO("keyEvent : <End of line>"); //APPL_INFO("keyEvent : <End of line>");
moveCursorRight(moveEnd); moveCursorRight(moveEnd);
break; break;
@ -412,7 +412,7 @@ bool appl::TextViewer::onEventEntry(const ewol::EventEntry& _event) {
return false; return false;
} }
bool appl::TextViewer::onEventInput(const ewol::EventInput& _event) { bool appl::TextViewer::onEventInput(const ewol::event::Input& _event) {
if (_event.getId() != 0) { if (_event.getId() != 0) {
keepFocus(); keepFocus();
} }
@ -441,7 +441,7 @@ bool appl::TextViewer::onEventInput(const ewol::EventInput& _event) {
relativePos.setX(0); relativePos.setX(0);
} }
if ( _event.getId() == 12 if ( _event.getId() == 12
&& _event.getStatus() == ewol::keyEvent::statusSingle) { && _event.getStatus() == ewol::key::statusSingle) {
APPL_DEBUG("kjhkjhkjh"); APPL_DEBUG("kjhkjhkjh");
// Rat5 save event // Rat5 save event
sendMultiCast(ednMsgGuiSave, "current"); sendMultiCast(ednMsgGuiSave, "current");
@ -450,8 +450,8 @@ bool appl::TextViewer::onEventInput(const ewol::EventInput& _event) {
// just forward event == > manage directly in the buffer // just forward event == > manage directly in the buffer
if (_event.getId() == 1) { if (_event.getId() == 1) {
// mouse selection : // mouse selection :
if (_event.getType() == ewol::keyEvent::typeMouse) { if (_event.getType() == ewol::key::typeMouse) {
if (_event.getStatus() == ewol::keyEvent::statusDown) { if (_event.getStatus() == ewol::key::statusDown) {
//if (_event.getSpecialKey().isSetShift() == false) { //if (_event.getSpecialKey().isSetShift() == false) {
appl::Buffer::Iterator newPos = getMousePosition(relativePos); appl::Buffer::Iterator newPos = getMousePosition(relativePos);
moveCursor(newPos); moveCursor(newPos);
@ -459,7 +459,7 @@ bool appl::TextViewer::onEventInput(const ewol::EventInput& _event) {
markToRedraw(); markToRedraw();
return true; return true;
//} //}
} else if (_event.getStatus() == ewol::keyEvent::statusUp) { } else if (_event.getStatus() == ewol::key::statusUp) {
appl::Buffer::Iterator newPos = getMousePosition(relativePos); appl::Buffer::Iterator newPos = getMousePosition(relativePos);
moveCursor(newPos); moveCursor(newPos);
m_buffer->setSelectMode(false); m_buffer->setSelectMode(false);
@ -467,40 +467,40 @@ bool appl::TextViewer::onEventInput(const ewol::EventInput& _event) {
std::string value; std::string value;
m_buffer->copy(value); m_buffer->copy(value);
if (value.size() != 0) { if (value.size() != 0) {
ewol::clipBoard::set(ewol::clipBoard::clipboardSelection, value); ewol::context::clipBoard::set(ewol::context::clipBoard::clipboardSelection, value);
} }
markToRedraw(); markToRedraw();
return true; return true;
} }
} }
if (_event.getStatus() == ewol::keyEvent::statusSingle) { if (_event.getStatus() == ewol::key::statusSingle) {
if (_event.getType() == ewol::keyEvent::typeMouse) { if (_event.getType() == ewol::key::typeMouse) {
appl::Buffer::Iterator newPos = getMousePosition(relativePos); appl::Buffer::Iterator newPos = getMousePosition(relativePos);
moveCursor(newPos); moveCursor(newPos);
markToRedraw(); markToRedraw();
return true; return true;
} }
} else if (_event.getStatus() == ewol::keyEvent::statusDouble) { } else if (_event.getStatus() == ewol::key::statusDouble) {
mouseEventDouble(); mouseEventDouble();
// Copy selection : // Copy selection :
std::string value; std::string value;
m_buffer->copy(value); m_buffer->copy(value);
if (value.size() != 0) { if (value.size() != 0) {
ewol::clipBoard::set(ewol::clipBoard::clipboardSelection, value); ewol::context::clipBoard::set(ewol::context::clipBoard::clipboardSelection, value);
} }
markToRedraw(); markToRedraw();
return true; return true;
} else if (_event.getStatus() == ewol::keyEvent::statusTriple) { } else if (_event.getStatus() == ewol::key::statusTriple) {
mouseEventTriple(); mouseEventTriple();
// Copy selection : // Copy selection :
std::string value; std::string value;
m_buffer->copy(value); m_buffer->copy(value);
if (value.size() != 0) { if (value.size() != 0) {
ewol::clipBoard::set(ewol::clipBoard::clipboardSelection, value); ewol::context::clipBoard::set(ewol::context::clipBoard::clipboardSelection, value);
} }
markToRedraw(); markToRedraw();
return true; return true;
} else if (_event.getStatus() == ewol::keyEvent::statusMove) { } else if (_event.getStatus() == ewol::key::statusMove) {
if (m_buffer->getSelectMode() == true) { if (m_buffer->getSelectMode() == true) {
//int64_t timeStart = ewol::getTime(); //int64_t timeStart = ewol::getTime();
appl::Buffer::Iterator newPos = getMousePosition(relativePos); appl::Buffer::Iterator newPos = getMousePosition(relativePos);
@ -518,10 +518,10 @@ bool appl::TextViewer::onEventInput(const ewol::EventInput& _event) {
} }
} }
} else if (2 == _event.getId()) { } else if (2 == _event.getId()) {
if (ewol::keyEvent::statusSingle == _event.getStatus()) { if (ewol::key::statusSingle == _event.getStatus()) {
appl::Buffer::Iterator newPos = getMousePosition(relativePos); appl::Buffer::Iterator newPos = getMousePosition(relativePos);
moveCursor(newPos); moveCursor(newPos);
ewol::clipBoard::request(ewol::clipBoard::clipboardSelection); ewol::context::clipBoard::request(ewol::context::clipBoard::clipboardSelection);
markToRedraw(); markToRedraw();
return true; return true;
} }
@ -596,16 +596,16 @@ appl::Buffer::Iterator appl::TextViewer::getMousePosition(const vec2& _relativeP
return m_buffer->end(); return m_buffer->end();
} }
void appl::TextViewer::onEventClipboard(enum ewol::clipBoard::clipboardListe _clipboardID) { void appl::TextViewer::onEventClipboard(enum ewol::context::clipBoard::clipboardListe _clipboardID) {
if (m_buffer != NULL) { if (m_buffer != NULL) {
std::string data = ewol::clipBoard::get(_clipboardID); std::string data = ewol::context::clipBoard::get(_clipboardID);
write(data); write(data);
} }
markToRedraw(); markToRedraw();
} }
void appl::TextViewer::onReceiveMessage(const ewol::EMessage& _msg) { void appl::TextViewer::onReceiveMessage(const ewol::object::Message& _msg) {
widget::WidgetScrooled::onReceiveMessage(_msg); ewol::widget::WidgetScrooled::onReceiveMessage(_msg);
APPL_VERBOSE("receive msg: " << _msg); APPL_VERBOSE("receive msg: " << _msg);
// First call plugin // First call plugin
if (appl::textPluginManager::onReceiveMessage(*this, _msg) == true) { if (appl::textPluginManager::onReceiveMessage(*this, _msg) == true) {
@ -683,8 +683,8 @@ void appl::TextViewer::onReceiveMessage(const ewol::EMessage& _msg) {
} }
} }
void appl::TextViewer::onObjectRemove(ewol::EObject* _removeObject) { void appl::TextViewer::onObjectRemove(ewol::Object* _removeObject) {
widget::WidgetScrooled::onObjectRemove(_removeObject); ewol::widget::WidgetScrooled::onObjectRemove(_removeObject);
if (m_buffer == _removeObject) { if (m_buffer == _removeObject) {
m_buffer = NULL; m_buffer = NULL;
markToRedraw(); markToRedraw();

16
sources/appl/Gui/TextViewer.h
View File

@ -21,7 +21,7 @@
#include <utility> #include <utility>
namespace appl { namespace appl {
class TextViewer : public widget::WidgetScrooled { class TextViewer : public ewol::widget::WidgetScrooled {
private: private:
appl::GlyphPainting* m_paintingProperties; //!< element painting property appl::GlyphPainting* m_paintingProperties; //!< element painting property
int32_t m_colorBackground; int32_t m_colorBackground;
@ -48,8 +48,8 @@ namespace appl {
return m_buffer; return m_buffer;
} }
private: private:
ewol::Text m_displayText; //!< Text display properties. ewol::compositing::Text m_displayText; //!< Text display properties.
ewol::Drawing m_displayDrawing; //!< Other diaplay requested. ewol::compositing::Drawing m_displayDrawing; //!< Other diaplay requested.
std::vector<std::pair<appl::Buffer*, vec2>> m_drawingRemenber; std::vector<std::pair<appl::Buffer*, vec2>> m_drawingRemenber;
public: public:
void setFontSize(int32_t _size); void setFontSize(int32_t _size);
@ -59,11 +59,11 @@ namespace appl {
public: // Derived function public: // Derived function
virtual bool calculateMinSize(void); virtual bool calculateMinSize(void);
virtual void onRegenerateDisplay(void); virtual void onRegenerateDisplay(void);
virtual void onReceiveMessage(const ewol::EMessage& _msg); virtual void onReceiveMessage(const ewol::object::Message& _msg);
virtual void onObjectRemove(ewol::EObject* _removeObject); virtual void onObjectRemove(ewol::Object* _removeObject);
virtual bool onEventInput(const ewol::EventInput& _event); virtual bool onEventInput(const ewol::event::Input& _event);
virtual bool onEventEntry(const ewol::EventEntry& _event); virtual bool onEventEntry(const ewol::event::Entry& _event);
virtual void onEventClipboard(enum ewol::clipBoard::clipboardListe _clipboardID); virtual void onEventClipboard(enum ewol::context::clipBoard::clipboardListe _clipboardID);
virtual void onGetFocus(void); virtual void onGetFocus(void);
virtual void onLostFocus(void); virtual void onLostFocus(void);
private: private:

9
sources/appl/Gui/ViewerManager.cpp
View File

@ -10,8 +10,9 @@
#include <appl/global.h> #include <appl/global.h>
#include <appl/Gui/ViewerManager.h> #include <appl/Gui/ViewerManager.h>
#include <appl/Gui/TextViewer.h> #include <appl/Gui/TextViewer.h>
#include <ewol/renderer/EObject.h> #include <ewol/object/Object.h>
#include <ewol/renderer/EObjectManager.h> #include <ewol/object/Manager.h>
#include <ewol/resource/Manager.h>
#undef __class__ #undef __class__
#define __class__ "ViewerManager" #define __class__ "ViewerManager"
@ -38,11 +39,11 @@ void appl::ViewerManager::setViewerSelected(appl::TextViewer* _viewer, appl::Buf
} }
} }
void appl::ViewerManager::onReceiveMessage(const ewol::EMessage& _msg) { void appl::ViewerManager::onReceiveMessage(const ewol::object::Message& _msg) {
APPL_DEBUG("receive message !!! " << _msg); APPL_DEBUG("receive message !!! " << _msg);
} }
void appl::ViewerManager::onObjectRemove(ewol::EObject* _removeObject) { void appl::ViewerManager::onObjectRemove(ewol::Object* _removeObject) {
ewol::Resource:: onObjectRemove(_removeObject); ewol::Resource:: onObjectRemove(_removeObject);
if (_removeObject == m_viewer) { if (_removeObject == m_viewer) {
m_viewer = NULL; m_viewer = NULL;

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

@ -12,7 +12,7 @@
#include <appl/Buffer.h> #include <appl/Buffer.h>
#include <appl/globalMsg.h> #include <appl/globalMsg.h>
#include <ewol/widget/Widget.h> #include <ewol/widget/Widget.h>
#include <ewol/resources/Resource.h> #include <ewol/resource/Resource.h>
#include <appl/BufferManager.h> #include <appl/BufferManager.h>
namespace appl { namespace appl {
@ -46,8 +46,8 @@ namespace appl {
return m_viewer == _viewer; return m_viewer == _viewer;
}; };
public: // herited function public: // herited function
void onReceiveMessage(const ewol::EMessage& _msg); void onReceiveMessage(const ewol::object::Message& _msg);
void onObjectRemove(ewol::EObject* _removeObject); void onObjectRemove(ewol::Object* _removeObject);
public: // resource manager public: // resource manager
/** /**
* @brief keep the resource pointer. * @brief keep the resource pointer.

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

@ -6,7 +6,7 @@
* @license GPL v3 (see license file) * @license GPL v3 (see license file)
*/ */
#include <ewol/renderer/eContext.h> #include <ewol/context/Context.h>
#include <appl/debug.h> #include <appl/debug.h>
#include <appl/Gui/WorkerCloseAllFile.h> #include <appl/Gui/WorkerCloseAllFile.h>
@ -59,7 +59,7 @@ appl::WorkerCloseAllFile::~WorkerCloseAllFile(void) {
appl::BufferManager::release(m_bufferManager); appl::BufferManager::release(m_bufferManager);
} }
void appl::WorkerCloseAllFile::onReceiveMessage(const ewol::EMessage& _msg) { void appl::WorkerCloseAllFile::onReceiveMessage(const ewol::object::Message& _msg) {
if (m_bufferManager == NULL) { if (m_bufferManager == NULL) {
// nothing to do in this case ==> can do nothing ... // nothing to do in this case ==> can do nothing ...
return; return;
@ -81,7 +81,7 @@ void appl::WorkerCloseAllFile::onReceiveMessage(const ewol::EMessage& _msg) {
} }
} }
void appl::WorkerCloseAllFile::onObjectRemove(ewol::EObject* _removeObject) { void appl::WorkerCloseAllFile::onObjectRemove(ewol::Object* _removeObject) {
if (_removeObject == m_worker) { if (_removeObject == m_worker) {
m_worker = NULL; m_worker = NULL;
APPL_VERBOSE("AutoRemove After saving sub widget ..."); APPL_VERBOSE("AutoRemove After saving sub widget ...");

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

@ -13,7 +13,7 @@
#include <appl/Gui/WorkerCloseFile.h> #include <appl/Gui/WorkerCloseFile.h>
namespace appl { namespace appl {
class WorkerCloseAllFile : public ewol::EObject { class WorkerCloseAllFile : public ewol::Object {
public: public:
WorkerCloseAllFile(void); WorkerCloseAllFile(void);
virtual ~WorkerCloseAllFile(void); virtual ~WorkerCloseAllFile(void);
@ -22,8 +22,8 @@ namespace appl {
appl::WorkerCloseFile* m_worker; //! pop-up element that is open... appl::WorkerCloseFile* m_worker; //! pop-up element that is open...
appl::BufferManager* m_bufferManager; //!< handle on the buffer manager appl::BufferManager* m_bufferManager; //!< handle on the buffer manager
public: // derived function public: // derived function
virtual void onReceiveMessage(const ewol::EMessage& _msg); virtual void onReceiveMessage(const ewol::object::Message& _msg);
virtual void onObjectRemove(ewol::EObject * _removeObject); virtual void onObjectRemove(ewol::Object * _removeObject);
}; };
}; };

18
sources/appl/Gui/WorkerCloseFile.cpp
View File

@ -6,7 +6,7 @@
* @license GPL v3 (see license file) * @license GPL v3 (see license file)
*/ */
#include <ewol/renderer/eContext.h> #include <ewol/context/Context.h>
#include <appl/debug.h> #include <appl/debug.h>
#include <appl/Gui/WorkerCloseFile.h> #include <appl/Gui/WorkerCloseFile.h>
#include <ewol/widget/meta/StdPopUp.h> #include <ewol/widget/meta/StdPopUp.h>
@ -63,7 +63,7 @@ appl::WorkerCloseFile::WorkerCloseFile(const std::string& _bufferName) :
return; return;
} }
widget::StdPopUp* tmpPopUp = new widget::StdPopUp(); ewol::widget::StdPopUp* tmpPopUp = new ewol::widget::StdPopUp();
if (tmpPopUp == NULL) { if (tmpPopUp == NULL) {
APPL_ERROR("Can not create a simple pop-up"); APPL_ERROR("Can not create a simple pop-up");
return; return;
@ -74,20 +74,20 @@ appl::WorkerCloseFile::WorkerCloseFile(const std::string& _bufferName) :
if (m_buffer->hasFileName() == true) { if (m_buffer->hasFileName() == true) {
bt = tmpPopUp->addButton("Save", true); bt = tmpPopUp->addButton("Save", true);
if (bt != NULL) { if (bt != NULL) {
bt->registerOnEvent(this, widget::Button::eventPressed, s_saveValidate); bt->registerOnEvent(this, ewol::widget::Button::eventPressed, s_saveValidate);
} }
} }
bt = tmpPopUp->addButton("Save As", true); bt = tmpPopUp->addButton("Save As", true);
if (bt != NULL) { if (bt != NULL) {
bt->registerOnEvent(this, widget::Button::eventPressed, s_saveAsValidate); bt->registerOnEvent(this, ewol::widget::Button::eventPressed, s_saveAsValidate);
} }
bt = tmpPopUp->addButton("Close", true); bt = tmpPopUp->addButton("Close", true);
if (bt != NULL) { if (bt != NULL) {
bt->registerOnEvent(this, widget::Button::eventPressed, s_closeValidate); bt->registerOnEvent(this, ewol::widget::Button::eventPressed, s_closeValidate);
} }
tmpPopUp->addButton("Cancel", true); tmpPopUp->addButton("Cancel", true);
tmpPopUp->setRemoveOnExternClick(true); tmpPopUp->setRemoveOnExternClick(true);
ewol::Windows* tmpWindows = ewol::getContext().getWindows(); ewol::widget::Windows* tmpWindows = ewol::getContext().getWindows();
if (tmpWindows == NULL) { if (tmpWindows == NULL) {
APPL_ERROR("Error to get the windows."); APPL_ERROR("Error to get the windows.");
autoDestroy(); autoDestroy();
@ -100,7 +100,7 @@ appl::WorkerCloseFile::~WorkerCloseFile(void) {
appl::BufferManager::release(m_bufferManager); appl::BufferManager::release(m_bufferManager);
} }
void appl::WorkerCloseFile::onReceiveMessage(const ewol::EMessage& _msg) { void appl::WorkerCloseFile::onReceiveMessage(const ewol::object::Message& _msg) {
if (m_bufferManager == NULL) { if (m_bufferManager == NULL) {
// nothing to do in this case ==> can do nothing ... // nothing to do in this case ==> can do nothing ...
return; return;
@ -118,7 +118,7 @@ void appl::WorkerCloseFile::onReceiveMessage(const ewol::EMessage& _msg) {
return; return;
} }
if (m_buffer->storeFile() == false) { if (m_buffer->storeFile() == false) {
ewol::Windows* tmpWindows = ewol::getContext().getWindows(); ewol::widget::Windows* tmpWindows = ewol::getContext().getWindows();
if (tmpWindows == NULL) { if (tmpWindows == NULL) {
return; return;
} }
@ -138,7 +138,7 @@ void appl::WorkerCloseFile::onReceiveMessage(const ewol::EMessage& _msg) {
} }
} }
void appl::WorkerCloseFile::onObjectRemove(ewol::EObject* _removeObject) { void appl::WorkerCloseFile::onObjectRemove(ewol::Object* _removeObject) {
if (_removeObject == m_worker) { if (_removeObject == m_worker) {
m_worker = NULL; m_worker = NULL;
APPL_VERBOSE("AutoRemove After closing sub widget ..."); APPL_VERBOSE("AutoRemove After closing sub widget ...");

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

@ -14,7 +14,7 @@
#include <appl/Gui/WorkerSaveFile.h> #include <appl/Gui/WorkerSaveFile.h>
namespace appl { namespace appl {
class WorkerCloseFile : public ewol::EObject { class WorkerCloseFile : public ewol::Object {
public: public:
static const char* eventCloseDone; static const char* eventCloseDone;
public: public:
@ -27,8 +27,8 @@ namespace appl {
appl::WorkerSaveFile* m_worker; //! sub-worker element... appl::WorkerSaveFile* m_worker; //! sub-worker element...
appl::BufferManager* m_bufferManager; //!< handle on the buffer manager appl::BufferManager* m_bufferManager; //!< handle on the buffer manager
public: // derived function public: // derived function
virtual void onReceiveMessage(const ewol::EMessage& _msg); virtual void onReceiveMessage(const ewol::object::Message& _msg);
virtual void onObjectRemove(ewol::EObject * _removeObject); virtual void onObjectRemove(ewol::Object * _removeObject);
}; };
}; };

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

@ -6,7 +6,7 @@
* @license GPL v3 (see license file) * @license GPL v3 (see license file)
*/ */
#include <ewol/renderer/eContext.h> #include <ewol/context/Context.h>
#include <appl/debug.h> #include <appl/debug.h>
#include <appl/Gui/WorkerSaveAllFile.h> #include <appl/Gui/WorkerSaveAllFile.h>
@ -62,7 +62,7 @@ appl::WorkerSaveAllFile::~WorkerSaveAllFile(void) {
appl::BufferManager::release(m_bufferManager); appl::BufferManager::release(m_bufferManager);
} }
void appl::WorkerSaveAllFile::onReceiveMessage(const ewol::EMessage& _msg) { void appl::WorkerSaveAllFile::onReceiveMessage(const ewol::object::Message& _msg) {
if (m_bufferManager == NULL) { if (m_bufferManager == NULL) {
// nothing to do in this case ==> can do nothing ... // nothing to do in this case ==> can do nothing ...
return; return;
@ -84,7 +84,7 @@ void appl::WorkerSaveAllFile::onReceiveMessage(const ewol::EMessage& _msg) {
} }
} }
void appl::WorkerSaveAllFile::onObjectRemove(ewol::EObject* _removeObject) { void appl::WorkerSaveAllFile::onObjectRemove(ewol::Object* _removeObject) {
if (_removeObject == m_worker) { if (_removeObject == m_worker) {
m_worker = NULL; m_worker = NULL;
APPL_VERBOSE("AutoRemove After saving sub widget ..."); APPL_VERBOSE("AutoRemove After saving sub widget ...");

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

@ -13,7 +13,7 @@
#include <appl/Gui/WorkerSaveFile.h> #include <appl/Gui/WorkerSaveFile.h>
namespace appl { namespace appl {
class WorkerSaveAllFile : public ewol::EObject { class WorkerSaveAllFile : public ewol::Object {
public: public:
WorkerSaveAllFile(void); WorkerSaveAllFile(void);
virtual ~WorkerSaveAllFile(void); virtual ~WorkerSaveAllFile(void);
@ -22,8 +22,8 @@ namespace appl {
appl::WorkerSaveFile* m_worker; //! pop-up element that is open... appl::WorkerSaveFile* m_worker; //! pop-up element that is open...
appl::BufferManager* m_bufferManager; //!< handle on the buffer manager appl::BufferManager* m_bufferManager; //!< handle on the buffer manager
public: // derived function public: // derived function
virtual void onReceiveMessage(const ewol::EMessage& _msg); virtual void onReceiveMessage(const ewol::object::Message& _msg);
virtual void onObjectRemove(ewol::EObject * _removeObject); virtual void onObjectRemove(ewol::Object * _removeObject);
}; };
}; };

14
sources/appl/Gui/WorkerSaveFile.cpp
View File

@ -6,7 +6,7 @@
* @license GPL v3 (see license file) * @license GPL v3 (see license file)
*/ */
#include <ewol/renderer/eContext.h> #include <ewol/context/Context.h>
#include <appl/debug.h> #include <appl/debug.h>
#include <appl/Gui/WorkerSaveFile.h> #include <appl/Gui/WorkerSaveFile.h>
@ -60,7 +60,7 @@ appl::WorkerSaveFile::WorkerSaveFile(const std::string& _bufferName, bool _force
return; return;
} }
} }
m_chooser = new widget::FileChooser(); m_chooser = new ewol::widget::FileChooser();
if (NULL == m_chooser) { if (NULL == m_chooser) {
APPL_ERROR("Can not allocate widget == > display might be in error"); APPL_ERROR("Can not allocate widget == > display might be in error");
autoDestroy(); autoDestroy();
@ -71,21 +71,21 @@ appl::WorkerSaveFile::WorkerSaveFile(const std::string& _bufferName, bool _force
etk::FSNode tmpName(m_bufferName); etk::FSNode tmpName(m_bufferName);
m_chooser->setFolder(tmpName.getNameFolder()); m_chooser->setFolder(tmpName.getNameFolder());
m_chooser->setFileName(tmpName.getNameFile()); m_chooser->setFileName(tmpName.getNameFile());
ewol::Windows* tmpWindows = ewol::getContext().getWindows(); ewol::widget::Windows* tmpWindows = ewol::getContext().getWindows();
if (tmpWindows == NULL) { if (tmpWindows == NULL) {
APPL_ERROR("Error to get the windows."); APPL_ERROR("Error to get the windows.");
autoDestroy(); autoDestroy();
return; return;
} }
tmpWindows->popUpWidgetPush(m_chooser); tmpWindows->popUpWidgetPush(m_chooser);
m_chooser->registerOnEvent(this, widget::FileChooser::eventValidate, s_saveAsValidate); m_chooser->registerOnEvent(this, ewol::widget::FileChooser::eventValidate, s_saveAsValidate);
} }
appl::WorkerSaveFile::~WorkerSaveFile(void) { appl::WorkerSaveFile::~WorkerSaveFile(void) {
appl::BufferManager::release(m_bufferManager); appl::BufferManager::release(m_bufferManager);
} }
void appl::WorkerSaveFile::onReceiveMessage(const ewol::EMessage& _msg) { void appl::WorkerSaveFile::onReceiveMessage(const ewol::object::Message& _msg) {
if (m_bufferManager == NULL) { if (m_bufferManager == NULL) {
// nothing to do in this case ==> can do nothing ... // nothing to do in this case ==> can do nothing ...
return; return;
@ -106,7 +106,7 @@ void appl::WorkerSaveFile::onReceiveMessage(const ewol::EMessage& _msg) {
} }
tmpBuffer->setFileName(_msg.getData()); tmpBuffer->setFileName(_msg.getData());
if (tmpBuffer->storeFile() == false) { if (tmpBuffer->storeFile() == false) {
ewol::Windows* tmpWindows = ewol::getContext().getWindows(); ewol::widget::Windows* tmpWindows = ewol::getContext().getWindows();
if (tmpWindows == NULL) { if (tmpWindows == NULL) {
return; return;
} }
@ -117,7 +117,7 @@ void appl::WorkerSaveFile::onReceiveMessage(const ewol::EMessage& _msg) {
} }
} }
void appl::WorkerSaveFile::onObjectRemove(ewol::EObject* _removeObject) { void appl::WorkerSaveFile::onObjectRemove(ewol::Object* _removeObject) {
if (_removeObject == m_chooser) { if (_removeObject == m_chooser) {
m_chooser = NULL; m_chooser = NULL;
APPL_VERBOSE("AutoRemove After closing sub widget ..."); APPL_VERBOSE("AutoRemove After closing sub widget ...");

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

@ -13,7 +13,7 @@
#include <appl/BufferManager.h> #include <appl/BufferManager.h>
namespace appl { namespace appl {
class WorkerSaveFile : public ewol::EObject { class WorkerSaveFile : public ewol::Object {
public: public:
static const char* eventSaveDone; static const char* eventSaveDone;
public: public:
@ -21,11 +21,11 @@ namespace appl {
virtual ~WorkerSaveFile(void); virtual ~WorkerSaveFile(void);
private: private:
std::string m_bufferName; std::string m_bufferName;
widget::FileChooser* m_chooser; //! pop-up element that is open... ewol::widget::FileChooser* m_chooser; //! pop-up element that is open...
appl::BufferManager* m_bufferManager; //!< handle on the buffer manager appl::BufferManager* m_bufferManager; //!< handle on the buffer manager
public: // derived function public: // derived function
virtual void onReceiveMessage(const ewol::EMessage& _msg); virtual void onReceiveMessage(const ewol::object::Message& _msg);
virtual void onObjectRemove(ewol::EObject * _removeObject); virtual void onObjectRemove(ewol::Object * _removeObject);
}; };
}; };

2
sources/appl/Highlight.cpp
View File

@ -10,7 +10,7 @@
#include <appl/global.h> #include <appl/global.h>
#include <appl/Highlight.h> #include <appl/Highlight.h>
#include <exml/exml.h> #include <exml/exml.h>
#include <ewol/resources/ResourceManager.h> #include <ewol/resource/Manager.h>
#undef __class__ #undef __class__

4
sources/appl/HighlightManager.cpp
View File

@ -9,8 +9,8 @@
#include <appl/debug.h> #include <appl/debug.h>
#include <appl/global.h> #include <appl/global.h>
#include <appl/HighlightManager.h> #include <appl/HighlightManager.h>
#include <ewol/renderer/EObject.h> #include <ewol/object/Object.h>
#include <ewol/renderer/EObjectManager.h> #include <ewol/object/Manager.h>
#undef __class__ #undef __class__
#define __class__ "highlightManager" #define __class__ "highlightManager"

10
sources/appl/TextPlugin.h
View File

@ -10,12 +10,12 @@
#define __APPL_TEXT_PLUGIN_H__ #define __APPL_TEXT_PLUGIN_H__
#include <etk/types.h> #include <etk/types.h>
#include <ewol/renderer/EObject.h> #include <ewol/object/Object.h>
#include <appl/Gui/TextViewer.h> #include <appl/Gui/TextViewer.h>
#include <ewol/compositing/Text.h> #include <ewol/compositing/Text.h>
namespace appl { namespace appl {
class TextViewerPlugin : public ewol::EObject { class TextViewerPlugin : public ewol::Object {
friend class appl::TextViewer; friend class appl::TextViewer;
public: public:
TextViewerPlugin(void); TextViewerPlugin(void);
@ -79,7 +79,7 @@ namespace appl {
* @return true if the event might not propagate anymore. * @return true if the event might not propagate anymore.
*/ */
virtual bool onEventEntry(appl::TextViewer& _textDrawer, virtual bool onEventEntry(appl::TextViewer& _textDrawer,
const ewol::EventEntry& _event) { const ewol::event::Entry& _event) {
return false; return false;
}; };
protected: protected:
@ -99,7 +99,7 @@ namespace appl {
* @return true if the event might not propagate anymore * @return true if the event might not propagate anymore
*/ */
virtual bool onEventInput(appl::TextViewer& _textDrawer, virtual bool onEventInput(appl::TextViewer& _textDrawer,
const ewol::EventInput& _event) { const ewol::event::Input& _event) {
return false; return false;
}; };
protected: protected:
@ -187,7 +187,7 @@ namespace appl {
* @return true if the event might not propagate anymore * @return true if the event might not propagate anymore
*/ */
virtual bool onReceiveMessage(appl::TextViewer& _textDrawer, virtual bool onReceiveMessage(appl::TextViewer& _textDrawer,
const ewol::EMessage& _msg) { const ewol::object::Message& _msg) {
return false; return false;
} }
protected: protected:

10
sources/appl/TextPluginAutoIndent.cpp
View File

@ -8,7 +8,7 @@
#include <appl/TextPluginAutoIndent.h> #include <appl/TextPluginAutoIndent.h>
#include <ewol/clipBoard.h> #include <ewol/context/clipBoard.h>
#include <appl/Gui/TextViewer.h> #include <appl/Gui/TextViewer.h>
#undef __class__ #undef __class__
@ -20,22 +20,22 @@ appl::TextPluginAutoIndent::TextPluginAutoIndent(void) {
} }
bool appl::TextPluginAutoIndent::onEventEntry(appl::TextViewer& _textDrawer, bool appl::TextPluginAutoIndent::onEventEntry(appl::TextViewer& _textDrawer,
const ewol::EventEntry& _event) { const ewol::event::Entry& _event) {
if (isEnable() == false) { if (isEnable() == false) {
return false; return false;
} }
//APPL_DEBUG("KB EVENT : " << _event); //APPL_DEBUG("KB EVENT : " << _event);
// just forward event == > manage directly in the buffer // just forward event == > manage directly in the buffer
if (_event.getType() != ewol::keyEvent::keyboardChar) { if (_event.getType() != ewol::key::keyboardChar) {
return false; return false;
} }
if (_event.getStatus() != ewol::keyEvent::statusDown) { if (_event.getStatus() != ewol::key::statusDown) {
return false; return false;
} }
if (_event.getChar() != etk::UChar::Return) { if (_event.getChar() != etk::UChar::Return) {
return false; return false;
} }
if (_event.getSpecialKey().isSetShift() == true) { if (_event.getSpecialKey().getShift() == true) {
return false; return false;
} }
appl::Buffer::Iterator startLine = _textDrawer.cursor(); appl::Buffer::Iterator startLine = _textDrawer.cursor();

4
sources/appl/TextPluginAutoIndent.h
View File

@ -10,7 +10,7 @@
#define __APPL_TEXT_PLUGIN_AUTO_INDENT_H__ #define __APPL_TEXT_PLUGIN_AUTO_INDENT_H__
#include <etk/types.h> #include <etk/types.h>
#include <ewol/renderer/EObject.h> #include <ewol/object/Object.h>
#include <appl/Gui/TextViewer.h> #include <appl/Gui/TextViewer.h>
#include <ewol/compositing/Text.h> #include <ewol/compositing/Text.h>
#include <appl/TextPlugin.h> #include <appl/TextPlugin.h>
@ -24,7 +24,7 @@ namespace appl {
}; };
public: public:
virtual bool onEventEntry(appl::TextViewer& _textDrawer, virtual bool onEventEntry(appl::TextViewer& _textDrawer,
const ewol::EventEntry& _event); const ewol::event::Entry& _event);
}; };
}; };

8
sources/appl/TextPluginCopy.cpp
View File

@ -8,7 +8,7 @@
#include <appl/TextPluginCopy.h> #include <appl/TextPluginCopy.h>
#include <ewol/clipBoard.h> #include <ewol/context/clipBoard.h>
#include <appl/Gui/TextViewer.h> #include <appl/Gui/TextViewer.h>
#undef __class__ #undef __class__
@ -34,7 +34,7 @@ void appl::TextPluginCopy::onPluginDisable(appl::TextViewer& _textDrawer) {
} }
bool appl::TextPluginCopy::onReceiveMessage(appl::TextViewer& _textDrawer, bool appl::TextPluginCopy::onReceiveMessage(appl::TextViewer& _textDrawer,
const ewol::EMessage& _msg) { const ewol::object::Message& _msg) {
if (isEnable() == false) { if (isEnable() == false) {
return false; return false;
} }
@ -44,7 +44,7 @@ bool appl::TextPluginCopy::onReceiveMessage(appl::TextViewer& _textDrawer,
std::string value; std::string value;
_textDrawer.copy(value); _textDrawer.copy(value);
if (value.size() != 0) { if (value.size() != 0) {
ewol::clipBoard::set(ewol::clipBoard::clipboardStd, value); ewol::context::clipBoard::set(ewol::context::clipBoard::clipboardStd, value);
} }
} }
if (_msg.getMessage() == ednMsgGuiCut) { if (_msg.getMessage() == ednMsgGuiCut) {
@ -53,7 +53,7 @@ bool appl::TextPluginCopy::onReceiveMessage(appl::TextViewer& _textDrawer,
return true; return true;
} else if (_msg.getMessage() == ednMsgGuiPaste) { } else if (_msg.getMessage() == ednMsgGuiPaste) {
if (_textDrawer.hasBuffer() == true) { if (_textDrawer.hasBuffer() == true) {
ewol::clipBoard::request(ewol::clipBoard::clipboardStd); ewol::context::clipBoard::request(ewol::context::clipBoard::clipboardStd);
} }
return true; return true;
} }

4
sources/appl/TextPluginCopy.h
View File

@ -10,7 +10,7 @@
#define __APPL_TEXT_PLUGIN_COPY_H__ #define __APPL_TEXT_PLUGIN_COPY_H__
#include <etk/types.h> #include <etk/types.h>
#include <ewol/renderer/EObject.h> #include <ewol/object/Object.h>
#include <appl/Gui/TextViewer.h> #include <appl/Gui/TextViewer.h>
#include <ewol/compositing/Text.h> #include <ewol/compositing/Text.h>
#include <appl/TextPlugin.h> #include <appl/TextPlugin.h>
@ -25,7 +25,7 @@ namespace appl {
public: public:
virtual void onPluginEnable(appl::TextViewer& _textDrawer); virtual void onPluginEnable(appl::TextViewer& _textDrawer);
virtual void onPluginDisable(appl::TextViewer& _textDrawer); virtual void onPluginDisable(appl::TextViewer& _textDrawer);
virtual bool onReceiveMessage(appl::TextViewer& _textDrawer, const ewol::EMessage& _msg); virtual bool onReceiveMessage(appl::TextViewer& _textDrawer, const ewol::object::Message& _msg);
}; };
}; };

12
sources/appl/TextPluginCtags.cpp
View File

@ -8,10 +8,10 @@
#include <appl/TextPluginCtags.h> #include <appl/TextPluginCtags.h>
#include <ewol/clipBoard.h> #include <ewol/context/clipBoard.h>
#include <appl/Gui/TextViewer.h> #include <appl/Gui/TextViewer.h>
#include <ewol/widget/meta/FileChooser.h> #include <ewol/widget/meta/FileChooser.h>
#include <ewol/renderer/eContext.h> #include <ewol/context/Context.h>
#include <appl/Gui/TagFileSelection.h> #include <appl/Gui/TagFileSelection.h>
#undef __class__ #undef __class__
@ -150,7 +150,7 @@ void appl::TextPluginCtags::printTag(const tagEntry *_entry) {
#endif #endif
} }
void appl::TextPluginCtags::onReceiveMessage(const ewol::EMessage& _msg) { void appl::TextPluginCtags::onReceiveMessage(const ewol::object::Message& _msg) {
if (_msg.getMessage() == eventOpenCtagsOpenFileReturn) { if (_msg.getMessage() == eventOpenCtagsOpenFileReturn) {
// open the new one : // open the new one :
etk::FSNode tmpFilename = _msg.getData(); etk::FSNode tmpFilename = _msg.getData();
@ -168,20 +168,20 @@ void appl::TextPluginCtags::onReceiveMessage(const ewol::EMessage& _msg) {
} }
} }
bool appl::TextPluginCtags::onReceiveMessage(appl::TextViewer& _textDrawer, bool appl::TextPluginCtags::onReceiveMessage(appl::TextViewer& _textDrawer,
const ewol::EMessage& _msg) { const ewol::object::Message& _msg) {
if (isEnable() == false) { if (isEnable() == false) {
return false; return false;
} }
if (_msg.getMessage() == eventOpenCtagsFile) { if (_msg.getMessage() == eventOpenCtagsFile) {
APPL_INFO("Request opening ctag file"); APPL_INFO("Request opening ctag file");
widget::FileChooser* tmpWidget = new widget::FileChooser(); ewol::widget::FileChooser* tmpWidget = new ewol::widget::FileChooser();
if (NULL == tmpWidget) { if (NULL == tmpWidget) {
APPL_ERROR("Can not allocate widget == > display might be in error"); APPL_ERROR("Can not allocate widget == > display might be in error");
} else { } else {
tmpWidget->setTitle("Open Exuberant Ctags file"); tmpWidget->setTitle("Open Exuberant Ctags file");
tmpWidget->setValidateLabel("Open"); tmpWidget->setValidateLabel("Open");
ewol::getContext().getWindows()->popUpWidgetPush(tmpWidget); ewol::getContext().getWindows()->popUpWidgetPush(tmpWidget);
tmpWidget->registerOnEvent(this, widget::FileChooser::eventValidate, eventOpenCtagsOpenFileReturn); tmpWidget->registerOnEvent(this, ewol::widget::FileChooser::eventValidate, eventOpenCtagsOpenFileReturn);
} }
return true; return true;
} else if (_msg.getMessage() == eventJumpDestination) { } else if (_msg.getMessage() == eventJumpDestination) {

6
sources/appl/TextPluginCtags.h
View File

@ -10,7 +10,7 @@
#define __APPL_TEXT_PLUGIN_CTAGS_H__ #define __APPL_TEXT_PLUGIN_CTAGS_H__
#include <etk/types.h> #include <etk/types.h>
#include <ewol/renderer/EObject.h> #include <ewol/object/Object.h>
#include <appl/Gui/TextViewer.h> #include <appl/Gui/TextViewer.h>
#include <ewol/compositing/Text.h> #include <ewol/compositing/Text.h>
#include <appl/TextPlugin.h> #include <appl/TextPlugin.h>
@ -38,9 +38,9 @@ namespace appl {
virtual void onPluginEnable(appl::TextViewer& _textDrawer); virtual void onPluginEnable(appl::TextViewer& _textDrawer);
virtual void onPluginDisable(appl::TextViewer& _textDrawer); virtual void onPluginDisable(appl::TextViewer& _textDrawer);
virtual bool onReceiveMessage(appl::TextViewer& _textDrawer, virtual bool onReceiveMessage(appl::TextViewer& _textDrawer,
const ewol::EMessage& _msg); const ewol::object::Message& _msg);
// internal message : // internal message :
virtual void onReceiveMessage(const ewol::EMessage& _msg); virtual void onReceiveMessage(const ewol::object::Message& _msg);
}; };
}; };

8
sources/appl/TextPluginData.h
View File

@ -10,7 +10,7 @@
#define __APPL_TEXT_PLUGIN_DATA_H__ #define __APPL_TEXT_PLUGIN_DATA_H__
#include <etk/types.h> #include <etk/types.h>
#include <ewol/renderer/EObject.h> #include <ewol/object/Object.h>
#include <appl/Gui/TextViewer.h> #include <appl/Gui/TextViewer.h>
#include <ewol/compositing/Text.h> #include <ewol/compositing/Text.h>
#include <appl/TextPlugin.h> #include <appl/TextPlugin.h>
@ -50,7 +50,7 @@ namespace appl {
} }
protected: // Wrap all element with their internal data: (do not use theses function) protected: // Wrap all element with their internal data: (do not use theses function)
bool onReceiveMessage(appl::TextViewer& _textDrawer, bool onReceiveMessage(appl::TextViewer& _textDrawer,
const ewol::EMessage& _msg) { const ewol::object::Message& _msg) {
TYPE* data = getDataRef(_textDrawer); TYPE* data = getDataRef(_textDrawer);
if (data == NULL) { if (data == NULL) {
return false; return false;
@ -88,7 +88,7 @@ namespace appl {
public: public:
virtual bool onReceiveMessage(appl::TextViewer& _textDrawer, virtual bool onReceiveMessage(appl::TextViewer& _textDrawer,
const ewol::EMessage& _msg, const ewol::object::Message& _msg,
TYPE& _data) { TYPE& _data) {
return false; return false;
} }
@ -115,7 +115,7 @@ namespace appl {
return; return;
}; };
public: public:
virtual void onObjectRemove(ewol::EObject* _removeObject) { virtual void onObjectRemove(ewol::Object* _removeObject) {
// TODO : plop // TODO : plop
}; };
}; };

6
sources/appl/TextPluginHistory.cpp
View File

@ -8,7 +8,7 @@
#include <appl/TextPluginHistory.h> #include <appl/TextPluginHistory.h>
#include <ewol/clipBoard.h> #include <ewol/context/clipBoard.h>
#include <appl/Gui/TextViewer.h> #include <appl/Gui/TextViewer.h>
#include <appl/TextPluginManager.h> #include <appl/TextPluginManager.h>
@ -35,7 +35,7 @@ void appl::TextPluginHistory::onPluginDisable(appl::TextViewer& _textDrawer) {
} }
bool appl::TextPluginHistory::onReceiveMessage(appl::TextViewer& _textDrawer, bool appl::TextPluginHistory::onReceiveMessage(appl::TextViewer& _textDrawer,
const ewol::EMessage& _msg, const ewol::object::Message& _msg,
appl::PluginHistoryData& _data) { appl::PluginHistoryData& _data) {
if (isEnable() == false) { if (isEnable() == false) {
return false; return false;
@ -176,7 +176,7 @@ bool appl::TextPluginHistory::onRemove(appl::TextViewer& _textDrawer,
} }
void appl::TextPluginHistory::onObjectRemove(ewol::EObject* _removeObject) { void appl::TextPluginHistory::onObjectRemove(ewol::Object* _removeObject) {
// TODO : Dependence with buffer removing ... // TODO : Dependence with buffer removing ...
} }

6
sources/appl/TextPluginHistory.h
View File

@ -10,7 +10,7 @@
#define __APPL_TEXT_PLUGIN_HISTORY_H__ #define __APPL_TEXT_PLUGIN_HISTORY_H__
#include <etk/types.h> #include <etk/types.h>
#include <ewol/renderer/EObject.h> #include <ewol/object/Object.h>
#include <appl/Gui/TextViewer.h> #include <appl/Gui/TextViewer.h>
#include <ewol/compositing/Text.h> #include <ewol/compositing/Text.h>
#include <appl/TextPluginData.h> #include <appl/TextPluginData.h>
@ -44,7 +44,7 @@ namespace appl {
virtual void onPluginEnable(appl::TextViewer& _textDrawer); virtual void onPluginEnable(appl::TextViewer& _textDrawer);
virtual void onPluginDisable(appl::TextViewer& _textDrawer); virtual void onPluginDisable(appl::TextViewer& _textDrawer);
virtual bool onReceiveMessage(appl::TextViewer& _textDrawer, virtual bool onReceiveMessage(appl::TextViewer& _textDrawer,
const ewol::EMessage& _msg, const ewol::object::Message& _msg,
appl::PluginHistoryData& _data); appl::PluginHistoryData& _data);
virtual bool onWrite(appl::TextViewer& _textDrawer, virtual bool onWrite(appl::TextViewer& _textDrawer,
const appl::Buffer::Iterator& _pos, const appl::Buffer::Iterator& _pos,
@ -67,7 +67,7 @@ namespace appl {
void clearRedo(appl::PluginHistoryData& _data); void clearRedo(appl::PluginHistoryData& _data);
void clearUndo(appl::PluginHistoryData& _data); void clearUndo(appl::PluginHistoryData& _data);
public: public:
virtual void onObjectRemove(ewol::EObject* _removeObject); virtual void onObjectRemove(ewol::Object* _removeObject);
}; };
}; };

6
sources/appl/TextPluginManager.cpp
View File

@ -133,7 +133,7 @@ void appl::textPluginManager::disconnect(appl::TextViewer& _widget) {
} }
bool appl::textPluginManager::onEventEntry(appl::TextViewer& _textDrawer, bool appl::textPluginManager::onEventEntry(appl::TextViewer& _textDrawer,
const ewol::EventEntry& _event) { const ewol::event::Entry& _event) {
std::vector<appl::TextViewerPlugin *>& list = getListOnEventEntry(); std::vector<appl::TextViewerPlugin *>& list = getListOnEventEntry();
for (int32_t iii=0; iii<list.size(); ++iii) { for (int32_t iii=0; iii<list.size(); ++iii) {
if (list[iii] == NULL) { if (list[iii] == NULL) {
@ -147,7 +147,7 @@ bool appl::textPluginManager::onEventEntry(appl::TextViewer& _textDrawer,
} }
bool appl::textPluginManager::onEventInput(appl::TextViewer& _textDrawer, bool appl::textPluginManager::onEventInput(appl::TextViewer& _textDrawer,
const ewol::EventInput& _event) { const ewol::event::Input& _event) {
std::vector<appl::TextViewerPlugin *>& list = getListOnEventInput(); std::vector<appl::TextViewerPlugin *>& list = getListOnEventInput();
for (int32_t iii=0; iii<list.size(); ++iii) { for (int32_t iii=0; iii<list.size(); ++iii) {
if (list[iii] == NULL) { if (list[iii] == NULL) {
@ -207,7 +207,7 @@ bool appl::textPluginManager::onRemove(appl::TextViewer& _textDrawer,
} }
bool appl::textPluginManager::onReceiveMessage(appl::TextViewer& _textDrawer, bool appl::textPluginManager::onReceiveMessage(appl::TextViewer& _textDrawer,
const ewol::EMessage& _msg) { const ewol::object::Message& _msg) {
std::vector<appl::TextViewerPlugin *>& list = getListOnReceiveMessage(); std::vector<appl::TextViewerPlugin *>& list = getListOnReceiveMessage();
for (int32_t iii=0; iii<list.size(); ++iii) { for (int32_t iii=0; iii<list.size(); ++iii) {
if (list[iii] == NULL) { if (list[iii] == NULL) {

8
sources/appl/TextPluginManager.h
View File

@ -10,7 +10,7 @@
#define __APPL_TEXT_PLUGIN_MANAGER_H__ #define __APPL_TEXT_PLUGIN_MANAGER_H__
#include <etk/types.h> #include <etk/types.h>
#include <ewol/renderer/EObject.h> #include <ewol/object/Object.h>
#include <appl/Gui/TextViewer.h> #include <appl/Gui/TextViewer.h>
#include <ewol/compositing/Text.h> #include <ewol/compositing/Text.h>
#include <appl/TextPlugin.h> #include <appl/TextPlugin.h>
@ -51,7 +51,7 @@ namespace appl {
* @return true if the event might not propagate anymore. * @return true if the event might not propagate anymore.
*/ */
bool onEventEntry(appl::TextViewer& _widget, bool onEventEntry(appl::TextViewer& _widget,
const ewol::EventEntry& _event); const ewol::event::Entry& _event);
/** /**
* @brief On Input event call. * @brief On Input event call.
* @param[in] _widget Reference on the widget caller. * @param[in] _widget Reference on the widget caller.
@ -59,7 +59,7 @@ namespace appl {
* @return true if the event might not propagate anymore * @return true if the event might not propagate anymore
*/ */
bool onEventInput(appl::TextViewer& _textDrawer, bool onEventInput(appl::TextViewer& _textDrawer,
const ewol::EventInput& _event); const ewol::event::Input& _event);
/** /**
* @brief Called when data is written in the buffer. * @brief Called when data is written in the buffer.
* @param[in] _widget Reference on the widget caller. * @param[in] _widget Reference on the widget caller.
@ -99,7 +99,7 @@ namespace appl {
* @return true if the event might not propagate anymore * @return true if the event might not propagate anymore
*/ */
bool onReceiveMessage(appl::TextViewer& _textDrawer, bool onReceiveMessage(appl::TextViewer& _textDrawer,
const ewol::EMessage& _msg); const ewol::object::Message& _msg);
/** /**
* @brief Called when Cursor move of position. * @brief Called when Cursor move of position.
* @param[in] _widget Reference on the widget caller. * @param[in] _widget Reference on the widget caller.

12
sources/appl/TextPluginMultiLineTab.cpp
View File

@ -8,7 +8,7 @@
#include <appl/TextPluginMultiLineTab.h> #include <appl/TextPluginMultiLineTab.h>
#include <ewol/clipBoard.h> #include <ewol/context/clipBoard.h>
#include <appl/Gui/TextViewer.h> #include <appl/Gui/TextViewer.h>
#undef __class__ #undef __class__
@ -19,15 +19,15 @@ appl::TextPluginMultiLineTab::TextPluginMultiLineTab(void) {
} }
bool appl::TextPluginMultiLineTab::onEventEntry(appl::TextViewer& _textDrawer, bool appl::TextPluginMultiLineTab::onEventEntry(appl::TextViewer& _textDrawer,
const ewol::EventEntry& _event) { const ewol::event::Entry& _event) {
if (isEnable() == false) { if (isEnable() == false) {
return false; return false;
} }
if (_event.getType() != ewol::keyEvent::keyboardChar) { if (_event.getType() != ewol::key::keyboardChar) {
return false; return false;
} }
//APPL_DEBUG("KB EVENT : \"" << UTF8_data << "\" size=" << strlen(UTF8_data) << "type=" << (int32_t)typeEvent); //APPL_DEBUG("KB EVENT : \"" << UTF8_data << "\" size=" << strlen(UTF8_data) << "type=" << (int32_t)typeEvent);
if (_event.getStatus() != ewol::keyEvent::statusDown) { if (_event.getStatus() != ewol::key::statusDown) {
return false; return false;
} }
char32_t localValue = _event.getChar(); char32_t localValue = _event.getChar();
@ -49,7 +49,7 @@ bool appl::TextPluginMultiLineTab::onEventEntry(appl::TextViewer& _textDrawer,
bool m_useTabs = true; bool m_useTabs = true;
int32_t m_tabDist = 4; int32_t m_tabDist = 4;
if (true == _event.getSpecialKey().isSetShift() ) { if (true == _event.getSpecialKey().getShift() ) {
// un-indent // un-indent
data.insert(0, 1, etk::UChar::Return); data.insert(0, 1, etk::UChar::Return);
for (int32_t iii=1; iii<data.size(); ++iii) { for (int32_t iii=1; iii<data.size(); ++iii) {
@ -79,7 +79,7 @@ bool appl::TextPluginMultiLineTab::onEventEntry(appl::TextViewer& _textDrawer,
if (data[iii-1] != etk::UChar::Return) { if (data[iii-1] != etk::UChar::Return) {
continue; continue;
} }
if (true == _event.getSpecialKey().isSetCtrl() ) { if (true == _event.getSpecialKey().getCtrl() ) {
data.insert(iii, 1, etk::UChar::Space); data.insert(iii, 1, etk::UChar::Space);
} else if (true == m_useTabs) { } else if (true == m_useTabs) {
data.insert(iii, 1, etk::UChar::Tabulation); data.insert(iii, 1, etk::UChar::Tabulation);

4
sources/appl/TextPluginMultiLineTab.h
View File

@ -10,7 +10,7 @@
#define __APPL_TEXT_PLUGIN_MULTI_LINE_TAB_H__ #define __APPL_TEXT_PLUGIN_MULTI_LINE_TAB_H__
#include <etk/types.h> #include <etk/types.h>
#include <ewol/renderer/EObject.h> #include <ewol/object/Object.h>
#include <appl/Gui/TextViewer.h> #include <appl/Gui/TextViewer.h>
#include <ewol/compositing/Text.h> #include <ewol/compositing/Text.h>
#include <appl/TextPlugin.h> #include <appl/TextPlugin.h>
@ -24,7 +24,7 @@ namespace appl {
}; };
public: public:
virtual bool onEventEntry(appl::TextViewer& _textDrawer, virtual bool onEventEntry(appl::TextViewer& _textDrawer,
const ewol::EventEntry& _event); const ewol::event::Entry& _event);
}; };
}; };

4
sources/appl/TextPluginRmLine.cpp
View File

@ -8,7 +8,7 @@
#include <appl/TextPluginRmLine.h> #include <appl/TextPluginRmLine.h>
#include <ewol/clipBoard.h> #include <ewol/context/clipBoard.h>
#include <appl/Gui/TextViewer.h> #include <appl/Gui/TextViewer.h>
#undef __class__ #undef __class__
@ -30,7 +30,7 @@ void appl::TextPluginRmLine::onPluginDisable(appl::TextViewer& _textDrawer) {
} }
bool appl::TextPluginRmLine::onReceiveMessage(appl::TextViewer& _textDrawer, bool appl::TextPluginRmLine::onReceiveMessage(appl::TextViewer& _textDrawer,
const ewol::EMessage& _msg) { const ewol::object::Message& _msg) {
if (isEnable() == false) { if (isEnable() == false) {
return false; return false;
} }

4
sources/appl/TextPluginRmLine.h
View File

@ -10,7 +10,7 @@
#define __APPL_TEXT_RM_LINE_H__ #define __APPL_TEXT_RM_LINE_H__
#include <etk/types.h> #include <etk/types.h>
#include <ewol/renderer/EObject.h> #include <ewol/object/Object.h>
#include <appl/Gui/TextViewer.h> #include <appl/Gui/TextViewer.h>
#include <ewol/compositing/Text.h> #include <ewol/compositing/Text.h>
#include <appl/TextPlugin.h> #include <appl/TextPlugin.h>
@ -25,7 +25,7 @@ namespace appl {
public: public:
virtual void onPluginEnable(appl::TextViewer& _textDrawer); virtual void onPluginEnable(appl::TextViewer& _textDrawer);
virtual void onPluginDisable(appl::TextViewer& _textDrawer); virtual void onPluginDisable(appl::TextViewer& _textDrawer);
virtual bool onReceiveMessage(appl::TextViewer& _textDrawer, const ewol::EMessage& _msg); virtual bool onReceiveMessage(appl::TextViewer& _textDrawer, const ewol::object::Message& _msg);
}; };
}; };

4
sources/appl/TextPluginSelectAll.cpp
View File

@ -8,7 +8,7 @@
#include <appl/TextPluginSelectAll.h> #include <appl/TextPluginSelectAll.h>
#include <ewol/clipBoard.h> #include <ewol/context/clipBoard.h>
#include <appl/Gui/TextViewer.h> #include <appl/Gui/TextViewer.h>
#undef __class__ #undef __class__
@ -32,7 +32,7 @@ void appl::TextPluginSelectAll::onPluginDisable(appl::TextViewer& _textDrawer) {
} }
bool appl::TextPluginSelectAll::onReceiveMessage(appl::TextViewer& _textDrawer, bool appl::TextPluginSelectAll::onReceiveMessage(appl::TextViewer& _textDrawer,
const ewol::EMessage& _msg) { const ewol::object::Message& _msg) {
if (isEnable() == false) { if (isEnable() == false) {
return false; return false;
} }

4
sources/appl/TextPluginSelectAll.h
View File

@ -10,7 +10,7 @@
#define __APPL_TEXT_PLUGIN_SELECT_ALL_H__ #define __APPL_TEXT_PLUGIN_SELECT_ALL_H__
#include <etk/types.h> #include <etk/types.h>
#include <ewol/renderer/EObject.h> #include <ewol/object/Object.h>
#include <appl/Gui/TextViewer.h> #include <appl/Gui/TextViewer.h>
#include <ewol/compositing/Text.h> #include <ewol/compositing/Text.h>
#include <appl/TextPlugin.h> #include <appl/TextPlugin.h>
@ -25,7 +25,7 @@ namespace appl {
public: public:
virtual void onPluginEnable(appl::TextViewer& _textDrawer); virtual void onPluginEnable(appl::TextViewer& _textDrawer);
virtual void onPluginDisable(appl::TextViewer& _textDrawer); virtual void onPluginDisable(appl::TextViewer& _textDrawer);
virtual bool onReceiveMessage(appl::TextViewer& _textDrawer, const ewol::EMessage& _msg); virtual bool onReceiveMessage(appl::TextViewer& _textDrawer, const ewol::object::Message& _msg);
}; };
}; };

32
sources/appl/global.cpp
View File

@ -8,15 +8,15 @@
#include <appl/global.h> #include <appl/global.h>
#include <appl/globalMsg.h> #include <appl/globalMsg.h>
#include <ewol/renderer/EObject.h> #include <ewol/object/Object.h>
#include <ewol/renderer/eContext.h> #include <ewol/context/Context.h>
#include <ewol/resources/ResourceManager.h> #include <ewol/resource/Manager.h>
#include <etk/os/FSNode.h> #include <etk/os/FSNode.h>
#undef __class__ #undef __class__
#define __class__ "globals" #define __class__ "globals"
class myParamGlobal : public ewol::EObject { class myParamGlobal : public ewol::Object {
public: public:
static const char * const configEOL; static const char * const configEOL;
static const char * const configAutoIndent; static const char * const configAutoIndent;
@ -41,7 +41,7 @@ class myParamGlobal : public ewol::EObject {
registerConfig(configShowSpaceChar, "bool", NULL, "Display the space char"); registerConfig(configShowSpaceChar, "bool", NULL, "Display the space char");
} }
bool onSetConfig(const ewol::EConfig& _conf) { bool onSetConfig(const ewol::object::Config& _conf) {
// Not set the EObject node parameter (name == > not change ...) // Not set the EObject node parameter (name == > not change ...)
if (_conf.getConfig() == configEOL) { if (_conf.getConfig() == configEOL) {
m_displayEOL = stobool(_conf.getData()); m_displayEOL = stobool(_conf.getData());
@ -180,18 +180,18 @@ static const char * const l_changeEndOfLine = "edn-event-change-endOfLine";
static const char * const l_changeRounded = "edn-event-change-rounded"; static const char * const l_changeRounded = "edn-event-change-rounded";
globals::ParameterGlobalsGui::ParameterGlobalsGui(void) : globals::ParameterGlobalsGui::ParameterGlobalsGui(void) :
widget::Sizer(widget::Sizer::modeVert) { ewol::widget::Sizer(ewol::widget::Sizer::modeVert) {
widget::CheckBox* myCheckbox = NULL; ewol::widget::CheckBox* myCheckbox = NULL;
widget::Spacer* mySpacer = NULL; ewol::widget::Spacer* mySpacer = NULL;
mySpacer = new widget::Spacer(); mySpacer = new ewol::widget::Spacer();
if (NULL == mySpacer) { if (NULL == mySpacer) {
APPL_ERROR("Can not allocate widget == > display might be in error"); APPL_ERROR("Can not allocate widget == > display might be in error");
} else { } else {
mySpacer->setExpand(bvec2(true,true)); mySpacer->setExpand(bvec2(true,true));
subWidgetAdd(mySpacer); subWidgetAdd(mySpacer);
} }
myCheckbox = new widget::CheckBox("Automatic Indentation"); myCheckbox = new ewol::widget::CheckBox("Automatic Indentation");
if (NULL == myCheckbox) { if (NULL == myCheckbox) {
APPL_ERROR("Can not allocate widget == > display might be in error"); APPL_ERROR("Can not allocate widget == > display might be in error");
} else { } else {
@ -200,7 +200,7 @@ globals::ParameterGlobalsGui::ParameterGlobalsGui(void) :
myCheckbox->registerOnEvent(this, ewolEventCheckBoxClicked, l_changeIndentation); myCheckbox->registerOnEvent(this, ewolEventCheckBoxClicked, l_changeIndentation);
subWidgetAdd(myCheckbox); subWidgetAdd(myCheckbox);
} }
myCheckbox = new widget::CheckBox("Display space char (' ')"); myCheckbox = new ewol::widget::CheckBox("Display space char (' ')");
if (NULL == myCheckbox) { if (NULL == myCheckbox) {
APPL_ERROR("Can not allocate widget == > display might be in error"); APPL_ERROR("Can not allocate widget == > display might be in error");
} else { } else {
@ -209,7 +209,7 @@ globals::ParameterGlobalsGui::ParameterGlobalsGui(void) :
myCheckbox->registerOnEvent(this, ewolEventCheckBoxClicked, l_changeSpace); myCheckbox->registerOnEvent(this, ewolEventCheckBoxClicked, l_changeSpace);
subWidgetAdd(myCheckbox); subWidgetAdd(myCheckbox);
} }
myCheckbox = new widget::CheckBox("Display tabulation char ('\\t')"); myCheckbox = new ewol::widget::CheckBox("Display tabulation char ('\\t')");
if (NULL == myCheckbox) { if (NULL == myCheckbox) {
APPL_ERROR("Can not allocate widget == > display might be in error"); APPL_ERROR("Can not allocate widget == > display might be in error");
} else { } else {
@ -218,7 +218,7 @@ globals::ParameterGlobalsGui::ParameterGlobalsGui(void) :
myCheckbox->registerOnEvent(this, ewolEventCheckBoxClicked, l_changeTabulation); myCheckbox->registerOnEvent(this, ewolEventCheckBoxClicked, l_changeTabulation);
subWidgetAdd(myCheckbox); subWidgetAdd(myCheckbox);
} }
myCheckbox = new widget::CheckBox("Display end of line ('\\n')"); myCheckbox = new ewol::widget::CheckBox("Display end of line ('\\n')");
if (NULL == myCheckbox) { if (NULL == myCheckbox) {
APPL_ERROR("Can not allocate widget == > display might be in error"); APPL_ERROR("Can not allocate widget == > display might be in error");
} else { } else {
@ -227,7 +227,7 @@ globals::ParameterGlobalsGui::ParameterGlobalsGui(void) :
myCheckbox->registerOnEvent(this, ewolEventCheckBoxClicked, l_changeEndOfLine); myCheckbox->registerOnEvent(this, ewolEventCheckBoxClicked, l_changeEndOfLine);
subWidgetAdd(myCheckbox); subWidgetAdd(myCheckbox);
} }
myCheckbox = new widget::CheckBox("switch Rounded/default"); myCheckbox = new ewol::widget::CheckBox("switch Rounded/default");
if (NULL == myCheckbox) { if (NULL == myCheckbox) {
APPL_ERROR("Can not allocate widget == > display might be in error"); APPL_ERROR("Can not allocate widget == > display might be in error");
} else { } else {
@ -243,8 +243,8 @@ globals::ParameterGlobalsGui::~ParameterGlobalsGui(void) {
} }
void globals::ParameterGlobalsGui::onReceiveMessage(const ewol::EMessage& _msg) { void globals::ParameterGlobalsGui::onReceiveMessage(const ewol::object::Message& _msg) {
widget::Sizer::onReceiveMessage(_msg); ewol::widget::Sizer::onReceiveMessage(_msg);
if (_msg.getMessage() == l_changeEndOfLine) { if (_msg.getMessage() == l_changeEndOfLine) {
if (_msg.getData() == "true") { if (_msg.getData() == "true") {

4
sources/appl/global.h
View File

@ -36,12 +36,12 @@ namespace globals
bool OrderTheBufferList(void); bool OrderTheBufferList(void);
class ParameterGlobalsGui : public widget::Sizer { class ParameterGlobalsGui : public ewol::widget::Sizer {
public : public :
ParameterGlobalsGui(void); ParameterGlobalsGui(void);
~ParameterGlobalsGui(void); ~ParameterGlobalsGui(void);
// herited function // herited function
virtual void onReceiveMessage(const ewol::EMessage& _msg); virtual void onReceiveMessage(const ewol::object::Message& _msg);
}; };
} }

14
sources/appl/init.cpp
View File

@ -9,8 +9,8 @@
#include <etk/types.h> #include <etk/types.h>
#include <etk/UString.h> #include <etk/UString.h>
#include <ewol/ewol.h> #include <ewol/ewol.h>
#include <ewol/renderer/EObject.h> #include <ewol/object/Object.h>
#include <ewol/widget/WidgetManager.h> #include <ewol/widget/Manager.h>
#include <appl/debug.h> #include <appl/debug.h>
#include <appl/global.h> #include <appl/global.h>
@ -18,9 +18,9 @@
#include <etk/tool.h> #include <etk/tool.h>
#include <unistd.h> #include <unistd.h>
//#include <ewol/config.h> //#include <ewol/config.h>
#include <ewol/commandLine.h> #include <ewol/context/commandLine.h>
//#include <ewol/UserConfig.h> //#include <ewol/UserConfig.h>
#include <ewol/renderer/eContext.h> #include <ewol/context/Context.h>
#include <appl/TextPluginManager.h> #include <appl/TextPluginManager.h>
#include <appl/BufferManager.h> #include <appl/BufferManager.h>
#include <appl/HighlightManager.h> #include <appl/HighlightManager.h>
@ -58,7 +58,7 @@ etk::CCout& operator <<(etk::CCout& _os, const std::u32string& _obj) {
/** /**
* @brief main application function initialisation * @brief main application function initialisation
*/ */
bool APP_Init(ewol::eContext& _context) { bool APP_Init(ewol::Context& _context) {
APPL_INFO(" == > init APPL v" << APPL_VERSION << " (START) [" << ewol::getBoardType() << "] (" << ewol::getCompilationMode() << ")"); APPL_INFO(" == > init APPL v" << APPL_VERSION << " (START) [" << ewol::getBoardType() << "] (" << ewol::getCompilationMode() << ")");
etk::theme::setName("COLOR", "colorWhite/"); etk::theme::setName("COLOR", "colorWhite/");
@ -135,9 +135,9 @@ bool APP_Init(ewol::eContext& _context) {
/** /**
* @brief main application function Un-Initialisation * @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)"); APPL_INFO(" == > Un-Init " PROJECT_NAME " (START)");
ewol::Windows* tmpWindows = _context.getWindows(); ewol::widget::Windows* tmpWindows = _context.getWindows();
_context.setWindows(NULL); _context.setWindows(NULL);