From 996fd5837044cdbbb9924ca5de095a2a2a4c8ac7 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Fri, 12 Sep 2014 21:52:03 +0200 Subject: [PATCH] [DEBUG #1] Save file done --- sources/appl/Gui/WorkerCloseAllFile.cpp | 14 ++++----- sources/appl/Gui/WorkerCloseAllFile.h | 3 +- sources/appl/Gui/WorkerCloseFile.cpp | 39 ++++++++++++++++++------- sources/appl/Gui/WorkerCloseFile.h | 5 +++- sources/appl/Gui/WorkerSaveAllFile.cpp | 14 ++++----- sources/appl/Gui/WorkerSaveAllFile.h | 3 +- sources/appl/Gui/WorkerSaveFile.cpp | 33 ++++++++++++++------- sources/appl/Gui/WorkerSaveFile.h | 5 +++- 8 files changed, 78 insertions(+), 38 deletions(-) diff --git a/sources/appl/Gui/WorkerCloseAllFile.cpp b/sources/appl/Gui/WorkerCloseAllFile.cpp index cfcca88..03b9313 100644 --- a/sources/appl/Gui/WorkerCloseAllFile.cpp +++ b/sources/appl/Gui/WorkerCloseAllFile.cpp @@ -20,10 +20,10 @@ appl::WorkerCloseAllFile::WorkerCloseAllFile() { } void appl::WorkerCloseAllFile::init() { - ewol::Object::init(); + ewol::object::Worker::init(); if (m_bufferManager == nullptr) { APPL_ERROR("can not call unexistant buffer manager ... "); - autoDestroy(); + destroy(); return; } // List all current open file : @@ -41,7 +41,7 @@ void appl::WorkerCloseAllFile::init() { } // checkif an element has something to do in the queue if (m_bufferNameList.size() == 0) { - autoDestroy(); + destroy(); return; } // create the worker : @@ -49,14 +49,14 @@ void appl::WorkerCloseAllFile::init() { // remove first element : m_bufferNameList.erase(m_bufferNameList.begin()); if (m_bufferNameList.size() == 0) { - autoDestroy(); + destroy(); return; } m_worker->signalCloseDone.bind(shared_from_this(), &appl::WorkerCloseAllFile::onCallbackCloseDone); } appl::WorkerCloseAllFile::~WorkerCloseAllFile() { - + APPL_ERROR("Remove Worker"); } void appl::WorkerCloseAllFile::onCallbackCloseDone() { @@ -65,7 +65,7 @@ void appl::WorkerCloseAllFile::onCallbackCloseDone() { return; } if (m_bufferNameList.size() == 0) { - autoDestroy(); + destroy(); return; } // create the worker : @@ -73,7 +73,7 @@ void appl::WorkerCloseAllFile::onCallbackCloseDone() { // remove first element : m_bufferNameList.erase(m_bufferNameList.begin()); if (m_bufferNameList.size() == 0) { - autoDestroy(); + destroy(); return; } m_worker->signalCloseDone.bind(shared_from_this(), &appl::WorkerCloseAllFile::onCallbackCloseDone); diff --git a/sources/appl/Gui/WorkerCloseAllFile.h b/sources/appl/Gui/WorkerCloseAllFile.h index dfb3885..9c2e4a2 100644 --- a/sources/appl/Gui/WorkerCloseAllFile.h +++ b/sources/appl/Gui/WorkerCloseAllFile.h @@ -9,11 +9,12 @@ #ifndef __WORKER_CLOSE_ALL_FILE_H__ #define __WORKER_CLOSE_ALL_FILE_H__ +#include #include #include namespace appl { - class WorkerCloseAllFile : public ewol::Object { + class WorkerCloseAllFile : public ewol::object::Worker { protected: WorkerCloseAllFile(); void init(); diff --git a/sources/appl/Gui/WorkerCloseFile.cpp b/sources/appl/Gui/WorkerCloseFile.cpp index 45869f1..285dcec 100644 --- a/sources/appl/Gui/WorkerCloseFile.cpp +++ b/sources/appl/Gui/WorkerCloseFile.cpp @@ -16,6 +16,7 @@ appl::WorkerCloseFile::WorkerCloseFile() : signalCloseDone(*this, "close-file-done"), + signalAbort(*this, "close-file-abort"), m_buffer(nullptr), m_worker(nullptr), m_bufferManager(nullptr) { @@ -25,11 +26,11 @@ appl::WorkerCloseFile::WorkerCloseFile() : } void appl::WorkerCloseFile::init(const std::string& _bufferName) { - ewol::Object::init(); + ewol::object::Worker::init(); m_bufferName = _bufferName; if (m_bufferManager == nullptr) { APPL_ERROR("can not call unexistant buffer manager ... "); - autoDestroy(); + destroy(); return; } if (m_bufferName == "") { @@ -44,13 +45,13 @@ void appl::WorkerCloseFile::init(const std::string& _bufferName) { } if (m_bufferManager->exist(m_bufferName) == false) { APPL_ERROR("Try to close an non-existant file :" << m_bufferName); - autoDestroy(); + destroy(); return; } m_buffer = m_bufferManager->get(m_bufferName); if (m_buffer == nullptr) { APPL_ERROR("Error to get the buffer : " << m_bufferName); - autoDestroy(); + destroy(); return; } if (m_buffer->isModify() == false) { @@ -81,21 +82,29 @@ void appl::WorkerCloseFile::init(const std::string& _bufferName) { if (bt != nullptr) { bt->signalPressed.bind(shared_from_this(), &appl::WorkerCloseFile::onCallbackClose); } - tmpPopUp->addButton("Cancel", true); + bt = tmpPopUp->addButton("Cancel", true); + if (bt != nullptr) { + bt->signalPressed.bind(shared_from_this(), &appl::WorkerCloseFile::onCallbackCancel); + } tmpPopUp->setRemoveOnExternClick(true); std::shared_ptr tmpWindows = ewol::getContext().getWindows(); if (tmpWindows == nullptr) { APPL_ERROR("Error to get the windows."); - autoDestroy(); + destroy(); return; } tmpWindows->popUpWidgetPush(tmpPopUp); } appl::WorkerCloseFile::~WorkerCloseFile() { - + APPL_ERROR("Remove Worker"); } +void appl::WorkerCloseFile::onCallbackCancel() { + APPL_VERBOSE("Cancel signal ..."); + signalAbort.emit(); + destroy(); +} void appl::WorkerCloseFile::onCallbackSaveAsValidate() { if (m_bufferManager == nullptr) { @@ -105,17 +114,21 @@ void appl::WorkerCloseFile::onCallbackSaveAsValidate() { m_worker = appl::WorkerSaveFile::create(m_bufferName); if (m_worker != nullptr) { m_worker->signalSaveDone.bind(shared_from_this(), &appl::WorkerCloseFile::onCallbackClose); + m_worker->signalAbort.bind(shared_from_this(), &appl::WorkerCloseFile::onCallbackCancel); } } void appl::WorkerCloseFile::onCallbackSaveValidate() { if (m_bufferManager == nullptr) { // nothing to do in this case ==> can do nothing ... + signalAbort.emit(); + destroy(); return; } if (m_buffer == nullptr) { APPL_ERROR("Error to get the buffer : oldName=" << m_bufferName); - autoDestroy(); + signalAbort.emit(); + destroy(); return; } if (m_buffer->storeFile() == false) { @@ -124,23 +137,29 @@ void appl::WorkerCloseFile::onCallbackSaveValidate() { return; } tmpWindows->displayWarningMessage("We can not save the file :
" + m_buffer->getFileName() + ""); + signalAbort.emit(); } else { signalCloseDone.emit(); } + destroy(); } void appl::WorkerCloseFile::onCallbackClose() { if (m_bufferManager == nullptr) { // nothing to do in this case ==> can do nothing ... + signalAbort.emit(); + destroy(); return; } if (m_buffer == nullptr) { APPL_ERROR("Error to get the buffer : " << m_bufferName); - autoDestroy(); + signalAbort.emit(); + destroy(); return; } - signalCloseDone.emit(); m_buffer->destroy(); m_buffer.reset(); + signalCloseDone.emit(); + destroy(); } diff --git a/sources/appl/Gui/WorkerCloseFile.h b/sources/appl/Gui/WorkerCloseFile.h index 2096a22..ef261d7 100644 --- a/sources/appl/Gui/WorkerCloseFile.h +++ b/sources/appl/Gui/WorkerCloseFile.h @@ -9,14 +9,16 @@ #ifndef __WORKER_CLOSE_FILE_H__ #define __WORKER_CLOSE_FILE_H__ +#include #include #include #include namespace appl { - class WorkerCloseFile : public ewol::Object { + class WorkerCloseFile : public ewol::object::Worker { public: ewol::object::Signal signalCloseDone; + ewol::object::Signal signalAbort; protected: // note : if == "" ==> current ... WorkerCloseFile(); @@ -33,6 +35,7 @@ namespace appl { void onCallbackSaveAsValidate(); void onCallbackSaveValidate(); void onCallbackClose(); + void onCallbackCancel(); }; }; diff --git a/sources/appl/Gui/WorkerSaveAllFile.cpp b/sources/appl/Gui/WorkerSaveAllFile.cpp index 5afe912..44007c9 100644 --- a/sources/appl/Gui/WorkerSaveAllFile.cpp +++ b/sources/appl/Gui/WorkerSaveAllFile.cpp @@ -20,10 +20,10 @@ appl::WorkerSaveAllFile::WorkerSaveAllFile() { } void appl::WorkerSaveAllFile::init() { - ewol::Object::init(); + ewol::object::Worker::init(); if (m_bufferManager == nullptr) { APPL_ERROR("can not call unexistant buffer manager ... "); - autoDestroy(); + destroy(); return; } // List all current open file : @@ -43,7 +43,7 @@ void appl::WorkerSaveAllFile::init() { } // checkif an element has something to do in the queue if (m_bufferNameList.size() == 0) { - autoDestroy(); + destroy(); return; } // create the worker : @@ -51,14 +51,14 @@ void appl::WorkerSaveAllFile::init() { // remove first element : m_bufferNameList.erase(m_bufferNameList.begin()); if (m_bufferNameList.size() == 0) { - autoDestroy(); + destroy(); return; } m_worker->signalSaveDone.bind(shared_from_this(), &appl::WorkerSaveAllFile::onCallbackSaveAsDone); } appl::WorkerSaveAllFile::~WorkerSaveAllFile() { - + APPL_ERROR("Remove Worker"); } void appl::WorkerSaveAllFile::onCallbackSaveAsDone() { @@ -67,7 +67,7 @@ void appl::WorkerSaveAllFile::onCallbackSaveAsDone() { return; } if (m_bufferNameList.size() == 0) { - autoDestroy(); + destroy(); return; } // create the worker : @@ -75,7 +75,7 @@ void appl::WorkerSaveAllFile::onCallbackSaveAsDone() { // remove first element : m_bufferNameList.erase(m_bufferNameList.begin()); if (m_bufferNameList.size() == 0) { - autoDestroy(); + destroy(); return; } m_worker->signalSaveDone.bind(shared_from_this(), &appl::WorkerSaveAllFile::onCallbackSaveAsDone); diff --git a/sources/appl/Gui/WorkerSaveAllFile.h b/sources/appl/Gui/WorkerSaveAllFile.h index f40bb75..c3f1192 100644 --- a/sources/appl/Gui/WorkerSaveAllFile.h +++ b/sources/appl/Gui/WorkerSaveAllFile.h @@ -9,11 +9,12 @@ #ifndef __WORKER_SAVE_ALL_FILE_H__ #define __WORKER_SAVE_ALL_FILE_H__ +#include #include #include namespace appl { - class WorkerSaveAllFile : public ewol::Object { + class WorkerSaveAllFile : public ewol::object::Worker { protected: WorkerSaveAllFile(); void init(); diff --git a/sources/appl/Gui/WorkerSaveFile.cpp b/sources/appl/Gui/WorkerSaveFile.cpp index 427eb63..351a2c0 100644 --- a/sources/appl/Gui/WorkerSaveFile.cpp +++ b/sources/appl/Gui/WorkerSaveFile.cpp @@ -15,18 +15,19 @@ appl::WorkerSaveFile::WorkerSaveFile() : - signalSaveDone(*this, "save-file-done") { + signalSaveDone(*this, "save-file-done"), + signalAbort(*this, "save-file-abort") { addObjectType("appl::WorkerSaveFile"); // load buffer manager: m_bufferManager = appl::BufferManager::create(); } void appl::WorkerSaveFile::init(const std::string& _bufferName, bool _forceSaveAs) { - ewol::Object::init(); + ewol::object::Worker::init(); m_bufferName = _bufferName; if (m_bufferManager == nullptr) { APPL_ERROR("can not call unexistant buffer manager ... "); - autoDestroy(); + destroy(); return; } if (m_bufferName == "") { @@ -34,34 +35,34 @@ void appl::WorkerSaveFile::init(const std::string& _bufferName, bool _forceSaveA std::shared_ptr tmpp = m_bufferManager->getBufferSelected(); if (tmpp == nullptr) { APPL_ERROR("No selected buffer now ..."); - autoDestroy(); + destroy(); return; } m_bufferName = tmpp->getFileName(); } if (m_bufferManager->exist(m_bufferName) == false) { APPL_ERROR("Try to save an non-existant file :" << m_bufferName); - autoDestroy(); + destroy(); return; } std::shared_ptr tmpBuffer = m_bufferManager->get(m_bufferName); if (tmpBuffer == nullptr) { APPL_ERROR("Error to get the buffer : " << m_bufferName); - autoDestroy(); + destroy(); return; } if (_forceSaveAs == false) { if (tmpBuffer->hasFileName() == true) { tmpBuffer->storeFile(); signalSaveDone.emit(); - autoDestroy(); + destroy(); return; } } m_chooser = ewol::widget::FileChooser::create(); if (nullptr == m_chooser) { APPL_ERROR("Can not allocate widget == > display might be in error"); - autoDestroy(); + destroy(); return; } m_chooser->setTitle("Save files As..."); @@ -72,44 +73,56 @@ void appl::WorkerSaveFile::init(const std::string& _bufferName, bool _forceSaveA std::shared_ptr tmpWindows = ewol::getContext().getWindows(); if (tmpWindows == nullptr) { APPL_ERROR("Error to get the windows."); - autoDestroy(); + destroy(); return; } tmpWindows->popUpWidgetPush(m_chooser); m_chooser->signalValidate.bind(shared_from_this(), &appl::WorkerSaveFile::onCallbackSaveAsValidate); + m_chooser->signalCancel.bind(shared_from_this(), &appl::WorkerSaveFile::onCallbackCancel); } appl::WorkerSaveFile::~WorkerSaveFile() { - + APPL_ERROR("Remove Worker"); +} + +void appl::WorkerSaveFile::onCallbackCancel() { + signalAbort.emit(); + destroy(); } void appl::WorkerSaveFile::onCallbackSaveAsValidate(const std::string& _value) { if (m_bufferManager == nullptr) { // nothing to do in this case ==> can do nothing ... + destroy(); return; } if (_value == "") { APPL_ERROR(" might be an error of the File chooser system..."); + destroy(); return; } if (m_bufferManager->exist(m_bufferName) == false) { APPL_ERROR("Try to save an non-existant file :" << m_bufferName); + destroy(); return; } std::shared_ptr tmpBuffer = m_bufferManager->get(m_bufferName); if (tmpBuffer == nullptr) { APPL_ERROR("Error to get the buffer : " << m_bufferName); + destroy(); return; } tmpBuffer->setFileName(_value); if (tmpBuffer->storeFile() == false) { std::shared_ptr tmpWindows = ewol::getContext().getWindows(); if (tmpWindows == nullptr) { + destroy(); return; } tmpWindows->displayWarningMessage("We can not save the file :
" + tmpBuffer->getFileName() + ""); } else { signalSaveDone.emit(); } + destroy(); } diff --git a/sources/appl/Gui/WorkerSaveFile.h b/sources/appl/Gui/WorkerSaveFile.h index 3734c0f..690491b 100644 --- a/sources/appl/Gui/WorkerSaveFile.h +++ b/sources/appl/Gui/WorkerSaveFile.h @@ -10,12 +10,14 @@ #define __WORKER_SAVE_FILE_H__ #include +#include #include namespace appl { - class WorkerSaveFile : public ewol::Object { + class WorkerSaveFile : public ewol::object::Worker { public: ewol::object::Signal signalSaveDone; + ewol::object::Signal signalAbort; protected: WorkerSaveFile(); void init(const std::string& _bufferName, bool _forceSaveAs=true); @@ -28,6 +30,7 @@ namespace appl { std::shared_ptr m_bufferManager; //!< handle on the buffer manager public: // callback function void onCallbackSaveAsValidate(const std::string& _value); + void onCallbackCancel(); }; };