Use Avalonia 12 preview versions for DialogHost, progress ring

Fails, likely due to dependencies relying on 11

TODO.txt

@@ -1,32 +1,3 @@
-magick "2026-01-29 — \$210 — WORK PERMIT.pdf" -background white -alpha background -alpha off -density 288 -resize 25% page-%03d.jpg
-https://github.com/dlemstra/Magick.NET/blob/main/docs/ConvertPDF.md
-https://stackoverflow.com/questions/65089839/add-an-external-pdf-page-to-pdfsharp-migradoc
-https://github.com/mephraim/ghostscriptsharp
-https://stackoverflow.com/a/71485279/3938401
-
-need a PDF viewer that works with annotations
-https://github.com/BobLd/PdfPig.Rendering.Skia/ works but quality is low for some reason, I don't know why. probably need a bug report or some option that is hidden.
-                using (var document = UglyToad.PdfPig.PdfDocument.Open(filePath, UglyToad.PdfPig.Rendering.Skia.SkiaRenderingParsingOptions.Instance))
-                {
-
-                    document.AddSkiaPageFactory(); // Same as document.AddPageFactory<SKPicture, SkiaPageFactory>() and document.AddPageFactory<PdfPageSize, PageSizeFactory>()
-
-                    for (int p = 1; p <= document.NumberOfPages; p++)
-                    {
-                        using var skBitmap = document.GetPageAsSKBitmap(p, 1);
-                        using (var fs = new FileStream(Path.Combine(convertedDir, $"{fileName}_{p}PIG.jpeg"), FileMode.Create))
-                        using (var ms = document.GetPageAsPng(p, 1, 4))
-                        {
-                            MemoryStream memoryStream = new MemoryStream();
-                            skBitmap.Encode(memoryStream, SkiaSharp.SKEncodedImageFormat.Jpeg, 100);
-                            memoryStream.Position = 0L;
-
-                            ms.WriteTo(fs);
-                        }
-                    }
-                }
-https://github.com/GowenGit/docnet -- may need to fork this and publish our own package if some OS doesn't work
-
 *-add more items
 *-save last opened folder to settings somewhere
 

installers/WindowsInstallerScript.iss

@@ -3,7 +3,7 @@
 ; Non-commercial use only
 
 #define MyAppName "MayShow"
-#define MyAppVersion "1.3.0"
+#define MyAppVersion "1.1.0"
 #define MyAppPublisher "Quickity Quack Productions"
 #define MyAppExeName "MayShow.exe"
 
@@ -45,9 +45,7 @@ Source: "..\src\bin\Release\net10.0\win-x64\publish\{#MyAppExeName}"; DestDir: "
 Source: "..\src\bin\Release\net10.0\win-x64\publish\av_libglesv2.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\src\bin\Release\net10.0\win-x64\publish\libHarfBuzzSharp.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\src\bin\Release\net10.0\win-x64\publish\libSkiaSharp.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\src\bin\Release\net10.0\win-x64\publish\LICENSE"; DestDir: "{app}"; DestName: "PDFium-license.txt"; Flags: ignoreversion 
+Source: "..\src\bin\Release\net10.0\win-x64\publish\Magick.Native-Q16-x64.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\src\bin\Release\net10.0\win-x64\publish\Magick.Native-Q8-x64.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\src\bin\Release\net10.0\win-x64\publish\pdfium.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\src\bin\Release\net10.0\win-x64\publish\Assets\*"; DestDir: "{app}\Assets"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 

installers/build-linux.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-VERSION="1.3.0"
 SRC_DIR="src" # user ran script from main folder
 if [ ! -d "$SRC_DIR" ]; then
     SRC_DIR= "../src" # try 
@@ -12,12 +11,6 @@ fi
 cd "$SRC_DIR"
 echo "Building release for linux-x64..."
 dotnet publish -c Release -r linux-x64 -p:StripSymbols=False -p:PublishAot=False
-echo "Zipping up linux-x64..."
-cd bin/Release/net10.0/linux-x64/publish
-zip -r "../../../../MayShow $VERSION linux-arm64.zip" .
-cd ../../../../../
 echo "Building release for linux-arm64..."
 dotnet publish -c Release -r linux-arm64 -p:StripSymbols=False -p:PublishAot=False
-cd bin/Release/net10.0/linux-arm64/publish
+# TODO: add automatic zipping and version number setting for ease of use
-zip -r "../../../../MayShow $VERSION linux-arm64.zip" .
-cd ../../../../../

src/App.axaml

@@ -100,15 +100,6 @@
         <DataTemplate DataType="{x:Type viewModels:WarningViewModel}">
             <views:WarningView/>
         </DataTemplate>
-        <DataTemplate DataType="{x:Type viewModels:ShutdownCheckViewModel}">
-            <views:ShutdownCheckView/>
-        </DataTemplate>
-        <DataTemplate DataType="{x:Type viewModels:ConfirmViewModel}">
-            <views:ConfirmView/>
-        </DataTemplate>
-        <DataTemplate DataType="{x:Type viewModels:SettingsViewModel}">
-            <views:SettingsView/>
-        </DataTemplate>
     </Application.DataTemplates>
     <Application.Resources>
         <ResourceDictionary>

src/Directory.Build.props

@@ -1,5 +1,5 @@
 <Project>
    <PropertyGroup>
-	   <AvaloniaVersion>11.3.12</AvaloniaVersion>
+	   <AvaloniaVersion>12.0.0-preview1</AvaloniaVersion>
    </PropertyGroup>
 </Project>

src/Helpers/Constants.cs

