Use Avalonia 12 preview versions for DialogHost, progress ring

Attempt to build on Avalonia 12
Fails, likely due to dependencies relying on 11
2026-02-20 15:10:53 +09:00 · 2026-02-20 14:42:52 +09:00
41 changed files with 333 additions and 2198 deletions
@@ -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

@@ -3,7 +3,7 @@
 ; Non-commercial use only

 #define MyAppName "MayShow"
-#define MyAppVersion "1.4.1"
+#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-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\Magick.Native-Q16-x64.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

@@ -1,6 +1,5 @@
 #!/bin/bash

-VERSION="1.4.1"
 SRC_DIR="src" # user ran script from main folder
 if [ ! -d "$SRC_DIR" ]; then
    SRC_DIR= "../src" # try 
@@ -11,16 +10,7 @@ if [ ! -d "$SRC_DIR" ]; then
 fi
 cd "$SRC_DIR"
 echo "Building release for linux-x64..."
-dotnet clean -c Release
 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-x64.zip" .
-cd ../../../../../
-# -----
 echo "Building release for linux-arm64..."
-dotnet clean -c Release
 dotnet publish -c Release -r linux-arm64 -p:StripSymbols=False -p:PublishAot=False
-cd bin/Release/net10.0/linux-arm64/publish
-zip -r "../../../../MayShow $VERSION linux-arm64.zip" .
-cd ../../../../../
+# TODO: add automatic zipping and version number setting for ease of use
@@ -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>
@@ -131,7 +122,7 @@
    </Application.Resources>
    <NativeMenu.Menu>
        <NativeMenu>
-            <NativeMenuItem Header="About MayShow" Click="AboutOnClick" />
+            <NativeMenuItem Header="About ReceiptBuilder" Click="AboutOnClick" />
        </NativeMenu>
    </NativeMenu.Menu>
 </Application>
