mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix filebox warning bug that occurs on Linux

Browse Source
This commit is contained in:
Jinhao 2016-11-28 06:23:18 +08:00
parent abe2f0687f
commit 8fef9916a9
1 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
source/gui/filebox.cpp
View File

@ -734,70 +734,74 @@ namespace nana
void _m_ok() void _m_ok()
{ {
if(0 == selection_.target.size()) std::string tar = selection_.target;
if(selection_.target.empty())
{ {
auto file = tb_file_.caption(); auto file = tb_file_.caption();
if(file.size()) if(file.size())
{ {
if(file[0] == L'.') if(file[0] == '.')
{ {
msgbox mb(*this, caption()); msgbox mb(*this, caption());
mb.icon(msgbox::icon_warning); mb.icon(msgbox::icon_warning);
mb<<file<<std::endl<<L"The filename is invalid."; mb<<file<<std::endl<<"The filename is invalid.";
mb(); mb();
return; return;
} }
std::string tar;
if(file[0] == '/') if(file[0] == '/')
tar = file; tar = file;
else else
tar = addr_.filesystem + file; tar = addr_.filesystem + file;
bool good = true;
auto fattr = fs::status(tar); auto fattr = fs::status(tar);
if(fattr.type() == fs::file_type::not_found)
//Check if the selected name is a directory
auto is_dir = fs::is_directory(fattr);
if(!is_dir && _m_append_def_extension(tar))
{ {
good = (_m_append_def_extension(tar) && (fs::status(tar).type() == fs::file_type::not_found)); //Add the extension, then check if it is a directory again.
fattr = fs::status(tar);
is_dir = fs::is_directory(fattr);
} }
if(good && fs::is_directory(fattr)) if(is_dir)
{ {
_m_load_cat_path(tar); _m_load_cat_path(tar);
tb_file_.caption(""); tb_file_.caption(std::string{});
return; return;
} }
if(io_read_) if(io_read_)
{ {
if(false == good) if(fs::file_type::not_found == fattr.type())
{ {
msgbox mb(*this, caption()); msgbox mb(*this, caption());
mb.icon(msgbox::icon_information); mb.icon(msgbox::icon_information);
mb<<L"The file \""<<nana::charset(tar, nana::unicode::utf8)<<L"\"\n is not existing. Please check and retry."; mb<<"The file \""<<tar<<"\"\n is not existing. Please check and retry.";
mb(); mb();
return;
} }
else
_m_finish(kind::filesystem, tar);
} }
else else
{ {
if(good) if(fs::file_type::not_found != fattr.type())
{ {
msgbox mb(*this, caption(), msgbox::yes_no); msgbox mb(*this, caption(), msgbox::yes_no);
mb.icon(msgbox::icon_question); mb.icon(msgbox::icon_question);
mb<<L"The input file is existing, do you want to overwrite it?"; mb<<"The input file is existing, do you want to overwrite it?";
if(msgbox::pick_no == mb()) if(msgbox::pick_no == mb())
return; return;
} }
}
}
}
_m_finish(kind::filesystem, tar); _m_finish(kind::filesystem, tar);
} }
}
}
else
_m_finish(kind::filesystem, selection_.target);
}
void _m_tr_expand(item_proxy node, bool exp) void _m_tr_expand(item_proxy node, bool exp)
{ {