Merge pull request #51 from SilverEzredes/master

Home Page Tips + fixes

Author: kagenocookie

ContentEditor.App/Configuration/AppConfig.cs

@@ -53,6 +53,8 @@ public static class Keys
         public const string WindowRect = "window_rect";
         public const string PauseAnimPlayerOnSeek = "pause_anim_player_on_seek";
         public const string UseFullscreenAnimPlayback = "use_fullscreen_anim_playback";
+        public const string DateFormat = "date_format";
+        public const string ClockFormat = "clock_format";
 
         public const string RenderAxis = "render_axis";
         public const string RenderMeshes = "render_meshes";
@@ -191,6 +193,8 @@ public void Set(T? value) => SetAndSave(value, (v) => {
     public readonly SettingWrapper<DateTime> LastUpdateCheck = new SettingWrapper<DateTime>(Keys.LastUpdateCheck, _lock, DateTime.MinValue);
     public readonly SettingWrapper<bool> PauseAnimPlayerOnSeek = new SettingWrapper<bool>(Keys.PauseAnimPlayerOnSeek, _lock, true);
     public readonly SettingWrapper<bool> UseFullscreenAnimPlayback = new SettingWrapper<bool>(Keys.UseFullscreenAnimPlayback, _lock, false);
+    public readonly SettingWrapper<int> DateFormat = new SettingWrapper<int>(Keys.DateFormat, _lock, 0);
+    public readonly SettingWrapper<bool> ClockFormat = new SettingWrapper<bool>(Keys.ClockFormat, _lock, false);
 
     public readonly SettingWrapper<int> PakDisplayModeValue = new SettingWrapper<int>(Keys.LogToFile, _lock, (int)FileDisplayMode.List);
     public FileDisplayMode PakDisplayMode { get => (FileDisplayMode)PakDisplayModeValue.Get(); set => PakDisplayModeValue.Set((int)value); }
@@ -339,6 +343,8 @@ public static void SaveConfigToIni()
             (Keys.QuaternionsAsEuler, instance.ShowQuaternionsAsEuler.value.ToString(), null),
             (Keys.PauseAnimPlayerOnSeek, instance.PauseAnimPlayerOnSeek.value.ToString(), null),
             (Keys.UseFullscreenAnimPlayback, instance.UseFullscreenAnimPlayback.value.ToString(), null),
+            (Keys.DateFormat, instance.DateFormat.value.ToString(), null),
+            (Keys.ClockFormat, instance.ClockFormat.value.ToString(), null),
 
             (Keys.RenderAxis, instance.RenderAxis.value.ToString(), null),
             (Keys.RenderMeshes, instance.RenderMeshes.value.ToString(), null),
@@ -452,10 +458,13 @@ private void LoadConfigs(IEnumerable<(string key, string value, string? group)>
                             if (int.TryParse(value, NumberStyles.Integer, CultureInfo.InvariantCulture, out var parsed)) UnpackMaxThreads.value = Math.Clamp(parsed, 1, 64);
                             break;
                         case Keys.BackgroundColor:
-                            if (ReeLib.via.Color.TryParse(value, out var _col)) BackgroundColor.value =  _col;
+                            if (ReeLib.via.Color.TryParse(value, out var _col)) BackgroundColor.value = _col;
                             break;
                         case Keys.LogLevel:
-                            if (int.TryParse(value, out var _intvalue)) LogLevel.value =  _intvalue;
+                            if (int.TryParse(value, out var _intvalue)) LogLevel.value = _intvalue;
+                            break;
+                        case Keys.DateFormat:
+                            if (int.TryParse(value, out _intvalue)) DateFormat.value = _intvalue;
                             break;
                         case Keys.MaxUndoSteps:
                             if (int.TryParse(value, out _intvalue)) MaxUndoSteps.value = Math.Max(_intvalue, 0);
@@ -478,6 +487,9 @@ private void LoadConfigs(IEnumerable<(string key, string value, string? group)>
                         case Keys.UseFullscreenAnimPlayback:
                             UseFullscreenAnimPlayback.value = ReadBool(value);
                             break;
+                        case Keys.ClockFormat:
+                            ClockFormat.value = ReadBool(value);
+                            break;
                         case Keys.RecentFiles:
                             JsonSettings.RecentFiles.AddRange(value.Split('|', StringSplitOptions.RemoveEmptyEntries));
                             break;

ContentEditor.App/Core/Time.cs

@@ -16,6 +16,13 @@ public class Time
 
     internal Time() { mainThread = Thread.CurrentThread; }
 
+    private static readonly string[] DateFormats =
+    [
+        "dd/MM/yyyy",
+        "MM/dd/yyyy",
+        "yyyy/MM/dd"
+    ];
+    public static string dateFormat => DateFormats[Math.Clamp(AppConfig.Instance.DateFormat.Get(), 0, DateFormats.Length - 1)];
     internal void Init()
     {
 
@@ -31,4 +38,4 @@ internal void Update(float deltaTime, bool isMainThread)
             _totalTime += deltaTime;
         }
     }
-}
+}

ContentEditor.App/Imgui/App/BundleManagementUI.cs

@@ -6,6 +6,7 @@
 using ReeLib;
 using ReeLib.Aimp;
 using System;
+using System.Globalization;
 using System.Numerics;
 using System.Runtime.InteropServices;
 using System.Text.Json.Nodes;
@@ -49,6 +50,7 @@ public BundleManagementUI(BundleManager workspace, string? preselectBundle, Acti
     protected UIContext context = null!;
     private readonly CreateBundleFromLooseFileFolderDelegate? createFromLooseFileFolder;
     private readonly CreateBundleFromPakDelegate? createFromPak;
+    private static string timeFormat => AppConfig.Instance.ClockFormat.Get() ? " hh:mm:ss tt" : " HH:mm:ss";
 
     public void Init(UIContext context)
     {
@@ -283,8 +285,8 @@ private void ShowBundlesMenu()
         }
 
         ImGui.BeginDisabled();
-        string createDate = $"Created at: {bundle.CreatedAt}";
-        string updateDate = $"Updated at: {bundle.UpdatedAt}";
+        string createDate = "Created at: " + FormatUTCString(bundle.CreatedAt);
+        string updateDate = "Updated at: " + FormatUTCString(bundle.UpdatedAt);
         ImGui.InputText("##CreationDate", ref createDate, 100);
         ImGui.InputText("##UpdateDate", ref updateDate, 100);
         ImGui.EndDisabled();
@@ -491,7 +493,14 @@ private void OpenFileFromNode(HierarchyTreeWidget node, Bundle bundle)
             openFileCallback!(path);
         }
     }
-
+    private string FormatUTCString(string utcString)
+    {
+        utcString = utcString.Replace("UTC", "").Trim();
+        if (DateTime.TryParseExact(utcString, "yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal, out var utc)) {
+            return utc.ToLocalTime().ToString(Time.dateFormat + timeFormat, CultureInfo.InvariantCulture);
+        }
+        return utcString;
+    }
     public bool RequestClose()
     {
         return false;