@@ -5,10 +5,7 @@ namespace MayShow.Helpers;
 
 class Constants
 {
-    public static string AppVersion = "1.3.0";
+    public static string AppVersion = "1.1.0";
-
-    public static string[] AllowedFileExtensionPatterns = [ "*.png", "*.jpg", "*.jpeg", "*.gif", "*.bmp", "*.webp", "*.pdf", "*.heic", ];
-    public static string[] AllowedFileExtensionsNoStar = [ "png", "jpg", "jpeg", "gif", "bmp", "webp", "pdf", "heic", ];
 
     public static string[] GetQuotes()
     {

src/Interfaces/ICanCheckShutdown.cs

@@ -1,8 +0,0 @@
-using System.Threading.Tasks;
-
-namespace MayShow.Interfaces;
-
-interface ICanCheckShutdown
-{
-    Task<bool> CheckIsSafeToShutdown();
-}

src/Interfaces/IChangeViewModel.cs

@@ -1,9 +1,10 @@
 using MayShow.ViewModels;
 
-namespace MayShow.Interfaces;
+namespace MayShow.Interfaces
-
-interface IChangeViewModel
 {
-    void PushViewModel(BaseViewModel model);
+    interface IChangeViewModel
-    void PopViewModel();
+    {
+        void PushViewModel(BaseViewModel model);
+        void PopViewModel();
+    }
 }

src/Interfaces/ITopLevelGrabber.cs

@@ -1,8 +1,9 @@
 using Avalonia.Controls;
 
-namespace MayShow.Interfaces;
+namespace MayShow.Interfaces
-
-interface ITopLevelGrabber
 {
-    TopLevel GetTopLevel();
+    interface ITopLevelGrabber
+    {
+        TopLevel GetTopLevel();
+    }
 }

src/MainWindow.axaml

@@ -13,8 +13,7 @@
         Height="650"
         MinHeight="550">
     <dialogHost:DialogHost CloseOnClickAway="False" 
-                           Identifier="DialogHost"
+                           Identifier="DialogHost">
-                           x:Name="WindowDialogHost">
         <dialogHost:DialogHost.DialogContent>
             <StackPanel/>
         </dialogHost:DialogHost.DialogContent>

src/MainWindow.axaml.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Controls.ApplicationLifetimes;
-using DialogHostAvalonia;
 using MayShow.Interfaces;
 using MayShow.ViewModels;
 
@@ -15,60 +10,6 @@ public partial class MainWindow : Window, ITopLevelGrabber
     {
         InitializeComponent();
         DataContext = new MainWindowViewModel(this);
-
-        Closing += WindowIsClosing;
-
-        var lifetime = Application.Current?.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime;
-        // lifetime?.ShutdownRequested += ApplicationIsShuttingDown;
-    }
-
-    private async void WindowIsClosing(object? sender, WindowClosingEventArgs e)
-    {
-        e.Cancel = true; // async -> need to cancel immediately
-        if (await CheckIfClosePossible())
-        {
-            Closing -= WindowIsClosing;
-            var lifetime = Application.Current?.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime;
-            lifetime?.ShutdownRequested -= ApplicationIsShuttingDown;
-            Close();
-        }
-    }
-
-    private async void ApplicationIsShuttingDown(object? sender, ShutdownRequestedEventArgs e)
-    {
-        e.Cancel = true; // async -> need to cancel immediately
-        if (await CheckIfClosePossible())
-        {
-            Closing -= WindowIsClosing;
-            var lifetime = Application.Current?.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime;
-            lifetime?.ShutdownRequested -= ApplicationIsShuttingDown;
-            lifetime?.TryShutdown();
-        }
-    }
-
-    private async Task<bool> CheckIfClosePossible()
-    {
-        var canShutdown = true;
-        if (DataContext is MainWindowViewModel mwvm)
-        {
-            if (mwvm is ICanCheckShutdown canCheck)
-            {
-                canShutdown = await canCheck.CheckIsSafeToShutdown();
-            }
-            // only checking 1 level but for this app that is OK
-            if (canShutdown && mwvm.CurrentViewModel is ICanCheckShutdown currModel)
-            {
-                try
-                {
-                    canShutdown = await currModel.CheckIsSafeToShutdown();
-                }
-                catch (Exception)
-                {
-                    canShutdown = true;
-                }
-            }
-        }
-        return canShutdown;
     }
 
     public TopLevel GetTopLevel()

src/MayShow.csproj

@@ -12,17 +12,12 @@
     <PublishTrimmed>true</PublishTrimmed>
     <PublishAot>true</PublishAot>
     <AssemblyName>MayShow</AssemblyName>
-    <AssemblyVersion>1.3.0</AssemblyVersion> <!-- Also update Constants version -->
+    <AssemblyVersion>1.1.0</AssemblyVersion> <!-- Also update Constants version -->
     <ApplicationIcon>MayShow-icon.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <TrimmerRootAssembly Include="MigraDoc.DocumentObjectModel" />
-    <TrimmerRootAssembly Include="MigraDoc.Rendering" />
-    <TrimmerRootAssembly Include="MigraDoc.RtfRendering" />
     <TrimmerRootAssembly Include="PdfSharp" />
     <TrimmerRootAssembly Include="Avalonia.Controls.DataGrid" />
-    <!-- <TrimmerRootAssembly Include="Docnet.Core" />
-    <TrimmerRootAssembly Include="SixLabors.ImageSharp" /> -->
   </ItemGroup>
   <ItemGroup>
     <AvaloniaResource Include="Assets\**" />
@@ -47,16 +42,10 @@
     <PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
     <PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />
     <PackageReference Include="Avalonia.Controls.DataGrid" Version="$(AvaloniaVersion)" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)">
+    <PackageReference Include="PDFsharp-MigraDoc" Version="6.2.3" />
-      <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
+    <PackageReference Include="Magick.NET-Q16-AnyCPU" Version="14.10.2" />
-      <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
+    <PackageReference Include="Deadpikle.AvaloniaProgressRing" Version="0.11.0-preview20260220" />
-    </PackageReference>
+    <PackageReference Include="DialogHost.Avalonia" Version="0.10.4-avalonia12" />
-    <PackageReference Include="PDFsharp-MigraDoc" Version="6.2.4" />
-    <PackageReference Include="Magick.NET-Q8-AnyCPU" Version="14.10.3" />
-    <PackageReference Include="Deadpikle.AvaloniaProgressRing" Version="0.10.11-preview20251127001" />
-    <PackageReference Include="DialogHost.Avalonia" Version="0.10.4" />
     <PackageReference Include="Xaml.Behaviors.Interactions.DragAndDrop.DataGrid" Version="11.3.9.5" />
-    <PackageReference Include="Docnet.Core" Version="2.6.0" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
   </ItemGroup>
 </Project>

src/Models/Settings.cs

@@ -12,12 +12,10 @@ namespace MayShow.Models;
 class Settings : ChangeNotifier
 {
     private string _lastUsedPath;
-    private bool _useDocnetPDFImageRendering;
 
     public Settings()
     {
         _lastUsedPath = "";
-        _useDocnetPDFImageRendering = true;
     }
 
     [JsonInclude]
@@ -27,13 +25,6 @@ class Settings : ChangeNotifier
         set { _lastUsedPath = value; NotifyPropertyChanged(); }
     }
 
-    [JsonInclude]
-    public bool UseDocnetPFDImageRendering
-    {
-        get => _useDocnetPDFImageRendering;
-        set { _useDocnetPDFImageRendering = value; NotifyPropertyChanged(); }
-    }
-
     public static string GetSettingsFileName()
     {
         return "settings.json";
@@ -43,7 +34,7 @@ class Settings : ChangeNotifier
     {
         var path = Path.Combine(
             Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
-            "MayShow"
+            "ReceiptPDFBuilder" // legacy name for existing settings prior to app name change
         );
         if (!Directory.Exists(path))
         {

src/Models/ShutdownCheckOptions.cs

@@ -1,8 +0,0 @@
-namespace MayShow.Models;
-
-enum ShutdownCheckOptions
-{
-    SaveAndShutdown,
-    NoSaveShutdown,
-    CancelShutdown,
-}

src/ViewModels/ConfirmViewModel.cs

@@ -1,52 +0,0 @@
-#nullable enable
-
-using DialogHostAvalonia;
-using MayShow.Helpers;
-
-namespace MayShow.ViewModels;
-
-class ConfirmViewModel
-{
-    private string _title;
-    private string _message;
-    private string _confirmTitle;
-    private string _declineTitle;
-
-    public ConfirmViewModel(string title, string message, string confirmTitle = "Yes", string declineTitle = "No")
-    {
-        _title = title;
-        _message = message;
-        _confirmTitle = confirmTitle;
-        _declineTitle = declineTitle;
-    }
-
-    public string Title
-    {
-        get => _title;
-    }
-
-    public string Message
-    {
-        get => _message;
-    }
-
-    public string ConfirmTitle
-    {
-        get => _confirmTitle;
-    }
-
-    public string DeclineTitle
-    {
-        get => _declineTitle;
-    }
-
-    public void Confirm()
-    {
-        DialogHost.Close("DialogHost", true);
-    }
-
-    public void Decline()
-    {
-        DialogHost.Close("DialogHost", false);
-    }
-}

src/ViewModels/MainViewModel.cs

@@ -21,19 +21,10 @@ using MayShow.Interfaces;
 using MayShow.Models;
 using MayShows.Helpers;
 
-using Docnet.Core.Models;
-using Docnet.Core;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
-using System.Reflection.Metadata.Ecma335;
-using Docnet.Core.Readers;
-
 namespace MayShow.ViewModels;
 
-class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
+class MainViewModel : BaseViewModel, IFontResolver
 {
-    private bool _isPerformingInitialLoad;
     private string _processDir;
     private bool _isCreatingPDF;
     private string _createPDFLog;
@@ -45,24 +36,21 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
 
     private Settings _settings;
 
-    private bool _hasUnsavedWork;
-
     public MainViewModel(IChangeViewModel viewModelChanger) : base(viewModelChanger)
     {
-        _isPerformingInitialLoad = true;
         _processDir = Path.GetDirectoryName(Environment.ProcessPath) ?? "";
         Console.WriteLine("Process is running from: {0}", _processDir);
         _isCreatingPDF = false;
         var quotes = Constants.GetQuotes();
         Random random = new Random();
         var quoteIndex = random.Next(0, quotes.Length);
-        _createPDFLog = "----- MayShow v" + Constants.AppVersion + " ------" + Environment.NewLine;
+        _createPDFLog = "----- MayShow v" + Constants.AppVersion + "------" + Environment.NewLine;
         _createPDFLog += quotes[quoteIndex] + Environment.NewLine;
         _createPDFLog += "---------------------------------------" + Environment.NewLine;
-        _createPDFLog += "Loaded and ready to create report!" + Environment.NewLine;
+        _createPDFLog += "Ready to create PDF!";
-        _createPDFLog += "Please copy and send this Program Log when reporting any issues with the software.";
         _workingFolder = "";
-        ReportFiles = _reportFiles = new ObservableCollection<ReportFile>();
+        _reportFiles = new ObservableCollection<ReportFile>();
+        _reportFiles.CollectionChanged += ( sender, e ) => { NotifyPropertyChanged(nameof(IsCreatePDFButtonEnabled)); };
         _reportTitle = "";
         _lastGeneratedTime = null;
         _settings = Settings.LoadSettings();
@@ -71,24 +59,12 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
             LogInfo("Loading data at last used path of {0}", _settings.LastUsedPath);
             ScanFolder(_settings.LastUsedPath);
         }
-        else
-        {
-            LogInfo("Choose a receipt folder to begin...");
-        }
-        HasUnsavedWork = false;
-        _isPerformingInitialLoad = false;
     }
 
     public string ReportTitle
     {
         get => _reportTitle;
-        set 
+        set { _reportTitle = value; NotifyPropertyChanged(); NotifyPropertyChanged(nameof(IsTitleBoxVisible)); }
-        { 
-            _reportTitle = value;
-            NotifyPropertyChanged(); 
-            NotifyPropertyChanged(nameof(IsTitleBoxVisible)); 
-            NotifyPropertyChanged(nameof(CanAddItem)); 
-        }
     }
 
     public bool IsTitleBoxVisible
@@ -96,11 +72,6 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
         get => !string.IsNullOrWhiteSpace(_workingFolder);
     }
 
-    public bool CanAddItem
-    {
-        get => IsTitleBoxVisible && !IsCreatingPDF;
-    }
-
     public bool IsCreatingPDF
     {
         get => _isCreatingPDF;
@@ -110,7 +81,6 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
             NotifyPropertyChanged();
             NotifyPropertyChanged(nameof(IsCreatePDFButtonEnabled)); 
             NotifyPropertyChanged(nameof(HasWorkingFolderAndNotMakingPDF));
-            NotifyPropertyChanged(nameof(CanAddItem)); 
         }
     }
 
@@ -147,16 +117,6 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
         set { _createPDFLog = value; NotifyPropertyChanged(); }
     }
 
-    public bool HasUnsavedWork
-    {
-        get => _hasUnsavedWork;
-        set
-        {
-            _hasUnsavedWork = value;
-            NotifyPropertyChanged();
-        }
-    }
-
     public ObservableCollection<ReportFile> ReportFiles
     {
         get => _reportFiles;
@@ -166,8 +126,7 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
             NotifyPropertyChanged(); 
             _reportFiles.CollectionChanged += ( sender, e ) => 
             { 
-                NotifyPropertyChanged(nameof(IsCreatePDFButtonEnabled));
+                NotifyPropertyChanged(nameof(IsCreatePDFButtonEnabled)); 
-                HasUnsavedWork = true;
             };
         }
     }