@@ -1,785 +0,0 @@
--Avalonia--
-
-The MIT License (MIT)
-
-Copyright (c) AvaloniaUI OÜ All Rights Reserved
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
--PDFsharp-MigraDoc--
-
-Copyright (c) 2001-2026 empira Software GmbH, Troisdorf (Cologne Area), Germany
-
-http://docs.pdfsharp.net
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
-DEALINGS IN THE SOFTWARE.
-
--ImageMagick--
-
-Terms and Conditions for Use, Reproduction, and Distribution
-
-The legally binding and authoritative terms and conditions for use, reproduction, and distribution of ImageMagick follow:
-
-Copyright © 1999 ImageMagick Studio LLC, a non-profit organization dedicated to making software imaging solutions freely available.
-
-1. Definitions.
-
-License shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
-
-Licensor shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
-
-Legal Entity shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, control means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-
-You (or Your) shall mean an individual or Legal Entity exercising permissions granted by this License.
-
-Source form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
-
-Object form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
-
-Work shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
-
-Derivative Works shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
-
-Contribution shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as Not a Contribution.
-
-Contributor shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
-
-    You must give any other recipients of the Work or Derivative Works a copy of this License; and
-    You must cause any modified files to carry prominent notices stating that You changed the files; and
-    You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
-    If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
-
-You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
-
--Magick.NET--
-
-  Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
--Deadpikle.AvaloniaProgressRing--
-
-MIT License
-
-Copyright (c) 2020 Deadpikle
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
--DialogHost.Avalonia--
-
-MIT License
-
-Copyright (c) 2021 SKProCH
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
--Xaml.Behaviors--
-
-The MIT License (MIT)
-
-Copyright (c) Wiesław Šoltés
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
--Docnet.Core--
-
-MIT License
-
-Copyright (c) 2018 Modestas Petravicius
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
--SixLabors.ImageSharp--
-
-(Note: MayShow is open source and thus is licensed to use SixLabors.ImageSharp under the Apache License, Version 2.0)
-
-Six Labors Split License
-Version 1.0, June 2022
-Copyright (c) Six Labors
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications, including but not limited to software source
-    code, documentation source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including
-    but not limited to compiled object code, generated documentation, and conversions to other media types.
-
-   "Work" (or "Works") shall mean any Six Labors software made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work.
-
-   "Direct Package Dependency" shall mean any Work in Source or Object form that is installed directly by You.
-
-   "Transitive Package Dependency" shall mean any Work in Object form that is installed indirectly by a third party
-    dependency unrelated to Six Labors.
-
-2. License
-
-   Works in Source or Object form are split licensed and may be licensed under the Apache License, Version 2.0 or a
-   Six Labors Commercial Use License.
-
-   Licenses are granted based upon You meeting the qualified criteria as stated. Once granted,
-   You must reference the granted license only in all documentation.
-
-   Works in Source or Object form are licensed to You under the Apache License, Version 2.0 if.
-
-   - You are consuming the Work in for use in software licensed under an Open Source or Source Available license.
-   - You are consuming the Work as a Transitive Package Dependency.
-   - You are consuming the Work as a Direct Package Dependency in the capacity of a For-profit company/individual with
-     less than 1M USD annual gross revenue.
-   - You are consuming the Work as a Direct Package Dependency in the capacity of a Non-profit organization
-     or Registered Charity.
-
-   For all other scenarios, Works in Source or Object form are licensed to You under the Six Labors Commercial License
-   which may be purchased by visiting https://sixlabors.com/pricing/.
-
--FontAwesome--
-
-Fonticons, Inc. (https://fontawesome.com)
-
--------------------------------------------------------------------------------
-
-Font Awesome Free License
-
-Font Awesome Free is free, open source, and GPL friendly. You can use it for
-commercial projects, open source projects, or really almost whatever you want.
-Full Font Awesome Free license: https://fontawesome.com/license/free.
-
--------------------------------------------------------------------------------
-
-# Icons: CC BY 4.0 License (https://creativecommons.org/licenses/by/4.0/)
-
-The Font Awesome Free download is licensed under a Creative Commons
-Attribution 4.0 International License and applies to all icons packaged
-as SVG and JS file types.
-
--------------------------------------------------------------------------------
-
-# Fonts: SIL OFL 1.1 License
-
-In the Font Awesome Free download, the SIL OFL license applies to all icons
-packaged as web and desktop font files.
-
-Copyright (c) 2026 Fonticons, Inc. (https://fontawesome.com)
-with Reserved Font Name: "Font Awesome".
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-SIL OPEN FONT LICENSE
-Version 1.1 - 26 February 2007
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting — in part or in whole — any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
-
--------------------------------------------------------------------------------
-
-# Code: MIT License (https://opensource.org/licenses/MIT)
-
-In the Font Awesome Free download, the MIT license applies to all non-font and
-non-icon files.
-
-Copyright 2026 Fonticons, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in the
-Software without restriction, including without limitation the rights to use, copy,
-modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
-and to permit persons to whom the Software is furnished to do so, subject to the
-following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
--------------------------------------------------------------------------------
-
-# Attribution
-
-Attribution is required by MIT, SIL OFL, and CC BY licenses. Downloaded Font
-Awesome Free files already contain embedded comments with sufficient
-attribution, so you shouldn't need to do anything additional when using these
-files normally.
-
-We've kept attribution comments terse, so we ask that you do not actively work
-to remove them from files, especially code. They're a great way for folks to
-learn about Font Awesome.
-
--------------------------------------------------------------------------------
-
-# Brand Icons
-
-All brand icons are trademarks of their respective owners. The use of these
-trademarks does not indicate endorsement of the trademark holder by Font
-Awesome, nor vice versa. **Please do not use brand logos for any purpose except
-to represent the company, product, or service to which they refer.**
-
--Noto Sans Font--
-Copyright 2022 The Noto Project Authors (https://github.com/notofonts/latin-greek-cyrillic)
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-https://openfontlicense.org
-
-
-----------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
-
--Noto Sans JP Font--
-
-Copyright 2014-2021 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-https://openfontlicense.org
-
-
-----------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-	   <AvaloniaVersion>11.3.12</AvaloniaVersion>
+	   <AvaloniaVersion>12.0.0-preview1</AvaloniaVersion>
   </PropertyGroup>
 </Project>
@@ -4,14 +4,16 @@ using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using System.Text;

-namespace MayShow.Helpers;
-
-// https://docs.microsoft.com/en-us/dotnet/api/system.componentmodel.inotifypropertychanged?view=netframework-4.7.2
-class ChangeNotifier : INotifyPropertyChanged
+namespace MayShow.Helpers
 {
-    public event PropertyChangedEventHandler? PropertyChanged;
-    protected void NotifyPropertyChanged([CallerMemberName] string propertyName = "")
+
+    // https://docs.microsoft.com/en-us/dotnet/api/system.componentmodel.inotifypropertychanged?view=netframework-4.7.2
+    class ChangeNotifier : INotifyPropertyChanged
    {
-        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        public event PropertyChangedEventHandler? PropertyChanged;
+        protected void NotifyPropertyChanged([CallerMemberName] string propertyName = "")
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
    }
 }
@@ -1,14 +1,11 @@

+using System;
+
 namespace MayShow.Helpers;

 class Constants
 {
-    public static string AppVersion = "1.4.1";
-
-    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 ReportSavedDataFileName = "report_data.json";
+    public static string AppVersion = "1.1.0";

    public static string[] GetQuotes()
    {
@@ -1,7 +1,6 @@

 using System;
 using System.Globalization;
-using System.IO;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Text.RegularExpressions;
@@ -36,17 +35,4 @@ class Utilities
        }
        return null;
    }
-
-    public static string GetInternalDataPath()
-    {
-        var path = Path.Combine(
-            Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
-            "MayShow"
-        );
-        if (!Directory.Exists(path))
-        {
-            Directory.CreateDirectory(path);
-        }
-        return path;
-    }
 }
@@ -1,8 +0,0 @@
-using System.Threading.Tasks;
-
-namespace MayShow.Interfaces;
-
-interface ICanCheckShutdown
-{
-    Task<bool> CheckIsSafeToShutdown();
-}
@@ -1,9 +1,10 @@
 using MayShow.ViewModels;

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

-namespace MayShow.Interfaces;
-
-interface ITopLevelGrabber
+namespace MayShow.Interfaces
 {
-    TopLevel GetTopLevel();
+    interface ITopLevelGrabber
+    {
+        TopLevel GetTopLevel();
+    }
 }
@@ -13,8 +13,7 @@
        Height="650"
        MinHeight="550">
    <dialogHost:DialogHost CloseOnClickAway="False" 
-                           Identifier="DialogHost"
-                           x:Name="WindowDialogHost">
+                           Identifier="DialogHost">
        <dialogHost:DialogHost.DialogContent>
            <StackPanel/>
        </dialogHost:DialogHost.DialogContent>
@@ -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()
@@ -12,17 +12,12 @@
    <PublishTrimmed>true</PublishTrimmed>
    <PublishAot>true</PublishAot>
    <AssemblyName>MayShow</AssemblyName>
-    <AssemblyVersion>1.4.1</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\**" />
@@ -40,12 +35,6 @@
    <Content Include="Assets\Fonts\Noto_Sans_JP\static\*.*">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
-    <Content Include="Assets\Fonts\FontAwesome\*.*">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\LICENSES.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
@@ -53,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)">
-      <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
-      <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="PDFsharp-MigraDoc" Version="6.2.4" />
-    <PackageReference Include="Magick.NET-Q8-AnyCPU" Version="14.10.4" />
-    <PackageReference Include="Deadpikle.AvaloniaProgressRing" Version="0.10.11-preview20251127001" />
-    <PackageReference Include="DialogHost.Avalonia" Version="0.10.4" />
+    <PackageReference Include="PDFsharp-MigraDoc" Version="6.2.3" />
+    <PackageReference Include="Magick.NET-Q16-AnyCPU" Version="14.10.2" />
+    <PackageReference Include="Deadpikle.AvaloniaProgressRing" Version="0.11.0-preview20260220" />
+    <PackageReference Include="DialogHost.Avalonia" Version="0.10.4-avalonia12" />
    <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>
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using System.Text.Json;
@@ -13,36 +12,10 @@ namespace MayShow.Models;
 class Settings : ChangeNotifier
 {
    private string _lastUsedPath;
-    private bool _useDocnetPDFImageRendering;
-    private bool _saveOutputPdfInWorkingDir;
-    private string _outputPdfDir;
-    private decimal _imageResizeThreshold;
-    private bool _saveReportJsonDataInInternalDir;
-    private Dictionary<string, string> _workingFolderToInternalFolderName;
-    public int _settingsVersion;

    public Settings()
    {
        _lastUsedPath = "";
-        _useDocnetPDFImageRendering = true;
-        _saveOutputPdfInWorkingDir = true;
-        _outputPdfDir = "";
-        _imageResizeThreshold = 1.5m;
-        _saveReportJsonDataInInternalDir = false;
-        _workingFolderToInternalFolderName = [];
-        _settingsVersion = 1;
-    }
-
-    public Settings(Settings other)
-    {
-        _lastUsedPath = other.LastUsedPath;
-        _useDocnetPDFImageRendering = other.UseDocnetPDFImageRendering;
-        _saveOutputPdfInWorkingDir = other.SaveOutputPdfInWorkingDir;
-        _outputPdfDir = other.OutputPdfDir;
-        _imageResizeThreshold = other.ImageResizeThreshold;
-        _saveReportJsonDataInInternalDir = other.SaveReportJsonDataInInternalDir;
-        _workingFolderToInternalFolderName = other.WorkingFolderToInternalFolderName;
-        _settingsVersion = other.SettingsVersion;
    }

    [JsonInclude]
@@ -52,75 +25,22 @@ class Settings : ChangeNotifier
        set { _lastUsedPath = value; NotifyPropertyChanged(); }
    }

-    [JsonInclude]
-    [JsonPropertyName("UseDocnetPFDImageRendering")] // ...this typo now has to live because people have this saved on disk...
-    public bool UseDocnetPDFImageRendering
+    public static string GetSettingsFileName()
    {
-        get => _useDocnetPDFImageRendering;
-        set { _useDocnetPDFImageRendering = value; NotifyPropertyChanged(); }
+        return "settings.json";
    }

-    [JsonInclude]
-    public bool SaveOutputPdfInWorkingDir
-    {
-        get => _saveOutputPdfInWorkingDir;
-        set { _saveOutputPdfInWorkingDir = value; NotifyPropertyChanged(); }
-    }
-
-    [JsonInclude]
-    public string OutputPdfDir
-    {
-        get => _outputPdfDir;
-        set { _outputPdfDir = value; NotifyPropertyChanged(); }
-    }
-
-    [JsonInclude]
-    public decimal ImageResizeThreshold
-    {
-        get => _imageResizeThreshold;
-        set { _imageResizeThreshold = value; NotifyPropertyChanged(); }
-    }
-
-    [JsonInclude]
-    public bool SaveReportJsonDataInInternalDir
-    {
-        get => _saveReportJsonDataInInternalDir;
-        set { _saveReportJsonDataInInternalDir = value; NotifyPropertyChanged(); }
-    }
-
-    [JsonInclude]
-    public Dictionary<string, string> WorkingFolderToInternalFolderName
-    {
-        get => _workingFolderToInternalFolderName;
-        set { _workingFolderToInternalFolderName = value; NotifyPropertyChanged(); }
-    }
-
-    [JsonInclude]
-    public int SettingsVersion
-    {
-        get => _settingsVersion;
-        set { _settingsVersion = value; NotifyPropertyChanged(); }
-    }
-
-    public static string SettingsFileName = "settings.json";
-
    public static string GetSettingsPath()
    {
-        var path = Utilities.GetInternalDataPath();
-        return Path.Combine(path, SettingsFileName);
-    }
-
-
-    public string SaveSettingsNotAsync()
-    {
-        var jsonContext = new SourceGenerationContext(Utilities.GetSerializerOptions());
-        using MemoryStream memoryStream = new MemoryStream();
-        JsonSerializer.Serialize(memoryStream, this, jsonContext.Settings);
-        memoryStream.Position = 0;
-        using var reader = new StreamReader(memoryStream);
-        var json = reader.ReadToEnd();
-        File.WriteAllText(GetSettingsPath(), json);
-        return json;
+        var path = Path.Combine(
+            Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+            "ReceiptPDFBuilder" // legacy name for existing settings prior to app name change
+        );
+        if (!Directory.Exists(path))
+        {
+            Directory.CreateDirectory(path);
+        }
+        return Path.Combine(path, GetSettingsFileName());
    }

    public async Task<string> SaveSettingsAsync()
@@ -1,8 +0,0 @@
-namespace MayShow.Models;
-
-enum ShutdownCheckOptions
-{
-    SaveAndShutdown,
-    NoSaveShutdown,
-    CancelShutdown,
-}
@@ -5,42 +5,43 @@ using System;
 using System.Collections.Generic;
 using System.Text;

-namespace MayShow.ViewModels;
-
-class BaseViewModel : ChangeNotifier
+namespace MayShow.ViewModels
 {
-    IChangeViewModel _viewModelChanger;
-    ITopLevelGrabber? _topLevelGrabber;
-
-    public BaseViewModel(IChangeViewModel viewModelChanger)
+    class BaseViewModel : ChangeNotifier
    {
-        _viewModelChanger = viewModelChanger;
-        _topLevelGrabber = null;
+        IChangeViewModel _viewModelChanger;
+        ITopLevelGrabber? _topLevelGrabber;
+
+        public BaseViewModel(IChangeViewModel viewModelChanger)
+        {
+            _viewModelChanger = viewModelChanger;
+            _topLevelGrabber = null;
+        }
+
+        public ITopLevelGrabber? TopLevelGrabber
+        {
+            get => _topLevelGrabber;
+            set { _topLevelGrabber = value; }
+        }
+
+        public IChangeViewModel ViewModelChanger
+        {
+            get { return _viewModelChanger; }
+            set { _viewModelChanger = value; }
+        }
+
+        #region IChangeViewModel
+
+        public void PopViewModel()
+        {
+            _viewModelChanger?.PopViewModel();
+        }
+
+        public void PushViewModel(BaseViewModel model)
+        {
+            _viewModelChanger?.PushViewModel(model);
+        }
+
+        #endregion
    }
-
-    public ITopLevelGrabber? TopLevelGrabber
-    {
-        get => _topLevelGrabber;
-        set { _topLevelGrabber = value; }
-    }
-
-    public IChangeViewModel ViewModelChanger
-    {
-        get { return _viewModelChanger; }
-        set { _viewModelChanger = value; }
-    }
-
-    #region IChangeViewModel
-
-    public void PopViewModel()
-    {
-        _viewModelChanger?.PopViewModel();
-    }
-
-    public void PushViewModel(BaseViewModel model)
-    {
-        _viewModelChanger?.PushViewModel(model);
-    }
-
-    #endregion
 }
@@ -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);
-    }
-}
@@ -21,23 +21,13 @@ 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;
-using MigraDoc.DocumentObjectModel.Visitors;
-
 namespace MayShow.ViewModels;

