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
Download Patch File Download Diff File Expand all files Collapse all files

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;