@@ -198,7 +157,6 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
                 _settings.LastUsedPath = folder.Path.LocalPath;
                 await _settings.SaveSettingsAsync();
                 ResortPDFItemsByDate();
-                HasUnsavedWork = true;
             }
         }
     }
@@ -209,7 +167,6 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
         {
             WorkingFolder = path;
             NotifyPropertyChanged(nameof(IsTitleBoxVisible));
-            NotifyPropertyChanged(nameof(CanAddItem)); 
             var reportFilePath = Path.Combine(path, GetReportSavedDataFileName());
             var successfullyLoadedPriorReport = false;
             if (File.Exists(reportFilePath))
@@ -239,7 +196,6 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
                     AddFileBasedOnPath(filePath);
                 }
                 ResortPDFItemsByDate();
-                HasUnsavedWork = true;
             }
         }
         else
@@ -254,17 +210,6 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
         DialogHost.Show(new AboutViewModel());
     }
 
-    public async Task ShowSettings()
-    {
-        var updatedSettings = await DialogHost.Show(new SettingsViewModel(_settings));
-        if (updatedSettings != null)
-        {
-            _settings = (Settings)updatedSettings;
-            await _settings.SaveSettingsAsync();
-            LogInfo("Saved updated settings!");
-        }
-    }
-
     public void RemoveFile(object f) => RemoveFileImpl((ReportFile)f);
 
     public async void RemoveFileImpl(ReportFile file)
