diff --git a/Compatible/Compatible.cs b/Compatible/Compatible.cs index 1da5393..5a1a997 100644 --- a/Compatible/Compatible.cs +++ b/Compatible/Compatible.cs @@ -872,6 +872,11 @@ zipEntry.FileName = $"Fit/Level Text Value{Path.GetExtension(zipEntry.FileName)}"; wasModified = true; } + if (zipEntry.FileName.StartsWith("Fit/Entry.")) + { + zipEntry.FileName = $"Fit/Entry Path{Path.GetExtension(zipEntry.FileName)}"; + wasModified = true; + } else if (zipEntry.FileName.StartsWith("Quit Mode/Undo.")) { zipEntry.FileName = $"Quit Mode/Handle Undo{Path.GetExtension(zipEntry.FileName)}"; diff --git a/Qwilight/Assets/UI/@Default/@Default.zip b/Qwilight/Assets/UI/@Default/@Default.zip index 96ae292..8b8e8e6 100644 --- a/Qwilight/Assets/UI/@Default/@Default.zip +++ b/Qwilight/Assets/UI/@Default/@Default.zip @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ea56a726559036f566927818d98e33c31c6aca8475366f91b0dec238db6b847 -size 93151288 +oid sha256:2dd370b50e07f6754dc9746e7eb4bb0e1c4f10c161a6abc6ce635311bc8732c7 +size 93205982 diff --git a/Qwilight/Qwilight/System/BaseUI/BaseUI.cs b/Qwilight/Qwilight/System/BaseUI/BaseUI.cs index 728d6da..8c88557 100644 --- a/Qwilight/Qwilight/System/BaseUI/BaseUI.cs +++ b/Qwilight/Qwilight/System/BaseUI/BaseUI.cs @@ -150,6 +150,8 @@ public ImageSource HighestInputCountNetSiteDrawing { get; set; } + public ImageSource EntryPathFitDrawing { get; set; } + public HandledDrawingItem? LengthDrawing { get; set; } public ImageSource LengthFitDrawing { get; set; } @@ -1754,6 +1756,9 @@ case "Length": LengthFitDrawing = defaultDrawing; break; + case "Entry Path": + EntryPathFitDrawing = defaultDrawing; + break; } break; case "": diff --git a/Qwilight/Qwilight/UIComponent/FitMode.cs b/Qwilight/Qwilight/UIComponent/FitMode.cs index 0379151..eee336c 100644 --- a/Qwilight/Qwilight/UIComponent/FitMode.cs +++ b/Qwilight/Qwilight/UIComponent/FitMode.cs @@ -17,6 +17,7 @@ public const int LatestDate = 8; public const int HandledCount = 9; public const int AverageInputCount = 10; + public const int EntryPath = 11; public ImageSource Drawing => Mode switch { @@ -31,6 +32,7 @@ LatestDate => BaseUI.Instance.LatestDateFitDrawing, HandledCount => BaseUI.Instance.HandledCountFitDrawing, AverageInputCount => BaseUI.Instance.AverageInputCountFitDrawing, + EntryPath => BaseUI.Instance.EntryPathFitDrawing, _ => default, }; @@ -77,6 +79,9 @@ case AverageInputCount: FitImpl(entryItem => entryItem.AverageInputCount, (entryItem, noteFile) => entryItem.AverageInputCount == noteFile.AverageInputCount); break; + case EntryPath: + FitImpl(entryItem => entryItem.EntryPath, null); + break; } void FitImpl(Func fromEntryItem, Func onEqual, bool asc = true) where T : IComparable @@ -125,6 +130,7 @@ break; case Artist: case Title: + case EntryPath: foreach (var noteFile in entryItem.WellNoteFiles) { noteFile.FittedText = null; diff --git a/Qwilight/Qwilight/View/Assets/Assets.xaml b/Qwilight/Qwilight/View/Assets/Assets.xaml index 1fcf2f4..c600d99 100644 --- a/Qwilight/Qwilight/View/Assets/Assets.xaml +++ b/Qwilight/Qwilight/View/Assets/Assets.xaml @@ -85,6 +85,7 @@ 8 9 10 + 11 0 1 diff --git a/Qwilight/Qwilight/View/MainWindow/DefaultMode/EntryView.xaml b/Qwilight/Qwilight/View/MainWindow/DefaultMode/EntryView.xaml index ef67d45..9afa369 100644 --- a/Qwilight/Qwilight/View/MainWindow/DefaultMode/EntryView.xaml +++ b/Qwilight/Qwilight/View/MainWindow/DefaultMode/EntryView.xaml @@ -21,15 +21,16 @@ - - - + + + + + - - +