-class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
+class MainViewModel : BaseViewModel, IFontResolver
 {
-    private bool _isPerformingInitialLoad;
    private string _processDir;
    private bool _isCreatingPDF;
-    private string _programLog;
+    private string _createPDFLog;
    private string _workingFolder;

    private string _reportTitle;
@@ -46,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("Internal storage directory is: {0}", Utilities.GetInternalDataPath());
+        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);
-        _programLog = "----- MayShow v" + Constants.AppVersion + " ------" + Environment.NewLine;
-        _programLog += quotes[quoteIndex] + Environment.NewLine;
-        _programLog += "---------------------------------------" + Environment.NewLine;
-        _programLog += "Loaded and ready to create report!" + Environment.NewLine;
-        _programLog += "Please copy and send this Program Log when reporting any issues with the software.";
+        _createPDFLog = "----- MayShow v" + Constants.AppVersion + "------" + Environment.NewLine;
+        _createPDFLog += quotes[quoteIndex] + Environment.NewLine;
+        _createPDFLog += "---------------------------------------" + Environment.NewLine;
+        _createPDFLog += "Ready to create PDF!";
        _workingFolder = "";
-        ReportFiles = _reportFiles = new ObservableCollection<ReportFile>();
+        _reportFiles = new ObservableCollection<ReportFile>();
+        _reportFiles.CollectionChanged += ( sender, e ) => { NotifyPropertyChanged(nameof(IsCreatePDFButtonEnabled)); };
        _reportTitle = "";
        _lastGeneratedTime = null;
        _settings = Settings.LoadSettings();
@@ -72,34 +59,17 @@ 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 
-        { 
-            _reportTitle = value;
-            NotifyPropertyChanged(); 
-            NotifyPropertyChanged(nameof(IsTitleBoxVisible)); 
-            NotifyPropertyChanged(nameof(CanAddItem)); 
-        }
+        set { _reportTitle = value; NotifyPropertyChanged(); NotifyPropertyChanged(nameof(IsTitleBoxVisible)); }
    }

    public bool IsTitleBoxVisible
    {
-        get => !string.IsNullOrWhiteSpace(WorkingFolder);
-    }
-
-    public bool CanAddItem
-    {
-        get => IsTitleBoxVisible && !IsCreatingPDF;
+        get => !string.IsNullOrWhiteSpace(_workingFolder);
    }

    public bool IsCreatingPDF
@@ -111,7 +81,6 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
            NotifyPropertyChanged();
            NotifyPropertyChanged(nameof(IsCreatePDFButtonEnabled)); 
            NotifyPropertyChanged(nameof(HasWorkingFolderAndNotMakingPDF));
-            NotifyPropertyChanged(nameof(CanAddItem)); 
        }
    }

@@ -122,12 +91,12 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown

    public bool HasWorkingFolder
    {
-        get => !string.IsNullOrWhiteSpace(WorkingFolder) && Directory.Exists(WorkingFolder);
+        get => !string.IsNullOrWhiteSpace(_workingFolder) && Directory.Exists(_workingFolder);
    }

    public bool HasWorkingFolderAndNotMakingPDF
    {
-        get => !string.IsNullOrWhiteSpace(WorkingFolder) && Directory.Exists(WorkingFolder) && !_isCreatingPDF;
+        get => !string.IsNullOrWhiteSpace(_workingFolder) && Directory.Exists(_workingFolder) && !_isCreatingPDF;
    }

    public string WorkingFolder
@@ -142,20 +111,10 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
        }
    }

-    public string ProgramLog
+    public string CreatePDFLog
    {
-        get => _programLog;
-        set { _programLog = value; NotifyPropertyChanged(); }
-    }
-
-    public bool HasUnsavedWork
-    {
-        get => _hasUnsavedWork;
-        set
-        {
-            _hasUnsavedWork = value;
-            NotifyPropertyChanged();
-        }
+        get => _createPDFLog;
+        set { _createPDFLog = value; NotifyPropertyChanged(); }
    }

    public ObservableCollection<ReportFile> ReportFiles
@@ -168,7 +127,6 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
            _reportFiles.CollectionChanged += ( sender, e ) => 
            { 
                NotifyPropertyChanged(nameof(IsCreatePDFButtonEnabled)); 
-                HasUnsavedWork = true;
            };
        }
    }
@@ -177,7 +135,7 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
    {
        var timestamp = string.Format("[{0:s}]", DateTime.Now);
        Console.WriteLine(timestamp + " " + message, arguments);
-        ProgramLog += Environment.NewLine + string.Format(message, arguments ?? []);
+        CreatePDFLog += Environment.NewLine + string.Format(message, arguments ?? []);
    }

    public async void ChooseFolder()
@@ -199,54 +157,17 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
                _settings.LastUsedPath = folder.Path.LocalPath;
                await _settings.SaveSettingsAsync();
                ResortPDFItemsByDate();
-                HasUnsavedWork = true;
            }
        }
    }

