Fixes #1154. FileDialog blank constructor results in unstable window (#1157)

* Fixes #1154. FileDialog blank constructor results in unstable window

* Fixes #1158. File Open Dialog should disable 'Open' if file is blank (or not valid).

* Changing to CanFocus behavior. Adding a Canceled check.

Terminal.Gui/Windows/FileDialog.cs

@@ -494,18 +494,38 @@ namespace Terminal.Gui {
 		/// </summary>
 		/// <param name="title">The title.</param>
 		/// <param name="prompt">The prompt.</param>
-		/// <param name="nameFieldLabel">The name field label.</param>
+		/// <param name="nameFieldLabel">The name of the file field label..</param>
 		/// <param name="message">The message.</param>
-		public FileDialog (ustring title, ustring prompt, ustring nameFieldLabel, ustring message) : base (title)//, Driver.Cols - 20, Driver.Rows - 5, null)
+		public FileDialog (ustring title, ustring prompt, ustring nameFieldLabel, ustring message)
+			: this (title, prompt, ustring.Empty, nameFieldLabel, message) { }
+
+		/// <summary>
+		/// Initializes a new instance of <see cref="FileDialog"/>
+		/// </summary>
+		/// <param name="title">The title.</param>
+		/// <param name="prompt">The prompt.</param>
+		/// <param name="message">The message.</param>
+
+		public FileDialog (ustring title, ustring prompt, ustring message) : this (title, prompt, ustring.Empty, message) { }
+
+		/// <summary>
+		/// Initializes a new instance of <see cref="FileDialog"/>
+		/// </summary>
+		/// <param name="title">The title.</param>
+		/// <param name="prompt">The prompt.</param>
+		/// <param name="nameDirLabel">The name of the directory field label.</param>
+		/// <param name="nameFieldLabel">The name of the file field label..</param>
+		/// <param name="message">The message.</param>
+		public FileDialog (ustring title, ustring prompt, ustring nameDirLabel, ustring nameFieldLabel, ustring message) : base (title)//, Driver.Cols - 20, Driver.Rows - 5, null)
 		{
-			this.message = new Label (message) { 
+			this.message = new Label (message) {
 				X = 1,
 				Y = 0,
 			};
 			Add (this.message);
 			var msgLines = TextFormatter.MaxLines (message, Driver.Cols - 20);
 
-			dirLabel = new Label ("Directory: ") {
+			dirLabel = new Label (nameDirLabel.IsEmpty ? "Directory: " : $"{nameDirLabel}: ") {
 				X = 1,
 				Y = 1 + msgLines
 			};
@@ -521,8 +541,8 @@ namespace Terminal.Gui {
 			};
 			Add (dirLabel, dirEntry);
 
-			this.nameFieldLabel = new Label ("Open: ") {
-				X = 6,
+			this.nameFieldLabel = new Label (nameFieldLabel.IsEmpty ? "File: " : $"{nameFieldLabel}: ") {
+				X = 1,
 				Y = 3 + msgLines,
 			};
 			nameEntry = new TextField ("") {
@@ -550,8 +570,9 @@ namespace Terminal.Gui {
 			};
 			AddButton (cancel);
 
-			this.prompt = new Button (prompt) {
+			this.prompt = new Button (prompt.IsEmpty ? "Ok" : prompt) {
 				IsDefault = true,
+				CanFocus = nameEntry.Text.IsEmpty ? false : true
 			};
 			this.prompt.Clicked += () => {
 				canceled = false;
@@ -559,6 +580,14 @@ namespace Terminal.Gui {
 			};
 			AddButton (this.prompt);
 
+			nameEntry.TextChanged += (e) => {
+				if (nameEntry.Text.IsEmpty) {
+					this.prompt.CanFocus = false;
+				} else {
+					this.prompt.CanFocus = true;
+				}
+			};
+
 			Width = Dim.Percent (80);
 			Height = Dim.Percent (80);
 

UICatalog/Scenarios/CsvEditor.cs

@@ -367,7 +367,7 @@ namespace UICatalog.Scenarios {
 
 			Application.Run(ofd);
 			
-			if(!string.IsNullOrWhiteSpace(ofd.FilePath?.ToString()))
+			if(!ofd.Canceled && !string.IsNullOrWhiteSpace(ofd.FilePath?.ToString()))
 			{
 				Open(ofd.FilePath.ToString());
 			}