@@ -276,7 +221,6 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
             if (idx != -1)
             {
                 ReportFiles.RemoveAt(idx);
-                HasUnsavedWork = true;
             }
         }
     }
@@ -292,10 +236,20 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
             file.Title = updatedData.Title;
             file.ReceiptDateTime = updatedData.ReceiptDateTime;
             file.Notes = updatedData.Notes;
-            HasUnsavedWork = true;
         }
     }
 
+    private string[] GetAllowedFileExtensionPatterns()
+    {
+        return [ "*.png", "*.jpg", "*.jpeg", "*.gif", "*.bmp", "*.webp", "*.pdf", "*.heic", ];
+    }
+
+    private string[] GetAllowedFileExtensionPatternsWithoutStar()
+    {
+        var list = GetAllowedFileExtensionPatterns();
+        return list.Select(x => x.Replace("*.", "")).ToArray();
+    }
+
     public async void AddItem()
     {
         var topLevel = TopLevelGrabber?.GetTopLevel();
@@ -308,7 +262,7 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
                 FileTypeFilter = [
                     new FilePickerFileType("All Types")
                     {
-                        Patterns = Constants.AllowedFileExtensionPatterns,
+                        Patterns = GetAllowedFileExtensionPatterns(),
                         AppleUniformTypeIdentifiers = [ "public.image", "com.adobe.pdf", "public.heic" ],
                         MimeTypes = [ "image/*", "application/pdf", "image/heic" ]
                     },
@@ -338,7 +292,7 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
         if (!string.IsNullOrWhiteSpace(filePath) && File.Exists(filePath) && !filePath.EndsWith(".DS_Store"))
         {
             // make sure extensions are OK
-            var fileExtensions = Constants.AllowedFileExtensionsNoStar;
+            var fileExtensions = GetAllowedFileExtensionPatternsWithoutStar();
             var didMatch = false;
             foreach (var fileExtension in fileExtensions)
             {
@@ -350,10 +304,7 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
             }
             if (!didMatch)
             {
-                if (!filePath.EndsWith(GetReportSavedDataFileName()))
+                LogInfo("File {0} did not match allowed file extension types, so it was not added.", filePath);
-                {
-                    LogInfo("File {0} did not match allowed file extension types, so it was not added.", filePath);
-                }
             }
             else
             {
@@ -365,22 +316,10 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
                     Notes = "",
                     FilePath = filePath,
                 });
-                HasUnsavedWork = true;
             }
         }
     }
 
-    public async void RemoveAllItems()
-    {
-        var result = await DialogHost.Show(new ConfirmViewModel("Warning!", "Are you sure you want to remove all items from this report?", "Remove All Items", "Cancel"));
-        if (result != null && (bool)result)
-        {
-            ReportFiles.Clear();
-            HasUnsavedWork = true;
-            NotifyPropertyChanged(nameof(IsCreatePDFButtonEnabled));
-        }
-    }
-
     public void LocateFile(object f) => LocateFileImpl((ReportFile) f);
     public async void LocateFileImpl(ReportFile reportFile)
     {
@@ -394,7 +333,7 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
                 FileTypeFilter = [
                     new FilePickerFileType("All Types")
                     {
-                        Patterns = Constants.AllowedFileExtensionPatterns,
+                        Patterns = GetAllowedFileExtensionPatterns(),
                         AppleUniformTypeIdentifiers = [ "public.image", "com.adobe.pdf", "public.heic" ],
                         MimeTypes = [ "image/*", "application/pdf", "image/heic" ]
                     },
@@ -412,7 +351,6 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
             {
                 var file = files[0];
                 reportFile.FilePath = file.Path.LocalPath;
-                HasUnsavedWork = true;
             }
         }
     }
@@ -451,7 +389,6 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
     {
         LogInfo("Sorting report files list...");
         ReportFiles = new ObservableCollection<ReportFile>(ReportFiles.OrderBy(x => x.ReceiptDateTime));
-        HasUnsavedWork = true;
     }
 
     public async void BuildPDF()
@@ -486,7 +423,7 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
         }
     }
 
