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

[DEV] start rework for dev interface of ewol

Browse Source
This commit is contained in:
Edouard DUPIN 2014-05-19 22:30:39 +02:00
parent 2d8c5d588d
commit 304ac2ba45
20 changed files with 59 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
data/lang/EN.json Normal file
View File

0
data/lang/FR.json Normal file
View File

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

@ -122,35 +122,34 @@ const char* l_smoothMax = "tmpEvent_maxChange";
MainWindows::MainWindows() {
addObjectType("appl::MainWindows");
APPL_DEBUG("CREATE WINDOWS ... ");
ewol::widget::Sizer * mySizerVert = NULL;
ewol::widget::Sizer * mySizerVert2 = NULL;
ewol::widget::Sizer * mySizerHori = NULL;
//ewol::Button * myButton = NULL;
appl::TextViewer * myTextView = NULL;
BufferView * myBufferView = NULL;
ewol::widget::Menu * myMenu = NULL;
ewol::object::Shared<ewol::widget::Sizer> mySizerVert = NULL;
ewol::object::Shared<ewol::widget::Sizer> mySizerVert2 = NULL;
ewol::object::Shared<ewol::widget::Sizer> mySizerHori = NULL;
ewol::object::Shared<appl::TextViewer> myTextView = NULL;
ewol::object::Shared<BufferView> myBufferView = NULL;
ewol::object::Shared<ewol::widget::Menu> myMenu = NULL;
// load buffer manager:
m_bufferManager = appl::BufferManager::keep();
mySizerVert = new ewol::widget::Sizer(ewol::widget::Sizer::modeVert);
mySizerVert = ewol::object::makeShared(new ewol::widget::Sizer(ewol::widget::Sizer::modeVert));
setSubWidget(mySizerVert);
mySizerHori = new ewol::widget::Sizer(ewol::widget::Sizer::modeHori);
mySizerHori = ewol::object::makeShared(new ewol::widget::Sizer(ewol::widget::Sizer::modeHori));
mySizerVert->subWidgetAdd(mySizerHori);
myBufferView = new BufferView();
myBufferView = ewol::object::makeShared(new BufferView());
myBufferView->setExpand(bvec2(false,true));
myBufferView->setFill(bvec2(true,true));
mySizerHori->subWidgetAdd(myBufferView);
mySizerVert2 = new ewol::widget::Sizer(ewol::widget::Sizer::modeVert);
mySizerVert2 = ewol::object::makeShared(new ewol::widget::Sizer(ewol::widget::Sizer::modeVert));
mySizerHori->subWidgetAdd(mySizerVert2);
// main buffer Area :
#if defined(__TARGET_OS__Android)
myTextView = new appl::TextViewer("FreeMono;DejaVuSansMono;FreeSerif", 16);
myTextView = ewol::object::makeShared(new appl::TextViewer("FreeMono;DejaVuSansMono;FreeSerif", 16));
#else
myTextView = new appl::TextViewer("FreeMono;DejaVuSansMono;FreeSerif", 11);
myTextView = ewol::object::makeShared(new appl::TextViewer("FreeMono;DejaVuSansMono;FreeSerif", 11));
#endif
myTextView->setName("appl-text-viewer");
myTextView->setExpand(bvec2(true,true));
@ -163,13 +162,13 @@ MainWindows::MainWindows() {
mySizerVert2->subWidgetAdd(myTextView);
*/
// search area :
Search * mySearch = new Search();
ewol::object::Shared<Search> mySearch = ewol::object::makeShared(new Search());
mySizerVert2->subWidgetAdd(mySearch);
mySizerHori = new ewol::widget::Sizer(ewol::widget::Sizer::modeHori);
mySizerHori = ewol::object::makeShared(new ewol::widget::Sizer(ewol::widget::Sizer::modeHori));
mySizerVert->subWidgetAdd(mySizerHori);
myMenu = new ewol::widget::Menu();
myMenu = ewol::object::makeShared(new ewol::widget::Menu());
mySizerHori->subWidgetAdd(myMenu);
int32_t idMenuFile = myMenu->addTitle("File");
myMenu->add(idMenuFile, "New", "", ednMsgGuiNew);
@ -218,7 +217,7 @@ MainWindows::MainWindows() {
myMenu->addSpacer();
myMenu->add(idMenugDisplay, "Reload openGl Shader", "", ednMsgGuiReloadShader);
m_widgetLabelFileName = new ewol::widget::Label("FileName");
m_widgetLabelFileName = ewol::object::makeShared(new ewol::widget::Label("FileName"));
m_widgetLabelFileName->setExpand(bvec2(true,false));
m_widgetLabelFileName->setFill(bvec2(true,false));;
mySizerHori->subWidgetAdd(m_widgetLabelFileName);
@ -301,7 +300,7 @@ void MainWindows::onReceiveMessage(const ewol::object::Message& _msg) {
tmpWidget->registerOnEvent(this, "validate", ednEventPopUpFileSelected);
} else if (_msg.getMessage() == ednMsgProperties) {
// Request the parameter GUI
ewol::widget::Parameter* tmpWidget = new ewol::widget::Parameter();
ewol::object::Shared<ewol::widget::Parameter> tmpWidget = ewol::object::makeShared(new ewol::widget::Parameter());
if (NULL == tmpWidget) {
APPL_ERROR("Can not allocate widget == > display might be in error");
} else {
@ -339,13 +338,13 @@ void MainWindows::onReceiveMessage(const ewol::object::Message& _msg) {
tmpWidget->setTitle("Properties");
popUpWidgetPush(tmpWidget);
tmpWidget->menuAddGroup("Editor");
ewol::Widget* tmpSubWidget = new globals::ParameterGlobalsGui();
ewol::object::Shared<ewol::Widget> tmpSubWidget = ewol::object::makeShared(new globals::ParameterGlobalsGui());
tmpWidget->menuAdd("Editor", "", tmpSubWidget);
tmpWidget->menuAdd("Font & Color", "", NULL);
tmpWidget->menuAdd("Highlight", "", NULL);
tmpWidget->menuAddGroup("General");
tmpWidget->menuAdd("Display", "", NULL);
tmpSubWidget = new ParameterAboutGui();
tmpSubWidget = ewol::object::makeShared(new ParameterAboutGui());
tmpWidget->menuAdd("About", "", tmpSubWidget);
}
} else if (_msg.getMessage() == appl::MsgNameGuiChangeColor) {
@ -476,14 +475,14 @@ void MainWindows::closeNotSavedFile(appl::Buffer* _buffer) {
APPL_ERROR("Call With NULL input...");
return;
}
ewol::widget::StdPopUp* tmpPopUp = new ewol::widget::StdPopUp();
ewol::object::Shared<ewol::widget::StdPopUp> tmpPopUp = ewol::object::makeShared(new ewol::widget::StdPopUp());
if (tmpPopUp == NULL) {
APPL_ERROR("Can not create a simple pop-up");
return;
}
tmpPopUp->setTitle("<bold>Close un-saved file:</bold>");
tmpPopUp->setComment("The file named : <i>\"" + _buffer->getFileName() + "\"</i> is curently modify. <br/>If you don't saves these modifications,<br/>they will be definitly lost...");
ewol::Widget* bt = NULL;
ewol::object::Shared<ewol::Widget> bt = NULL;
if (_buffer->hasFileName() == true) {
bt = tmpPopUp->addButton("Save", true);
if (bt != NULL) {
@ -507,7 +506,7 @@ void MainWindows::closeNotSavedFile(appl::Buffer* _buffer) {
popUpWidgetPush(tmpPopUp);
}
void MainWindows::onObjectRemove(ewol::Object* _removeObject) {
void MainWindows::onObjectRemove(const ewol::object::Shared<ewol::Object> _removeObject) {
ewol::widget::Windows::onObjectRemove(_removeObject);
if (m_widgetLabelFileName == _removeObject) {
m_widgetLabelFileName = NULL;

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

@ -19,7 +19,7 @@
class MainWindows : public ewol::widget::Windows {
private:
ewol::widget::Label* m_widgetLabelFileName;
ewol::object::Shared<ewol::widget::Label> m_widgetLabelFileName;
public:
// Constructeur
MainWindows();
@ -38,7 +38,7 @@ class MainWindows : public ewol::widget::Windows {
void closeNotSavedFile(appl::Buffer* _buffer);
public: // Derived function
virtual void onReceiveMessage(const ewol::object::Message& _msg);
virtual void onObjectRemove(ewol::Object * _removeObject);
virtual void onObjectRemove(const ewol::object::Shared<ewol::Object> _removeObject);
};

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

@ -55,8 +55,8 @@ Search::Search() :
setConfigNamed("SEARCH:wrap", "value", std::to_string(m_wrap));
setConfigNamed("SEARCH:up-down", "value", std::to_string(m_forward));
// get widget
m_searchEntry = dynamic_cast<ewol::widget::Entry*>(getWidgetNamed("SEARCH:search-entry"));
m_replaceEntry = dynamic_cast<ewol::widget::Entry*>(getWidgetNamed("SEARCH:replace-entry"));
m_searchEntry = ewol::dynamic_pointer_cast<ewol::widget::Entry>(getWidgetNamed("SEARCH:search-entry"));
m_replaceEntry = ewol::dynamic_pointer_cast<ewol::widget::Entry>(getWidgetNamed("SEARCH:replace-entry"));
// Display and hide event:
registerMultiCast(ednMsgGuiSearch);
// basicly hiden ...
@ -72,7 +72,7 @@ void Search::find() {
APPL_WARNING("No viewer manager selected!!!");
return;
}
appl::TextViewer* viewer = m_viewerManager->getViewerSelected();
ewol::object::Shared<appl::TextViewer> viewer = m_viewerManager->getViewerSelected();
if (viewer == NULL) {
APPL_INFO("No viewer selected!!!");
return;
@ -108,7 +108,7 @@ void Search::replace() {
APPL_WARNING("No viewer manager selected!!!");
return;
}
appl::TextViewer* viewer = m_viewerManager->getViewerSelected();
ewol::object::Shared<appl::TextViewer> viewer = m_viewerManager->getViewerSelected();
if (viewer == NULL) {
APPL_INFO("No viewer selected!!!");
return;
@ -162,7 +162,7 @@ void Search::onReceiveMessage(const ewol::object::Message& _msg) {
}
}
void Search::onObjectRemove(ewol::Object * _removeObject) {
void Search::onObjectRemove(const ewol::object::Shared<ewol::Object> _removeObject) {
ewol::widget::Composer::onObjectRemove(_removeObject);
if (_removeObject == m_searchEntry) {
m_searchEntry = NULL;

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

@ -21,8 +21,8 @@ class Search : public ewol::widget::Composer {
bool m_forward;
bool m_caseSensitive;
bool m_wrap;
ewol::widget::Entry* m_searchEntry;
ewol::widget::Entry* m_replaceEntry;
ewol::object::Shared<ewol::widget::Entry> m_searchEntry;
ewol::object::Shared<ewol::widget::Entry> m_replaceEntry;
std::u32string m_searchData;
std::u32string m_replaceData;
public:
@ -40,7 +40,7 @@ class Search : public ewol::widget::Composer {
void replace();
public: // derived function
virtual void onReceiveMessage(const ewol::object::Message& _msg);
virtual void onObjectRemove(ewol::Object * _removeObject);
virtual void onObjectRemove(const ewol::object::Shared<ewol::Object> _removeObject);
};
#endif

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

@ -139,7 +139,7 @@ void appl::TagFileSelection::addCtagsNewItem(std::string _file, int32_t _line) {
}
}
void appl::TagFileSelection::onObjectRemove(ewol::Object * _removeObject) {
void appl::TagFileSelection::onObjectRemove(const ewol::object::Shared<ewol::Object> _removeObject) {
// First step call parrent :
ewol::widget::PopUp::onObjectRemove(_removeObject);
// second step find if in all the elements ...

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

@ -32,7 +32,7 @@ namespace appl {
void addCtagsNewItem(std::string file, int32_t line);
public: // herited function
void onReceiveMessage(const ewol::object::Message& _msg);
void onObjectRemove(ewol::Object * _removeObject);
void onObjectRemove(const ewol::object::Shared<ewol::Object> _removeObject);
};
};

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

@ -702,7 +702,7 @@ void appl::TextViewer::onReceiveMessage(const ewol::object::Message& _msg) {
}
}
void appl::TextViewer::onObjectRemove(ewol::Object* _removeObject) {
void appl::TextViewer::onObjectRemove(const ewol::object::Shared<ewol::Object>& _removeObject) {
ewol::widget::WidgetScrolled::onObjectRemove(_removeObject);
if (m_buffer == _removeObject) {
m_buffer = NULL;

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

@ -33,8 +33,8 @@ namespace appl {
int32_t m_colorSelection;
int32_t m_colorNormal;
private:
appl::BufferManager* m_bufferManager; //!< handle on the buffer manager
appl::ViewerManager* m_viewerManager; //!< handle on the buffer manager
ewol::object::Shared<appl::BufferManager> m_bufferManager; //!< handle on the buffer manager
ewol::object::Shared<appl::ViewerManager> m_viewerManager; //!< handle on the buffer manager
public:
TextViewer(const std::string& _fontName="", int32_t _fontSize=-1);
virtual ~TextViewer();
@ -61,7 +61,7 @@ namespace appl {
virtual bool calculateMinSize();
virtual void onRegenerateDisplay();
virtual void onReceiveMessage(const ewol::object::Message& _msg);
virtual void onObjectRemove(ewol::Object* _removeObject);
virtual void onObjectRemove(const ewol::object::Shared<ewol::Object>& _removeObject);
virtual bool onEventInput(const ewol::event::Input& _event);
virtual bool onEventEntry(const ewol::event::Entry& _event);
virtual void onEventClipboard(enum ewol::context::clipBoard::clipboardListe _clipboardID);

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

@ -29,7 +29,11 @@ appl::ViewerManager::~ViewerManager() {
appl::BufferManager::release(m_bufferManager);
}
void appl::ViewerManager::setViewerSelected(appl::TextViewer* _viewer, appl::Buffer* _buffer) {
bool appl::ViewerManager::isLastSelected(ewol::object::Shared<appl::TextViewer> _viewer) {
return m_viewer == _viewer;
}
void appl::ViewerManager::setViewerSelected(const ewol::object::Shared<appl::TextViewer>& _viewer, appl::Buffer* _buffer) {
if (m_viewer == _viewer) {
return;
}
@ -43,10 +47,10 @@ void appl::ViewerManager::onReceiveMessage(const ewol::object::Message& _msg) {
APPL_DEBUG("receive message !!! " << _msg);
}
void appl::ViewerManager::onObjectRemove(ewol::Object* _removeObject) {
void appl::ViewerManager::onObjectRemove(const ewol::object::Shared<ewol::Object>& _removeObject) {
ewol::Resource:: onObjectRemove(_removeObject);
if (_removeObject == m_viewer) {
m_viewer = NULL;
m_viewer.reset();
return;
}
}

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

@ -23,18 +23,18 @@ namespace appl {
~ViewerManager();
private:
appl::BufferManager* m_bufferManager; //!< handle on the buffer manager
appl::TextViewer* m_viewer;
ewol::object::Shared<appl::TextViewer> m_viewer;
public:
/**
* @brief Set the current buffer selected
* @param[in] _viewer Pointer on the viewer selected
*/
void setViewerSelected(appl::TextViewer* _viewer, appl::Buffer* _buffer);
void setViewerSelected(const ewol::object::Shared<appl::TextViewer>& _viewer, appl::Buffer* _buffer);
/**
* @brief Get the current buffer selected
* @return Pointer on the buffer selected
*/
appl::TextViewer* getViewerSelected() {
ewol::object::Shared<appl::TextViewer> getViewerSelected() {
return m_viewer;
};
/**
@ -42,12 +42,10 @@ namespace appl {
* @param[in] _viewer element selected.
* @return true if the element is selected
*/
bool isLastSelected(appl::TextViewer* _viewer) {
return m_viewer == _viewer;
};
bool isLastSelected(ewol::object::Shared<appl::TextViewer> _viewer);
public: // herited function
void onReceiveMessage(const ewol::object::Message& _msg);
void onObjectRemove(ewol::Object* _removeObject);
void onObjectRemove(const ewol::object::Shared<ewol::Object>& _removeObject);
public: // resource manager
/**
* @brief keep the resource pointer.

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

@ -81,7 +81,7 @@ void appl::WorkerCloseAllFile::onReceiveMessage(const ewol::object::Message& _ms
}
}
void appl::WorkerCloseAllFile::onObjectRemove(ewol::Object* _removeObject) {
void appl::WorkerCloseAllFile::onObjectRemove(const ewol::object::Shared<ewol::Object>& _removeObject) {
if (_removeObject == m_worker) {
m_worker = NULL;
APPL_VERBOSE("AutoRemove After saving sub widget ...");

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

@ -23,7 +23,7 @@ namespace appl {
appl::BufferManager* m_bufferManager; //!< handle on the buffer manager
public: // derived function
virtual void onReceiveMessage(const ewol::object::Message& _msg);
virtual void onObjectRemove(ewol::Object * _removeObject);
virtual void onObjectRemove(const ewol::object::Shared<ewol::Object>& _removeObject);
};
};

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

@ -138,7 +138,7 @@ void appl::WorkerCloseFile::onReceiveMessage(const ewol::object::Message& _msg)
}
}
void appl::WorkerCloseFile::onObjectRemove(ewol::Object* _removeObject) {
void appl::WorkerCloseFile::onObjectRemove(const ewol::object::Shared<ewol::Object>& _removeObject) {
if (_removeObject == m_worker) {
m_worker = NULL;
APPL_VERBOSE("AutoRemove After closing sub widget ...");

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

@ -28,7 +28,7 @@ namespace appl {
appl::BufferManager* m_bufferManager; //!< handle on the buffer manager
public: // derived function
virtual void onReceiveMessage(const ewol::object::Message& _msg);
virtual void onObjectRemove(ewol::Object * _removeObject);
virtual void onObjectRemove(const ewol::object::Shared<ewol::Object>& _removeObject);
};
};

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

@ -84,7 +84,7 @@ void appl::WorkerSaveAllFile::onReceiveMessage(const ewol::object::Message& _msg
}
}
void appl::WorkerSaveAllFile::onObjectRemove(ewol::Object* _removeObject) {
void appl::WorkerSaveAllFile::onObjectRemove(const ewol::object::Shared<ewol::Object>& _removeObject) {
if (_removeObject == m_worker) {
m_worker = NULL;
APPL_VERBOSE("AutoRemove After saving sub widget ...");

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

@ -23,7 +23,7 @@ namespace appl {
appl::BufferManager* m_bufferManager; //!< handle on the buffer manager
public: // derived function
virtual void onReceiveMessage(const ewol::object::Message& _msg);
virtual void onObjectRemove(ewol::Object * _removeObject);
virtual void onObjectRemove(const ewol::object::Shared<ewol::Object>& _removeObject);
};
};

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

@ -117,7 +117,7 @@ void appl::WorkerSaveFile::onReceiveMessage(const ewol::object::Message& _msg) {
}
}
void appl::WorkerSaveFile::onObjectRemove(ewol::Object* _removeObject) {
void appl::WorkerSaveFile::onObjectRemove(const ewol::object::Shared<ewol::Object>& _removeObject) {
if (_removeObject == m_chooser) {
m_chooser = NULL;
APPL_VERBOSE("AutoRemove After closing sub widget ...");

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

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