diff --git a/Qwilight/Compute/AutoCompute.cs b/Qwilight/Compute/AutoCompute.cs index 13dba8f..51fab01 100644 --- a/Qwilight/Compute/AutoCompute.cs +++ b/Qwilight/Compute/AutoCompute.cs @@ -46,7 +46,7 @@ public override void OnHandled() { var mainViewModel = ViewModels.Instance.MainValue; - HandlingUISystem.Instance.HandleParallel(() => + UIHandler.Instance.HandleParallel(() => { if (!mainViewModel.IsQuitMode && Configure.Instance.SaltAuto && mainViewModel.EntryItems.Count(entryItem => !entryItem.IsLogical) > 1) { diff --git a/Qwilight/System/AudioInputSystem.cs b/Qwilight/System/AudioInputSystem.cs index f8ca8c1..22133d0 100644 --- a/Qwilight/System/AudioInputSystem.cs +++ b/Qwilight/System/AudioInputSystem.cs @@ -94,7 +94,7 @@ var waveInSystem = WaveInValue?.System; if (waveInSystem != null) { - HandlingUISystem.Instance.HandleParallel(() => + UIHandler.Instance.HandleParallel(() => { try { @@ -194,7 +194,7 @@ var waveSystem = WaveValue?.System; if (waveSystem != null) { - HandlingUISystem.Instance.HandleParallel(() => + UIHandler.Instance.HandleParallel(() => { try { @@ -226,7 +226,7 @@ { if (Configure.Instance.AudioInput && Configure.Instance.WaveIn) { - HandlingUISystem.Instance.HandleParallel(() => + UIHandler.Instance.HandleParallel(() => { var waveInValues = new List(); foreach (var targetSystem in new MMDeviceEnumerator().EnumerateAudioEndPoints(DataFlow.Capture, DeviceState.Active)) @@ -251,7 +251,7 @@ { if (Configure.Instance.AudioInput && Configure.Instance.Wave) { - HandlingUISystem.Instance.HandleParallel(() => + UIHandler.Instance.HandleParallel(() => { var waveValues = new List(); foreach (var targetSystem in new MMDeviceEnumerator().EnumerateAudioEndPoints(DataFlow.Render, DeviceState.Active)) diff --git a/Qwilight/System/AudioSystem/AudioSystem.cs b/Qwilight/System/AudioSystem/AudioSystem.cs index 05c84b1..194917d 100644 --- a/Qwilight/System/AudioSystem/AudioSystem.cs +++ b/Qwilight/System/AudioSystem/AudioSystem.cs @@ -244,7 +244,7 @@ Name = audioValueName }; }).ToArray(); - HandlingUISystem.Instance.HandleParallel(() => + UIHandler.Instance.HandleParallel(() => { AudioValues.Clear(); foreach (var audioValue in audioValues) diff --git a/Qwilight/System/DB.cs b/Qwilight/System/DB.cs index 10c578d..9b0b1ab 100644 --- a/Qwilight/System/DB.cs +++ b/Qwilight/System/DB.cs @@ -2,6 +2,7 @@ using Qwilight.NoteFile; using Qwilight.UIComponent; using Qwilight.Utilities; +using Qwilight.ViewModel; using System.Data; using System.Data.SQLite; using System.IO; @@ -659,7 +660,7 @@ return commentItems; } - public void SetEventNoteData(ICollection wwwLevelComputingValues) + public void SetEventNoteData(ICollection wwwLevelComputingValues) { foreach (var wwwLevelComputingValue in wwwLevelComputingValues) { diff --git a/Qwilight/System/HandlingUISystem.cs b/Qwilight/System/HandlingUISystem.cs deleted file mode 100644 index f11cdf5..0000000 --- a/Qwilight/System/HandlingUISystem.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.Windows.Threading; - -namespace Qwilight -{ - public sealed class HandlingUISystem - { - public static readonly HandlingUISystem Instance = new(); - - public Dispatcher UIHandler { get; set; } - - public void Init(Action onUnhandledFault) - { - UIHandler = Dispatcher.CurrentDispatcher; - UIHandler.UnhandledException += (sender, e) => - { - e.Handled = true; - onUnhandledFault(e.Exception); - }; - } - - public void HandleParallel(Action onHandle) - { - if (UIHandler.CheckAccess()) - { - onHandle(); - } - else - { - UIHandler.InvokeAsync(onHandle); - } - } - } -} diff --git a/Qwilight/System/LevelSystem.cs b/Qwilight/System/LevelSystem.cs index 28dfefa..d83e222 100644 --- a/Qwilight/System/LevelSystem.cs +++ b/Qwilight/System/LevelSystem.cs @@ -128,7 +128,7 @@ Variety = NotifySystem.NotifyVariety.Levying, OnStop = wipeTotal => false }; - HandlingUISystem.Instance.HandleParallel(() => ViewModels.Instance.NotifyValue.NotifyItemCollection.Insert(0, savingLevelItem)); + UIHandler.Instance.HandleParallel(() => ViewModels.Instance.NotifyValue.NotifyItemCollection.Insert(0, savingLevelItem)); NotifySystem.Instance.Notify(NotifySystem.NotifyVariety.Info, NotifySystem.NotifyConfigure.NotSave, savingLevelItem.Text); var target = ModifyDataValue(levelTableValue.data_url); var levelTableFileName = levelTableValue.name; diff --git a/Qwilight/System/MediaSystem/HandledMediaItem.cs b/Qwilight/System/MediaSystem/HandledMediaItem.cs index ceffd21..d3f2d6b 100644 --- a/Qwilight/System/MediaSystem/HandledMediaItem.cs +++ b/Qwilight/System/MediaSystem/HandledMediaItem.cs @@ -22,7 +22,7 @@ public void Dispose() { Media.Dispose(); - HandlingUISystem.Instance.HandleParallel(() => DefaultMedia?.Close()); + UIHandler.Instance.HandleParallel(() => DefaultMedia?.Close()); } } } \ No newline at end of file diff --git a/Qwilight/System/MediaSystem/MediaHandlerItem.cs b/Qwilight/System/MediaSystem/MediaHandlerItem.cs index fc32455..003a89d 100644 --- a/Qwilight/System/MediaSystem/MediaHandlerItem.cs +++ b/Qwilight/System/MediaSystem/MediaHandlerItem.cs @@ -91,7 +91,7 @@ { if (mediaPosition < HandledMediaItem.Length) { - HandlingUISystem.Instance.HandleParallel(() => + UIHandler.Instance.HandleParallel(() => { var defaultMedia = new System.Windows.Media.MediaPlayer { @@ -117,7 +117,7 @@ public void StopDefault() { - HandlingUISystem.Instance.HandleParallel(() => HandledMediaItem.DefaultMedia?.Stop()); + UIHandler.Instance.HandleParallel(() => HandledMediaItem.DefaultMedia?.Stop()); IsDefaultHandling = false; } @@ -125,11 +125,11 @@ { if (isPaused) { - HandlingUISystem.Instance.HandleParallel(() => HandledMediaItem.DefaultMedia?.Pause()); + UIHandler.Instance.HandleParallel(() => HandledMediaItem.DefaultMedia?.Pause()); } else { - HandlingUISystem.Instance.HandleParallel(() => HandledMediaItem.DefaultMedia?.Play()); + UIHandler.Instance.HandleParallel(() => HandledMediaItem.DefaultMedia?.Play()); } } @@ -138,7 +138,7 @@ var defaultMedia = HandledMediaItem.DefaultMedia; if (defaultMedia != null) { - HandlingUISystem.Instance.HandleParallel(() => + UIHandler.Instance.HandleParallel(() => { if (Math.Abs(defaultMedia.Position.TotalMilliseconds - mediaPosition) >= 500.0) { diff --git a/Qwilight/System/MediaSystem/MediaSystem.cs b/Qwilight/System/MediaSystem/MediaSystem.cs index cf5ff39..14e0de2 100644 --- a/Qwilight/System/MediaSystem/MediaSystem.cs +++ b/Qwilight/System/MediaSystem/MediaSystem.cs @@ -49,7 +49,7 @@ { if (ViewModels.Instance.MainValue.IsWPFViewVisible) { - HandlingUISystem.Instance.HandleParallel(() => mediaHandlerItem.HandledMediaItem.DefaultMedia.SpeedRatio = mediaHandler.AudioMultiplier); + UIHandler.Instance.HandleParallel(() => mediaHandlerItem.HandledMediaItem.DefaultMedia.SpeedRatio = mediaHandler.AudioMultiplier); } else { diff --git a/Qwilight/System/NotifySystem.cs b/Qwilight/System/NotifySystem.cs index 08f0b0f..af6adfd 100644 --- a/Qwilight/System/NotifySystem.cs +++ b/Qwilight/System/NotifySystem.cs @@ -21,7 +21,7 @@ int _toNotifyID = 1; - public void NotifyPending() => HandlingUISystem.Instance.HandleParallel(() => + public void NotifyPending() => UIHandler.Instance.HandleParallel(() => { var toNotifyCount = ViewModels.Instance.NotifyValue.NotifyItemCollection.Count(toNotifyItem => { @@ -37,7 +37,7 @@ public void Notify(NotifyVariety toNotifyVariety, NotifyConfigure toNotifyConfigure, string toNotify, bool allowComputingMode = true, string audioAlt = null, Action onHandle = null, int toNotifyID = -1) { - HandlingUISystem.Instance.HandleParallel(() => + UIHandler.Instance.HandleParallel(() => { switch (toNotifyConfigure) { diff --git a/Qwilight/System/StillSystem.cs b/Qwilight/System/StillSystem.cs index 24e0a85..7983452 100644 --- a/Qwilight/System/StillSystem.cs +++ b/Qwilight/System/StillSystem.cs @@ -37,11 +37,11 @@ { if (_window != null) { - HandlingUISystem.Instance.HandleParallel(() => + UIHandler.Instance.HandleParallel(() => { GraphicsCaptureSession session = null; var framePool = Direct3D11CaptureFramePool.Create(_targetSystem, DirectXPixelFormat.B8G8R8A8UIntNormalized, 2, _window.Size); - framePool.FrameArrived += (sender, args) => HandlingUISystem.Instance.HandleParallel(async () => + framePool.FrameArrived += (sender, args) => UIHandler.Instance.HandleParallel(async () => { CanvasBitmap drawing; try diff --git a/Qwilight/System/TVSystem.cs b/Qwilight/System/TVSystem.cs index 35e92fd..4974221 100644 --- a/Qwilight/System/TVSystem.cs +++ b/Qwilight/System/TVSystem.cs @@ -42,7 +42,7 @@ public bool TVAssists => TVAssist0 || TVAssist1; - bool IsAvailable => !ViewModels.Instance.MainValue.IsVital; + bool IsAvailable => !ViewModels.Instance.MainValue.IsHPCMode; public void HandleSystemIfAvailable() { diff --git a/Qwilight/System/TwilightSystem.cs b/Qwilight/System/TwilightSystem.cs index d0857b5..f1d2a76 100644 --- a/Qwilight/System/TwilightSystem.cs +++ b/Qwilight/System/TwilightSystem.cs @@ -325,10 +325,10 @@ AutoEnter(autoEnter => autoEnter == AutoEnterSite.AutoEnter); break; case Event.Types.EventID.QuitSite: - var toWipeSiteViewModel = ViewModels.Instance.WipeSiteViewModel(eventItemText); - if (toWipeSiteViewModel != null) + var toQuitSiteView = ViewModels.Instance.WipeSiteViewModel(eventItemText)?.View; + if (toQuitSiteView != null) { - HandlingUISystem.Instance.HandleParallel(() => siteContainerViewModel.SiteViewCollection.Remove(toWipeSiteViewModel.View)); + UIHandler.Instance.HandleParallel(() => siteContainerViewModel.SiteViewCollection.Remove(toQuitSiteView)); } break; case Event.Types.EventID.Warning: @@ -417,15 +417,15 @@ toEnterSiteViewModel.SetAllowedPostableItems(twilightEnterSite); toEnterSiteViewModel.ModeComponentValue.CopyAsJSON(twilightEnterSite.modeComponentData); } - HandlingUISystem.Instance.HandleParallel(() => + UIHandler.Instance.HandleParallel(() => { - var toEnterSite = new SiteView + var toEnterSiteView = new SiteView { DataContext = toEnterSiteViewModel }; - toEnterSiteViewModel.View = toEnterSite; - siteContainerViewModel.SiteViewCollection.Add(toEnterSite); - siteContainerViewModel.SiteViewValue = toEnterSite; + toEnterSiteViewModel.View = toEnterSiteView; + siteContainerViewModel.SiteViewCollection.Add(toEnterSiteView); + siteContainerViewModel.SiteViewValue = toEnterSiteView; }); break; case Event.Types.EventID.CallBundle: @@ -463,7 +463,7 @@ var valueUIBundleCollection = bundleViewModel.UIBundleCollection; var qwilightBundleCollection = bundleViewModel.QwilightBundleCollection; var eventNoteBundleCollection = bundleViewModel.EventNoteBundleCollection; - HandlingUISystem.Instance.HandleParallel(() => + UIHandler.Instance.HandleParallel(() => { noteFileBundleCollection.Clear(); foreach (var noteFileBundleItem in noteFileBundleItems) @@ -700,7 +700,7 @@ netSIteCommentItemCollection[date] = netSiteCommentItems; } var netSiteCommentItemsCollection = netSiteCommentViewModel.NetSiteCommentItemsCollection; - HandlingUISystem.Instance.HandleParallel(() => + UIHandler.Instance.HandleParallel(() => { netSiteCommentItemsCollection.Clear(); foreach (var date in netSIteCommentItemCollection.Values) @@ -747,7 +747,7 @@ }; _saveAsBundleMap[saveAsBundleID] = saveAsBundleItem; NotifySystem.Instance.Notify(NotifySystem.NotifyVariety.Info, NotifySystem.NotifyConfigure.NotSave, saveAsBundleItem.Text); - HandlingUISystem.Instance.HandleParallel(() => toNotifyViewModel.NotifyItemCollection.Insert(0, saveAsBundleItem)); + UIHandler.Instance.HandleParallel(() => toNotifyViewModel.NotifyItemCollection.Insert(0, saveAsBundleItem)); var onZipSaving = new EventHandler((sender, e) => { e.Cancel = saveAsBundleItem.IsStopped; @@ -917,7 +917,7 @@ QuitStatus = bundleLength }; _saveBundleMap[saveBundleID] = saveBundleItem; - HandlingUISystem.Instance.HandleParallel(() => toNotifyViewModel.NotifyItemCollection.Insert(0, saveBundleItem)); + UIHandler.Instance.HandleParallel(() => toNotifyViewModel.NotifyItemCollection.Insert(0, saveBundleItem)); var bundleVariety = (BundleItem.BundleVariety)twilightSaveBundle.bundleVariety; if (bundleVariety != BundleItem.BundleVariety.DefaultNotes && bundleVariety != BundleItem.BundleVariety.DefaultUI) { @@ -1352,7 +1352,7 @@ { if (IsEstablished) { - HandlingUISystem.Instance.HandleParallel(siteContainerViewModel.SiteViewCollection.Clear); + UIHandler.Instance.HandleParallel(siteContainerViewModel.SiteViewCollection.Clear); ViewModels.Instance.WipeSiteViewModels(); foreach (var bundleID in _saveBundleMap.Keys) { @@ -1568,7 +1568,7 @@ public async Task GetDefaultUIDate(long defaultUIDate, bool isSilent) { var twilightWwwDefaultDate = await GetWwwParallel($"{QwilightComponent.QwilightAPI}/defaultUIDate?date={defaultUIDate}").ConfigureAwait(false); - if (twilightWwwDefaultDate.HasValue && !ViewModels.Instance.MainValue.IsVital) + if (twilightWwwDefaultDate.HasValue && !ViewModels.Instance.MainValue.IsHPCMode) { var date = twilightWwwDefaultDate.Value.date; Configure.Instance.DefaultUIDate = date; diff --git a/Qwilight/System/UIHandler.cs b/Qwilight/System/UIHandler.cs new file mode 100644 index 0000000..8fb4655 --- /dev/null +++ b/Qwilight/System/UIHandler.cs @@ -0,0 +1,33 @@ +using System.Windows.Threading; + +namespace Qwilight +{ + public sealed class UIHandler + { + public static readonly UIHandler Instance = new(); + + public Dispatcher MainHandler { get; set; } + + public void Init(Action onUnhandledFault) + { + MainHandler = Dispatcher.CurrentDispatcher; + MainHandler.UnhandledException += (sender, e) => + { + e.Handled = true; + onUnhandledFault(e.Exception); + }; + } + + public void HandleParallel(Action onHandle) + { + if (MainHandler.CheckAccess()) + { + onHandle(); + } + else + { + MainHandler.InvokeAsync(onHandle); + } + } + } +} diff --git a/Qwilight/UIComponent/WwwLevelGroup.cs b/Qwilight/UIComponent/WwwLevelGroup.cs deleted file mode 100644 index ccf6c5c..0000000 --- a/Qwilight/UIComponent/WwwLevelGroup.cs +++ /dev/null @@ -1,676 +0,0 @@ -using CommunityToolkit.Mvvm.Input; -using Qwilight.Compute; -using Qwilight.NoteFile; -using Qwilight.Utilities; -using Qwilight.ViewModel; -using System.Collections.ObjectModel; -using System.Data.SQLite; -using System.Security.Cryptography; - -namespace Qwilight.UIComponent -{ - public sealed partial class WwwLevelGroup : Model - { - public sealed class WwwLevelComputing : Computing - { - public override BaseNoteFile.NoteVariety NoteVarietyValue => WwwLevelNoteVariety; - - public BaseNoteFile.NoteVariety WwwLevelNoteVariety { get; set; } - - public override void OnCompiled() - { - } - - public override void OnFault(Exception e) - { - } - - public string NoteID { get; init; } - - public bool NotHaveIt { get; init; } - } - - readonly WwwLevelData _wwwLevelDataValue = new WwwLevelData(); - readonly double[] _audioMultipliers = new double[2]; - WwwLevelItem _wwwLevelItem; - bool _isLevelItemLoading; - - string GetEventNoteID() => string.Join('/', WwwLevelComputingCollection.Select(wwwLevelComputing => wwwLevelComputing.NoteID)); - - public bool HasEventNote => ViewModels.Instance.MainValue.EventNoteEntryItems.ContainsKey(GetEventNoteID()); - - [RelayCommand] - void OnGetWwwLevel() - { - try - { - DB.Instance.SetEventNoteData(WwwLevelComputingCollection); - if (WwwLevelItemValue != null) - { - var eventNoteName = WwwLevelItemValue.Title; - var date = DateTime.Now; - var eventNoteVariety = DB.EventNoteVariety.Qwilight; - DB.Instance.SetEventNote(GetEventNoteID(), eventNoteName, date, eventNoteVariety); - var mainViewModel = ViewModels.Instance.MainValue; - mainViewModel.LoadEventNoteEntryItems(); - mainViewModel.Want(); - NotifySystem.Instance.Notify(NotifySystem.NotifyVariety.OK, NotifySystem.NotifyConfigure.Default, LanguageSystem.Instance.OpenedEventNotes); - NotifyIsCompatible(); - } - } - catch (SQLiteException) - { - NotifySystem.Instance.Notify(NotifySystem.NotifyVariety.Warning, NotifySystem.NotifyConfigure.Default, LanguageSystem.Instance.BeforeEventNoteContents); - } - } - - [RelayCommand] - void OnLevyWwwLevel() - { - ViewModels.Instance.WwwLevelValue.Close(); - var mainViewModel = ViewModels.Instance.MainValue; - var defaultModeComponentValue = mainViewModel.ModeComponentValue.Clone(); - var modeComponentValue = mainViewModel.ModeComponentValue; - if (!IsAutoModeCompatible) - { - modeComponentValue.AutoModeValue = AutoModes.First().Value; - } - if (!IsNoteSaltModeCompatible) - { - modeComponentValue.NoteSaltModeValue = NoteSaltModes.First().Value; - } - modeComponentValue.AudioMultiplier = Math.Clamp(modeComponentValue.AudioMultiplier, _audioMultipliers[0], _audioMultipliers[1]); - if (!IsFaintNoteModeCompatible) - { - modeComponentValue.FaintNoteModeValue = FaintNoteModes.First().Value; - } - if (!IsJudgmentModeCompatible) - { - modeComponentValue.JudgmentModeValue = JudgmentModes.First().Value; - } - if (!IsHitPointsModeCompatible) - { - modeComponentValue.HitPointsModeValue = HitPointsModes.First().Value; - } - if (!IsNoteMobilityModeCompatible) - { - modeComponentValue.NoteMobilityModeValue = NoteMobilityModes.First().Value; - } - if (!IsLongNoteModeCompatible) - { - modeComponentValue.LongNoteModeValue = LongNoteModes.First().Value; - } - if (!IsInputFavorModeCompatible) - { - modeComponentValue.InputFavorModeValue = InputFavorModes.First().Value; - } - if (!IsNoteModifyModeCompatible) - { - modeComponentValue.NoteModifyModeValue = NoteModifyModes.First().Value; - } - if (!IsBPMModeCompatible) - { - modeComponentValue.BPMModeValue = BPMModes.First().Value; - } - if (!IsWaveModeCompatible) - { - modeComponentValue.WaveModeValue = WaveModes.First().Value; - } - if (!IsSetNoteModeCompatible) - { - modeComponentValue.SetNoteModeValue = SetNoteModes.First().Value; - } - if (!IsLowestJudgmentConditionModeCompatible) - { - modeComponentValue.LowestJudgmentConditionModeValue = LowestJudgmentConditionModes.First().Value; - } - modeComponentValue.PutCopyNotesValueV2 = ModeComponent.PutCopyNotes.Default; - mainViewModel.HandleLevyNoteFile(mainViewModel.EventNoteEntryItems[GetEventNoteID()], _wwwLevelDataValue, defaultModeComponentValue); - } - - public bool IsLevelItemLoading - { - get => _isLevelItemLoading; - - set => SetProperty(ref _isLevelItemLoading, value, nameof(IsLevelItemLoading)); - } - - public string LevelName { get; init; } - - public ObservableCollection WwwLevelItemCollection { get; } = new(); - - public ObservableCollection WwwLevelComputingCollection { get; } = new(); - - public ObservableCollection ClearedEdgeItemCollection { get; } = new(); - - public ObservableCollection ClearedTitleItemCollection { get; } = new(); - - public bool HasClearedEdgeItem => ClearedEdgeItemCollection.Count > 0; - - public bool HasClearedTitleItem => ClearedTitleItemCollection.Count > 0; - - public string Title { get; set; } - - public string Comment { get; set; } - - public bool AllowPause { get; set; } - - public string[] StandContents { get; } = new string[2]; - - public string[] PointContents { get; } = new string[2]; - - public string[] BandContents { get; } = new string[2]; - - public string[] AudioMultiplierContents { get; } = new string[2]; - - public string[][] JudgmentContents { get; } = new string[6][]; - - public bool IsAutoModeCompatible => AutoModes.Count == 0 || AutoModes.Any(wwwLevelModeComponent => wwwLevelModeComponent.Value == ViewModels.Instance.MainValue.ModeComponentValue.AutoModeValue); - - public bool IsNoteSaltModeCompatible => NoteSaltModes.Count == 0 || NoteSaltModes.Any(wwwLevelModeComponent => wwwLevelModeComponent.Value == ViewModels.Instance.MainValue.ModeComponentValue.NoteSaltModeValue); - - public bool IsFaintNoteModeCompatible => FaintNoteModes.Count == 0 || FaintNoteModes.Any(wwwLevelModeComponent => wwwLevelModeComponent.Value == ViewModels.Instance.MainValue.ModeComponentValue.FaintNoteModeValue); - - public bool IsJudgmentModeCompatible => JudgmentModes.Count == 0 || JudgmentModes.Any(wwwLevelModeComponent => wwwLevelModeComponent.Value == ViewModels.Instance.MainValue.ModeComponentValue.JudgmentModeValue); - - public bool IsHitPointsModeCompatible => HitPointsModes.Count == 0 || HitPointsModes.Any(wwwLevelModeComponent => wwwLevelModeComponent.Value == ViewModels.Instance.MainValue.ModeComponentValue.HitPointsModeValue); - - public bool IsNoteMobilityModeCompatible => NoteMobilityModes.Count == 0 || NoteMobilityModes.Any(wwwLevelModeComponent => wwwLevelModeComponent.Value == ViewModels.Instance.MainValue.ModeComponentValue.NoteMobilityModeValue); - - public bool IsLongNoteModeCompatible => LongNoteModes.Count == 0 || LongNoteModes.Any(wwwLevelModeComponent => wwwLevelModeComponent.Value == ViewModels.Instance.MainValue.ModeComponentValue.LongNoteModeValue); - - public bool IsInputFavorModeCompatible => InputFavorModes.Count == 0 || InputFavorModes.Any(wwwLevelModeComponent => wwwLevelModeComponent.Value == ViewModels.Instance.MainValue.ModeComponentValue.InputFavorModeValue); - - public bool IsNoteModifyModeCompatible => NoteModifyModes.Count == 0 || NoteModifyModes.Any(wwwLevelModeComponent => wwwLevelModeComponent.Value == ViewModels.Instance.MainValue.ModeComponentValue.NoteModifyModeValue); - - public bool IsBPMModeCompatible => BPMModes.Count == 0 || BPMModes.Any(wwwLevelModeComponent => wwwLevelModeComponent.Value == ViewModels.Instance.MainValue.ModeComponentValue.BPMModeValue); - - public bool IsWaveModeCompatible => WaveModes.Count == 0 || WaveModes.Any(wwwLevelModeComponent => wwwLevelModeComponent.Value == ViewModels.Instance.MainValue.ModeComponentValue.WaveModeValue); - - public bool IsSetNoteModeCompatible => SetNoteModes.Count == 0 || SetNoteModes.Any(wwwLevelModeComponent => wwwLevelModeComponent.Value == ViewModels.Instance.MainValue.ModeComponentValue.SetNoteModeValue); - - public bool IsLowestJudgmentConditionModeCompatible => LowestJudgmentConditionModes.Count == 0 || LowestJudgmentConditionModes.Any(wwwLevelModeComponent => wwwLevelModeComponent.Value == ViewModels.Instance.MainValue.ModeComponentValue.LowestJudgmentConditionModeValue); - - public ObservableCollection> AutoModes { get; } = new(); - - public ObservableCollection> NoteSaltModes { get; } = new(); - - public ObservableCollection> FaintNoteModes { get; } = new(); - - public ObservableCollection> JudgmentModes { get; } = new(); - - public ObservableCollection> HitPointsModes { get; } = new(); - - public ObservableCollection> NoteMobilityModes { get; } = new(); - - public ObservableCollection> LongNoteModes { get; } = new(); - - public ObservableCollection> InputFavorModes { get; } = new(); - - public ObservableCollection> NoteModifyModes { get; } = new(); - - public ObservableCollection> BPMModes { get; } = new(); - - public ObservableCollection> WaveModes { get; } = new(); - - public ObservableCollection> SetNoteModes { get; } = new(); - - public ObservableCollection> LowestJudgmentConditionModes { get; } = new(); - - public WwwLevelItem WwwLevelItemValue - { - get => _wwwLevelItem; - - set - { - if (SetProperty(ref _wwwLevelItem, value, nameof(WwwLevelItemValue)) && value != null) - { - _ = Awaitable(); - async Task Awaitable() - { - IsLevelItemLoading = true; - - var levelID = value.LevelID; - var twilightWwwLevel = await TwilightSystem.Instance.GetWwwParallel($"{QwilightComponent.QwilightAPI}/level?levelID={levelID}&language={Configure.Instance.Language}").ConfigureAwait(false); - if (twilightWwwLevel.HasValue && WwwLevelItemValue?.LevelID == levelID) - { - var twilightWwwLevelValue = twilightWwwLevel.Value; - - Title = value.Title; - OnPropertyChanged(nameof(Title)); - - Comment = value.Comment; - OnPropertyChanged(nameof(Comment)); - - Array.Fill(StandContents, null); - if (twilightWwwLevelValue.stand != null) - { - if (twilightWwwLevelValue.stand[0] != -1) - { - StandContents[0] = string.Format(LanguageSystem.Instance.WwwLevelStandContents0, twilightWwwLevelValue.stand[0].ToString("#,##0")); - } - if (twilightWwwLevelValue.stand[1] != -1) - { - StandContents[1] = string.Format(LanguageSystem.Instance.WwwLevelStandContents1, twilightWwwLevelValue.stand[1].ToString("#,##0")); - } - } - OnPropertyChanged(nameof(StandContents)); - _wwwLevelDataValue.Stand = twilightWwwLevelValue.stand; - _wwwLevelDataValue.StandContents = string.Join(" ", StandContents).Trim(); - - Array.Fill(PointContents, null); - if (twilightWwwLevelValue.point != null) - { - if (twilightWwwLevelValue.point[0] != -1) - { - PointContents[0] = string.Format(LanguageSystem.Instance.WwwLevelPointContents0, 100.0 * twilightWwwLevelValue.point[0]); - } - if (twilightWwwLevelValue.point[1] != -1) - { - PointContents[1] = string.Format(LanguageSystem.Instance.WwwLevelPointContents1, 100.0 * twilightWwwLevelValue.point[1]); - } - } - OnPropertyChanged(nameof(PointContents)); - _wwwLevelDataValue.Point = twilightWwwLevelValue.point; - _wwwLevelDataValue.PointContents = string.Join(" ", PointContents).Trim(); - - Array.Fill(BandContents, null); - if (twilightWwwLevelValue.band != null) - { - if (twilightWwwLevelValue.band[0] != -1) - { - BandContents[0] = string.Format(LanguageSystem.Instance.WwwLevelBandContents0, twilightWwwLevelValue.band[0]); - } - if (twilightWwwLevelValue.band[1] != -1) - { - BandContents[1] = string.Format(LanguageSystem.Instance.WwwLevelBandContents1, twilightWwwLevelValue.band[1]); - } - } - OnPropertyChanged(nameof(BandContents)); - _wwwLevelDataValue.Band = twilightWwwLevelValue.band; - _wwwLevelDataValue.BandContents = string.Join(" ", BandContents).Trim(); - - Array.Fill(AudioMultiplierContents, null); - if (twilightWwwLevelValue.audioMultiplier != null) - { - if (twilightWwwLevelValue.audioMultiplier[0] != -1) - { - AudioMultiplierContents[0] = string.Format(LanguageSystem.Instance.WwwLevelAudioMultiplierContents0, twilightWwwLevelValue.audioMultiplier[0].ToString("0.00")); - _audioMultipliers[0] = twilightWwwLevelValue.audioMultiplier[0]; - } - else - { - _audioMultipliers[0] = double.NegativeInfinity; - } - if (twilightWwwLevelValue.audioMultiplier[1] != -1) - { - AudioMultiplierContents[1] = string.Format(LanguageSystem.Instance.WwwLevelAudioMultiplierContents1, twilightWwwLevelValue.audioMultiplier[1].ToString("0.00")); - _audioMultipliers[1] = twilightWwwLevelValue.audioMultiplier[1]; - } - else - { - _audioMultipliers[1] = double.PositiveInfinity; - } - } - OnPropertyChanged(nameof(AudioMultiplierContents)); - _wwwLevelDataValue.LowestAudioMultiplier = (twilightWwwLevelValue.audioMultiplier?[0] == -1.0 ? null : twilightWwwLevelValue.audioMultiplier?[0] as double?) ?? 0.5; - _wwwLevelDataValue.HighestAudioMultiplier = (twilightWwwLevelValue.audioMultiplier?[1] == -1.0 ? null : twilightWwwLevelValue.audioMultiplier?[1] as double?) ?? 2.0; - - Array.Fill(JudgmentContents, null); - if (twilightWwwLevelValue.judgments != null) - { - for (var i = twilightWwwLevelValue.judgments.Length - 1; i >= 0; --i) - { - if (twilightWwwLevelValue.judgments[i] != null) - { - JudgmentContents[i] = new string[twilightWwwLevelValue.judgments[i].Length]; - if (twilightWwwLevelValue.judgments[i][0] != -1) - { - JudgmentContents[i][0] = string.Format(LanguageSystem.Instance.WwwLevelJudgmentContents0, twilightWwwLevelValue.judgments[i][0]); - } - if (twilightWwwLevelValue.judgments[i][1] != -1) - { - JudgmentContents[i][1] = string.Format(LanguageSystem.Instance.WwwLevelJudgmentContents1, twilightWwwLevelValue.judgments[i][1]); - } - } - } - } - OnPropertyChanged(nameof(JudgmentContents)); - _wwwLevelDataValue.Judgments = twilightWwwLevelValue.judgments; - _wwwLevelDataValue.JudgmentContents[(int)Component.Judged.Highest] = JudgmentContents[(int)Component.Judged.Highest] != null ? $"Yell! {string.Join(" ", JudgmentContents[(int)Component.Judged.Highest]).Trim()}" : null; - _wwwLevelDataValue.JudgmentContents[(int)Component.Judged.Higher] = JudgmentContents[(int)Component.Judged.Higher] != null ? $"Yell {string.Join(" ", JudgmentContents[(int)Component.Judged.Higher]).Trim()}" : null; - _wwwLevelDataValue.JudgmentContents[(int)Component.Judged.High] = JudgmentContents[(int)Component.Judged.High] != null ? $"Cool {string.Join(" ", JudgmentContents[(int)Component.Judged.High]).Trim()}" : null; - _wwwLevelDataValue.JudgmentContents[(int)Component.Judged.Low] = JudgmentContents[(int)Component.Judged.Low] != null ? $"Good {string.Join(" ", JudgmentContents[(int)Component.Judged.Low]).Trim()}" : null; - _wwwLevelDataValue.JudgmentContents[(int)Component.Judged.Lower] = JudgmentContents[(int)Component.Judged.Lower] != null ? $"Poor {string.Join(" ", JudgmentContents[(int)Component.Judged.Lower]).Trim()}" : null; - _wwwLevelDataValue.JudgmentContents[(int)Component.Judged.Lowest] = JudgmentContents[(int)Component.Judged.Lowest] != null ? $"Failed {string.Join(" ", JudgmentContents[(int)Component.Judged.Lowest]).Trim()}" : null; - - AllowPause = twilightWwwLevelValue.allowPause; - OnPropertyChanged(nameof(AllowPause)); - _wwwLevelDataValue.AllowPause = twilightWwwLevelValue.allowPause; - - var mainViewModel = ViewModels.Instance.MainValue; - var siteContainerViewModel = ViewModels.Instance.SiteContainerValue; - var toModifyModeComponentViewModel = ViewModels.Instance.ModifyModeComponentValue; - - HandlingUISystem.Instance.HandleParallel(() => - { - WwwLevelComputingCollection.Clear(); - foreach (var levelNote in twilightWwwLevelValue.levelNote) - { - var title = levelNote.title; - var artist = levelNote.artist; - var levelText = levelNote.levelText; - var genre = levelNote.genre; - var noteVariety = levelNote.noteVariety; - if (noteVariety == BaseNoteFile.NoteVariety.EventNote) - { - title = new string('❌', 1 + RandomNumberGenerator.GetInt32(10)); - artist = new string('❌', 1 + RandomNumberGenerator.GetInt32(10)); - levelText = new string('❌', 1 + RandomNumberGenerator.GetInt32(10)); - genre = new string('❌', 1 + RandomNumberGenerator.GetInt32(10)); - } - WwwLevelComputingCollection.Add(new WwwLevelComputing - { - WwwLevelNoteVariety = noteVariety, - NoteID = levelNote.noteID, - Title = title, - Artist = artist, - Genre = genre, - LevelValue = levelNote.level, - LevelText = levelText, - NotHaveIt = !ViewModels.Instance.MainValue.NoteID512s.ContainsKey(levelNote.noteID) - }); - } - - AutoModes.Clear(); - if (twilightWwwLevelValue.autoMode != null) - { - foreach (var autoMode in twilightWwwLevelValue.autoMode.OrderBy(value => toModifyModeComponentViewModel.ModeComponentValues[ModifyModeComponentViewModel.AutoModeVariety].FindIndex(modeComponentValue => (ModeComponent.AutoMode)modeComponentValue.Value == value))) - { - AutoModes.Add(new WwwLevelModeComponent - { - Value = autoMode, - OnInput = new RelayCommand(() => - { - mainViewModel.ModeComponentValue.AutoModeValue = autoMode; - siteContainerViewModel.CallSetModeComponent(); - OnPropertyChanged(nameof(IsAutoModeCompatible)); - }) - }); - } - } - - NoteSaltModes.Clear(); - if (twilightWwwLevelValue.noteSaltMode != null) - { - foreach (var noteSaltMode in twilightWwwLevelValue.noteSaltMode.OrderBy(value => toModifyModeComponentViewModel.ModeComponentValues[ModifyModeComponentViewModel.NoteSaltModeVariety].FindIndex(modeComponentValue => (ModeComponent.NoteSaltMode)modeComponentValue.Value == value))) - { - NoteSaltModes.Add(new WwwLevelModeComponent - { - Value = noteSaltMode, - OnInput = new RelayCommand(() => - { - mainViewModel.ModeComponentValue.NoteSaltModeValue = noteSaltMode; - siteContainerViewModel.CallSetModeComponent(); - mainViewModel.HandleAutoComputer(); - OnPropertyChanged(nameof(IsNoteSaltModeCompatible)); - }) - }); - } - } - - FaintNoteModes.Clear(); - if (twilightWwwLevelValue.faintNoteMode != null) - { - foreach (var faintNoteMode in twilightWwwLevelValue.faintNoteMode.OrderBy(value => toModifyModeComponentViewModel.ModeComponentValues[ModifyModeComponentViewModel.FaintNoteModeVariety].FindIndex(modeComponentValue => (ModeComponent.FaintNoteMode)modeComponentValue.Value == value))) - { - FaintNoteModes.Add(new WwwLevelModeComponent - { - Value = faintNoteMode, - OnInput = new RelayCommand(() => - { - mainViewModel.ModeComponentValue.FaintNoteModeValue = faintNoteMode; - siteContainerViewModel.CallSetModeComponent(); - OnPropertyChanged(nameof(IsFaintNoteModeCompatible)); - }) - }); - } - } - - JudgmentModes.Clear(); - if (twilightWwwLevelValue.judgmentMode != null) - { - foreach (var judgmentMode in twilightWwwLevelValue.judgmentMode.OrderBy(value => toModifyModeComponentViewModel.ModeComponentValues[ModifyModeComponentViewModel.JudgmentModeVariety].FindIndex(modeComponentValue => (ModeComponent.JudgmentMode)modeComponentValue.Value == value))) - { - JudgmentModes.Add(new WwwLevelModeComponent - { - Value = judgmentMode, - OnInput = new RelayCommand(() => - { - mainViewModel.ModeComponentValue.JudgmentModeValue = judgmentMode; - mainViewModel.OnJudgmentMeterMillisModified(); - siteContainerViewModel.CallSetModeComponent(); - OnPropertyChanged(nameof(IsJudgmentModeCompatible)); - }) - }); - } - } - - HitPointsModes.Clear(); - if (twilightWwwLevelValue.hitPointsMode != null) - { - foreach (var hitPointsMode in twilightWwwLevelValue.hitPointsMode.OrderBy(value => toModifyModeComponentViewModel.ModeComponentValues[ModifyModeComponentViewModel.HitPointsModeVariety].FindIndex(modeComponentValue => (ModeComponent.HitPointsMode)modeComponentValue.Value == value))) - { - HitPointsModes.Add(new WwwLevelModeComponent - { - Value = hitPointsMode, - OnInput = new RelayCommand(() => - { - mainViewModel.ModeComponentValue.HitPointsModeValue = hitPointsMode; - siteContainerViewModel.CallSetModeComponent(); - OnPropertyChanged(nameof(IsHitPointsModeCompatible)); - }) - }); - } - } - - NoteMobilityModes.Clear(); - if (twilightWwwLevelValue.noteMobilityMode != null) - { - foreach (var noteMobilityMode in twilightWwwLevelValue.noteMobilityMode.OrderBy(value => toModifyModeComponentViewModel.ModeComponentValues[ModifyModeComponentViewModel.NoteMobilityModeVariety].FindIndex(modeComponentValue => (ModeComponent.NoteMobilityMode)modeComponentValue.Value == value))) - { - NoteMobilityModes.Add(new WwwLevelModeComponent - { - Value = noteMobilityMode, - OnInput = new RelayCommand(() => - { - mainViewModel.ModeComponentValue.NoteMobilityModeValue = noteMobilityMode; - siteContainerViewModel.CallSetModeComponent(); - OnPropertyChanged(nameof(IsNoteMobilityModeCompatible)); - }) - }); - } - } - - LongNoteModes.Clear(); - if (twilightWwwLevelValue.longNoteMode != null) - { - foreach (var longNoteMode in twilightWwwLevelValue.longNoteMode.OrderBy(value => toModifyModeComponentViewModel.ModeComponentValues[ModifyModeComponentViewModel.LongNoteModeVariety].FindIndex(modeComponentValue => (ModeComponent.LongNoteMode)modeComponentValue.Value == value))) - { - LongNoteModes.Add(new WwwLevelModeComponent - { - Value = longNoteMode, - OnInput = new RelayCommand(() => - { - mainViewModel.ModeComponentValue.LongNoteModeValue = longNoteMode; - siteContainerViewModel.CallSetModeComponent(); - mainViewModel.HandleAutoComputer(); - OnPropertyChanged(nameof(IsLongNoteModeCompatible)); - }) - }); - } - } - - InputFavorModes.Clear(); - if (twilightWwwLevelValue.inputFavorMode != null) - { - foreach (var inputFavorMode in twilightWwwLevelValue.inputFavorMode.OrderBy(value => toModifyModeComponentViewModel.ModeComponentValues[ModifyModeComponentViewModel.InputFavorModeVariety].FindIndex(modeComponentValue => (ModeComponent.InputFavorMode)modeComponentValue.Value == value))) - { - InputFavorModes.Add(new WwwLevelModeComponent - { - Value = inputFavorMode, - OnInput = new RelayCommand(() => - { - mainViewModel.ModeComponentValue.InputFavorModeValue = inputFavorMode; - siteContainerViewModel.CallSetModeComponent(); - mainViewModel.HandleAutoComputer(); - OnPropertyChanged(nameof(IsInputFavorModeCompatible)); - }) - }); - } - } - - NoteModifyModes.Clear(); - if (twilightWwwLevelValue.noteModifyMode != null) - { - foreach (var noteModifyMode in twilightWwwLevelValue.noteModifyMode.OrderBy(value => toModifyModeComponentViewModel.ModeComponentValues[ModifyModeComponentViewModel.NoteModifyModeVariety].FindIndex(modeComponentValue => (ModeComponent.NoteModifyMode)modeComponentValue.Value == value))) - { - NoteModifyModes.Add(new WwwLevelModeComponent - { - Value = noteModifyMode, - OnInput = new RelayCommand(() => - { - mainViewModel.ModeComponentValue.NoteModifyModeValue = noteModifyMode; - siteContainerViewModel.CallSetModeComponent(); - mainViewModel.HandleAutoComputer(); - OnPropertyChanged(nameof(IsNoteModifyModeCompatible)); - }) - }); - } - } - - BPMModes.Clear(); - if (twilightWwwLevelValue.bpmMode != null) - { - foreach (var bpmMode in twilightWwwLevelValue.bpmMode.OrderBy(value => toModifyModeComponentViewModel.ModeComponentValues[ModifyModeComponentViewModel.BPMModeVariety].FindIndex(modeComponentValue => (ModeComponent.BPMMode)modeComponentValue.Value == value))) - { - BPMModes.Add(new WwwLevelModeComponent - { - Value = bpmMode, - OnInput = new RelayCommand(() => - { - mainViewModel.ModeComponentValue.BPMModeValue = bpmMode; - siteContainerViewModel.CallSetModeComponent(); - mainViewModel.HandleAutoComputer(); - OnPropertyChanged(nameof(IsBPMModeCompatible)); - }) - }); - } - } - - WaveModes.Clear(); - if (twilightWwwLevelValue.waveMode != null) - { - foreach (var waveMode in twilightWwwLevelValue.waveMode.OrderBy(value => toModifyModeComponentViewModel.ModeComponentValues[ModifyModeComponentViewModel.WaveModeVariety].FindIndex(modeComponentValue => (ModeComponent.WaveMode)modeComponentValue.Value == value))) - { - WaveModes.Add(new WwwLevelModeComponent - { - Value = waveMode, - OnInput = new RelayCommand(() => - { - mainViewModel.ModeComponentValue.WaveModeValue = waveMode; - siteContainerViewModel.CallSetModeComponent(); - mainViewModel.HandleAutoComputer(); - OnPropertyChanged(nameof(IsWaveModeCompatible)); - }) - }); - } - } - - SetNoteModes.Clear(); - if (twilightWwwLevelValue.setNoteMode != null) - { - foreach (var setNoteMode in twilightWwwLevelValue.setNoteMode.OrderBy(value => toModifyModeComponentViewModel.ModeComponentValues[ModifyModeComponentViewModel.SetNoteModeVariety].FindIndex(modeComponentValue => (ModeComponent.SetNoteMode)modeComponentValue.Value == value))) - { - SetNoteModes.Add(new WwwLevelModeComponent - { - Value = setNoteMode, - OnInput = new RelayCommand(() => - { - mainViewModel.ModeComponentValue.SetNoteModeValue = setNoteMode; - siteContainerViewModel.CallSetModeComponent(); - mainViewModel.HandleAutoComputer(); - OnPropertyChanged(nameof(IsSetNoteModeCompatible)); - }) - }); - } - } - - LowestJudgmentConditionModes.Clear(); - if (twilightWwwLevelValue.lowestJudgmentConditionMode != null) - { - foreach (var lowestJudgmentConditionMode in twilightWwwLevelValue.lowestJudgmentConditionMode.OrderBy(value => toModifyModeComponentViewModel.ModeComponentValues[ModifyModeComponentViewModel.LowestJudgmentConditionModeVariety].FindIndex(modeComponentValue => (ModeComponent.LowestJudgmentConditionMode)modeComponentValue.Value == value))) - { - LowestJudgmentConditionModes.Add(new WwwLevelModeComponent - { - Value = lowestJudgmentConditionMode, - OnInput = new RelayCommand(() => - { - mainViewModel.ModeComponentValue.LowestJudgmentConditionModeValue = lowestJudgmentConditionMode; - siteContainerViewModel.CallSetModeComponent(); - OnPropertyChanged(nameof(IsLowestJudgmentConditionModeCompatible)); - }) - }); - } - } - }); - - Utility.SetUICollection(ClearedTitleItemCollection, twilightWwwLevelValue.titles.Select(title => new AvatarTitleItem - { - Title = title.title, - TitleID = title.titleID, - TitlePaint = Utility.GetTitlePaint(title.titleColor), - TitleColor = Utility.GetTitleColor(title.titleColor) - }).ToArray()); - OnPropertyChanged(nameof(HasClearedTitleItem)); - - Utility.SetUICollection(ClearedEdgeItemCollection, twilightWwwLevelValue.edgeIDs.Select(data => new AvatarEdgeItem - { - EdgeID = data, - }).ToArray()); - OnPropertyChanged(nameof(HasClearedEdgeItem)); - - NotifyIsCompatible(); - } - - IsLevelItemLoading = false; - } - } - } - } - - public void NotifyIsCompatible() - { - OnPropertyChanged(nameof(IsAutoModeCompatible)); - OnPropertyChanged(nameof(IsNoteSaltModeCompatible)); - OnPropertyChanged(nameof(IsFaintNoteModeCompatible)); - OnPropertyChanged(nameof(IsJudgmentModeCompatible)); - OnPropertyChanged(nameof(IsHitPointsModeCompatible)); - OnPropertyChanged(nameof(IsNoteMobilityModeCompatible)); - OnPropertyChanged(nameof(IsLongNoteModeCompatible)); - OnPropertyChanged(nameof(IsInputFavorModeCompatible)); - OnPropertyChanged(nameof(IsNoteModifyModeCompatible)); - OnPropertyChanged(nameof(IsBPMModeCompatible)); - OnPropertyChanged(nameof(IsWaveModeCompatible)); - OnPropertyChanged(nameof(IsSetNoteModeCompatible)); - OnPropertyChanged(nameof(IsLowestJudgmentConditionModeCompatible)); - OnPropertyChanged(nameof(HasEventNote)); - } - - public override string ToString() => LevelName; - - public override bool Equals(object obj) => obj is WwwLevelGroup wwwLevelGroup && LevelName == wwwLevelGroup.LevelName; - - public override int GetHashCode() => LevelName.GetHashCode(); - } -} diff --git a/Qwilight/Utilities/Utility.cs b/Qwilight/Utilities/Utility.cs index fc6777e..8b7b3b4 100644 --- a/Qwilight/Utilities/Utility.cs +++ b/Qwilight/Utilities/Utility.cs @@ -229,7 +229,7 @@ onEqual ??= EqualityComparer.Default; if (target is INotifyCollectionChanged) { - HandlingUISystem.Instance.HandleParallel(Hande); + UIHandler.Instance.HandleParallel(Hande); } else { diff --git a/Qwilight/View/ColorInput.xaml.cs b/Qwilight/View/ColorInput.xaml.cs index fe1fe79..0961a52 100644 --- a/Qwilight/View/ColorInput.xaml.cs +++ b/Qwilight/View/ColorInput.xaml.cs @@ -29,7 +29,7 @@ protected override void OnClick() { ViewModels.Instance.ColorValue.SetColor(ColorValue); - ViewModels.Instance.ColorValue.OnLazyCollasped = value => HandlingUISystem.Instance.HandleParallel(() => ColorValue = value); + ViewModels.Instance.ColorValue.OnLazyCollasped = value => UIHandler.Instance.HandleParallel(() => ColorValue = value); ViewModels.Instance.ColorValue.Open(); } } diff --git a/Qwilight/View/MainWindow/DefaultMode/EntryView.xaml.cs b/Qwilight/View/MainWindow/DefaultMode/EntryView.xaml.cs index a65466d..ae9d23c 100644 --- a/Qwilight/View/MainWindow/DefaultMode/EntryView.xaml.cs +++ b/Qwilight/View/MainWindow/DefaultMode/EntryView.xaml.cs @@ -13,21 +13,21 @@ { InitializeComponent(); - StrongReferenceMessenger.Default.Register(this, (recipient, message) => HandlingUISystem.Instance.HandleParallel(() => + StrongReferenceMessenger.Default.Register(this, (recipient, message) => UIHandler.Instance.HandleParallel(() => { if ((DataContext as MainViewModel).IsNoteFileMode) { EntryItemsView.ScrollIntoView(message.Target); } })); - StrongReferenceMessenger.Default.Register(this, (recipient, message) => HandlingUISystem.Instance.HandleParallel(() => + StrongReferenceMessenger.Default.Register(this, (recipient, message) => UIHandler.Instance.HandleParallel(() => { if ((DataContext as MainViewModel).IsNoteFileMode) { EntryItemsView.Focus(); } })); - StrongReferenceMessenger.Default.Register(this, (recipient, message) => HandlingUISystem.Instance.HandleParallel(() => + StrongReferenceMessenger.Default.Register(this, (recipient, message) => UIHandler.Instance.HandleParallel(() => { var i = FitInput.SelectedIndex; FitInput.Items.Refresh(); diff --git a/Qwilight/View/MainWindow/LoadingView.xaml.cs b/Qwilight/View/MainWindow/LoadingView.xaml.cs index f3b1e02..386563a 100644 --- a/Qwilight/View/MainWindow/LoadingView.xaml.cs +++ b/Qwilight/View/MainWindow/LoadingView.xaml.cs @@ -10,7 +10,7 @@ public LoadingView() { InitializeComponent(); - StrongReferenceMessenger.Default.Register(this, (recipient, message) => HandlingUISystem.Instance.HandleParallel(() => + StrongReferenceMessenger.Default.Register(this, (recipient, message) => UIHandler.Instance.HandleParallel(() => { var fadingElement = new DoubleAnimation { diff --git a/Qwilight/View/MainWindow/MainWindow.xaml.cs b/Qwilight/View/MainWindow/MainWindow.xaml.cs index 3e3ecda..17c04d0 100644 --- a/Qwilight/View/MainWindow/MainWindow.xaml.cs +++ b/Qwilight/View/MainWindow/MainWindow.xaml.cs @@ -137,7 +137,7 @@ StrongReferenceMessenger.Default.Register(this, (recipient, message) => { - HandlingUISystem.Instance.HandleParallel(() => + UIHandler.Instance.HandleParallel(() => { if (Configure.Instance.WindowedMode) { @@ -188,8 +188,8 @@ }); StrongReferenceMessenger.Default.Register(this, (recipient, message) => message.Reply(GetWindowArea())); StrongReferenceMessenger.Default.Register(this, (recipient, message) => message.Reply(_handle)); - StrongReferenceMessenger.Default.Register(this, (recipient, message) => HandlingUISystem.Instance.HandleParallel(() => _d2DView.SwapChain = message.D2DView)); - StrongReferenceMessenger.Default.Register(this, (recipient, message) => HandlingUISystem.Instance.HandleParallel(() => + StrongReferenceMessenger.Default.Register(this, (recipient, message) => UIHandler.Instance.HandleParallel(() => _d2DView.SwapChain = message.D2DView)); + StrongReferenceMessenger.Default.Register(this, (recipient, message) => UIHandler.Instance.HandleParallel(() => { var windowArea = GetWindowArea(); var windowAreaLength = windowArea.Width; @@ -239,7 +239,7 @@ { if (isVisible) { - HandlingUISystem.Instance.HandleParallel(() => + UIHandler.Instance.HandleParallel(() => { _siteView.Enable(); _siteView.Show(); @@ -249,7 +249,7 @@ } else { - HandlingUISystem.Instance.HandleParallel(() => + UIHandler.Instance.HandleParallel(() => { _siteView.Hide(); _siteView.Disable(); diff --git a/Qwilight/View/MainWindow/WPFView.xaml.cs b/Qwilight/View/MainWindow/WPFView.xaml.cs index 1e03840..dc1f9fa 100644 --- a/Qwilight/View/MainWindow/WPFView.xaml.cs +++ b/Qwilight/View/MainWindow/WPFView.xaml.cs @@ -12,7 +12,7 @@ { InitializeComponent(); - StrongReferenceMessenger.Default.Register(this, (recipient, message) => HandlingUISystem.Instance.HandleParallel(() => + StrongReferenceMessenger.Default.Register(this, (recipient, message) => UIHandler.Instance.HandleParallel(() => { var mainViewModel = DataContext as MainViewModel; if (mainViewModel.IsWPFViewVisible) diff --git a/Qwilight/View/QwilightClass.xaml.cs b/Qwilight/View/QwilightClass.xaml.cs index d7b620b..781c7af 100644 --- a/Qwilight/View/QwilightClass.xaml.cs +++ b/Qwilight/View/QwilightClass.xaml.cs @@ -120,7 +120,7 @@ OnUnhandledFault(fault); } }; - HandlingUISystem.Instance.Init(OnUnhandledFault); + UIHandler.Instance.Init(OnUnhandledFault); QwilightComponent.OnGetBuiltInData = data => TryFindResource(data); diff --git a/Qwilight/View/SiteYell/DefaultSiteYell/AudioSiteYell.xaml.cs b/Qwilight/View/SiteYell/DefaultSiteYell/AudioSiteYell.xaml.cs index 3e2b6c7..35b8436 100644 --- a/Qwilight/View/SiteYell/DefaultSiteYell/AudioSiteYell.xaml.cs +++ b/Qwilight/View/SiteYell/DefaultSiteYell/AudioSiteYell.xaml.cs @@ -66,7 +66,7 @@ { AudioPosition = 100.0 * AudioView.Position / AudioView.NaturalDuration.TimeSpan; } - }, HandlingUISystem.Instance.UIHandler) + }, UIHandler.Instance.MainHandler) { IsEnabled = false }; diff --git a/Qwilight/View/SiteYell/DefaultSiteYell/MediaSiteYell.xaml.cs b/Qwilight/View/SiteYell/DefaultSiteYell/MediaSiteYell.xaml.cs index 2f95009..a480109 100644 --- a/Qwilight/View/SiteYell/DefaultSiteYell/MediaSiteYell.xaml.cs +++ b/Qwilight/View/SiteYell/DefaultSiteYell/MediaSiteYell.xaml.cs @@ -70,7 +70,7 @@ { MediaPosition = 100.0 * MediaView.Position / MediaView.NaturalDuration.TimeSpan; } - }, HandlingUISystem.Instance.UIHandler) + }, UIHandler.Instance.MainHandler) { IsEnabled = false }; diff --git a/Qwilight/View/VoteWindow.xaml b/Qwilight/View/VoteWindow.xaml index 94b0417..db2483b 100644 --- a/Qwilight/View/VoteWindow.xaml +++ b/Qwilight/View/VoteWindow.xaml @@ -38,7 +38,7 @@ - + diff --git a/Qwilight/View/WwwLevelWindow.xaml b/Qwilight/View/WwwLevelWindow.xaml index a7967b9..7671dd6 100644 --- a/Qwilight/View/WwwLevelWindow.xaml +++ b/Qwilight/View/WwwLevelWindow.xaml @@ -46,21 +46,21 @@ - - + + - + - - + + - + @@ -78,17 +78,17 @@ - - + + - - - - + + + + @@ -111,58 +111,58 @@ -