-    public async Task SaveInterimReportInfo()
+    public async void SaveInterimReportInfo()
     {
         var report = new PDFReport()
         {
@@ -510,7 +447,6 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
         var savePath = Path.Combine(_workingFolder, GetReportSavedDataFileName());
         await File.WriteAllTextAsync(savePath, json);
         LogInfo("Saved report information to {0}", savePath);
-        HasUnsavedWork = false;
     }
 
     private async Task CreateAndSaveReportObjectAfterReportCreation()
@@ -622,12 +558,6 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
         reportTitlePar.Format.Font.Name = "Noto Sans JP"; // has english letters in it, too
         reportTitlePar.AddText(ReportTitle);
         //
-        var convertedDir = Path.Combine(folderPath, "converted");
-        if (!Directory.Exists(convertedDir))
-        {
-            Directory.CreateDirectory(convertedDir);
-        }
-        //
         GlobalFontSettings.FontResolver = this;
         GlobalFontSettings.FallbackFontResolver = new FailsafeFontResolver();
         var hasAddedData = false;
@@ -655,7 +585,14 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
             imageTitlePar.Format.Font.Size = 12;
             imageTitlePar.Format.Font.Bold = true;
             imageTitlePar.Format.Font.Name = "Noto Sans JP"; // has english letters in it, too
-            imageTitlePar.AddText(string.IsNullOrWhiteSpace(file.Title) ? file.FileName : file.Title);
+            if (string.IsNullOrWhiteSpace(file.Title))
+            {
+                imageTitlePar.AddText(file.FileName);   
+            }
+            else
+            {
+                imageTitlePar.AddText(file.Title);
+            }
             var receiptDatePar = section.AddParagraph();
             receiptDatePar.Format.Alignment = ParagraphAlignment.Center;
             receiptDatePar.Format.Font.Size = 12;
@@ -683,142 +620,67 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
             var info = new FileInfo(file.FilePath);
             uint loadedImageWidth = 0;
             uint loadedImageHeight = 0;
-            if (!isPDF)
+            if (isHEIC || isWebp || isPNG)
             {
+                // Save image as jpg
+                var convertedDir = Path.Combine(folderPath, "converted");
+                if (!Directory.Exists(convertedDir))
+                {
+                    Directory.CreateDirectory(convertedDir);
+                }
+                var outputPath = Path.Combine(convertedDir, info.Name + ".jpg");
                 using var mImage = new MagickImage(info.FullName);
                 loadedImageWidth = mImage.Width;
                 loadedImageHeight = mImage.Height;
-                var convertedOutputPath = Path.Combine(convertedDir, info.Name + ".jpg");
+                mImage.Quality = 80;
-                var didAdjust = false;
+                if (mImage.Width >= 400 || mImage.Height >= 400)
-                LogInfo("Image orientation of {0} is {1}", fileName, mImage.Orientation);
-                if (mImage.Orientation != OrientationType.TopLeft)
                 {
-                    LogInfo("Auto-adjusted image orientation of {0}", fileName);
+                    loadedImageWidth = (uint)Math.Floor(mImage.Width * 0.5);
-                    mImage.AutoOrient();
+                    loadedImageHeight = (uint)Math.Floor(mImage.Height * 0.5);
-                    didAdjust = true;
+                    mImage.Scale(loadedImageWidth, loadedImageHeight);
-                }
-                // perform needed image manipulations
-                if (isHEIC || isWebp || isPNG || (!isPDF && info.Length > 1.5 * 1024 * 1024 /* 1.5 MB */))
-                {
-                    // Save image as jpg
-                    mImage.Quality = 80;
-                    if (mImage.Width >= 400 || mImage.Height >= 400)
-                    {
-                        loadedImageWidth = (uint)Math.Floor(mImage.Width * 0.5);
-                        loadedImageHeight = (uint)Math.Floor(mImage.Height * 0.5);
-                        mImage.Scale(loadedImageWidth, loadedImageHeight);
-                        LogInfo("Image {2} scaled to {0}x{1}", loadedImageWidth, loadedImageHeight, fileName);
-                    }
-                    didAdjust = true;
-                    LogInfo("Converted image {0} to JPEG", fileName);
-                }
-                else
-                {
-                    // load height/width
-                    loadedImageWidth = mImage.Width;
-                    loadedImageHeight = mImage.Height;
-                }
-                if (didAdjust)
-                {
-                    await mImage.WriteAsync(convertedOutputPath);
-                    filePath = convertedOutputPath;
-                    LogInfo(string.Format("Saved adjusted image to JPEG; file path is now {0}", filePath));                    
-                }
-                // write to PDF
-                var paragraph = section.AddParagraph();
-                paragraph.Format.Alignment = ParagraphAlignment.Center;
-                var image = paragraph.AddImage(filePath);
-                image.LockAspectRatio = true;
-                if (!isPDF && loadedImageHeight > 600)
-                {
-                    image.Height = 550; // make sure it will fit on one page
-                }
-                else
-                {
-                    image.Width = imageWidth; // can't be too wide now...not sure why...maybe due to margins...
                 }
+                await mImage.WriteAsync(outputPath);
+                filePath = Path.Combine("Converted", info.Name + ".jpg");
+                LogInfo(string.Format("Converted image to JPEG; fileName is now {0}", file.FilePath));
+            }
+            else if (!isPDF)
+            {
+                // load height/width
+                using var mImage = new MagickImage(info.FullName);
+                loadedImageWidth = mImage.Width;
+                loadedImageHeight = mImage.Height;
+            }
+            var paragraph = section.AddParagraph();
+            paragraph.Format.Alignment = ParagraphAlignment.Center;
+            var image = paragraph.AddImage(filePath);
+            image.LockAspectRatio = true;
+            if (!isPDF && loadedImageHeight > 600)
+            {
+                image.Height = 550; // make sure it will fit on one page
             }
             else
             {
-                // need to render PDF to images
+                image.Width = imageWidth; // can't be too wide now...not sure why...maybe due to margins...
-                if (_settings.UseDocnetPFDImageRendering)
-                {
-                    // render using Docnet library (which utilizes pdfium, the chrome renderer)
-                    string RenderPdfPageToImage(IDocReader docReader, int pgNum)
-                    {
-                        Console.WriteLine("Rendering pg " + pgNum);
-                        using var pageReader = docReader.GetPageReader(pgNum);
-                        Console.WriteLine("Getting image for page " + pgNum);
-                        var rawBytes = pageReader.GetImage(RenderFlags.RenderAnnotations);
-                        Console.WriteLine("Getting width & height for page " + pgNum);
-                        var width = pageReader.GetPageWidth();
-                        var height = pageReader.GetPageHeight();
-                        Console.WriteLine("Loading pixel data for page " + pgNum);
-                        using var img = Image.LoadPixelData<Bgra32>(rawBytes, width, height);
-                        // you are likely going to want this as well otherwise you might end up with transparent parts.
-                        img.Mutate(x => x.BackgroundColor(SixLabors.ImageSharp.Color.White));
-                        var pdfPageImageOutputPath = Path.Combine(convertedDir, info.Name + "-Page-" 
-                            + (pgNum + 1).ToString().PadLeft(3, '0') + ".jpg");
-                        img.Save(pdfPageImageOutputPath);
-                        Console.WriteLine("Done rendering pg " + pgNum);
-                        return pdfPageImageOutputPath;
-                    }
-                    // render all pages to images
-                    var docReader = DocLib.Instance.GetDocReader(
-                        filePath,
-                        new PageDimensions(1080, 1920)); // TODO: are these dims right?
-                    // add to document
-                    var pgCount = docReader.GetPageCount();
-                    if (pgCount > 0)
-                    {
-                        var convertedPdfImagePath = RenderPdfPageToImage(docReader, 0);
-                        imageTitlePar.AddText(string.Format(" (PDF with {0} page{1}) ", 
-                            pgCount, 
-                            pgCount == 1 ? "" : "s"));
-                        var paragraph = section.AddParagraph();
-                        paragraph.Format.Alignment = ParagraphAlignment.Center;
-                        var image = paragraph.AddImage(convertedPdfImagePath);
-                        image.Width = imageWidth;
-                        image.LockAspectRatio = true;
-                        for (var j = 1; j < pgCount; j++)
-                        {
-                            section.AddPageBreak();
-                            paragraph = section.AddParagraph();
-                            paragraph.Format.Alignment = ParagraphAlignment.Center;
-                            convertedPdfImagePath = RenderPdfPageToImage(docReader, j);
-                            image = paragraph.AddImage(convertedPdfImagePath);
-                            image.LockAspectRatio = true;
-                            image.Width = imageWidth;
-                        }
-                    }
-                }
-                else
-                {
-                    // render first page (eventually need to improve code to just do everything in a loop)
-                    var paragraph = section.AddParagraph();
-                    paragraph.Format.Alignment = ParagraphAlignment.Center;
-                    var image = paragraph.AddImage(filePath);
-                    image.LockAspectRatio = true;
-                    image.Width = imageWidth; // can't be too wide now...not sure why...maybe due to margins...
-                    // render other PDF pages, if any
-                    // see: https://stackoverflow.com/a/65091204/3938401
-                    var pdfFileToAdd = PdfReader.Open(filePath, PdfDocumentOpenMode.Import);
-                    var pgCount = pdfFileToAdd.PageCount;
-                    imageTitlePar.AddText(string.Format(" (PDF with {0} page{1}) ", 
-                        pgCount, 
-                        pgCount == 1 ? "" : "s"));
-                    for (var j = 2; j <= pgCount; j++)
-                    {
-                        section.AddPageBreak();
-                        paragraph = section.AddParagraph();
-                        paragraph.Format.Alignment = ParagraphAlignment.Center;
-                        image = paragraph.AddImage(filePath + "#" + j);
-                        image.LockAspectRatio = true;
-                        image.Width = imageWidth;
-                    }
-                }
             }
             LogInfo(string.Format("Added image: {0} ({1})", file.Title, filePath));
+            if (isPDF)
+            {
+                // add other PDF pages
+                // see: https://stackoverflow.com/a/65091204/3938401
+                var pdfFileToAdd = PdfReader.Open(filePath);
+                imageTitlePar.AddText(string.Format(" (PDF with {0} page{1}) ", 
+                    pdfFileToAdd.PageCount, 
+                    pdfFileToAdd.PageCount == 1 ? "" : "s"));
+                for (var j = 2; j <= pdfFileToAdd.PageCount; j++)
+                {
+                    section.AddPageBreak();
+                    paragraph = section.AddParagraph();
+                    paragraph.Format.Alignment = ParagraphAlignment.Center;
+                    image = paragraph.AddImage(filePath + "#" + j);
+                    image.LockAspectRatio = true;
+                    image.Width = imageWidth;
+                }
+            }
             hasAddedData = true;
         }
         var pdfRenderer = new PdfDocumentRenderer
