installers/WindowsInstallerScript.iss

@@ -3,7 +3,7 @@
 ; Non-commercial use only
 
 #define MyAppName "MayShow"
-#define MyAppVersion "1.4.2"
+#define MyAppVersion "1.4.3"
 #define MyAppPublisher "Quickity Quack Productions"
 #define MyAppExeName "MayShow.exe"
 

installers/build-linux.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION="1.4.2"
+VERSION="1.4.3"
 SRC_DIR="src" # user ran script from main folder
 if [ ! -d "$SRC_DIR" ]; then
     SRC_DIR= "../src" # try 

src/Directory.Build.props

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

src/MayShow.Desktop/app.manifest

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

src/MayShow.Shared/Helpers/Constants.cs

@@ -1,15 +1,34 @@
 
+using System.Collections.Generic;
+using MayShow.Models;
+
 namespace MayShow.Helpers;
 
 class Constants
 {
-    public static string AppVersion = "1.4.2";
+    public static string AppVersion = "1.4.3";
 
     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 List<DateDisplayFormat> GetDateDisplayFormats()
+    {
+        return [
+            new DateDisplayFormat("Month/Day/Year", "4/5/2026", "M/d/yyyy"),
+            new DateDisplayFormat("Year-Month-Day", "2026-04-05", "yyyy-MM-dd"),
+            new DateDisplayFormat("Month Day, Year", "April 5, 2026", "MMMM d, yyyy"),
+            new DateDisplayFormat("DOW, Month Day, Year", "Sunday, April 5, 2026", "dddd, MMMM d, yyyy"),
+            new DateDisplayFormat("Abbreviated-Month Day, Year", "Apr 5, 2026", "MMM d, yyyy"),
+            new DateDisplayFormat("DOW, Abbreviated-Month Day, Year", "Sunday, Apr 5, 2026", "dddd, MMM d, yyyy"),
+            new DateDisplayFormat("Day Month, Year", "5 April 2026", "d MMMM yyyy"),
+            new DateDisplayFormat("Day Abbreviated-Month, Year", "5 Apr 2026", "d MMM yyyy"),
+            new DateDisplayFormat("Day Month, Year", "05 April 2026", "dd MMMM yyyy"),
+            new DateDisplayFormat("Day Abbreviated-Month, Year", "05 Apr 2026", "dd MMM yyyy"),
+        ];
+    }
+
     public static string[] GetQuotes()
     {
         // sources:

src/MayShow.Shared/Helpers/DateFormatConverter.cs

@@ -0,0 +1,35 @@
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using Avalonia.Data.Converters;
+
+namespace MayShow.Helpers;
+
+public class DateFormatConverter : IMultiValueConverter
+{
+    public object? Convert(
+        IList<object?> values,
+        Type targetType,
+        object? parameter,
+        CultureInfo culture)
+    {
+        if (values.Count >= 2 && values[0] is DateOnly date && values[1] is string format)
+        {
+            return date.ToString(format);
+        }
+        if (values.Count >= 2 && values[0] is string dateFormat && values[1] is DateOnly dateOnly)
+        {
+            return dateOnly.ToString(dateFormat);
+        }
+        if (values.Count >= 2 && values[0] is DateTime dateTime && values[1] is string format3)
+        {
+            return dateTime.ToString(format3);
+        }
+        if (values.Count >= 2 && values[0] is string format4 && values[1] is DateTime dateTime2)
+        {
+            return dateTime2.ToString(format4);
+        }
+        return "";
+    }
+}

src/MayShow.Shared/Helpers/ListExtensions.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 
-namespace MayShows.Helpers;
+namespace MayShow.Helpers;
 
 public static class ThreadSafeRandom
 {

src/MayShow.Shared/Helpers/Utilities.cs

@@ -9,7 +9,7 @@ using System.Text.RegularExpressions;
 using MayShow.Models;
 using Tmds.DBus.Protocol;
 
-namespace MayShows.Helpers;
+namespace MayShow.Helpers;
 
 class Utilities
 {

src/MayShow.Shared/MayShow.Shared.csproj

@@ -6,10 +6,8 @@
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
     <AssemblyName>MayShow</AssemblyName>
-    <AssemblyVersion>1.4.2</AssemblyVersion> <!-- Also update Constants version -->
+    <AssemblyVersion>1.4.3</AssemblyVersion> <!-- Also update Constants version -->
-  </PropertyGroup>
+    <ApplicationIcon>MayShow-icon.ico</ApplicationIcon>
-  <PropertyGroup>
-    <MSBuildDisableGetCopyToPublishDirectoryItemsOptimization>true</MSBuildDisableGetCopyToPublishDirectoryItemsOptimization>
   </PropertyGroup>
   <ItemGroup>
     <TrimmerRootAssembly Include="MigraDoc.DocumentObjectModel" />
@@ -60,7 +58,9 @@
       <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
     </PackageReference>
     <PackageReference Include="PDFsharp-MigraDoc" Version="6.2.4" />
-    <PackageReference Include="Magick.NET-Q8-AnyCPU" Version="14.11.1" />
+    <PackageReference Include="Magick.NET-Q8-AnyCPU" Version="14.11.1" Condition="'$(RuntimeIdentifier)' != 'osx-x64'" />
+    <!-- DO NOT UPDATE BEYOND 14.9.1 OR YOU WILL BREAK macOS MONTEREY USERS -->
+    <PackageReference Include="Magick.NET-Q8-x64" Version="14.9.1" Condition="'$(RuntimeIdentifier)' == 'osx-x64'" />
     <PackageReference Include="Deadpikle.AvaloniaProgressRing" Version="0.10.11-preview20251127001" />
     <PackageReference Include="DialogHost.Avalonia" Version="0.10.4" />
     <PackageReference Include="Xaml.Behaviors.Interactions.DragAndDrop.DataGrid" Version="11.3.9.5" />

src/MayShow.Shared/Models/DateDisplayFormat.cs

@@ -0,0 +1,35 @@
+using MayShow.Helpers;
+
+namespace MayShow.Models;
+
+class DateDisplayFormat : ChangeNotifier
+{
+    private string _title;
+    private string _example;
+    private string _value;
+
+    public DateDisplayFormat(string title, string example, string value)
+    {
+        _title = title;
+        _example = example;
+        _value = value;
+    }
+
+    public string Title
+    {
+        get => _title;
+        set { _title = value; NotifyPropertyChanged(); }
+    }
+
+    public string Example
+    {
+        get => _example;
+        set { _example = value; NotifyPropertyChanged(); }
+    }
+
+    public string Value
+    {
+        get => _value;
+        set { _value = value; NotifyPropertyChanged(); }
+    }
+}

src/MayShow.Shared/Models/ReportFile.cs

@@ -23,7 +23,7 @@ class ReportFile : ChangeNotifier
     public ReportFile(ReportFile other)
     {
         Title = _title = other.Title;
-        ReceiptDateTime = _receiptDateTime = other.ReceiptDateTime;
+        ReceiptDateTime = _receiptDateTime = other.ReceiptDateTime ?? DateTime.Now;
         Notes = _notes = other.Notes;
         FilePath = _filePath = other.FilePath;
     }
@@ -34,12 +34,12 @@ class ReportFile : ChangeNotifier
         set { _title = value; NotifyPropertyChanged(); }
     }
 
-    public DateTime ReceiptDateTime
+    public DateTime? ReceiptDateTime
     {
         get => _receiptDateTime;
         set 
         {
-            _receiptDateTime = value; 
+            _receiptDateTime = value ?? DateTime.Now; 
             NotifyPropertyChanged(); 
             NotifyPropertyChanged(nameof(ReceiptDate));
         }

src/MayShow.Shared/Models/Settings.cs

@@ -7,7 +7,6 @@ using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 using MayShow.Helpers;
-using MayShows.Helpers;
 
 namespace MayShow.Models;
 
@@ -21,6 +20,8 @@ class Settings : ChangeNotifier
     private bool _saveReportJsonDataInInternalDir;
     private Dictionary<string, string> _workingFolderToInternalFolderName; // obsolete
     private List<PDFReportInfo> _allReportInfo;
+    public string _dataGridDateFormat;
+    public string _reportDateFormat;
     public int _settingsVersion;
 
     public Settings() : base()
@@ -34,6 +35,8 @@ class Settings : ChangeNotifier
         _workingFolderToInternalFolderName = [];
         _allReportInfo = [];
         _settingsVersion = 2;
+        _dataGridDateFormat = "dd/MM/yyyy";
+        _reportDateFormat = "yyyy-MM-dd";
     }
 
     public Settings(Settings other)
@@ -47,6 +50,8 @@ class Settings : ChangeNotifier
         _workingFolderToInternalFolderName = other.WorkingFolderToInternalFolderName;
         _settingsVersion = other.SettingsVersion;
         _allReportInfo = other.AllReportInfo;
+        _dataGridDateFormat = other.DataGridDateFormat;
+        _reportDateFormat = other.ReportDateFormat;
     }
 
     [JsonInclude]
@@ -113,6 +118,20 @@ class Settings : ChangeNotifier
         set { _settingsVersion = value; NotifyPropertyChanged(); }
     }
 
+    [JsonInclude]
+    public string DataGridDateFormat
+    {
+        get => _dataGridDateFormat;
+        set { _dataGridDateFormat = value; NotifyPropertyChanged(); }
+    }
+
+    [JsonInclude]
+    public string ReportDateFormat
+    {
+        get => _reportDateFormat;
+        set { _reportDateFormat = value; NotifyPropertyChanged(); }
+    }
+
     public static string SettingsFileName = "settings.json";
 
     public static string GetSettingsPath()

src/MayShow.Shared/ViewModels/SettingsViewModel.cs

@@ -18,7 +18,7 @@ using PdfSharp.Snippets.Font;
 using MayShow.Interfaces;
 using MayShow.Models;
 using MayShow.Helpers;
-using MayShows.Helpers;
+using System.Collections.Generic;
 
 namespace MayShow.ViewModels;
 
@@ -28,6 +28,9 @@ class SettingsViewModel: ChangeNotifier
     private Settings _settings;
     private string _errorMessage;
     private ITopLevelGrabber? _topLevelGrabber;
+    private List<DateDisplayFormat> _dateFormats;
+    private int _gridDisplayDateFormatSelectedIndex;
+    private int _reportDisplayDateFormatSelectedIndex;
 
     public SettingsViewModel(Settings settingsToEdit, ITopLevelGrabber? topLevelGrabber): base()
     {
@@ -35,6 +38,17 @@ class SettingsViewModel: ChangeNotifier
         _settings = new Settings(settingsToEdit); // clone it
         _errorMessage = "";
         _topLevelGrabber = topLevelGrabber;
+        _dateFormats = Constants.GetDateDisplayFormats();
+        _gridDisplayDateFormatSelectedIndex = _dateFormats.FindIndex(x => x.Value == _previousSettings.DataGridDateFormat);
+        if (_gridDisplayDateFormatSelectedIndex == -1)
+        {
+            _gridDisplayDateFormatSelectedIndex = 0;
+        }
+        _reportDisplayDateFormatSelectedIndex = _dateFormats.FindIndex(x => x.Value == _previousSettings.ReportDateFormat);
+        if (_reportDisplayDateFormatSelectedIndex == -1)
+        {
+            _reportDisplayDateFormatSelectedIndex = 0;
+        }
     }
 
     public bool UseDocnetPDFImageRendering
@@ -109,6 +123,33 @@ class SettingsViewModel: ChangeNotifier
         }
     }
 
