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

[DEBUG] set back the close buffer

Browse Source
This commit is contained in:
Edouard DUPIN 2015-10-21 22:10:13 +02:00
parent 6980c78684
commit d1f0caf386
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sources/appl/BufferManager.cpp
View File

@ -89,12 +89,13 @@ void appl::BufferManager::setBufferSelected(std::shared_ptr<appl::Buffer> _buffe
m_bufferSelected = _bufferSelected; m_bufferSelected = _bufferSelected;
if (m_bufferSelected == nullptr) { if (m_bufferSelected == nullptr) {
APPL_ERROR("select a NULL buffer ..."); APPL_ERROR("select a NULL buffer ...");
//parameterSetOnWidgetNamed("appl-widget-display-name", "value", "---"); parameterSetOnWidgetNamed("appl-widget-display-name", "value", "---");
return; return;
} }
APPL_INFO("Set buffer selected"); APPL_INFO("Set buffer selected");
//signalSelectFile.emit(m_bufferSelected->getName()); //signalSelectFile.emit(m_bufferSelected->getName());
//parameterSetOnWidgetNamed("appl-widget-display-name", "value", m_bufferSelected->getName()); //parameterSetOnWidgetNamed("appl-widget-display-name", "value", m_bufferSelected->getName());
parameterSetOnWidgetNamed("appl-widget-display-name", "value", m_bufferSelected->getName());
APPL_INFO("Set buffer selected (done)"); APPL_INFO("Set buffer selected (done)");
} }
@ -136,8 +137,6 @@ void appl::BufferManager::open(const std::string& _fileName) {
parameterSetOnWidgetNamed("appl-widget-display-name", "value", etk::FSNodeGetRealName(_fileName)); parameterSetOnWidgetNamed("appl-widget-display-name", "value", etk::FSNodeGetRealName(_fileName));
} }
/* TODO : ...
void appl::BufferManager::requestDestroyFromChild(const std::shared_ptr<Object>& _child) { void appl::BufferManager::requestDestroyFromChild(const std::shared_ptr<Object>& _child) {
APPL_WARNING("Buffer request a close..."); APPL_WARNING("Buffer request a close...");
bool find = false; bool find = false;
@ -160,10 +159,25 @@ void appl::BufferManager::requestDestroyFromChild(const std::shared_ptr<Object>&
signalRemoveBuffer.emit(std::dynamic_pointer_cast<appl::Buffer>(_child)); signalRemoveBuffer.emit(std::dynamic_pointer_cast<appl::Buffer>(_child));
} }
if (m_bufferSelected == _child) { if (m_bufferSelected == _child) {
APPL_ERROR("is selected"); if ( it != m_list.end()
&& *it != nullptr) {
APPL_INFO("Remove buffer select new one");
signalSelectFile.emit((*it)->getFileName());
//parameterSetOnWidgetNamed("appl-widget-display-name", "value", (*it)->getFileName());
APPL_INFO("Remove buffer select new one (done)");
return;
}
if ( m_list.size() != 0
&& m_list.back() != nullptr) {
APPL_INFO("Remove buffer select new one (last)");
signalSelectFile.emit(m_list.back()->getFileName());
//parameterSetOnWidgetNamed("appl-widget-display-name", "value", m_list.back()->getFileName());
APPL_INFO("Remove buffer select new one (done)");
return;
}
signalSelectFile.emit(""); signalSelectFile.emit("");
parameterSetOnWidgetNamed("appl-widget-display-name", "value", ""); //parameterSetOnWidgetNamed("appl-widget-display-name", "value", "");
m_bufferSelected = nullptr; m_bufferSelected = nullptr;
} }
} }
*/

2
sources/appl/BufferManager.h
View File

@ -83,7 +83,7 @@ namespace appl {
return m_bufferSelected; return m_bufferSelected;
}; };
private: private:
// TODO : void requestDestroyFromChild(const std::shared_ptr<Object>& _child); void requestDestroyFromChild(const std::shared_ptr<Object>& _child);
public: public:
// generic iterators: // generic iterators:
std::list<std::shared_ptr<appl::Buffer>>::const_iterator begin() const { std::list<std::shared_ptr<appl::Buffer>>::const_iterator begin() const {

5
sources/lutin_edn.py
View File

@ -125,16 +125,13 @@ def create(target, module_name):
my_module.copy_file("../data/Font/freefont/FreeSerif.ttf","fonts/FreeSerif.ttf") my_module.copy_file("../data/Font/freefont/FreeSerif.ttf","fonts/FreeSerif.ttf")
my_module.copy_path("../data/Font/freefont/FreeMon*.ttf","fonts/") my_module.copy_path("../data/Font/freefont/FreeMon*.ttf","fonts/")
tagFile = os.path.join(tools.get_current_path(__file__), "tag")
versionID = tools.file_read_data(tagFile)
my_module.compile_flags('c', [ my_module.compile_flags('c', [
"-DAPPL_VERSION=\"\\\"" + versionID + "\\\"\"" "-DAPPL_VERSION=\"\\\"" + tools.version_to_string(get_version()) + "\\\"\""
]) ])
tagFile = os.path.join(tools.get_current_path(__file__), "tagCode") tagFile = os.path.join(tools.get_current_path(__file__), "tagCode")
versionIDCode = tools.file_read_data(tagFile) versionIDCode = tools.file_read_data(tagFile)
# set the package properties: # set the package properties:
my_module.pkg_set("VERSION", versionID)
my_module.pkg_set("VERSION_CODE", versionIDCode) my_module.pkg_set("VERSION_CODE", versionIDCode)
if target.name=="MacOs": if target.name=="MacOs":
my_module.pkg_set("ICON", tools.get_current_path(__file__) + "/../data/icon.icns") my_module.pkg_set("ICON", tools.get_current_path(__file__) + "/../data/icon.icns")