-    private string GetReportSavedDataPath(string folderPath)
-    {
-        if (_settings.SaveReportJsonDataInInternalDir)
-        {
-            var internalPath = Utilities.GetInternalDataPath();
-            if (!_settings.WorkingFolderToInternalFolderName.ContainsKey(folderPath))
-            {
-                var uuid = "";
-                var potentialPath = "";
-                var isDone = false;
-                // make sure uuid not already used...just in case...because paranoia...
-                do
-                {
-                    uuid = Guid.NewGuid().ToString();
-                    potentialPath = Path.Combine(internalPath, uuid);
-                    isDone = !Directory.Exists(potentialPath);
-                } while (!isDone);
-                // make internal dir -- using dir so we have option to copy data into dir later if needed
-                // (if we ever implement a more robust report system where we keep all files)
-                Directory.CreateDirectory(potentialPath);
-                _settings.WorkingFolderToInternalFolderName[folderPath] = uuid;
-                _settings.SaveSettingsNotAsync(); // save new key/value pair
-            }
-            return Path.Combine(
-                internalPath, 
-                _settings.WorkingFolderToInternalFolderName[folderPath], 
-                Constants.ReportSavedDataFileName
-            );
-        }
-        else
-        {
-            return Path.Combine(folderPath, Constants.ReportSavedDataFileName);
-        }
-    }
-
    private void ScanFolder(string path)
    {
        if (Directory.Exists(path))
        {
            WorkingFolder = path;
            NotifyPropertyChanged(nameof(IsTitleBoxVisible));
-            NotifyPropertyChanged(nameof(CanAddItem));
-            var reportFilePath = GetReportSavedDataPath(path);
+            var reportFilePath = Path.Combine(path, GetReportSavedDataFileName());
            var successfullyLoadedPriorReport = false;
            if (File.Exists(reportFilePath))
            {
@@ -256,7 +177,6 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
                var report = JsonSerializer.Deserialize<PDFReport>(json, jsonContext.PDFReport);
                if (report != null && report.Files.Count > 0)
                {
-                    Console.WriteLine("Loading prior report data at {0}", reportFilePath);
                    ReportFiles = new ObservableCollection<ReportFile>(report.Files);
                    ReportTitle = report.Title;
                    WorkingFolder = report.BaseFolder;
@@ -270,13 +190,12 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
                // Scan folder for files and display in DataGrid
                ReportFiles.Clear();
                ReportTitle = "";
-                var filePaths = Directory.GetFiles(WorkingFolder);
+                var filePaths = Directory.GetFiles(_workingFolder);
                foreach (var filePath in filePaths)
                {
                    AddFileBasedOnPath(filePath);
                }
                ResortPDFItemsByDate();
-                HasUnsavedWork = true;
            }
        }
        else
@@ -291,17 +210,6 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
        DialogHost.Show(new AboutViewModel());
    }

-    public async Task ShowSettings()
-    {
-        var updatedSettings = await DialogHost.Show(new SettingsViewModel(_settings, TopLevelGrabber));
-        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)
@@ -313,7 +221,6 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
            if (idx != -1)
            {
                ReportFiles.RemoveAt(idx);
-                HasUnsavedWork = true;
            }
        }
    }
@@ -329,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();
@@ -345,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" ]
                    },
@@ -375,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)
            {
@@ -387,10 +304,7 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
            }
            if (!didMatch)
            {
-                if (!filePath.EndsWith(Constants.ReportSavedDataFileName))
-                {
-                    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
            {
@@ -402,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)
    {
@@ -431,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" ]
                    },
@@ -449,7 +351,6 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
            {
                var file = files[0];
                reportFile.FilePath = file.Path.LocalPath;
-                HasUnsavedWork = true;
            }
        }
    }
@@ -488,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()
@@ -501,7 +401,7 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
        {
            try
            {
-                await Task.Run(() => CreatePDF(WorkingFolder));
+                await Task.Run(() => CreatePDF(_workingFolder));
            } catch (Exception e)
            {
                LogInfo("PDF process failed! Reason: " + e.Message);
@@ -523,13 +423,13 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
        }
    }

-    public async Task SaveInterimReportInfo()
+    public async void SaveInterimReportInfo()
    {
        var report = new PDFReport()
        {
            Title = ReportTitle,
            Files = ReportFiles.ToList(),
-            BaseFolder = WorkingFolder,
+            BaseFolder = _workingFolder,
            LastSaved = DateTime.Now,
            LastGenerated = _lastGeneratedTime,
        };
@@ -544,10 +444,9 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
        memoryStream.Position = 0;
        using var reader = new StreamReader(memoryStream);
        var json = await reader.ReadToEndAsync();
-        var savePath = GetReportSavedDataPath(WorkingFolder);
+        var savePath = Path.Combine(_workingFolder, GetReportSavedDataFileName());
        await File.WriteAllTextAsync(savePath, json);
        LogInfo("Saved report information to {0}", savePath);
-        HasUnsavedWork = false;
    }

    private async Task CreateAndSaveReportObjectAfterReportCreation()
@@ -556,7 +455,7 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
        {
            Title = ReportTitle,
            Files = ReportFiles.ToList(),
-            BaseFolder = WorkingFolder,
+            BaseFolder = _workingFolder,
            LastSaved = DateTime.Now,
            LastGenerated = DateTime.Now,
        };
@@ -564,37 +463,14 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
        await SavePDFReportDataToDisk(report);
    }