@@ -826,43 +688,14 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
             Document = pdfDoc,
             WorkingDirectory = folderPath
         };
-        LogInfo("Rendering document to PDF file...");
+        LogInfo("Rendering document...");
         pdfRenderer.RenderDocument();
         string outputPDFFileName = Path.Join(folderPath, outputFileName);
-        LogInfo("Saving PDF document to disk...");
+        LogInfo("Saving document to disk...");
         pdfRenderer.PdfDocument.Save(outputPDFFileName);
-        LogInfo("Finished saving PDF output to: " + outputPDFFileName);
+        LogInfo("Saved PDF output to: " + outputPDFFileName);
         await CreateAndSaveReportObjectAfterReportCreation();
         OpenFolderForFileInFileViewer(outputPDFFileName);
         IsCreatingPDF = false;
     }
-
-    public async Task<bool> CheckIsSafeToShutdown()
-    {
-        if (!HasUnsavedWork || string.IsNullOrWhiteSpace(WorkingFolder))
-        {
-            return true;
-        }
-        else
-        {
-            var result = await DialogHost.Show(new ShutdownCheckViewModel());
-            if (result != null && result is ShutdownCheckOptions opt)
-            {
-                if (opt == ShutdownCheckOptions.SaveAndShutdown)
-                {
-                    await SaveInterimReportInfo();
-                    return true;
-                }
-                else if (opt == ShutdownCheckOptions.NoSaveShutdown)
-                {
-                    return true;
-                }
-                else if (opt == ShutdownCheckOptions.CancelShutdown)
-                {
-                    return false;
-                }
-            }
-        }
-        return false;
-    }
 }

src/ViewModels/SettingsViewModel.cs

@@ -1,58 +0,0 @@
-#nullable enable
-
-using System;
-using System.Collections.ObjectModel;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Avalonia.Platform.Storage;
-using Avalonia.Themes.Fluent;
-using DialogHostAvalonia;
-using ImageMagick;
-using MigraDoc.DocumentObjectModel;
-using MigraDoc.Rendering;
-using PdfSharp.Fonts;
-using PdfSharp.Pdf.IO;
-using PdfSharp.Snippets.Font;
-using MayShow.Interfaces;
-using MayShow.Models;
-using MayShow.Helpers;
-
-namespace MayShow.ViewModels;
-
-class SettingsViewModel: ChangeNotifier
-{
-    private Settings _previousSettings;
-    private Settings _settings;
-
-    public SettingsViewModel(Settings settingsToEdit)
-    {
-        _previousSettings = settingsToEdit;
-        _settings = new Settings
-        {
-            LastUsedPath = _previousSettings.LastUsedPath,
-            UseDocnetPFDImageRendering = _previousSettings.UseDocnetPFDImageRendering
-        };
-    }
-
-    public bool UseDocnetPDFImageRendering
-    {
-        get => _settings.UseDocnetPFDImageRendering;
-        set
-        {
-            _settings.UseDocnetPFDImageRendering = value;
-            NotifyPropertyChanged();
-        }
-    }
-
-    public void Cancel()
-    {
-        DialogHost.Close("DialogHost", null);
-    }
-
-    public void Save()
-    {
-        DialogHost.Close("DialogHost", _settings);
-    }
-}

src/ViewModels/ShutdownCheckViewModel.cs

@@ -1,29 +0,0 @@
-#nullable enable
-
-using DialogHostAvalonia;
-using MayShow.Models;
-
-namespace MayShow.ViewModels;
-
-class ShutdownCheckViewModel
-{
-
-    public ShutdownCheckViewModel()
-    {
-    }
-
-    public void SaveAndShutdown()
-    {
-        DialogHost.Close("DialogHost", ShutdownCheckOptions.SaveAndShutdown);
-    }
-
-    public void DoNotSaveAndShutdown()
-    {
-        DialogHost.Close("DialogHost", ShutdownCheckOptions.NoSaveShutdown);
-    }
-
-    public void CancelShutdown()
-    {
-        DialogHost.Close("DialogHost", ShutdownCheckOptions.CancelShutdown);
-    }
-}

src/Views/AboutView.axaml

@@ -7,8 +7,7 @@
              xmlns:models="clr-namespace:MayShow.Models"
              xmlns:vm="clr-namespace:MayShow.ViewModels"
              xmlns:dialogHost="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia"
-             x:DataType="vm:AboutViewModel"
+             x:DataType="vm:AboutViewModel">
-             MaxWidth="450">
     <StackPanel Orientation="Vertical"
                 Spacing="4">
         <TextBlock Text="MayShow"
