From 81dda5fe08930bd01bfac2243eb83d3f009ce8c0 Mon Sep 17 00:00:00 2001 From: alcexhim Date: Thu, 5 Jun 2014 09:18:08 -0400 Subject: [PATCH] Ensure OK button gets enabled at appropriate times when creating a new file (regression) --- .../Dialogs/NewDialog.cs | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/CSharp/Environments/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/Dialogs/NewDialog.cs b/CSharp/Environments/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/Dialogs/NewDialog.cs index f650b1af..6bfd8fb7 100644 --- a/CSharp/Environments/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/Dialogs/NewDialog.cs +++ b/CSharp/Environments/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/Dialogs/NewDialog.cs @@ -105,7 +105,11 @@ namespace UniversalEditor.UserInterface.WindowsForms.Dialogs { lvFileTemplates.Items.Clear(); - if (dts.SelectedObject == null) return; + if (dts.SelectedObject == null) + { + cmdOK.Enabled = false; + return; + } ObjectModelReference omr = (dts.SelectedObject as ObjectModelReference); @@ -138,12 +142,24 @@ namespace UniversalEditor.UserInterface.WindowsForms.Dialogs } } #endregion + + if (lvFileTemplates.Items.Count > 0) + { + lvFileTemplates.Items[0].Selected = true; + } + + cmdOK.Enabled = lvFileTemplates.SelectedItems.Count == 1; } private void lvFileTemplates_SelectionChanged(object sender, EventArgs e) { - if (lvFileTemplates.SelectedItems.Count == 0) return; + if (lvFileTemplates.SelectedItems.Count == 0) + { + cmdOK.Enabled = false; + return; + } mvarSelectedItem = (lvFileTemplates.SelectedItems[0].Data as Template); + cmdOK.Enabled = true; } private void tvProject_AfterSelect(object sender, TreeViewEventArgs e)