forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FileDialog: Improve directory selection 

If you select a directory but do not open it and then hit the "Select Directory" button to close the dialog the open path would be given as result instead of the selected directory.
This change breaks backwards compatibility insofar that the "path" property you would use to access the selected path in OpenDirectory dialogs is no longer the path the user chose, but instead the parent directory of the path the user chose.
This commit is contained in:
Cedric Schneider 2016-05-07 23:12:45 +02:00
parent d6011aa5e4
commit da7a1df886
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/dlangui/dialogs/filedlg.d
View File

@ -161,6 +161,7 @@ class FileDialog : Dialog, CustomGridCellAdapter {
_filterIndex = index;
}
/// the path to the directory whose files should be displayed
@property string path() {
return _path;
}
@ -169,6 +170,7 @@ class FileDialog : Dialog, CustomGridCellAdapter {
_path = s;
}
/// the name of the file or directory that is currently selected
@property string filename() {
return _filename;
}
@ -348,11 +350,7 @@ class FileDialog : Dialog, CustomGridCellAdapter {
DirEntry e = _entries[index];
string fname = e.name;
_edFilename.text = toUTF32(baseName(fname));
if (e.isDir) {
_filename = "";
} else if (e.isFile) {
_filename = fname;
}
_filename = fname;
}
protected void createAndEnterDirectory(string name) {
@ -384,14 +382,14 @@ class FileDialog : Dialog, CustomGridCellAdapter {
return true;
}
if (action.id == StandardAction.Open || action.id == StandardAction.OpenDirectory || action.id == StandardAction.Save) {
if (_filename.length > 0 || action.id == StandardAction.OpenDirectory) {
if (_filename.length > 0) {
Action result = _action;
if (action.id == StandardAction.OpenDirectory)
result.stringParam = _path;
else
result.stringParam = _filename;
close(result);
return true;
result.stringParam = _filename;
// success if either selected dir & has to open dir or if selected file
if (action.id == StandardAction.OpenDirectory && isDir(_filename) || isFile(_filename)) {
close(result);
return true;
}
} else if (_filename.length == 0){
auto row = _fileList.row();
onItemActivated(row);