atria-soft/ewol
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] update file chooser with FSNode

Browse Source
This commit is contained in:
Edouard DUPIN 2014-05-13 21:32:02 +02:00
parent 96719f3dcc
commit 9682de59e2
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build

@ -1 +1 @@
Subproject commit bb36f26b0b57443af42100be66f83a3b91183674 Subproject commit 2985efea70b5bff3bda00e948a072a63e1bc3d96

2
external/etk vendored

@ -1 +1 @@
Subproject commit 6a3d2d129e5097a1060b05ec0a266b951c32cecb Subproject commit 6bec5ddccb307d3b42b253c37ceb3dc7afced304

4
sources/ewol/widget/ListFileSystem.cpp
View File

@ -70,6 +70,7 @@ ewol::widget::ListFileSystem::ListFileSystem(void) :
ewol::widget::ListFileSystem::~ListFileSystem(void) { ewol::widget::ListFileSystem::~ListFileSystem(void) {
clearList(); clearList();
ewol::resource::ColorFile::release(m_colorProperty);
}; };
void ewol::widget::ListFileSystem::clearList(void) { 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() && _raw-offset < (int32_t)m_list.size()
&& NULL != m_list[_raw-offset]) { && NULL != m_list[_raw-offset]) {
_myTextToWrite = m_list[_raw-offset]->getNameFile(); _myTextToWrite = m_list[_raw-offset]->getNameFile();
EWOL_VERBOSE("get filename for : '" << *m_list[_raw-offset] << ":'" << _myTextToWrite << "'");
} }
_fg = m_colorProperty->get(m_colorIdText); _fg = m_colorProperty->get(m_colorIdText);
if (_raw % 2) { if (_raw % 2) {
@ -181,7 +183,7 @@ bool ewol::widget::ListFileSystem::onItemEvent(int32_t _IdInput,
offset = 2; offset = 2;
} }
if (_typeEvent == ewol::key::statusSingle) { 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) { if (1 == _IdInput) {
int32_t previousRaw = m_selectedLine; int32_t previousRaw = m_selectedLine;
if (_raw > (int32_t)m_list.size()+offset ) { if (_raw > (int32_t)m_list.size()+offset ) {

9
sources/ewol/widget/meta/FileChooser.cpp
View File

@ -181,16 +181,14 @@ void ewol::widget::FileChooser::onReceiveMessage(const ewol::object::Message& _m
tmpFileCompleatName += m_file; tmpFileCompleatName += m_file;
generateEventId(_msg.getMessage(), tmpFileCompleatName); generateEventId(_msg.getMessage(), tmpFileCompleatName);
} else if( _msg.getMessage() == ewolEventFileChooserListFileValidate } else if( _msg.getMessage() == ewolEventFileChooserListFileValidate
|| (_msg.getMessage() == eventValidate && m_file != "" ) || (_msg.getMessage() == eventValidate && m_file != "" )
|| (_msg.getMessage() == ewolEventFileChooserEntryFileEnter && m_file != "" ) ) { || (_msg.getMessage() == ewolEventFileChooserEntryFileEnter && m_file != "" ) ) {
// select the file == > generate a validate // select the file == > generate a validate
if (_msg.getData() != "") { if (_msg.getData() != "") {
setFileName(_msg.getData()); setFileName(_msg.getData());
} }
EWOL_VERBOSE(" generate a fiel opening : \"" << m_folder << "\" / \"" << m_file << "\""); EWOL_VERBOSE(" generate a fiel opening : \"" << m_folder << "\" / \"" << m_file << "\"");
std::string tmpFileCompleatName = m_folder; generateEventId(eventValidate, getCompleateFileName());
tmpFileCompleatName += m_file;
generateEventId(eventValidate, tmpFileCompleatName);
autoDestroy(); autoDestroy();
} else if(_msg.getMessage() == ewolEventFileChooserHome) { } else if(_msg.getMessage() == ewolEventFileChooserHome) {
std::string tmpUserFolder = etk::getUserHomeFolder(); std::string tmpUserFolder = etk::getUserHomeFolder();
@ -220,5 +218,6 @@ std::string ewol::widget::FileChooser::getCompleateFileName(void) {
std::string tmpString = m_folder; std::string tmpString = m_folder;
tmpString += "/"; tmpString += "/";
tmpString += m_file; tmpString += m_file;
return tmpString; etk::FSNode node(tmpString);
return node.getName();
} }