Allow opened project to be closed

Author: TheJoeFin

MagickCrop/Controls/WelcomeMessage.xaml.cs

@@ -64,7 +64,7 @@ private void OpenProject(RecentProjectInfo? project)
         if (project == null) return;
 
         // Close the welcome screen
-        WelcomeBorder.Visibility = Visibility.Collapsed;
+        Visibility = Visibility.Collapsed;
 
         // Get the main window and open the project
         if (Window.GetWindow(this) is MainWindow mainWindow)
@@ -109,7 +109,7 @@ private void Hyperlink_Click(object sender, RoutedEventArgs e)
 
     private void OpenFileButton_Click(object sender, RoutedEventArgs e)
     {
-        WelcomeBorder.Visibility = Visibility.Collapsed;
+        Visibility = Visibility.Collapsed;
         PrimaryButtonEvent?.Invoke(sender, e);
     }
 
@@ -130,13 +130,13 @@ private void AboutHyperbuttons_Click(object sender, RoutedEventArgs e)
 
     private async void OpenPackageButton_Click(object sender, RoutedEventArgs e)
     {
-        WelcomeBorder.Visibility = Visibility.Collapsed;
+        Visibility = Visibility.Collapsed;
 
         bool opened = false;
         if (Window.GetWindow(this) is MainWindow mainWindow)
             opened = await mainWindow.LoadMeasurementsPackageFromFile();
 
         if (!opened)
-            WelcomeBorder.Visibility = Visibility.Visible;
+            Visibility = Visibility.Visible;
     }
 }

MagickCrop/MainWindow.xaml

@@ -156,19 +156,31 @@
                 </Grid.RowDefinitions>
                 <ScrollViewer>
                     <StackPanel Width="200" Orientation="Vertical">
-                        <wpfui:Button
-                            x:Name="ReOpenFileButton"
-                            Width="180"
-                            Margin="0,0,0,8"
-                            HorizontalAlignment="Center"
-                            Appearance="Transparent"
-                            Click="OpenFileButton_Click"
-                            Content="Open image..."
-                            ToolTip="Open a new image file">
-                            <wpfui:Button.Icon>
-                                <wpfui:SymbolIcon Symbol="FolderOpen24" />
-                            </wpfui:Button.Icon>
-                        </wpfui:Button>
+                        <Grid Width="160">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <wpfui:SymbolIcon
+                                Grid.Column="0"
+                                Margin="0,0,5,0"
+                                Symbol="Image24" />
+                            <TextBlock
+                                x:Name="ReOpenFileText"
+                                Grid.Column="1"
+                                VerticalAlignment="Center"
+                                Text="Image File Name"
+                                TextTrimming="CharacterEllipsis" />
+                            <wpfui:SymbolIcon
+                                x:Name="CloseFileIcon"
+                                Grid.Column="2"
+                                Margin="5,0,0,0"
+                                MouseDown="CloseFileIcon_MouseDown"
+                                Symbol="Dismiss24"
+                                ToolTip="Click to close and show the welcome screen"
+                                Visibility="Collapsed" />
+                        </Grid>
                         <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                             <MenuItem
                                 x:Name="UndoMenuItem"

MagickCrop/MainWindow.xaml.cs

@@ -48,7 +48,7 @@ public partial class MainWindow : FluentWindow
     private Services.RecentProjectsManager? recentProjectsManager;
     private string? currentProjectId;
     private System.Timers.Timer? autoSaveTimer;
-    private readonly int AutoSaveIntervalMs = (int)TimeSpan.FromSeconds(3).TotalMilliseconds;
+    private readonly int AutoSaveIntervalMs = (int)TimeSpan.FromSeconds(5).TotalMilliseconds;
 
     private static readonly List<FormatItem> _formats =
     [
@@ -91,6 +91,7 @@ public MainWindow()
         AspectRatioTransformPreview.RatioItem = selectedAspectRatio;
 
         InitializeProjectManager();
+        UpdateOpenedFileNameText();
     }
 
     private void DrawPolyLine()
@@ -576,6 +577,9 @@ await Task.Run(async () =>
 
         // Create a new project ID for this image
         currentProjectId = Guid.NewGuid().ToString();
+
+        // Update the ReOpenFileButton to show the current file name
+        UpdateOpenedFileNameText();
     }
 
     private void OpenFolderButton_Click(object sender, RoutedEventArgs e)
@@ -1490,6 +1494,8 @@ private async Task LoadMeasurementPackageAsync(string fileName)
             currentProjectId = package.Metadata.ProjectId;
         else
             currentProjectId = Guid.NewGuid().ToString();
+        
+        UpdateOpenedFileNameText();
     }
 
     public async void LoadMeasurementsPackageFromFile(string filePath)
@@ -1591,4 +1597,69 @@ protected override void OnClosing(System.ComponentModel.CancelEventArgs e)
 
         base.OnClosing(e);
     }
+
+    private void UpdateOpenedFileNameText()
+    {
+        if (string.IsNullOrEmpty(openedFileName))
+        {
+            ReOpenFileText.Text = "Image/Project Name";
+            CloseFileIcon.Visibility = Visibility.Collapsed;
+        }
+        else
+        {
+            ReOpenFileText.Text = openedFileName;
+
+            if (openedPackage is not null)
+                ReOpenFileText.Text = $" {openedPackage.Metadata.OriginalFilename}";
+            CloseFileIcon.Visibility = Visibility.Visible;
+        }
+    }
+
+    private void CloseFileIcon_MouseDown(object sender, MouseButtonEventArgs e)
+    {
+        e.Handled = true; // Prevent the click from bubbling to the button
+        ResetApplicationState();
+    }
+
+    private void ResetApplicationState()
+    {
+        // Stop the autosave timer
+        autoSaveTimer?.Stop();
+        AutosaveCurrentState();
+
+        // Clear the image
+        MainImage.Source = null;
+        imagePath = null;
+        openedFileName = string.Empty;
+        openedPackage = null;
+        savedPath = null;
+        
+        // Reset the title
+        wpfuiTitleBar.Title = "Magick Crop & Measure by TheJoeFin";
+        
+        // Reset UI elements
+        RemoveMeasurementControls();
+        HideTransformControls();
+        HideCroppingControls();
+        HideResizeControls();
+        BottomBorder.Visibility = Visibility.Collapsed;
+        WelcomeMessageModal.Visibility = Visibility.Visible;
+        OpenFolderButton.IsEnabled = false;
+        Save.IsEnabled = false;
+        
+        // Reset the canvas transform
+        if (ShapeCanvas.RenderTransform is MatrixTransform matTrans)
+        {
+            matTrans.Matrix = new Matrix();
+        }
+        
+        // Reset undo/redo
+        undoRedo.Clear();
+        
+        // Create a new project ID
+        currentProjectId = Guid.NewGuid().ToString();
+        
+        // Update the button state
+        UpdateOpenedFileNameText();
+    }
 }

MagickCrop/Models/UndoRedo.cs

@@ -42,6 +42,12 @@ public string Redo()
         _undoStack.Push(item);
         return newPath;
     }
+
+    internal void Clear()
+    {
+        _undoStack.Clear();
+        _redoStack.Clear();
+    }
 }
 
 public abstract class UndoRedoItem