@@ -17,12 +16,15 @@
                    FontSize="18"
                    FontWeight="Bold"/>
         <TextBlock Text="MayShow (an intentional misspelling of 明証, pronounced may-shō, a Japanese word meaning proof, evidence, or corroboration) is a PDF report creation tool. It was built by MB for A in 2026. May the quacking of ducks always be in your favor. Thanks for using our software!"
+                   MaxWidth="300"
                    TextWrapping="Wrap"
                    FontSize="14"/>
         <TextBlock Text="App icon made using https://gauger.me/fonticon/ with FontAwesome icon 'file-invoice-dollar' and the macOS software Icon Composer."
+                   MaxWidth="300"
                    TextWrapping="Wrap"
                    FontSize="14"/>
         <TextBlock Text="Copyright 2026 - Quickity Quack Productions"
+                   MaxWidth="300"
                    TextWrapping="Wrap"
                    HorizontalAlignment="Center"
                    Margin="0,4,0,4"

src/Views/ConfirmView.axaml

@@ -1,35 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="MayShow.Views.ConfirmView"
-             xmlns:models="clr-namespace:MayShow.Models"
-             xmlns:vm="clr-namespace:MayShow.ViewModels"
-             x:DataType="vm:ConfirmViewModel">
-    <StackPanel Orientation="Vertical"
-                Spacing="4">
-        <TextBlock TextAlignment="Center"
-                   FontWeight="Bold"
-                   FontSize="18"
-                   Text="{Binding Title}"/>
-        <TextBlock TextAlignment="Center"
-                   FontWeight="Bold"
-                   TextWrapping="Wrap"
-                   FontSize="14"
-                   MaxWidth="350"
-                   Text="{Binding Message}"/>
-        <StackPanel Orientation="Horizontal"
-                    Spacing="12"
-                    HorizontalAlignment="Right"
-                    Margin="4">
-            <Button Command="{Binding Decline}"
-                    Content="{Binding DeclineTitle}"
-                    HorizontalAlignment="Right"/>
-            <Button Command="{Binding Confirm}"
-                    Classes="accent"
-                    Content="{Binding ConfirmTitle}"
-                    HorizontalAlignment="Right"/>
-        </StackPanel>
-    </StackPanel>
-</UserControl>

src/Views/ConfirmView.axaml.cs

@@ -1,14 +0,0 @@
-using System;
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace MayShow.Views;
-
-public partial class ConfirmView : UserControl
-{
-    public ConfirmView()
-    {
-        this.InitializeComponent();
-    }
-}

src/Views/EditFile.axaml

@@ -9,8 +9,7 @@
              xmlns:models="clr-namespace:MayShow.Models"
              xmlns:vm="clr-namespace:MayShow.ViewModels"
              xmlns:dialogHost="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia"
-             x:DataType="vm:EditFileViewModel"
+             x:DataType="vm:EditFileViewModel">
-             MaxWidth="350">
     <ScrollViewer AllowAutoHide="False">
         <StackPanel Orientation="Vertical"
                     Spacing="4"
@@ -34,8 +33,7 @@
             <Label Content="Receipt Date" />
             <Calendar SelectionMode="SingleDate"
                         SelectedDate="{Binding ClonedFile.ReceiptDateTime}" 
-                        DisplayDate="{Binding ClonedFile.ReceiptDateTime}"
+                        DisplayDate="{Binding ClonedFile.ReceiptDateTime}" />
-                        IsTodayHighlighted="False" />
             <StackPanel Orientation="Horizontal"
                         Spacing="12"
                         Margin="0,4,0,0"

src/Views/MainView.axaml

@@ -12,23 +12,15 @@
              x:DataType="vm:MainViewModel">
   <Grid ColumnDefinitions="*"
         RowDefinitions="Auto, 2*, Auto, Auto, *">
-    <Button Command="{Binding ShowSettings}"
-            Grid.Row="0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            Margin="4,4,0,4">
-        <TextBlock><Run Text="&#xf013;" FontFamily="{StaticResource FontAwesomeSolid}"/> Settings</TextBlock>
-    </Button>
     <Button Command="{Binding ShowAbout}"
             Grid.Row="0"
             HorizontalAlignment="Right"
             VerticalAlignment="Top"
-            Margin="0,4,4,4">
+            Margin="0,2,4,0">
         <TextBlock><Run Text="&#xf059;" FontFamily="{StaticResource FontAwesomeSolid}"/> About</TextBlock>
     </Button>
     <StackPanel Orientation="Vertical"
-                Spacing="2"
+                Spacing="2">
-                Margin="0,4,0,0">
         <Label Content="MayShow: Report Builder"
                FontSize="20"
                FontWeight="Bold"
@@ -175,7 +167,7 @@
                                     Margin="2"
                                     IsEnabled="{Binding !$parent[DataGrid].((vm:MainViewModel)DataContext).IsCreatingPDF}">
                                 <Button.Content>
-                                    <TextBlock><Run Text="&#xf044;" FontFamily="{StaticResource FontAwesomeSolid}"/> Edit</TextBlock>
+                                    <TextBlock><Run Text="&#xf1f8;" FontFamily="{StaticResource FontAwesomeSolid}"/> Edit</TextBlock>
                                 </Button.Content>
                             </Button>
                             <Button Command="{Binding $parent[DataGrid].((vm:MainViewModel)DataContext).RemoveFile}"
@@ -231,31 +223,27 @@
         <StackPanel Orientation="Horizontal"
                     Spacing="4">
             <Button Command="{Binding AddItem}"
-                    IsEnabled="{Binding CanAddItem}">
+                    IsEnabled="{Binding !IsCreatingPDF}">
                 <TextBlock><Run Text="&#x002b;" FontFamily="{StaticResource FontAwesomeSolid}"/> Add Item(s)</TextBlock>
             </Button>
-            <Button Command="{Binding RemoveAllItems}"
-                    IsEnabled="{Binding IsCreatePDFButtonEnabled}"
-                    Classes="Danger">
-                <TextBlock><Run Text="&#xf1f8;" FontFamily="{StaticResource FontAwesomeSolid}"/> Remove All Items</TextBlock>
-            </Button>
-            <Button Command="{Binding ResortPDFItemsByDate}"
-                    IsEnabled="{Binding IsCreatePDFButtonEnabled}">
-                <TextBlock><Run Text="&#xf162;" FontFamily="{StaticResource FontAwesomeSolid}"/> Re-sort PDF Items</TextBlock>
-            </Button>
             <Button Command="{Binding SaveInterimReportInfo}"
                     IsEnabled="{Binding HasWorkingFolderAndNotMakingPDF}">
                 <TextBlock><Run Text="&#xf0c7;" FontFamily="{StaticResource FontAwesomeSolid}"/> Save Report Info</TextBlock>
             </Button>