-    public async Task CopyLogToClipboard()
+    private string GetReportSavedDataFileName()
    {
-        var clipboard = TopLevelGrabber?.GetTopLevel().Clipboard;
-        if (clipboard != null)
-        {
-            await clipboard.SetTextAsync(ProgramLog);
-            LogInfo("Program log has been copied to the clipboard!");
-        }
+        return "report_data.json";
    }

    public byte[]? GetFont(string faceName)
    {
        LogInfo(string.Format("Loading font {0}", faceName));
-        if (faceName == "Noto Sans")
-        {
-            var path = Path.Combine(_processDir, "Assets/Fonts/Noto_Sans/static/NotoSans-Regular.ttf");
-            if (!File.Exists(path))
-            {
-                path = Path.Combine(_processDir, "../Resources/Assets/Fonts/Noto_Sans/static/NotoSans-Regular.ttf");
-            }
-            return File.ReadAllBytes(path);
-        }
-        if (faceName == "Noto Sans Bold")
-        {
-            var path = Path.Combine(_processDir, "Assets/Fonts/Noto_Sans/static/NotoSans-Bold.ttf");
-            if (!File.Exists(path))
-            {
-                path = Path.Combine(_processDir, "../Resources/Assets/Fonts/Noto_Sans/static/NotoSans-Bold.ttf");
-            }
-            return File.ReadAllBytes(path);
-        }
        if (faceName == "Noto Sans JP")
        {
            var path = Path.Combine(_processDir, "Assets/Fonts/Noto_Sans_JP/static/NotoSansJP-Regular.ttf");
@@ -619,14 +495,6 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
    public FontResolverInfo? ResolveTypeface(string familyName, bool bold, bool italic)
    {
        // LogInfo(string.Format("Resolving font name {0}", familyName));
-        if (familyName == "Noto Sans")
-        {
-            if (bold)
-            {
-                return new FontResolverInfo(familyName + " Bold");
-            }
-            return new FontResolverInfo(familyName);
-        }
        if (familyName == "Noto Sans JP")
        {
            if (bold)
@@ -638,74 +506,16 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
        return null;
    }

-    private Paragraph GetFooterParagraph()
-    {
-        var footerPar = new Paragraph();
-        footerPar.Format.Alignment = ParagraphAlignment.Center;
-        footerPar.Format.Font.Size = 10;
-        footerPar.AddText("--Page ");
-        footerPar.AddPageField();
-        footerPar.AddText(" of ");
-        footerPar.AddNumPagesField();
-        footerPar.AddText("--");
-        footerPar.AddLineBreak();
-        footerPar.AddText("Report generated on " + DateTime.Now.ToString("f"));
-        footerPar.Tag = "FooterPar";
-        footerPar.Format.Font.Name = "Noto Sans";
-        return footerPar;
-    }
-
-    private decimal GetExistingPageItemHeight(PdfDocumentRenderer pdfRenderer, decimal footerParagraphHeight)
-    {
-        pdfRenderer.DocumentRenderer.PrepareDocument();
-        var currPageCount = pdfRenderer.DocumentRenderer.FormattedDocument?.PageCount;
-        var heightForExistingItemsOnPage = footerParagraphHeight;
-        if (currPageCount.HasValue)
-        {
-            var renderInfo = pdfRenderer.DocumentRenderer.GetRenderInfoFromPage(currPageCount.Value);
-            if (renderInfo != null)
-            {
-                // Console.WriteLine("Got render info for page: {0}", currPageCount);
-                foreach (var item in renderInfo)
-                {
-                    heightForExistingItemsOnPage += (decimal)item.LayoutInfo.ContentArea.Height.Inch;
-                }
-            }
-        }
-        return heightForExistingItemsOnPage;
-    }
-
    // https://forum.pdfsharp.net/viewtopic.php?f=2&t=1025
    private async Task CreatePDF(string folderPath)
    {
        // TODO: calculate needed width for images based on page width and margins and all that?
-        // safety checks
-        var outputDir = _settings.SaveOutputPdfInWorkingDir ? folderPath : _settings.OutputPdfDir;
-        if (!Directory.Exists(outputDir))
-        {
-            await DialogHost.Show(new WarningViewModel("Output directory not found! Please adjust your application Settings before continuing. Output directory: " + outputDir));
-            return;
-        }
-        // setup globals and consts...
-        GlobalFontSettings.FontResolver = this;
-        GlobalFontSettings.FallbackFontResolver = new FailsafeFontResolver();
-        const decimal pageWidth = 8.5m;
-        const decimal pageHeight = 11.0m;
-        const decimal margin = 0.5m;
-        const int imageResolution = 72;
-        const int imageInsertMarginPixels = 30; // we calculate max available; use max - this # for max image size
-        var maxItemPxWidth = ((pageWidth - (2 * margin)) * imageResolution) - imageInsertMarginPixels;
-        // start making PDF!
+        // TODO: resize (non-HEIC) images for smaller size...?
        IsCreatingPDF = true;
        var pdfDoc = new Document();
        var outputFileName = ReportTitle + ".pdf";
        var folderName = new DirectoryInfo(folderPath).Name;
-        const int maxImageWidth = 425;
-        var imageLineFormat = new MigraDoc.DocumentObjectModel.Shapes.LineFormat()
-        {
-            Color = Colors.Black,
-            Width = Unit.FromPoint(2),
-        };;
+        const int imageWidth = 425;
        if (folderName.Contains('-'))
        {
            // see if year/month format
@@ -720,63 +530,36 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
                LogInfo("Auto-changed output file name to " + outputFileName);
            }
        }
-        // setup initial section (for page characteristics)
        var section = pdfDoc.AddSection();
        section.PageSetup.PageFormat = PageFormat.Letter;
-        section.PageSetup.PageWidth = pageWidth + "in";
-        section.PageSetup.PageHeight = pageHeight + "in";
-        section.PageSetup.TopMargin = margin + "in";
-        section.PageSetup.RightMargin = margin + "in";
-        section.PageSetup.BottomMargin = margin + "in";
-        section.PageSetup.LeftMargin = margin + "in";
+        section.PageSetup.PageWidth = "8.5in";
+        section.PageSetup.PageHeight = "11in";
+        section.PageSetup.TopMargin = "0.5in";
+        section.PageSetup.RightMargin = "0.5in";
+        section.PageSetup.BottomMargin = "0.5in";
+        section.PageSetup.LeftMargin = "0.5in";
        // setup footer for page number
-        var footerPar = GetFooterParagraph();
+        var footerPar = new Paragraph();
+        footerPar.Format.Alignment = ParagraphAlignment.Center;
+        footerPar.Format.Font.Size = 10;
+        footerPar.AddText("--Page ");
+        footerPar.AddPageField();
+        footerPar.AddText(" of ");
+        footerPar.AddNumPagesField();
+        footerPar.AddText("--");
+        footerPar.AddLineBreak();
+        footerPar.AddText("Report generated on " + DateTime.Now.ToString("f"));
        section.Footers.Primary.Add(footerPar);
-        // create a quick PDF doc renderer to measure footer paragraph height
-        var footerParagraphHeight = 0.4m; // estimate
-        var footerOnlyPdfDoc = new Document();
-        var sectionClone = section.Clone();
-        footerOnlyPdfDoc.Add(sectionClone);
-        sectionClone.Add(GetFooterParagraph());
-        var footerPdfRenderer = new PdfDocumentRenderer
-        {
-            Document = footerOnlyPdfDoc
-        };
-        footerPdfRenderer.DocumentRenderer.PrepareDocument();
-        var footerRenderInfo = footerPdfRenderer.DocumentRenderer.GetRenderInfoFromPage(1);
-        if (footerRenderInfo != null)
-        {
-            foreach (var item in footerRenderInfo)
-            {
-                if (item.DocumentObject.Tag?.ToString() == "FooterPar")
-                {
-                    Console.WriteLine("Got footer paragraph height!");
-                    footerParagraphHeight = (decimal)item.LayoutInfo.ContentArea.Height.Inch;
-                    break;
-                }
-            }
-        }
-        // continue setting up document
-        // First page only: add report title
+        // add report title
        var reportTitlePar = section.AddParagraph();
        reportTitlePar.Format.Alignment = ParagraphAlignment.Center;
        reportTitlePar.Format.Font.Size = 16;
        reportTitlePar.Format.Font.Bold = true;
        reportTitlePar.Format.Font.Name = "Noto Sans JP"; // has english letters in it, too
        reportTitlePar.AddText(ReportTitle);
-        reportTitlePar.Tag = "TitlePar";
-        // get converted files directory path and create it if necessary
-        var convertedDir = Path.Combine(Utilities.GetInternalDataPath(), "converted");
-        if (!Directory.Exists(convertedDir))
-        {
-            Directory.CreateDirectory(convertedDir);
-        }
        //
-        var pdfRenderer = new PdfDocumentRenderer
-        {
-            Document = pdfDoc,
-            WorkingDirectory = folderPath
-        };
+        GlobalFontSettings.FontResolver = this;
+        GlobalFontSettings.FallbackFontResolver = new FailsafeFontResolver();
        var hasAddedData = false;
        for (var i = 0; i < ReportFiles.Count; i++)
        {
@@ -802,15 +585,20 @@ 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);
-            imageTitlePar.Tag = "ReceiptTitlePar";
+            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;
            receiptDatePar.Format.Font.Bold = true;
            receiptDatePar.Format.Font.Name = "Noto Sans JP"; // has english letters in it, too
            receiptDatePar.AddText(file.ReceiptDate.ToString("yyyy-MM-dd"));
-            receiptDatePar.Tag = "ReceiptDatePar";
            if (!string.IsNullOrWhiteSpace(file.Notes))
            {
                var imageNotesPar = section.AddParagraph();
@@ -819,10 +607,8 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
                imageNotesPar.Format.Font.Bold = false;
                imageNotesPar.Format.Font.Name = "Noto Sans JP";
                imageNotesPar.AddText(file.Notes);
-                imageNotesPar.Tag = "ReceiptNotesPar";
            }
-            var emptyPar = section.AddParagraph(); // add empty line for spacing
-            emptyPar.Tag = "EmptyParagraph";
+            section.AddParagraph(); // add empty line for spacing
            // now add the image
            var lowerName = fileName.ToLower();
            var isPDF = lowerName.EndsWith(".pdf");
@@ -834,234 +620,82 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
            var info = new FileInfo(file.FilePath);
            uint loadedImageWidth = 0;
            uint loadedImageHeight = 0;
-            // get max pixel height remaining for items on this page
-            // (For multi-page PDFs, showing page 2 and on will have more height since they have no title, 
-            // but to keep things consistent we will use the same height for all PDF pages.)
-            // render up to now on this page and get height remaining in inches
-            var currPageCount = pdfRenderer.DocumentRenderer.FormattedDocument?.PageCount;
-            var heightForExistingItemsOnPage = GetExistingPageItemHeight(pdfRenderer, footerParagraphHeight);
-            var remainingHeightInches = pageHeight - (2 * margin) - heightForExistingItemsOnPage;
-            var remainingHeightPixels = (remainingHeightInches * imageResolution) - imageInsertMarginPixels;
-            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");
-                var didAdjust = false;
-                LogInfo("Image orientation of {0} is {1}", fileName, mImage.Orientation);
-                if (mImage.Orientation != OrientationType.TopLeft)
+                mImage.Quality = 80;
+                if (mImage.Width >= 400 || mImage.Height >= 400)
                {
-                    LogInfo("Auto-adjusted image orientation of {0}", fileName);
-                    mImage.AutoOrient();
-                    didAdjust = true;
+                    loadedImageWidth = (uint)Math.Floor(mImage.Width * 0.5);
+                    loadedImageHeight = (uint)Math.Floor(mImage.Height * 0.5);
+                    mImage.Scale(loadedImageWidth, loadedImageHeight);
                }
-                // perform needed image manipulations
-                if (isHEIC || isWebp || isPNG || (!isPDF && info.Length > _settings.ImageResizeThreshold * 1024 * 1024))
-                {
-                    // 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.Resolution = imageResolution; // dots per inch
-                image.Tag = "ReceiptImageTag";
-                paragraph.Tag = "ReceiptImageParagraphTag";
-                image.LineFormat = imageLineFormat.Clone();
-                // resize down until it will fit on the page
-                while (loadedImageHeight > remainingHeightPixels || loadedImageWidth > maxItemPxWidth)
-                {
-                    // Console.WriteLine("Image height = {0}, width = {1}; decreasing size by 5% to h={2}, w={3}", loadedImageHeight, loadedImageWidth, (uint)Math.Floor(loadedImageHeight * 0.95), (uint)Math.Floor(loadedImageWidth * 0.95));
-                    // keep reducing size by 5% (little by little) until it fits on the page
-                    // ...might skew ever so slightly but should not be noticable...
-                    loadedImageHeight = (uint)Math.Floor(loadedImageHeight * 0.95);
-                    loadedImageWidth = (uint)Math.Floor(loadedImageWidth * 0.95);
-                }
-                image.Height = loadedImageHeight;
-                image.Width = loadedImageWidth;
+                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 // isPDF
+            else if (!isPDF)
            {
-                // need to render PDF to images
-                if (_settings.UseDocnetPDFImageRendering)
-                {
-                    // 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;
-                        // get image height/width off of disk so we can resize down if needed
-                        var image = paragraph.AddImage(convertedPdfImagePath);
-                        image.LockAspectRatio = true;
-                        image.LineFormat = imageLineFormat.Clone();
-                        using (var firstPdfPageImage = new MagickImage(convertedPdfImagePath))
-                        {
-                            var pdfPageImageWidth = firstPdfPageImage.Width;
-                            var pdfPageImageHeight = firstPdfPageImage.Height;
-                            // resize down until it will fit on the page
-                            while (pdfPageImageHeight > remainingHeightPixels || pdfPageImageWidth > maxItemPxWidth)
-                            {
-                                pdfPageImageHeight = (uint)Math.Floor(pdfPageImageHeight * 0.95);
-                                pdfPageImageWidth = (uint)Math.Floor(pdfPageImageWidth * 0.95);
-                            }
-                            image.Height = pdfPageImageHeight;
-                            image.Width = pdfPageImageWidth;
-                        }
-                        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 = maxImageWidth;
-                            image.LineFormat = imageLineFormat.Clone();
-                            using (var otherPdfPageImage = new MagickImage(convertedPdfImagePath))
-                            {
-                                var pdfPageImageWidth = otherPdfPageImage.Width;
-                                var pdfPageImageHeight = otherPdfPageImage.Height;
-                                // resize down until it will fit on the page
-                                while (pdfPageImageHeight > remainingHeightPixels || pdfPageImageWidth > maxItemPxWidth)
-                                {
-                                    pdfPageImageHeight = (uint)Math.Floor(pdfPageImageHeight * 0.95);
-                                    pdfPageImageWidth = (uint)Math.Floor(pdfPageImageWidth * 0.95);
-                                }
-                                image.Height = pdfPageImageHeight;
-                                image.Width = pdfPageImageWidth;
-                            }
-                        }
-                    }
-                }
-                else
-                {
-                    // use older, not-docnet rendering method.
-                    // uses MigraDoc rendering. Does not work with annotations, and since Migradoc
-                    // doesn't let us know how big the image is, we can't do the image resizing, so
-                    // we just do our best.
-                    // 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 = maxImageWidth; // can't be too wide now...not sure why...maybe due to margins...
-                    image.LineFormat = imageLineFormat.Clone();
-                    // 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 = maxImageWidth;
-                        image.LineFormat = imageLineFormat.Clone();
-                    }
-                }
+                // 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
+            {
+                image.Width = imageWidth; // can't be too wide now...not sure why...maybe due to margins...
            }
            LogInfo(string.Format("Added image: {0} ({1})", file.Title, filePath));
-            hasAddedData = true;
-        }
-        LogInfo("Rendering document to PDF file...");
-        pdfRenderer.DocumentRenderer.PrepareDocument(); // needed if you make edits after first PrepareDocument() is called
-        pdfRenderer.RenderDocument();
-        // actually save to disk now
-        string outputPDFFilePath = Path.Join(outputDir, outputFileName);
-        LogInfo("Saving PDF document to disk...");
-        pdfRenderer.PdfDocument.Save(outputPDFFilePath);
-        LogInfo("Finished saving PDF output to: " + outputPDFFilePath);
-        await CreateAndSaveReportObjectAfterReportCreation();
-        // clean up data dir
-        Directory.Delete(convertedDir, true);
-        // show output folder to user
-        OpenFolderForFileInFileViewer(outputPDFFilePath);
-        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 (isPDF)
            {
-                if (opt == ShutdownCheckOptions.SaveAndShutdown)
+                // 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++)
                {
-                    await SaveInterimReportInfo();
-                    return true;
-                }
-                else if (opt == ShutdownCheckOptions.NoSaveShutdown)
-                {
-                    return true;
-                }
-                else if (opt == ShutdownCheckOptions.CancelShutdown)
-                {
-                    return false;
+                    section.AddPageBreak();
+                    paragraph = section.AddParagraph();
+                    paragraph.Format.Alignment = ParagraphAlignment.Center;
+                    image = paragraph.AddImage(filePath + "#" + j);
+                    image.LockAspectRatio = true;
+                    image.Width = imageWidth;
                }
            }
+            hasAddedData = true;
        }
