From 7d2f359a0c5ec72d07f95491baa698b800b04069 Mon Sep 17 00:00:00 2001 From: Nathan Warden Date: Wed, 14 Jan 2015 18:02:51 -0500 Subject: File path in save dialog automatically appended with correct extension if not manually added by the user. --- scene/gui/file_dialog.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scene/gui/file_dialog.cpp b/scene/gui/file_dialog.cpp index a7ff1431bd..a98cb841dc 100644 --- a/scene/gui/file_dialog.cpp +++ b/scene/gui/file_dialog.cpp @@ -184,7 +184,8 @@ void FileDialog::_action_pressed() { if (idx>=0 && idx0) { + String str = (flt.get_slice(",",0).strip_edges()); + f+=str.substr(1, str.length()-1); + valid=true; + } } else { valid=true; } -- cgit v1.2.3 From c2ffdb05d4bffd75fd28fb791882c14ec6758b8c Mon Sep 17 00:00:00 2001 From: Nathan Warden Date: Thu, 15 Jan 2015 13:00:33 -0500 Subject: Set the default Linux extension to nothing. --- platform/x11/export/export.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/x11/export/export.cpp b/platform/x11/export/export.cpp index b17b92bccf..bed57fbe9f 100644 --- a/platform/x11/export/export.cpp +++ b/platform/x11/export/export.cpp @@ -11,7 +11,7 @@ void register_x11_exporter() { { Ref exporter = Ref( memnew(EditorExportPlatformPC) ); - exporter->set_binary_extension("bin"); + exporter->set_binary_extension(""); exporter->set_release_binary32("linux_x11_32_release"); exporter->set_debug_binary32("linux_x11_32_debug"); exporter->set_release_binary64("linux_x11_64_release"); -- cgit v1.2.3 From cac555dc78047b96486d5c52e990c7dde62f0a6b Mon Sep 17 00:00:00 2001 From: Nathan Warden Date: Fri, 16 Jan 2015 07:48:28 -0500 Subject: When overwriting a file with an auto added extension the file name is now set correctly. --- scene/gui/file_dialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scene/gui/file_dialog.cpp b/scene/gui/file_dialog.cpp index a98cb841dc..fbcfdb69bb 100644 --- a/scene/gui/file_dialog.cpp +++ b/scene/gui/file_dialog.cpp @@ -156,7 +156,6 @@ void FileDialog::_action_pressed() { if (mode==MODE_SAVE_FILE) { - String ext = f.extension(); bool valid=false; if (filter->get_selected()==filter->get_item_count()-1) { @@ -197,6 +196,7 @@ void FileDialog::_action_pressed() { if (!valid && filterSliceCount>0) { String str = (flt.get_slice(",",0).strip_edges()); f+=str.substr(1, str.length()-1); + file->set_text(f.get_file()); valid=true; } } else { -- cgit v1.2.3