From 9682de59e274b61511c810ca78b13536bbe26aeb Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Tue, 13 May 2014 21:32:02 +0200 Subject: [PATCH] [DEV] update file chooser with FSNode --- build | 2 +- external/etk | 2 +- sources/ewol/widget/ListFileSystem.cpp | 4 +++- sources/ewol/widget/meta/FileChooser.cpp | 9 ++++----- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/build b/build index bb36f26b..2985efea 160000 --- a/build +++ b/build @@ -1 +1 @@ -Subproject commit bb36f26b0b57443af42100be66f83a3b91183674 +Subproject commit 2985efea70b5bff3bda00e948a072a63e1bc3d96 diff --git a/external/etk b/external/etk index 6a3d2d12..6bec5ddc 160000 --- a/external/etk +++ b/external/etk @@ -1 +1 @@ -Subproject commit 6a3d2d129e5097a1060b05ec0a266b951c32cecb +Subproject commit 6bec5ddccb307d3b42b253c37ceb3dc7afced304 diff --git a/sources/ewol/widget/ListFileSystem.cpp b/sources/ewol/widget/ListFileSystem.cpp index 89c1707f..faa75747 100644 --- a/sources/ewol/widget/ListFileSystem.cpp +++ b/sources/ewol/widget/ListFileSystem.cpp @@ -70,6 +70,7 @@ ewol::widget::ListFileSystem::ListFileSystem(void) : ewol::widget::ListFileSystem::~ListFileSystem(void) { clearList(); + ewol::resource::ColorFile::release(m_colorProperty); }; void ewol::widget::ListFileSystem::clearList(void) { @@ -156,6 +157,7 @@ bool ewol::widget::ListFileSystem::getElement(int32_t _colomn, int32_t _raw, std && _raw-offset < (int32_t)m_list.size() && NULL != m_list[_raw-offset]) { _myTextToWrite = m_list[_raw-offset]->getNameFile(); + EWOL_VERBOSE("get filename for : '" << *m_list[_raw-offset] << ":'" << _myTextToWrite << "'"); } _fg = m_colorProperty->get(m_colorIdText); if (_raw % 2) { @@ -181,7 +183,7 @@ bool ewol::widget::ListFileSystem::onItemEvent(int32_t _IdInput, offset = 2; } if (_typeEvent == ewol::key::statusSingle) { - EWOL_INFO("Event on List : IdInput=" << _IdInput << " colomn=" << _colomn << " raw=" << _raw ); + EWOL_DEBUG("Event on List : IdInput=" << _IdInput << " colomn=" << _colomn << " raw=" << _raw ); if (1 == _IdInput) { int32_t previousRaw = m_selectedLine; if (_raw > (int32_t)m_list.size()+offset ) { diff --git a/sources/ewol/widget/meta/FileChooser.cpp b/sources/ewol/widget/meta/FileChooser.cpp index 03a55085..0fcc6a20 100644 --- a/sources/ewol/widget/meta/FileChooser.cpp +++ b/sources/ewol/widget/meta/FileChooser.cpp @@ -181,16 +181,14 @@ void ewol::widget::FileChooser::onReceiveMessage(const ewol::object::Message& _m tmpFileCompleatName += m_file; generateEventId(_msg.getMessage(), tmpFileCompleatName); } else if( _msg.getMessage() == ewolEventFileChooserListFileValidate - || (_msg.getMessage() == eventValidate && m_file != "" ) + || (_msg.getMessage() == eventValidate && m_file != "" ) || (_msg.getMessage() == ewolEventFileChooserEntryFileEnter && m_file != "" ) ) { // select the file == > generate a validate if (_msg.getData() != "") { setFileName(_msg.getData()); } EWOL_VERBOSE(" generate a fiel opening : \"" << m_folder << "\" / \"" << m_file << "\""); - std::string tmpFileCompleatName = m_folder; - tmpFileCompleatName += m_file; - generateEventId(eventValidate, tmpFileCompleatName); + generateEventId(eventValidate, getCompleateFileName()); autoDestroy(); } else if(_msg.getMessage() == ewolEventFileChooserHome) { std::string tmpUserFolder = etk::getUserHomeFolder(); @@ -220,5 +218,6 @@ std::string ewol::widget::FileChooser::getCompleateFileName(void) { std::string tmpString = m_folder; tmpString += "/"; tmpString += m_file; - return tmpString; + etk::FSNode node(tmpString); + return node.getName(); }