-        return false;
+        var pdfRenderer = new PdfDocumentRenderer
+        {
+            Document = pdfDoc,
+            WorkingDirectory = folderPath
+        };
+        LogInfo("Rendering document...");
+        pdfRenderer.RenderDocument();
+        string outputPDFFileName = Path.Join(folderPath, outputFileName);
+        LogInfo("Saving document to disk...");
+        pdfRenderer.PdfDocument.Save(outputPDFFileName);
+        LogInfo("Saved PDF output to: " + outputPDFFileName);
+        await CreateAndSaveReportObjectAfterReportCreation();
+        OpenFolderForFileInFileViewer(outputPDFFileName);
+        IsCreatingPDF = false;
    }
 }
@@ -4,46 +4,47 @@ using System;
 using System.Collections.Generic;
 using System.Text;

-namespace MayShow.ViewModels;
-
-class MainWindowViewModel : ChangeNotifier, IChangeViewModel
+namespace MayShow.ViewModels
 {
-    BaseViewModel _currentViewModel;
-    Stack<BaseViewModel> _viewModels;
-
-    public MainWindowViewModel(ITopLevelGrabber topLevelGrabber)
+    class MainWindowViewModel : ChangeNotifier, IChangeViewModel
    {
-        _viewModels = new Stack<BaseViewModel>();
-        var initialViewModel = new MainViewModel(this)
+        BaseViewModel _currentViewModel;
+        Stack<BaseViewModel> _viewModels;
+
+        public MainWindowViewModel(ITopLevelGrabber topLevelGrabber)
        {
-            TopLevelGrabber = topLevelGrabber
-        };
-        _viewModels.Push(initialViewModel);
-        _currentViewModel = initialViewModel;
-    }
-
-    public BaseViewModel CurrentViewModel
-    {
-        get { return _currentViewModel; }
-        set { _currentViewModel = value; NotifyPropertyChanged(); }
-    }
-
-    #region IChangeViewModel
-
-    public void PushViewModel(BaseViewModel model)
-    {
-        _viewModels.Push(model);
-        CurrentViewModel = model;
-    }
-
-    public void PopViewModel()
-    {
-        if (_viewModels.Count > 1)
-        {
-            _viewModels.Pop();
-            CurrentViewModel = _viewModels.Peek();
+            _viewModels = new Stack<BaseViewModel>();
+            var initialViewModel = new MainViewModel(this)
+            {
+                TopLevelGrabber = topLevelGrabber
+            };
+            _viewModels.Push(initialViewModel);
+            _currentViewModel = initialViewModel;
        }
-    }

-    #endregion
+        public BaseViewModel CurrentViewModel
+        {
+            get { return _currentViewModel; }
+            set { _currentViewModel = value; NotifyPropertyChanged(); }
+        }
+
+        #region IChangeViewModel
+
+        public void PushViewModel(BaseViewModel model)
+        {
+            _viewModels.Push(model);
+            CurrentViewModel = model;
+        }
+
+        public void PopViewModel()
+        {
+            if (_viewModels.Count > 1)
+            {
+                _viewModels.Pop();
+                CurrentViewModel = _viewModels.Peek();
+            }
+        }
+
+        #endregion
+    }
 }
