summaryrefslogtreecommitdiffstats
path: root/scene/gui/file_dialog.cpp
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-12-31 00:33:07 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-12-31 00:33:07 -0300
commit335c52ba03ecbccd0c9af8f9278b69da09a3e931 (patch)
tree5e4f5e2ea0d735228de7733e2fb689abbc2bc9c9 /scene/gui/file_dialog.cpp
parentfd836cad270f7eb9645356cd583c8f11bf737b0f (diff)
parentac13c8c0c6fc346462b21ee00139dddd2e4ec1e3 (diff)
downloadredot-engine-335c52ba03ecbccd0c9af8f9278b69da09a3e931.tar.gz
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'scene/gui/file_dialog.cpp')
-rw-r--r--scene/gui/file_dialog.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/gui/file_dialog.cpp b/scene/gui/file_dialog.cpp
index 22e3a81e52..ad30295e60 100644
--- a/scene/gui/file_dialog.cpp
+++ b/scene/gui/file_dialog.cpp
@@ -49,7 +49,7 @@ void FileDialog::_notification(int p_what) {
if (p_what==NOTIFICATION_ENTER_TREE) {
- refresh->set_icon(get_icon("Reload","EditorIcons"));
+ refresh->set_icon(get_icon("reload"));
}
if (p_what==NOTIFICATION_DRAW) {
@@ -650,7 +650,7 @@ void FileDialog::_bind_methods() {
ObjectTypeDB::bind_method(_MD("get_vbox:VBoxContainer"),&FileDialog::get_vbox);
ObjectTypeDB::bind_method(_MD("set_access","access"),&FileDialog::set_access);
ObjectTypeDB::bind_method(_MD("get_access"),&FileDialog::get_access);
- ObjectTypeDB::bind_method(_MD("set_show_hidden_files"),&FileDialog::set_show_hidden_files);
+ ObjectTypeDB::bind_method(_MD("set_show_hidden_files","show"),&FileDialog::set_show_hidden_files);
ObjectTypeDB::bind_method(_MD("is_showing_hidden_files"),&FileDialog::is_showing_hidden_files);
ObjectTypeDB::bind_method(_MD("_select_drive"),&FileDialog::_select_drive);
ObjectTypeDB::bind_method(_MD("_make_dir"),&FileDialog::_make_dir);