+    public List<DateDisplayFormat> DateFormats
+    {
+        get => _dateFormats;
+    }
+
+    public int DataGridDisplayDateFormatSelectedIndex
+    {
+        get => _gridDisplayDateFormatSelectedIndex;
+        set
+        {
+            _gridDisplayDateFormatSelectedIndex = value;
+            _settings.DataGridDateFormat = _dateFormats[value].Value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    public int ReportDisplayDateFormatSelectedIndex
+    {
+        get => _reportDisplayDateFormatSelectedIndex;
+        set
+        {
+            _reportDisplayDateFormatSelectedIndex = value;
+            _settings.ReportDateFormat = _dateFormats[value].Value;
+            NotifyPropertyChanged();
+        }
+    }
+
     public async void ChooseOutputFolder()
     {
         var topLevel = _topLevelGrabber?.GetTopLevel();

src/MayShow.Shared/Views/AboutView.axaml

@@ -11,7 +11,7 @@
              MaxWidth="450">
     <StackPanel Orientation="Vertical"
                 Spacing="4">
-        <TextBlock Text="MayShow 1.4.2"
+        <TextBlock Text="MayShow 1.4.3"
                    HorizontalAlignment="Center"
                    TextWrapping="Wrap"
                    FontSize="18"

src/MayShow.Shared/Views/CreatePDFReportView.axaml

@@ -10,6 +10,9 @@
              xmlns:vm="clr-namespace:MayShow.ViewModels"
              xmlns:progRing="clr-namespace:AvaloniaProgressRing;assembly=AvaloniaProgressRing"
              x:DataType="vm:CreatePDFReportViewModel">
+  <UserControl.Resources>
+    <helpers:DateFormatConverter x:Key="DateFormatter" />
+  </UserControl.Resources>
   <Grid ColumnDefinitions="*"
         RowDefinitions="Auto, 2*, Auto, Auto, *">
     <Button Command="{Binding ShowSettings}"
@@ -97,7 +100,7 @@
                 <DataGridTemplateColumn.CellTemplate>
                     <DataTemplate>
                         <Grid ColumnDefinitions="Auto, *">
-                            <Button Command="{Binding $parent[DataGrid].((vm:CreatePDFReportViewModel)DataContext).LocateFile}"
+                            <Button Command="{Binding $parent[UserControl].((vm:CreatePDFReportViewModel)DataContext).LocateFile}"
                                     CommandParameter="{Binding}"
                                     IsVisible="{Binding !IsFileFoundOnDisk}"
                                     Margin="2"
@@ -107,7 +110,7 @@
                                     Grid.Column="0"
                                     FontFamily="{StaticResource FontAwesomeSolid}"
                                     ToolTip.Tip="File not found; click to locate..."
-                                    IsEnabled="{Binding !$parent[DataGrid].((vm:CreatePDFReportViewModel)DataContext).IsCreatingPDF}"/>
+                                    IsEnabled="{Binding !$parent[UserControl].((vm:CreatePDFReportViewModel)DataContext).IsCreatingPDF}"/>
                             <TextBlock Text="{Binding Title}" 
                                        TextTrimming="CharacterEllipsis"
                                        TextWrapping="NoWrap"
@@ -133,19 +136,29 @@
             </DataGridTemplateColumn>
             <DataGridTemplateColumn Header="Receipt Date"
                                     IsReadOnly="False"
-                                    Width="125">
+                                    Width="150">
                 <DataGridTemplateColumn.CellTemplate>
                     <DataTemplate>
-                        <Label Content="{Binding ReceiptDate}" 
+                        <Label VerticalAlignment="Center"
-                               VerticalAlignment="Center"
                                Margin="8,0,8,0"
-                               HorizontalAlignment="Left"/>
+                               HorizontalAlignment="Left">
+                               <Label.Content>
+                                    <MultiBinding Converter="{StaticResource DateFormatter}">
+                                        <Binding Path="ReceiptDate" />
+                                        <Binding Path="$parent[UserControl].((vm:CreatePDFReportViewModel)DataContext).DataGridDateFormat" />
+                                    </MultiBinding>
+                               </Label.Content>
+                        </Label>
                     </DataTemplate>
                 </DataGridTemplateColumn.CellTemplate>
                 <DataGridTemplateColumn.CellEditingTemplate>
                     <DataTemplate DataType="models:ReportFile">
                         <CalendarDatePicker SelectedDate="{Binding ReceiptDateTime}"
-                                            DisplayDate="{Binding ReceiptDateTime}"/>
+                                            DisplayDate="{Binding ReceiptDateTime}"
+                                            SelectedDateFormat="Custom"
+                                            HorizontalAlignment="Stretch"
+                                            Watermark="{Binding $parent[UserControl].((vm:CreatePDFReportViewModel)DataContext).DataGridDateFormatWatermark}"
+                                            CustomDateFormatString="{Binding $parent[UserControl].((vm:CreatePDFReportViewModel)DataContext).DataGridDateFormat}"/>
                     </DataTemplate>
                 </DataGridTemplateColumn.CellEditingTemplate>
             </DataGridTemplateColumn>
@@ -156,6 +169,7 @@
                     <DataTemplate>
                         <TextBlock Text="{Binding FileName}" 
                                    VerticalAlignment="Center"
+                                   TextTrimming="PrefixCharacterEllipsis"
                                    ToolTip.Tip="{Binding FileName}"
                                    Margin="8,0,8,0"
                                    HorizontalAlignment="Left"/>
@@ -164,25 +178,27 @@
             </DataGridTemplateColumn>
             <DataGridTemplateColumn Header=""
                                     IsReadOnly="True"
-                                    Width="*">
+                                    Width="200">
                 <DataGridTemplateColumn.CellTemplate>
                     <DataTemplate>
                         <StackPanel Orientation="Horizontal"
                                     Spacing="4">
-                            <Button Command="{Binding $parent[DataGrid].((vm:CreatePDFReportViewModel)DataContext).EditFileProperties}"
+                            <Button Command="{Binding $parent[UserControl].((vm:CreatePDFReportViewModel)DataContext).EditFileProperties}"
                                     CommandParameter="{Binding}"
                                     Classes="accent"
                                     Margin="2"
-                                    IsEnabled="{Binding !$parent[DataGrid].((vm:CreatePDFReportViewModel)DataContext).IsCreatingPDF}">
+                                    FontSize="12"
+                                    IsEnabled="{Binding !$parent[UserControl].((vm:CreatePDFReportViewModel)DataContext).IsCreatingPDF}">
                                 <Button.Content>
                                     <TextBlock><Run Text="&#xf044;" FontFamily="{StaticResource FontAwesomeSolid}"/> Edit</TextBlock>
                                 </Button.Content>
                             </Button>
-                            <Button Command="{Binding $parent[DataGrid].((vm:CreatePDFReportViewModel)DataContext).RemoveFile}"
+                            <Button Command="{Binding $parent[UserControl].((vm:CreatePDFReportViewModel)DataContext).RemoveFile}"
                                     CommandParameter="{Binding}"
                                     Classes="Danger"
                                     Margin="2"
-                                    IsEnabled="{Binding !$parent[DataGrid].((vm:CreatePDFReportViewModel)DataContext).IsCreatingPDF}">
+                                    FontSize="12"
+                                    IsEnabled="{Binding !$parent[UserControl].((vm:CreatePDFReportViewModel)DataContext).IsCreatingPDF}">
                                 <Button.Content>
                                     <TextBlock><Run Text="&#xf1f8;" FontFamily="{StaticResource FontAwesomeSolid}"/> Remove</TextBlock>
                                 </Button.Content>
@@ -206,13 +222,13 @@
                                 Spacing="8"
                                 Margin="4"
                                 Grid.Row="2">
-                        <Button Command="{Binding $parent[DataGrid].((vm:CreatePDFReportViewModel)DataContext).OpenFileLocation}" 
+                        <Button Command="{Binding $parent[UserControl].((vm:CreatePDFReportViewModel)DataContext).OpenFileLocation}" 
                                 CommandParameter="{Binding}">
                             <Button.Content>
                                 <TextBlock FontSize="12"><Run Text="&#xf07c;" FontFamily="{StaticResource FontAwesomeSolid}"/> Open File Location</TextBlock>
                             </Button.Content>
                         </Button>
-                        <Button Command="{Binding $parent[DataGrid].((vm:CreatePDFReportViewModel)DataContext).OpenFile}" 
+                        <Button Command="{Binding $parent[UserControl].((vm:CreatePDFReportViewModel)DataContext).OpenFile}" 
                                 CommandParameter="{Binding}">
                             <Button.Content>
                                 <TextBlock FontSize="12"><Run Text="&#xf07c;" FontFamily="{StaticResource FontAwesomeSolid}"/> Open File</TextBlock>

src/MayShow.Shared/Views/SettingsView.axaml

@@ -46,8 +46,34 @@
                            HorizontalAlignment="Left"
                            VerticalAlignment="Top"/>
             </Grid>
+            <Label Content="File List Date Format"
+                   HorizontalAlignment="Left"
+                   FontSize="14" />
+            <ComboBox SelectedIndex="{Binding DataGridDisplayDateFormatSelectedIndex}" 
+                      ItemsSource="{Binding DateFormats}"
+                      MaxDropDownHeight="300">
+                <ComboBox.ItemTemplate>
+                    <DataTemplate x:DataType="models:DateDisplayFormat">
+                        <TextBlock Text="{Binding Example}" 
+                                TextWrapping="Wrap"/>
+                    </DataTemplate>
+                </ComboBox.ItemTemplate>
+            </ComboBox>
+            <Label Content="PDF Report Date Format"
+                   HorizontalAlignment="Left"
+                   FontSize="14" />
+            <ComboBox SelectedIndex="{Binding ReportDisplayDateFormatSelectedIndex}" 
+                      ItemsSource="{Binding DateFormats}"
+                      MaxDropDownHeight="300">
+                <ComboBox.ItemTemplate>
+                    <DataTemplate x:DataType="models:DateDisplayFormat">
+                        <TextBlock Text="{Binding Example}" 
+                                TextWrapping="Wrap"/>
+                    </DataTemplate>
+                </ComboBox.ItemTemplate>
+            </ComboBox>
             <CheckBox IsChecked="{Binding SaveReportJsonDataInInternalDir}">Save report data (names, notes, etc.) in MayShow settings directory (saves in working directory by default)</CheckBox>
-        <Button Command="{Binding OpenSettingsDir}">
+            <Button Command="{Binding OpenSettingsDir}">
                 <TextBlock>
                     <Run Text="&#xf07c;"
                         FontFamily="{StaticResource FontAwesomeSolid}" /> Open MayShow Settings Directory</TextBlock>