godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-10 13:00:37 +00:00
Code Releases Wiki Activity

new file dialog!

Browse Source 
-ItemList control for easier lists/thumbnails
-New file dialog, with support for thumbnails, favorites, recent places,
etc
-Moved .fscache out of the project, no more bugs due to committed/pulled
.fscache!
-Dir dialog now sorts directories
This commit is contained in:
Juan Linietsky
2015-06-06 09:44:38 -03:00
parent 07a466f6e6
commit 9acab32daa
75 changed files with 2219 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tools/editor/property_editor.cpp
View File

@@ -83,7 +83,7 @@ void CustomPropertyEditor::_menu_option(int p_which) {
switch(p_which) {
case OBJ_MENU_LOAD: {
file->set_mode(FileDialog::MODE_OPEN_FILE);
file->set_mode(EditorFileDialog::MODE_OPEN_FILE);
List<String> extensions;
String type=(hint==PROPERTY_HINT_RESOURCE_TYPE)?hint_text:String();
@@ -908,11 +908,11 @@ void CustomPropertyEditor::_action_pressed(int p_which) {
if (p_which==0) {
if (hint==PROPERTY_HINT_FILE)
file->set_access(FileDialog::ACCESS_RESOURCES);
file->set_access(EditorFileDialog::ACCESS_RESOURCES);
else
file->set_access(FileDialog::ACCESS_FILESYSTEM);
file->set_access(EditorFileDialog::ACCESS_FILESYSTEM);
file->set_mode(FileDialog::MODE_OPEN_FILE);
file->set_mode(EditorFileDialog::MODE_OPEN_FILE);
file->clear_filters();
file->clear_filters();
@@ -946,10 +946,10 @@ void CustomPropertyEditor::_action_pressed(int p_which) {
if (p_which==0) {
if (hint==PROPERTY_HINT_DIR)
file->set_access(FileDialog::ACCESS_RESOURCES);
file->set_access(EditorFileDialog::ACCESS_RESOURCES);
else
file->set_access(FileDialog::ACCESS_FILESYSTEM);
file->set_mode(FileDialog::MODE_OPEN_DIR);
file->set_access(EditorFileDialog::ACCESS_FILESYSTEM);
file->set_mode(EditorFileDialog::MODE_OPEN_DIR);
file->clear_filters();
file->popup_centered_ratio();
} else {
@@ -1001,8 +1001,8 @@ void CustomPropertyEditor::_action_pressed(int p_which) {
}
} else if (p_which==1) {
file->set_access(FileDialog::ACCESS_RESOURCES);
file->set_mode(FileDialog::MODE_OPEN_FILE);
file->set_access(EditorFileDialog::ACCESS_RESOURCES);
file->set_mode(EditorFileDialog::MODE_OPEN_FILE);
List<String> extensions;
String type=(hint==PROPERTY_HINT_RESOURCE_TYPE)?hint_text:String();
@@ -1081,8 +1081,8 @@ void CustomPropertyEditor::_action_pressed(int p_which) {
} else if (p_which==1) {
file->set_access(FileDialog::ACCESS_RESOURCES);
file->set_mode(FileDialog::MODE_OPEN_FILE);
file->set_access(EditorFileDialog::ACCESS_RESOURCES);
file->set_mode(EditorFileDialog::MODE_OPEN_FILE);
List<String> extensions;
ImageLoader::get_recognized_extensions(&extensions);
@@ -1612,7 +1612,7 @@ CustomPropertyEditor::CustomPropertyEditor() {
color_picker->connect("color_changed",this,"_color_changed");
set_as_toplevel(true);
file = memnew ( FileDialog );
file = memnew ( EditorFileDialog );
add_child(file);
file->hide();