@@ -1,146 +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;
-    private string _errorMessage;
-    private ITopLevelGrabber? _topLevelGrabber;
-
-    public SettingsViewModel(Settings settingsToEdit, ITopLevelGrabber? topLevelGrabber)
-    {
-        _previousSettings = settingsToEdit;
-        _settings = new Settings(settingsToEdit); // clone it
-        _errorMessage = "";
-        _topLevelGrabber = topLevelGrabber;
-    }
-
-    public bool UseDocnetPDFImageRendering
-    {
-        get => _settings.UseDocnetPDFImageRendering;
-        set
-        {
-            _settings.UseDocnetPDFImageRendering = value;
-            NotifyPropertyChanged();
-        }
-    }
-
-    public bool SaveOutputPdfInWorkingDir
-    {
-        get => _settings.SaveOutputPdfInWorkingDir;
-        set
-        {
-            _settings.SaveOutputPdfInWorkingDir = value;
-            NotifyPropertyChanged();
-        }
-    }
-
-    public string OutputPdfDirPath
-    {
-        get => _settings.OutputPdfDir;
-        set
-        {
-            _settings.OutputPdfDir = value;
-            NotifyPropertyChanged();
-            NotifyPropertyChanged(nameof(IsOutputPdfDirValid));
-        }
-    }
-
-    public bool IsOutputPdfDirValid
-    {
-        get => SaveOutputPdfInWorkingDir || (!SaveOutputPdfInWorkingDir && Directory.Exists(OutputPdfDirPath));
-    }
-
-    public bool HasErrorMessage
-    {
-        get => !string.IsNullOrWhiteSpace(_errorMessage);
-    }
-
-    public string ErrorMessage
-    {
-        get => _errorMessage;
-        set
-        {
-            _errorMessage = value;
-            NotifyPropertyChanged();
-            NotifyPropertyChanged(nameof(HasErrorMessage));
-        }
-    }
-
-    public decimal ImageResizeThreshold
-    {
-        get => _settings.ImageResizeThreshold;
-        set
-        {
-            _settings.ImageResizeThreshold = value;
-            NotifyPropertyChanged();
-        }
-    }
-
-    public bool SaveReportJsonDataInInternalDir
-    {
-        get => _settings.SaveReportJsonDataInInternalDir;
-        set
-        {
-            _settings.SaveReportJsonDataInInternalDir = value;
-            NotifyPropertyChanged();
-        }
-    }
-
-    public async void ChooseOutputFolder()
-    {
-        var topLevel = _topLevelGrabber?.GetTopLevel();
-        if (topLevel != null)
-        {
-            var folders = await topLevel.StorageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions()
-            {
-                Title = "Choose where to save your report file...",
-                AllowMultiple = false,
-            });
-            if (folders.Count == 1)
-            {
-                var folder = folders[0];
-                OutputPdfDirPath = folder.Path.LocalPath;
-            }
-        }
-    }
-
-    public void Cancel()
-    {
-        DialogHost.Close("DialogHost", null);
-    }
-
-    public void Save()
-    {
-        if (!IsOutputPdfDirValid)
-        {
-            ErrorMessage = "Output directory cannot be found!";
-        }
-        else
-        {
-            ErrorMessage = "";
-            DialogHost.Close("DialogHost", _settings);
-        }
-    }
-}
@@ -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);
-    }
-}
@@ -2,29 +2,30 @@
 using MayShow.Helpers;
 using MayShow.Models;

-namespace MayShow.ViewModels;
-
-class WarningDeleteItemViewModel : ChangeNotifier
+namespace MayShow.ViewModels
 {
-    ReportFile _file;
-
-    public WarningDeleteItemViewModel(ReportFile file)
+    class WarningDeleteItemViewModel : ChangeNotifier
    {
-        _file = file;
-    }
+        ReportFile _file;

-    public ReportFile File
-    {
-        get => _file;
-    }
+        public WarningDeleteItemViewModel(ReportFile file)
+        {
+            _file = file;
+        }

-    public void KeepItem()
-    {
-        DialogHost.Close("DialogHost", false);
-    }
+        public ReportFile File
+        {
+            get => _file;
+        }

-    public void RemoveItem()
-    {
-        DialogHost.Close("DialogHost", true);
+        public void KeepItem()
+        {
+            DialogHost.Close("DialogHost", false);
+        }
+
+        public void RemoveItem()
+        {
+            DialogHost.Close("DialogHost", true);
+        }
    }
 }
@@ -7,34 +7,24 @@
             xmlns:models="clr-namespace:MayShow.Models"
             xmlns:vm="clr-namespace:MayShow.ViewModels"
             xmlns:dialogHost="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia"
-             x:DataType="vm:AboutViewModel"
-             MaxWidth="450">
+             x:DataType="vm:AboutViewModel">
    <StackPanel Orientation="Vertical"
                Spacing="4">
-        <TextBlock Text="MayShow 1.4.1"
+        <TextBlock Text="MayShow"
                   HorizontalAlignment="Center"
                   TextWrapping="Wrap"
                   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"/>
-        <Label Content="Open Source Licenses:"/>
-        <ScrollViewer Margin="2"
-                      Grid.Row="4"
-                      x:Name="LogScrollView"
-                      VerticalScrollBarVisibility="Visible"
-                      AllowAutoHide="False"
-                      MaxHeight="250">
-            <SelectableTextBlock Margin="2"
-                                 TextWrapping="Wrap"
-                                 FontSize="10"
-                                 x:Name="LicenseTextBlock"/>
-        </ScrollViewer>
        <TextBlock Text="Copyright 2026 - Quickity Quack Productions"
+                   MaxWidth="300"
                   TextWrapping="Wrap"
                   HorizontalAlignment="Center"
                   Margin="0,4,0,4"
@@ -1,38 +1,15 @@
 using System;
-using System.Diagnostics;
-using System.IO;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;

-namespace MayShow.Views;
-
-public partial class AboutView : UserControl
+namespace MayShow.Views
 {
-    public AboutView()
+    public partial class AboutView : UserControl
    {
-        this.InitializeComponent();
-
-        // set license text
-        var processDir = Path.GetDirectoryName(Environment.ProcessPath) ?? "";
-        var licenseFileName = Path.Combine(processDir, "Assets", "LICENSES.txt");
-        var licenseText = "";
-        if (File.Exists(licenseFileName))
+        public AboutView()
        {
-            licenseText = File.ReadAllText(licenseFileName);
+            this.InitializeComponent();
        }
-        else
-        {
-            licenseFileName = Path.Combine(processDir, "../Resources/Assets/LICENSES.txt");
-            if (File.Exists(licenseFileName))
-            {
-                licenseText = File.ReadAllText(licenseFileName);
-            }
-            else
-            {
-                licenseText = "Error: Unable to find license file!";
-            }
-        }
-        LicenseTextBlock.Text = licenseText.Trim();
    }
 }
