Added "mode_overrides_title" property to FileDialog.

3 files changed, 31 insertions, 5 deletions

diff --git a/doc/classes/FileDialog.xml b/doc/classes/FileDialog.xml
index 0f7038238e..ecf04a0009 100644
--- a/doc/classes/FileDialog.xml
+++ b/doc/classes/FileDialog.xml
@@ -103,6 +103,9 @@
 		</member>
 		<member name="mode" type="int" setter="set_mode" getter="get_mode" enum="FileDialog.Mode">
 		</member>
+		<member name="mode_overrides_title" type="bool" setter="set_mode_overrides_title" getter="is_mode_overriding_title">
+			If [code]true[/code], changing the [code]mode[/code] property will set the window title accordingly (e. g. setting mode to [code]MODE_OPEN_FILE[/code] will change the window title to "Open a File").
+		</member>
 		<member name="show_hidden_files" type="bool" setter="set_show_hidden_files" getter="is_showing_hidden_files">
 		</member>
 	</members>
diff --git a/scene/gui/file_dialog.cpp b/scene/gui/file_dialog.cpp
index 9bfb70bf42..a8edcbbdcf 100644
--- a/scene/gui/file_dialog.cpp
+++ b/scene/gui/file_dialog.cpp
@@ -609,6 +609,14 @@ void FileDialog::set_current_path(const String &p_path) {
 	}
 }
 
+void FileDialog::set_mode_overrides_title(bool p_override) {
+	mode_overrides_title = p_override;
+}
+
+bool FileDialog::is_mode_overriding_title() const {
+	return mode_overrides_title;
+}
+
 void FileDialog::set_mode(Mode p_mode) {
 
 	mode = p_mode;
@@ -616,27 +624,32 @@ void FileDialog::set_mode(Mode p_mode) {
 
 		case MODE_OPEN_FILE:
 			get_ok()->set_text(RTR("Open"));
-			set_title(RTR("Open a File"));
+			if (mode_overrides_title)
+				set_title(RTR("Open a File"));
 			makedir->hide();
 			break;
 		case MODE_OPEN_FILES:
 			get_ok()->set_text(RTR("Open"));
-			set_title(RTR("Open File(s)"));
+			if (mode_overrides_title)
+				set_title(RTR("Open File(s)"));
 			makedir->hide();
 			break;
 		case MODE_OPEN_DIR:
 			get_ok()->set_text(RTR("Select Current Folder"));
-			set_title(RTR("Open a Directory"));
+			if (mode_overrides_title)
+				set_title(RTR("Open a Directory"));
 			makedir->show();
 			break;
 		case MODE_OPEN_ANY:
 			get_ok()->set_text(RTR("Open"));
-			set_title(RTR("Open a File or Directory"));
+			if (mode_overrides_title)
+				set_title(RTR("Open a File or Directory"));
 			makedir->show();
 			break;
 		case MODE_SAVE_FILE:
 			get_ok()->set_text(RTR("Save"));
-			set_title(RTR("Save a File"));
+			if (mode_overrides_title)
+				set_title(RTR("Save a File"));
 			makedir->show();
 			break;
 	}
@@ -766,6 +779,8 @@ void FileDialog::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_current_dir", "dir"), &FileDialog::set_current_dir);
 	ClassDB::bind_method(D_METHOD("set_current_file", "file"), &FileDialog::set_current_file);
 	ClassDB::bind_method(D_METHOD("set_current_path", "path"), &FileDialog::set_current_path);
+	ClassDB::bind_method(D_METHOD("set_mode_overrides_title", "override"), &FileDialog::set_mode_overrides_title);
+	ClassDB::bind_method(D_METHOD("is_mode_overriding_title"), &FileDialog::is_mode_overriding_title);
 	ClassDB::bind_method(D_METHOD("set_mode", "mode"), &FileDialog::set_mode);
 	ClassDB::bind_method(D_METHOD("get_mode"), &FileDialog::get_mode);
 	ClassDB::bind_method(D_METHOD("get_vbox"), &FileDialog::get_vbox);
@@ -797,6 +812,7 @@ void FileDialog::_bind_methods() {
 	BIND_ENUM_CONSTANT(ACCESS_USERDATA);
 	BIND_ENUM_CONSTANT(ACCESS_FILESYSTEM);
 
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "mode_overrides_title"), "set_mode_overrides_title", "is_mode_overriding_title");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "mode", PROPERTY_HINT_ENUM, "Open one,Open many,Open folder,Open any,Save"), "set_mode", "get_mode");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "access", PROPERTY_HINT_ENUM, "Resources,User data,File system"), "set_access", "get_access");
 	ADD_PROPERTY(PropertyInfo(Variant::POOL_STRING_ARRAY, "filters"), "set_filters", "get_filters");
@@ -820,6 +836,8 @@ FileDialog::FileDialog() {
 
 	show_hidden_files = default_show_hidden_files;
 
+	mode_overrides_title = true;
+
 	VBoxContainer *vbc = memnew(VBoxContainer);
 	add_child(vbc);
 
diff --git a/scene/gui/file_dialog.h b/scene/gui/file_dialog.h
index ca3d9f54b2..c8c1f23105 100644
--- a/scene/gui/file_dialog.h
+++ b/scene/gui/file_dialog.h
@@ -92,6 +92,8 @@ private:
 
 	Vector<String> filters;
 
+	bool mode_overrides_title;
+
 	static bool default_show_hidden_files;
 	bool show_hidden_files;
 
@@ -143,6 +145,9 @@ public:
 	void set_current_file(const String &p_file);
 	void set_current_path(const String &p_path);
 
+	void set_mode_overrides_title(bool p_override);
+	bool is_mode_overriding_title() const;
+
 	void set_mode(Mode p_mode);
 	Mode get_mode() const;