+            <Button Command="{Binding ResortPDFItemsByDate}"
+                    IsEnabled="{Binding IsCreatePDFButtonEnabled}">
+                <TextBlock><Run Text="&#xf162;" FontFamily="{StaticResource FontAwesomeSolid}"/> Re-sort PDF Items</TextBlock>
+            </Button>
+            <Button Command="{Binding BuildPDF}"
+                    Classes="accent"
+                    IsEnabled="{Binding IsCreatePDFButtonEnabled}">
+                <TextBlock><Run Text="&#xf1c1;" FontFamily="{StaticResource FontAwesomeSolid}"/> Create Report PDF</TextBlock>
+            </Button>
         </StackPanel>
       <StackPanel Orientation="Horizontal"
+                  IsVisible="{Binding IsCreatingPDF}"
                   Spacing="6"
                   HorizontalAlignment="Center">
-        <Button Command="{Binding BuildPDF}"
-                Classes="accent"
-                IsEnabled="{Binding IsCreatePDFButtonEnabled}">
-            <TextBlock><Run Text="&#xf1c1;" FontFamily="{StaticResource FontAwesomeSolid}"/> Create Report PDF</TextBlock>
-        </Button>
         <Label Content="Creating PDF..."
                IsVisible="{Binding IsCreatingPDF}"
                VerticalAlignment="Center"/>

src/Views/MainView.axaml.cs

@@ -3,7 +3,6 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Markup.Xaml;
-using MayShow.ViewModels;
 
 namespace MayShow.Views
 {
@@ -13,7 +12,6 @@ namespace MayShow.Views
         {
             this.InitializeComponent();
             LogBlock.PropertyChanged += LogBlock_PropertyChanged;
-            FilesGrid.CellEditEnded += FileCellEditEnded;
         }
 
         private void LogBlock_PropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e)
@@ -28,18 +26,6 @@ namespace MayShow.Views
         {
             var topLevel = TopLevel.GetTopLevel(this);
             topLevel?.FocusManager?.ClearFocus();
-            if (DataContext is MainViewModel mvm)
-            {
-                mvm?.HasUnsavedWork = true;
-            }
-        }
-
-        private void FileCellEditEnded(object? sender, DataGridCellEditEndedEventArgs args)
-        {
-            if (args.EditAction == DataGridEditAction.Commit && DataContext is MainViewModel mvm)
-            {
-                mvm?.HasUnsavedWork = true;
-            }
         }
     }
 }

src/Views/SettingsView.axaml

@@ -1,40 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d"
-             d:DesignWidth="800"
-             d:DesignHeight="450"
-             x:Class="MayShow.Views.SettingsView"
-             xmlns:models="clr-namespace:MayShow.Models"
-             xmlns:vm="clr-namespace:MayShow.ViewModels"
-             x:DataType="vm:SettingsViewModel"
-             MaxWidth="350">
-    <ScrollViewer AllowAutoHide="False">
-        <StackPanel Orientation="Vertical"
-                    Spacing="4"
-                    Margin="12,4,12,0">
-            <Label Content="Settings"
-                    HorizontalAlignment="Center"
-                    FontSize="16"
-                    FontWeight="Bold" />
-            <CheckBox IsChecked="{Binding !UseDocnetPDFImageRendering}">Use legacy PDF handling (does not work with macOS annotations)</CheckBox>
-            <StackPanel Orientation="Horizontal"
-                        Spacing="12"
-                        Margin="0,4,0,0"
-                        HorizontalAlignment="Right">
-                <Button Command="{Binding Cancel}">
-                    <TextBlock>
-                        <Run Text="&#xf0e2;"
-                            FontFamily="{StaticResource FontAwesomeSolid}" /> Cancel</TextBlock>
-                </Button>
-                <Button Command="{Binding Save}"
-                        Classes="accent">
-                    <TextBlock>
-                        <Run Text="&#xf0c7;"
-                            FontFamily="{StaticResource FontAwesomeSolid}" /> Save</TextBlock>
-                </Button>
-            </StackPanel>
-        </StackPanel>
-    </ScrollViewer>
-</UserControl>

src/Views/SettingsView.axaml.cs

@@ -1,15 +0,0 @@
-using System;
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace MayShow.Views
-{
-    public partial class SettingsView : UserControl
-    {
-        public SettingsView()
-        {
-            this.InitializeComponent();
-        }
-    }
-}

src/Views/ShutdownCheckView.axaml

@@ -1,39 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="MayShow.Views.ShutdownCheckView"
-             xmlns:models="clr-namespace:MayShow.Models"
-             xmlns:vm="clr-namespace:MayShow.ViewModels"
-             xmlns:dialogHost="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia"
-             x:DataType="vm:ShutdownCheckViewModel">
-    <StackPanel Orientation="Vertical"
-                Spacing="4">
-        <TextBlock TextAlignment="Center"
-                   FontWeight="Bold"
-                   FontSize="18"
-                   Text="Warning: You have unsaved report data!"/>
-        <TextBlock TextAlignment="Center"
-                   FontWeight="Bold"
-                   TextWrapping="Wrap"
-                   FontSize="14"
-                   Text="Do you want to save your data before the program is closed?"/>
-        <StackPanel Orientation="Horizontal"
-                    Spacing="8">
-            <Button Command="{Binding SaveAndShutdown}"
-                    Classes="accent"
-                    Content="Save Data and Close"
-                    HorizontalAlignment="Right"
-                    Margin="0,4,0,4"/>
-            <Button Command="{Binding DoNotSaveAndShutdown}"
-                    Content="Do NOT Save Data and Close"
-                    HorizontalAlignment="Right"
-                    Margin="0,4,0,4"/>
-            <Button Command="{Binding CancelShutdown}"
-                    Content="Cancel Program Shutdown"
-                    HorizontalAlignment="Right"
-                    Margin="0,4,0,4"/>
-        </StackPanel>
-    </StackPanel>
-</UserControl>

src/Views/ShutdownCheckView.axaml.cs

@@ -1,14 +0,0 @@
-using System;
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace MayShow.Views;
-
-public partial class ShutdownCheckView : UserControl
-{
-    public ShutdownCheckView()
-    {
-        this.InitializeComponent();
-    }
-}

src/app.manifest

@@ -3,7 +3,7 @@
   <!-- This manifest is used on Windows only.
        Don't remove it as it might cause problems with window transparency and embedded controls.
        For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
-  <assemblyIdentity version="1.3.0.0" name="MayShow.Desktop"/>
+  <assemblyIdentity version="1.1.0.0" name="MayShow.Desktop"/>
 
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>