@@ -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>
@@ -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();
-    }
-}
@@ -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"
-             MaxWidth="350">
+             x:DataType="vm:EditFileViewModel">
    <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}"
-                        IsTodayHighlighted="False" />
+                        DisplayDate="{Binding ClonedFile.ReceiptDateTime}" />
            <StackPanel Orientation="Horizontal"
                        Spacing="12"
                        Margin="0,4,0,0"
@@ -3,12 +3,13 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;

-namespace MayShow.Views;
-
-public partial class EditFile : UserControl
+namespace MayShow.Views
 {
-    public EditFile()
+    public partial class EditFile : UserControl
    {
-        this.InitializeComponent();
+        public EditFile()
+        {
+            this.InitializeComponent();
+        }
    }
 }
@@ -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"
-                Margin="0,4,0,0">
+                Spacing="2">
        <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"/>
@@ -270,23 +258,14 @@
                Spacing="2"
                Grid.Row="3">
        <Rectangle Fill="Gray" Height="3" HorizontalAlignment="Stretch"/>
-        <Grid ColumnDefinitions="Auto, *">
-            <Label Content="Program Log" FontSize="14" FontWeight="Bold" Grid.Column="0"/>
-            <Button Command="{Binding CopyLogToClipboard}"
-                    FontSize="10"
-                    Grid.Column="1"
-                    HorizontalAlignment="Right"
-                    Margin="0,2,8,2">
-                <TextBlock><Run Text="&#xf0c5;" FontFamily="{StaticResource FontAwesomeSolid}"/> Copy Program Log to Clipboard</TextBlock>
-            </Button>
-        </Grid>
+        <Label Content="Program Log" FontSize="14" FontWeight="Bold"/>
    </StackPanel>
    <ScrollViewer Margin="2"
                  Grid.Row="4"
                  x:Name="LogScrollView"
                  VerticalScrollBarVisibility="Visible"
                  AllowAutoHide="False">
-        <SelectableTextBlock Text="{Binding ProgramLog}"
+        <SelectableTextBlock Text="{Binding CreatePDFLog}"
                            Margin="2"
                            TextWrapping="Wrap"
                            x:Name="LogBlock"/>
@@ -3,42 +3,29 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Markup.Xaml;
-using MayShow.ViewModels;

-namespace MayShow.Views;
-
-public partial class MainView : UserControl
+namespace MayShow.Views
 {
-    public MainView()
+    public partial class MainView : UserControl
    {
-        this.InitializeComponent();
-        LogBlock.PropertyChanged += LogBlock_PropertyChanged;
-        FilesGrid.CellEditEnded += FileCellEditEnded;
-    }
-
-    private void LogBlock_PropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e)
-    {
-        if (e.Property.ToString() == "Text")
+        public MainView()
        {
-            LogScrollView.ScrollToEnd();
+            this.InitializeComponent();
+            LogBlock.PropertyChanged += LogBlock_PropertyChanged;
        }
-    }

-    public void UnfocusTextbox()
-    {
-        var topLevel = TopLevel.GetTopLevel(this);
-        topLevel?.FocusManager?.ClearFocus();
-        if (DataContext is MainViewModel mvm)
+        private void LogBlock_PropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e)
        {
-            mvm?.HasUnsavedWork = true;
+            if (e.Property.ToString() == "Text")
+            {
+                LogScrollView.ScrollToEnd();
+            }
        }
-    }

-    private void FileCellEditEnded(object? sender, DataGridCellEditEndedEventArgs args)
-    {
-        if (args.EditAction == DataGridEditAction.Commit && DataContext is MainViewModel mvm)
+        public void UnfocusTextbox()
        {
-            mvm?.HasUnsavedWork = true;
+            var topLevel = TopLevel.GetTopLevel(this);
+            topLevel?.FocusManager?.ClearFocus();
        }
    }
 }
@@ -1,72 +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="450">
-    <ScrollViewer AllowAutoHide="False">
-        <StackPanel Orientation="Vertical"
-                    Spacing="8"
-                    Margin="12,4,12,4">
-            <Label Content="Settings"
-                    HorizontalAlignment="Center"
-                    FontSize="16"
-                    FontWeight="Bold" />
-            <TextBlock TextWrapping="Wrap"
-                       HorizontalAlignment="Left"
-                       Width="350">
-                Always reduce size of images if above this file size in megabytes (MB):
-            </TextBlock>
-            <NumericUpDown Value="{Binding ImageResizeThreshold}"
-                           Increment="0.1"
-                           Minimum="0.5"
-                           FormatString="0.00"
-                           Maximum="10"
-                           Width="150"
-                           HorizontalAlignment="Left"
-                           Margin="0,0,0,4" />
-            <CheckBox IsChecked="{Binding !UseDocnetPDFImageRendering}">Use legacy PDF handling (does not work with macOS annotations)</CheckBox>
-            <CheckBox IsChecked="{Binding SaveOutputPdfInWorkingDir}">Always save report PDF in working directory</CheckBox>
-            <Grid ColumnDefinitions="Auto, *"
-                IsVisible="{Binding !SaveOutputPdfInWorkingDir}">
-                <Button Content="Choose report output folder..."
-                        Grid.Column="0"
-                        Command="{Binding ChooseOutputFolder}"
-                        VerticalAlignment="Top"/>
-                <TextBlock Text="{Binding OutputPdfDirPath}"
-                           Margin="4,0,0,0"
-                           TextWrapping="Wrap"
-                           Grid.Column="1"
-                           HorizontalAlignment="Left"
-                           VerticalAlignment="Top"/>
-            </Grid>
-            <CheckBox IsChecked="{Binding SaveReportJsonDataInInternalDir}">Save report data (names, notes, etc.) in MayShow settings directory (saves in working directory by default)</CheckBox>
-            <TextBlock TextWrapping="Wrap"
-                       Foreground="Red"
-                       Text="{Binding ErrorMessage}"
-                       IsVisible="{Binding HasErrorMessage}"/>
-            <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>
@@ -1,14 +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();
-    }
-}
@@ -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>
@@ -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();
-    }
-}
@@ -3,12 +3,13 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;

-namespace MayShow.Views;
-
-public partial class WarningDeleteItem : UserControl
+namespace MayShow.Views
 {
-    public WarningDeleteItem()
+    public partial class WarningDeleteItem : UserControl
    {
-        this.InitializeComponent();
+        public WarningDeleteItem()
+        {
+            this.InitializeComponent();
+        }
    }
 }
@@ -18,7 +18,7 @@
                   FontWeight="Bold"
                   TextWrapping="Wrap"
                   FontSize="14"
-                   MaxWidth="400"
+                   MaxWidth="350"
                   Text="{Binding Error}"/>
        <Button Command="{Binding Close}"
                Classes="accent"
@@ -3,12 +3,13 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;

-namespace MayShow.Views;
-
-public partial class WarningView : UserControl
+namespace MayShow.Views
 {
-    public WarningView()
+    public partial class WarningView : UserControl
    {
-        this.InitializeComponent();
+        public WarningView()
+        {
+            this.InitializeComponent();
+        }
    }
 }
@@ -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.4.1.0" name="MayShow.Desktop"/>
+  <assemblyIdentity version="1.1.0.0" name="MayShow.Desktop"/>

  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
    <application>
Author	SHA1	Message	Date
mbabienco	5b87eb7d87	Use Avalonia 12 preview versions for DialogHost, progress ring	2026-02-20 15:10:53 +09:00
mbabienco	f3dd4bec82	Attempt to build on Avalonia 12 Fails, likely due to dependencies relying on 11	2026-02-20 14:42:52 +09:00