added Reopen Last File feature

Author: maxijabase

Interop/HotkeyControl.cs

@@ -11,6 +11,7 @@ public class HotkeyControl
             { "New", "Ctrl+N" },
             { "NewTemplate", "Ctrl+Shift+N" },
             { "Open", "Ctrl+O" },
+            { "ReopenLastClosedTab", "Ctrl+Shift+T" },
             { "Save", "Ctrl+S" },
             { "SaveAll", "Ctrl+Shift+S" },
             { "SaveAs", "Ctrl+Alt+S" },

Interop/TranslationProvider.cs

@@ -367,6 +367,7 @@ private void FillToEnglishDefaults()
             language.Add("EnableRPCFile", "Show current file");
             language.Add("TemplateExists", "Template name already exists");
             language.Add("IllegalCharacters", "Illegal characters");
+            language.Add("ReopenLastClosedTab", "Reopen the last closed tab");
         }
     }
 }

Program.cs

@@ -30,9 +30,8 @@ public static class Program
         public static Config[] Configs;
         public static int SelectedConfig;
         public static string SelectedTemplatePath;
-
+        public static Stack<string> RecentFilesStack = new();
         public static UpdateInfo UpdateStatus;
-
         public static bool RCCKMade;
         public static DiscordRpcClient DiscordClient = new(Constants.DiscordRPCAppID);
         public static Timestamps DiscordTime = Timestamps.Now;

UI/Components/DASMElement/DASMElement.xaml.cs

@@ -923,6 +923,7 @@ private void Treeview__SelectedItemChanged(object sender, RoutedPropertyChangedE
         public void Close()
         {
             Program.MainWindow.DASMReferences.Remove(this);
+            Program.RecentFilesStack.Push(FilePath);
             Program.MainWindow.UpdateWindowTitle();
         }
 

UI/Components/EditorElement/EditorElement.xaml.cs

@@ -747,30 +747,28 @@ public async void Close(bool ForcedToSave = false, bool CheckSavings = true)
                 fileWatcher = null;
             }
 
-            if (CheckSavings)
+            if (CheckSavings && _NeedsSave)
             {
-                if (_NeedsSave)
+                if (ForcedToSave)
                 {
-                    if (ForcedToSave)
+                    Save();
+                }
+                else
+                {
+                    var title = $"{Program.Translations.GetLanguage("SavingFile")} '" + Parent.Title.Trim('*') +
+                                "'";
+                    var Result = await Program.MainWindow.ShowMessageAsync(title, "",
+                        MessageDialogStyle.AffirmativeAndNegative, Program.MainWindow.MetroDialogOptions);
+                    if (Result == MessageDialogResult.Affirmative)
                     {
                         Save();
                     }
-                    else
-                    {
-                        var title = $"{Program.Translations.GetLanguage("SavingFile")} '" + Parent.Title.Trim('*') +
-                                    "'";
-                        var Result = await Program.MainWindow.ShowMessageAsync(title, "",
-                            MessageDialogStyle.AffirmativeAndNegative, Program.MainWindow.MetroDialogOptions);
-                        if (Result == MessageDialogResult.Affirmative)
-                        {
-                            Save();
-                        }
-                    }
                 }
             }
 
             Program.MainWindow.EditorsReferences.Remove(this);
-
+            Program.MainWindow.MenuI_ReopenLastClosedTab.IsEnabled = true;
+            Program.RecentFilesStack.Push(FullFilePath);
             Parent = null; //to prevent a ring depency which disables the GC from work
             Program.MainWindow.UpdateWindowTitle();
         }

UI/MainWindow/MainWindow.xaml

@@ -98,8 +98,12 @@
       <Grid x:Name="MainWindowCommands">
         <Menu>
           <MenuItem x:Name="MenuI_File" Header="File" SubmenuOpened="FileMenu_Open">
+
             <MenuItem x:Name="MenuI_New" Header="New" Click="Menu_New"/>
             <MenuItem x:Name="MenuI_NewTemplate" Header="New From Template" Click="Menu_NewFromTemplate"/>
+
+            <Separator/>
+
             <MenuItem x:Name="MenuI_Open" Header="Open" Click="Menu_Open"/>
             <MenuItem x:Name="MenuI_Recent" Header="Recent files">
               <MenuItem.ContextMenu>
@@ -108,13 +112,19 @@
                 </ContextMenu>
               </MenuItem.ContextMenu>
             </MenuItem>
+            <MenuItem x:Name="MenuI_ReopenLastClosedTab" Header="Reopen last tab" Click="Menu_ReopenLastClosedTab"/>
+            
             <Separator />
+            
             <MenuItem x:Name="MenuI_Save" Header="Save" Click="Menu_Save"/>
             <MenuItem x:Name="MenuI_SaveAll" Header="Save All" Click="Menu_SaveAll"/>
             <MenuItem x:Name="MenuI_SaveAs" Header="Save As" Click="Menu_SaveAs"/>
+            
             <Separator />
+            
             <MenuItem x:Name="MenuI_Close" Header="Close" Click="Menu_Close"/>
             <MenuItem x:Name="MenuI_CloseAll" Header="Close All" Click="Menu_CloseAll"/>
+            
           </MenuItem>
 
           <MenuItem x:Name="MenuI_Edit" Header="Edit" SubmenuOpened="EditMenu_Open">

UI/MainWindow/MainWindow.xaml.cs

@@ -127,6 +127,8 @@ public MainWindow(SplashScreen sc)
             LoadCommandsDictionary();
             LoadRecentsList();
 
+            MenuI_ReopenLastClosedTab.IsEnabled = false;
+
             UpdateOBFileButton();
 
             SearchCooldownTimer = new DispatcherTimer { Interval = TimeSpan.FromMilliseconds(300) };

UI/MainWindow/MainWindowCommands.cs

@@ -517,5 +517,17 @@ private void Command_OpenSPDef()
             };
             spDefinitionWindow.ShowDialog();
         }
+        /// <summary>
+        /// Re-opens the last closed tab
+        /// </summary>
+        private void Command_ReopenLastClosedTab()
+        {
+            if (Program.RecentFilesStack.Count > 0)
+            {
+                TryLoadSourceFile(Program.RecentFilesStack.Pop(), out _, true, false, true);
+            }
+
+            MenuI_ReopenLastClosedTab.IsEnabled = Program.RecentFilesStack.Count > 0;
+        }
     }
 }

UI/MainWindow/MainWindowInputHandler.cs

@@ -65,6 +65,7 @@ private void LoadCommandsDictionary()
                 { "New", Command_New },
                 { "NewTemplate", Command_NewFromTemplate },
                 { "Open", Command_Open },
+                { "ReopenLastClosedTab", Command_ReopenLastClosedTab },
                 { "Save", Command_Save },
                 { "SaveAll", Command_SaveAll },
                 { "SaveAs", Command_SaveAs },

UI/MainWindow/MainWindowMenuHandler.cs

@@ -44,6 +44,11 @@ private void Menu_ClearRecent(object sender, RoutedEventArgs e)
             MenuI_Recent.IsEnabled = false;
         }
 
+        private void Menu_ReopenLastClosedTab(object sender, RoutedEventArgs e)
+        {
+            Command_ReopenLastClosedTab();
+        }
+
         private void Menu_New(object sender, RoutedEventArgs e)
         {
             Command_New();
@@ -411,6 +416,7 @@ private MenuItem BuildRecentFileItem(string file)
                 TryLoadSourceFile(fInfo.FullName, out _, true, false, true);
             };
 
+            // Return the MenuItem
             return mi;
         }
         #endregion