summaryrefslogtreecommitdiffstats
path: root/editor
diff options
context:
space:
mode:
authorDmitry Koteroff <vortex@verona.im>2017-11-27 18:58:28 +0300
committerRémi Verschelde <rverschelde@gmail.com>2017-11-27 22:39:36 +0100
commitad351a29db8328c82838a8aaf070eb111116d632 (patch)
treefea8dab87c0855865701585c09c92b44ac99e372 /editor
parented0af051116938064fbe3ef464fa41689684e796 (diff)
downloadredot-engine-ad351a29db8328c82838a8aaf070eb111116d632.tar.gz
Some improvements to file/dir open/save dialogs:
1. Removed "..", instead you now will see "Select Current Folder" and "Select this Folder" buttons. 2. Added "go to parent folder" (^) button to Save a File dialog. 3. Tree.cpp: "nothing_selected" signal has been re-made (previous implementation, merged in #13308, wasn't optimal in context of performance) 4. Fixed issue in Project Export dialog: MODE_SAVE_FILE wasn't set when you click "Export". 5. Now you can deselect items by clicking on empty space in Open a Directory dialog.
Diffstat (limited to 'editor')
-rw-r--r--editor/editor_file_dialog.cpp7
-rw-r--r--editor/project_export.cpp1
2 files changed, 2 insertions, 6 deletions
diff --git a/editor/editor_file_dialog.cpp b/editor/editor_file_dialog.cpp
index c78b11737e..eb5af2eaeb 100644
--- a/editor/editor_file_dialog.cpp
+++ b/editor/editor_file_dialog.cpp
@@ -586,7 +586,7 @@ void EditorFileDialog::update_file_list() {
while ((item = dir_access->get_next(&isdir)) != "") {
- if (item == ".")
+ if (item == "." || item == "..")
continue;
ishidden = dir_access->current_is_hidden();
@@ -599,11 +599,6 @@ void EditorFileDialog::update_file_list() {
}
}
- if (dirs.find("..") == NULL) {
- //may happen if lacking permissions
- dirs.push_back("..");
- }
-
dirs.sort_custom<NaturalNoCaseComparator>();
files.sort_custom<NaturalNoCaseComparator>();
diff --git a/editor/project_export.cpp b/editor/project_export.cpp
index 6500b10a3a..767dbcc27b 100644
--- a/editor/project_export.cpp
+++ b/editor/project_export.cpp
@@ -723,6 +723,7 @@ void ProjectExportDialog::_export_project() {
export_project->add_filter("*." + extension + " ; " + platform->get_name() + " Export");
}
+ export_project->set_mode(FileDialog::MODE_SAVE_FILE);
export_project->popup_centered_ratio();
}