polishing new closing options for files

Author: maxijabase

UI/Components/EditorElement/EditorElement.xaml.cs

@@ -46,6 +46,7 @@ public partial class EditorElement : UserControl
         private bool WantFoldingUpdate;
         public bool IsTemplateEditor = false;
         private bool Closed = false;
+        public bool ClosingPromptOpened = false;
 
         public string FullFilePath
         {
@@ -740,10 +741,12 @@ public async void Close(bool ForcedToSave = false, bool CheckSavings = true)
                 }
                 else
                 {
+                    ClosingPromptOpened = true;
                     var result = await Program.MainWindow.ShowMessageAsync(
                         $"Do you want to save changes to '{Parent.Title.Substring(1)}'?",
                         "Your changes will be lost if you don't save them",
                         MessageDialogStyle.AffirmativeAndNegativeAndSingleAuxiliary, Program.MainWindow.ClosingDialogOptions);
+                    ClosingPromptOpened = false;
                     switch (result)
                     {
                         case MessageDialogResult.Affirmative:
@@ -774,7 +777,7 @@ public async void Close(bool ForcedToSave = false, bool CheckSavings = true)
 
             Parent = null;
 
-            Program.MainWindow.EditorsReferences.Remove(this);
+            Program.MainWindow.EditorReferences.Remove(this);
             Program.MainWindow.MenuI_ReopenLastClosedTab.IsEnabled = true;
             Program.RecentFilesStack.Push(FullFilePath);
             Program.MainWindow.UpdateWindowTitle();

UI/MainWindow/MainWindow.xaml.cs

@@ -31,7 +31,7 @@ public partial class MainWindow
         #region Variables
         private readonly Storyboard BlendOverEffect;
         private readonly Storyboard DisableServerAnim;
-        public readonly List<EditorElement> EditorsReferences = new();
+        public readonly List<EditorElement> EditorReferences = new();
         public readonly List<DASMElement> DASMReferences = new();
         private readonly Storyboard EnableServerAnim;
         public readonly List<MenuItem> MenuItems;
@@ -416,7 +416,7 @@ private void AddEditorElement(FileInfo fInfo, string editorTitle, bool SelectMe,
             layoutDocument.ToolTip = fInfo.FullName;
             editor = new EditorElement(fInfo.FullName) { Parent = layoutDocument };
             layoutDocument.Content = editor;
-            EditorsReferences.Add(editor);
+            EditorReferences.Add(editor);
             DockingPane.Children.Add(layoutDocument);
             AddNewRecentFile(fInfo);
             if (SelectMe)

UI/MainWindow/MainWindowCommands.cs

@@ -68,7 +68,7 @@ public DASMElement GetCurrentDASMElement()
         /// <returns></returns>
         public EditorElement[] GetAllEditorElements()
         {
-            return EditorsReferences.Count < 1 ? null : EditorsReferences.ToArray();
+            return EditorReferences.Count < 1 ? null : EditorReferences.ToArray();
         }
 
         /// <summary>
@@ -338,7 +338,7 @@ private void Command_Close()
             try
             {
                 var ee = GetCurrentEditorElement();
-                if (ee == null || ee.IsTemplateEditor)
+                if (ee == null || ee.IsTemplateEditor || ee.ClosingPromptOpened)
                 {
                     return;
                 }
@@ -359,50 +359,13 @@ private async void Command_CloseAll()
             try
             {
                 var editors = GetAllEditorElements();
-                if (editors == null || GetCurrentEditorElement().IsTemplateEditor)
+
+                if (editors == null || GetCurrentEditorElement().IsTemplateEditor || editors.Length == 0 || editors.Any(x => x.ClosingPromptOpened))
                 {
                     return;
                 }
 
-                if (editors.Length > 0)
-                {
-                    var UnsavedEditorsExisting = false;
-                    foreach (var editor in editors)
-                    {
-                        UnsavedEditorsExisting |= editor.NeedsSave;
-                    }
-
-                    var ForceSave = false;
-                    if (UnsavedEditorsExisting)
-                    {
-                        var str = new StringBuilder();
-                        for (var i = 0; i < editors.Length; ++i)
-                        {
-                            if (i == 0)
-                            {
-                                str.Append(editors[i].Parent.Title.Trim('*'));
-                            }
-                            else
-                            {
-                                str.AppendLine(editors[i].Parent.Title.Trim('*'));
-                            }
-                        }
-
-                        var result = await this.ShowMessageAsync(Program.Translations.Get("SaveFollow"),
-                            str.ToString(), MessageDialogStyle.AffirmativeAndNegative, MetroDialogOptions);
-                        if (result == MessageDialogResult.Affirmative)
-                        {
-                            ForceSave = true;
-                        }
-                    }
-
-                    foreach (var editor in editors)
-                    {
-                        DockingPane.RemoveChild(editor.Parent);
-                        editor.Close(ForceSave, ForceSave);
-                    }
-                }
-                UpdateOBFileButton();
+                editors.ToList().ForEach(x => x.Close());
             }
             catch (Exception ex)
             {

UI/Windows/NewFileWindow.xaml.cs

@@ -100,7 +100,7 @@ public NewFileWindow()
             ParseTemplateFile();
             Language_Translate();
             PreviewBox.Parent = new LayoutDocument();
-            Program.MainWindow.EditorsReferences.Add(PreviewBox);
+            Program.MainWindow.EditorReferences.Add(PreviewBox);
             if (Program.OptionsObject.Program_AccentColor != "Red" || Program.OptionsObject.Program_Theme != "BaseDark")
             {
                 ThemeManager.ChangeAppStyle(this, ThemeManager.GetAccent(Program.OptionsObject.Program_AccentColor),
@@ -279,7 +279,7 @@ private void NewFileWind_KeyDown(object sender, KeyEventArgs e)
 
         private void NewFileWind_Closing(object sender, CancelEventArgs e)
         {
-            Program.MainWindow.EditorsReferences.Remove(PreviewBox);
+            Program.MainWindow.EditorReferences.Remove(PreviewBox);
         }
 
         #endregion