Add current time display to preview

Try to fix font loading issue for NewRodinProDB.

Author: David Khristepher Santos

PSXPackagerGUI/Models/Resource/FontManager.cs

@@ -7,17 +7,15 @@ namespace PSXPackagerGUI.Models.Resource;
 
 public static class FontManager
 {
-    private static string ResourcePath = Path.Combine(ApplicationInfo.AppPath, "Resources");
-
     public static FontFamily NewRodinProDBFontFamily { get; private set; }
 
     public static Typeface NewRodinProDB { get; private set; }
 
     static FontManager()
     {
-        var fontUri = new Uri(Path.Combine(ResourcePath, "Editor", "NewRodin Pro DB.otf"), UriKind.Absolute);
+        var fontUri = new Uri("pack://application:,,,/Resources/Editor/#FOT-NewRodin Pro DB", UriKind.Absolute);
 
-        NewRodinProDBFontFamily = new FontFamily(fontUri, "NewRodin Pro DB");
+        NewRodinProDBFontFamily = new FontFamily(fontUri, "FOT-NewRodin Pro DB");
 
         NewRodinProDB = new Typeface(
             NewRodinProDBFontFamily,

PSXPackagerGUI/Models/SingleModel.cs

@@ -26,6 +26,7 @@ public class SingleModel : BaseNotifyModel
         private bool _showInformation;
         private bool _showBackground;
         private Track? _selectedTrack;
+        private string _currentTime;
 
         public SettingsModel Settings
         {
@@ -90,5 +91,11 @@ public Track? SelectedTrack
             get => _selectedTrack;
             set => SetProperty(ref _selectedTrack, value);
         }
+
+        public string CurrentTime
+        {
+            get => _currentTime;
+            set => SetProperty(ref _currentTime, value);
+        }
     }
 }

PSXPackagerGUI/Models/SingleModelDesignTime.cs

@@ -35,4 +35,5 @@ public SingleModelDesignTime() : base()
 
         SelectedDisc = Discs[0];
     }
+
 }

PSXPackagerGUI/PSXPackagerGUI.csproj

@@ -19,6 +19,7 @@
 		<None Remove="Resources\Editor\back.png" />
 		<None Remove="Resources\Editor\boot.png" />
 		<None Remove="Resources\Editor\ICON0.PNG" />
+		<None Remove="Resources\Editor\NewRodin Pro DB.otf" />
 		<None Remove="Resources\Editor\no_icon0.png" />
 		<None Remove="Resources\Editor\PIC0.PNG" />
 		<None Remove="Resources\Editor\PIC1.PNG" />
@@ -50,6 +51,9 @@
 
 	<ItemGroup>
 		<Resource Include="Resources\disc.png" />
+		<Resource Include="Resources\Editor\NewRodin Pro DB.otf">
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Resource>
 		<Resource Include="Resources\floppy-48x48.png" />
 		<Resource Include="Resources\games-48x48.png" />
 		<Resource Include="Resources\gear-48x48.png" />
@@ -83,9 +87,6 @@
 		<None Update="Resources\alpha.png">
 		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
-		<None Update="Resources\Editor\NewRodin Pro DB.otf">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
 		<None Update="Resources\overlay.png">
 		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>

PSXPackagerGUI/Pages/ImageProcessing.cs

@@ -38,7 +38,7 @@ public static void SaveBitmapSource(BitmapSource bitmap, Stream stream, BitmapEn
         encoder.Save(stream);
     }
 
-    public static BitmapSource Resize(
+    public static ImageSource Resize(
         BitmapSource source,
         int maxWidth,
         int maxHeight)

PSXPackagerGUI/Pages/SinglePage.xaml

@@ -373,6 +373,14 @@
                                     </Image.Style>
                                 </Image>
                             </Border>
+                            <TextBlock FontFamily="pack://application:,,,/Resources/Editor/#FOT-NewRodin Pro DB" FontSize="14" FontWeight="Bold" Foreground="White"
+                                       Text="{Binding CurrentTime}"
+                                       TextAlignment="Right"
+                                       Width="480" Height="272" Margin="0,0,25,0">
+                                <TextBlock.Effect>
+                                    <DropShadowEffect BlurRadius="5" ShadowDepth="2"></DropShadowEffect>
+                                </TextBlock.Effect>
+                            </TextBlock>
                         </Grid>
                         <Grid  Grid.Row="2" Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}">
                             <Label>Drag and drop images onto the resource areas to load into the resource. Right-click to show context menu.</Label>

PSXPackagerGUI/Pages/SinglePage.xaml.cs

@@ -98,7 +98,21 @@ public SinglePage(Window window, SettingsModel settings, GameDB gameDb)
             ResetModel();
             _stopwatch = Stopwatch.StartNew();
             CompositionTarget.Rendering += CompositionTargetOnRendering;
-            //Closing += OnClosing;
+
+            timer = new Timer(Callback, null, new TimeSpan(0, 0, 1), new TimeSpan(0, 0, 1));
+            Window.Closed += Window_Closed;
+        }
+
+        private void Window_Closed(object? sender, EventArgs e)
+        {
+            timer?.Dispose();
+        }
+
+        private Timer timer;
+
+        private void Callback(object? state)
+        {
+            _model.CurrentTime = $"{DateTime.Now:M/d h:mm tt}";
         }