From 4ed670c01b4fd9074bcb5071f135ffbbb1ddab15 Mon Sep 17 00:00:00 2001 From: Vincent Maas Date: Fri, 2 Aug 2024 13:47:03 +0200 Subject: [PATCH] add pages for new UI, fix issues --- ColorControl.UI/Blazor.cs | 8 +- ColorControl.UI/ColorControl.UI.csproj | 45 +- ColorControl.UI/Components/App.razor | 21 +- .../Components/Layout/NavMenu.razor | 58 +- .../Components/Layout/NavMenu.razor.css | 4 + .../Components/Layout/TopMenu.razor | 8 +- .../Components/Pages/AMD/AmdPresetPage.razor | 391 +++ .../Components/Pages/AMD/AmdSettings.razor | 64 + .../Components/Pages/AMD/AmdSummary.razor | 208 ++ .../Components/Pages/Counter.razor | 19 - .../Pages/Game/GamePresetPage.razor | 235 ++ .../Components/Pages/Game/GameSettings.razor | 61 + .../Components/Pages/Game/GameSummary.razor | 160 ++ .../Pages/Generic/ConfirmModal.razor | 36 + .../Components/Pages/Generic/FieldDefs.razor | 125 + .../Pages/Generic/FieldsModal.razor | 127 + .../Components/Pages/Generic/FlagsInput.razor | 53 + .../Pages/Generic/ShortcutInput.razor | 63 + .../Components/Pages/Generic/StepsInput.razor | 402 +++ .../Pages/Generic/TriggerInput.razor | 49 + ColorControl.UI/Components/Pages/Home.razor | 57 +- ColorControl.UI/Components/Pages/Info.razor | 50 + .../Components/Pages/LG/LgDevicePage.razor | 215 ++ .../Pages/LG/LgExecuteActionModal.razor | 117 + .../Components/Pages/LG/LgPresetPage.razor | 184 ++ .../Components/Pages/LG/LgSettings.razor | 34 + .../Components/Pages/LG/LgSummary.razor | 353 +++ .../Components/Pages/Logging.razor | 205 ++ .../Pages/Nvidia/NvidiaDithering.razor | 181 ++ .../Pages/Nvidia/NvidiaDriverSettings.razor | 247 ++ .../Pages/Nvidia/NvidiaPreset.razor | 618 +++++ .../Pages/Nvidia/NvidiaSettings.razor | 76 + .../Pages/Nvidia/NvidiaSummary.razor | 251 ++ .../Components/Pages/Options.razor | 332 ++- .../Pages/Samsung/SamsungDevicePage.razor | 237 ++ .../Pages/Samsung/SamsungPresetPage.razor | 173 ++ .../Pages/Samsung/SamsungServiceMenu.razor | 233 ++ .../Pages/Samsung/SamsungSettings.razor | 34 + .../Pages/Samsung/SamsungSummary.razor | 333 +++ .../Components/Pages/Weather.razor | 64 - .../Extensions/PresetExtensions.cs | 43 + ColorControl.UI/State/AppState.cs | 2 +- ColorControl.UI/appsettings.Development.json | 1 + ColorControl.UI/appsettings.json | 1 + ColorControl.UI/wwwroot/app.css | 4 + ColorControl/ColorControl.csproj | 9 +- ColorControl/CommandLineHandler.cs | 2 +- ColorControl/Forms/OptionsPanel.Designer.cs | 162 +- ColorControl/Forms/OptionsPanel.cs | 34 +- ColorControl/MainForm.cs | 683 +++-- ColorControl/MainWorker.cs | 4 +- ColorControl/Program.cs | 792 +++--- ColorControl/Services/AMD/ADL.cs | 396 --- ColorControl/Services/AMD/ADLWrapper.cs | 402 --- ColorControl/Services/AMD/AmdDisplayInfo.cs | 27 +- ColorControl/Services/AMD/AmdPanel.cs | 1308 +++++----- ColorControl/Services/AMD/AmdPreset.cs | 148 -- ColorControl/Services/AMD/AmdService.cs | 351 ++- .../Services/Common/GraphicsService.cs | 43 + ColorControl/Services/Common/IServiceBase.cs | 7 +- .../Services/Common/LoggingService.cs | 70 + .../Services/Common/NotifyIconManager.cs | 398 +-- .../Services/Common/OptionsService.cs | 224 ++ ColorControl/Services/Common/PresetBase.cs | 232 -- .../Common/QuickAccessForm.Designer.cs | 1 + .../Services/Common/QuickAccessForm.cs | 3 +- ColorControl/Services/Common/ServiceBase.cs | 529 ++-- .../Services/Common/ServiceManager.cs | 80 +- ColorControl/Services/Common/UpdateManager.cs | 10 +- .../Services/GameLauncher/GamePanel.cs | 13 +- .../Services/GameLauncher/GamePreset.cs | 106 - .../Services/GameLauncher/GameService.cs | 64 +- .../GameLauncher/GameServiceConfig.cs | 11 - ColorControl/Services/LG/LgDevice.cs | 77 +- ColorControl/Services/LG/LgGameBar.cs | 579 ++--- ColorControl/Services/LG/LgPanel.cs | 2280 ++++++++--------- ColorControl/Services/LG/LgPreset.cs | 118 - ColorControl/Services/LG/LgService.cs | 240 +- ColorControl/Services/LG/LgServiceConfig.cs | 78 +- ColorControl/Services/LG/RemoteControlForm.cs | 385 +-- .../Services/LG/RemoteControlPanel.cs | 283 +- .../Services/NVIDIA/ColorDataConverter.cs | 3 +- ColorControl/Services/NVIDIA/NvDitherPanel.cs | 1 + ColorControl/Services/NVIDIA/NvGpuInfo.cs | 2 +- ColorControl/Services/NVIDIA/NvPanel.cs | 27 +- ColorControl/Services/NVIDIA/NvService.cs | 304 +-- .../Services/NVIDIA/NvServiceConfig.cs | 12 - .../Services/Samsung/ISamsungService.cs | 27 +- .../Services/Samsung/SamsungButtons.cs | 50 - .../Services/Samsung/SamsungDevice.cs | 1605 ++++++------ ColorControl/Services/Samsung/SamsungPanel.cs | 1976 +++++++------- .../Services/Samsung/SamsungPreset.cs | 109 - .../Services/Samsung/SamsungService.cs | 190 +- .../Services/Samsung/SamsungServiceConfig.cs | 17 +- .../Svc/ColorControlBackgroundService.cs | 2 +- ColorControl/XForms/BrowserWindow.xaml | 21 + ColorControl/XForms/BrowserWindow.xaml.cs | 87 + ColorControl/XForms/LogWindow.xaml | 65 + ColorControl/XForms/LogWindow.xaml.cs | 25 +- ColorControl/lgtv/LgTvApi.cs | 1508 +++++------ ColorControl/lgtv/LgWebOsMouseService.cs | 134 +- ColorControl/lgtv/MessageType.cs | 4 - MHC2Gen/IccContext.cs | 16 +- Nspector/Common/DrsSettingsService.cs | 1344 +++++----- Nspector/Common/Meta/SettingMeta.cs | 9 +- Nspector/nspector/CustomSettingNames.xml | 107 +- Nspector/nspector/Reference.xml | 37 - NvAPIWrapper/Display/ColorData.cs | 368 +-- Shared/Common/GlobalContext.cs | 88 +- Shared/Common/InfoDto.cs | 11 + Shared/Common/PipeUtils.cs | 204 +- Shared/Common/StreamString.cs | 33 + Shared/Contracts/AMD/ADL.cs | 393 +++ Shared/Contracts/AMD/ADLWrapper.cs | 397 +++ Shared/Contracts/AMD/AmdPreset.cs | 175 ++ Shared/Contracts/AMD/AmdServiceConfig.cs | 17 + Shared/Contracts/Config.cs | 28 +- Shared/Contracts/Delegates.cs | 3 + Shared/Contracts/FieldDefinition.cs | 112 + Shared/Contracts/Game/GamePreset.cs | 138 + Shared/Contracts/Game/GameServiceConfig.cs | 18 + Shared/Contracts/InvokableActionDto.cs | 19 + Shared/Contracts/LG/LgDeviceDto.cs | 32 + Shared/Contracts/LG/LgDeviceOptions.cs | 23 + Shared/Contracts/LG/LgEnums.cs | 389 +++ Shared/Contracts/LG/LgFields.cs | 105 + Shared/Contracts/LG/LgPreset.cs | 119 + Shared/Contracts/LG/LgServiceConfigDto.cs | 20 + Shared/Contracts/Module.cs | 11 +- Shared/Contracts/ModuleDto.cs | 9 + Shared/Contracts/NVIDIA/NovideoSettings.cs | 24 + .../NVIDIA/NvColorEnhancementSettings.cs | 34 +- Shared/Contracts/NVIDIA/NvEnums.cs | 45 + .../NVIDIA/NvHdmiInfoFrameSettings.cs | 9 + Shared/Contracts/NVIDIA/NvHdrSettings.cs | 31 +- .../Contracts}/NVIDIA/NvPreset.cs | 189 +- Shared/Contracts/NVIDIA/NvServiceConfig.cs | 21 + Shared/Contracts/NVIDIA/NvSettingConstants.cs | 30 + Shared/Contracts/NVIDIA/NvSettingItemDto.cs | 67 + Shared/Contracts/PresetStep.cs | 90 + Shared/Contracts/Presets/PresetBase.cs | 271 ++ Shared/Contracts/Samsung/SamsungButtons.cs | 50 + Shared/Contracts/Samsung/SamsungDeviceDto.cs | 32 + .../Contracts/Samsung/SamsungDeviceOptions.cs | 23 + Shared/Contracts/Samsung/SamsungEnums.cs | 13 + Shared/Contracts/Samsung/SamsungFields.cs | 85 + Shared/Contracts/Samsung/SamsungPreset.cs | 112 + Shared/Contracts/Samsung/SamsungPresets.cs | 23 + .../Samsung/SamsungServiceConfigDto.cs | 33 + Shared/Contracts/VirtualResolution.cs | 25 +- Shared/EventDispatcher/EventDispatcher.cs | 5 +- .../KeyboardShortcutDispatcher.cs | 65 +- Shared/Forms/MessageForms.cs | 68 +- Shared/Forms/MessageForms.resx | 120 + Shared/Services/OptionsService.cs | 27 - Shared/Services/RpcClientService.cs | 4 +- Shared/Services/RpcServerService.cs | 83 +- Shared/Services/RpcUiClientService.cs | 57 + novideo_srgb/MainWindow.xaml.cs | 20 + 159 files changed, 18672 insertions(+), 9709 deletions(-) create mode 100644 ColorControl.UI/Components/Pages/AMD/AmdPresetPage.razor create mode 100644 ColorControl.UI/Components/Pages/AMD/AmdSettings.razor create mode 100644 ColorControl.UI/Components/Pages/AMD/AmdSummary.razor delete mode 100644 ColorControl.UI/Components/Pages/Counter.razor create mode 100644 ColorControl.UI/Components/Pages/Game/GamePresetPage.razor create mode 100644 ColorControl.UI/Components/Pages/Game/GameSettings.razor create mode 100644 ColorControl.UI/Components/Pages/Game/GameSummary.razor create mode 100644 ColorControl.UI/Components/Pages/Generic/ConfirmModal.razor create mode 100644 ColorControl.UI/Components/Pages/Generic/FieldDefs.razor create mode 100644 ColorControl.UI/Components/Pages/Generic/FieldsModal.razor create mode 100644 ColorControl.UI/Components/Pages/Generic/FlagsInput.razor create mode 100644 ColorControl.UI/Components/Pages/Generic/ShortcutInput.razor create mode 100644 ColorControl.UI/Components/Pages/Generic/StepsInput.razor create mode 100644 ColorControl.UI/Components/Pages/Generic/TriggerInput.razor create mode 100644 ColorControl.UI/Components/Pages/Info.razor create mode 100644 ColorControl.UI/Components/Pages/LG/LgDevicePage.razor create mode 100644 ColorControl.UI/Components/Pages/LG/LgExecuteActionModal.razor create mode 100644 ColorControl.UI/Components/Pages/LG/LgPresetPage.razor create mode 100644 ColorControl.UI/Components/Pages/LG/LgSettings.razor create mode 100644 ColorControl.UI/Components/Pages/LG/LgSummary.razor create mode 100644 ColorControl.UI/Components/Pages/Logging.razor create mode 100644 ColorControl.UI/Components/Pages/Nvidia/NvidiaDithering.razor create mode 100644 ColorControl.UI/Components/Pages/Nvidia/NvidiaDriverSettings.razor create mode 100644 ColorControl.UI/Components/Pages/Nvidia/NvidiaPreset.razor create mode 100644 ColorControl.UI/Components/Pages/Nvidia/NvidiaSettings.razor create mode 100644 ColorControl.UI/Components/Pages/Nvidia/NvidiaSummary.razor create mode 100644 ColorControl.UI/Components/Pages/Samsung/SamsungDevicePage.razor create mode 100644 ColorControl.UI/Components/Pages/Samsung/SamsungPresetPage.razor create mode 100644 ColorControl.UI/Components/Pages/Samsung/SamsungServiceMenu.razor create mode 100644 ColorControl.UI/Components/Pages/Samsung/SamsungSettings.razor create mode 100644 ColorControl.UI/Components/Pages/Samsung/SamsungSummary.razor delete mode 100644 ColorControl.UI/Components/Pages/Weather.razor create mode 100644 ColorControl.UI/Extensions/PresetExtensions.cs delete mode 100644 ColorControl/Services/AMD/ADL.cs delete mode 100644 ColorControl/Services/AMD/ADLWrapper.cs delete mode 100644 ColorControl/Services/AMD/AmdPreset.cs create mode 100644 ColorControl/Services/Common/LoggingService.cs create mode 100644 ColorControl/Services/Common/OptionsService.cs delete mode 100644 ColorControl/Services/Common/PresetBase.cs delete mode 100644 ColorControl/Services/GameLauncher/GamePreset.cs delete mode 100644 ColorControl/Services/GameLauncher/GameServiceConfig.cs delete mode 100644 ColorControl/Services/LG/LgPreset.cs delete mode 100644 ColorControl/Services/NVIDIA/NvServiceConfig.cs delete mode 100644 ColorControl/Services/Samsung/SamsungButtons.cs delete mode 100644 ColorControl/Services/Samsung/SamsungPreset.cs create mode 100644 ColorControl/XForms/BrowserWindow.xaml create mode 100644 ColorControl/XForms/BrowserWindow.xaml.cs delete mode 100644 ColorControl/lgtv/MessageType.cs create mode 100644 Shared/Common/InfoDto.cs create mode 100644 Shared/Contracts/AMD/ADL.cs create mode 100644 Shared/Contracts/AMD/ADLWrapper.cs create mode 100644 Shared/Contracts/AMD/AmdPreset.cs create mode 100644 Shared/Contracts/AMD/AmdServiceConfig.cs create mode 100644 Shared/Contracts/Delegates.cs create mode 100644 Shared/Contracts/FieldDefinition.cs create mode 100644 Shared/Contracts/Game/GamePreset.cs create mode 100644 Shared/Contracts/Game/GameServiceConfig.cs create mode 100644 Shared/Contracts/InvokableActionDto.cs create mode 100644 Shared/Contracts/LG/LgDeviceDto.cs create mode 100644 Shared/Contracts/LG/LgDeviceOptions.cs create mode 100644 Shared/Contracts/LG/LgEnums.cs create mode 100644 Shared/Contracts/LG/LgFields.cs create mode 100644 Shared/Contracts/LG/LgPreset.cs create mode 100644 Shared/Contracts/LG/LgServiceConfigDto.cs create mode 100644 Shared/Contracts/ModuleDto.cs create mode 100644 Shared/Contracts/NVIDIA/NovideoSettings.cs create mode 100644 Shared/Contracts/NVIDIA/NvEnums.cs rename {ColorControl/Services => Shared/Contracts}/NVIDIA/NvPreset.cs (71%) create mode 100644 Shared/Contracts/NVIDIA/NvServiceConfig.cs create mode 100644 Shared/Contracts/NVIDIA/NvSettingConstants.cs create mode 100644 Shared/Contracts/NVIDIA/NvSettingItemDto.cs create mode 100644 Shared/Contracts/PresetStep.cs create mode 100644 Shared/Contracts/Presets/PresetBase.cs create mode 100644 Shared/Contracts/Samsung/SamsungButtons.cs create mode 100644 Shared/Contracts/Samsung/SamsungDeviceDto.cs create mode 100644 Shared/Contracts/Samsung/SamsungDeviceOptions.cs create mode 100644 Shared/Contracts/Samsung/SamsungEnums.cs create mode 100644 Shared/Contracts/Samsung/SamsungFields.cs create mode 100644 Shared/Contracts/Samsung/SamsungPreset.cs create mode 100644 Shared/Contracts/Samsung/SamsungPresets.cs create mode 100644 Shared/Contracts/Samsung/SamsungServiceConfigDto.cs create mode 100644 Shared/Forms/MessageForms.resx delete mode 100644 Shared/Services/OptionsService.cs create mode 100644 Shared/Services/RpcUiClientService.cs diff --git a/ColorControl.UI/Blazor.cs b/ColorControl.UI/Blazor.cs index deca49b..582849a 100644 --- a/ColorControl.UI/Blazor.cs +++ b/ColorControl.UI/Blazor.cs @@ -1,10 +1,11 @@ +using ColorControl.Shared.Contracts; using ColorControl.Shared.Services; namespace ColorControl.UI; public static class Blazor { - public static void Start() + public static void Start(Config? config = null) { var builder = WebApplication.CreateBuilder(); @@ -12,8 +13,9 @@ public static class Blazor builder.Services.AddRazorComponents() .AddInteractiveServerComponents(); - builder.Services.AddSingleton(); - builder.Services.AddSingleton(); + builder.Services.AddSingleton(new AppState { SelectedTheme = (config?.UseDarkMode ?? true) ? "dark" : "light" }); + builder.Services.AddTransient(); + builder.WebHost.ConfigureKestrel(o => o.ListenAnyIP(config?.UiPort > 0 ? config.UiPort : 5000)); var app = builder.Build(); diff --git a/ColorControl.UI/ColorControl.UI.csproj b/ColorControl.UI/ColorControl.UI.csproj index 8374a7f..d9c99b4 100644 --- a/ColorControl.UI/ColorControl.UI.csproj +++ b/ColorControl.UI/ColorControl.UI.csproj @@ -1,4 +1,4 @@ - + net8.0-windows10.0.20348.0 @@ -7,8 +7,51 @@ Library + + + + + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + diff --git a/ColorControl.UI/Components/App.razor b/ColorControl.UI/Components/App.razor index 1f31ed6..86bbe4f 100644 --- a/ColorControl.UI/Components/App.razor +++ b/ColorControl.UI/Components/App.razor @@ -1,4 +1,8 @@ -@inject AppState AppState +@using ColorControl.Shared.Contracts +@using ColorControl.Shared.Services +@inject AppState AppState +@inject RpcUiClientService ClientService; +@inject NavigationManager _navigationManager; @implements IDisposable @attribute [StreamRendering] @@ -9,7 +13,8 @@ - + + @@ -23,8 +28,18 @@ @code { - protected override void OnInitialized() + protected override async Task OnInitializedAsync() { + var config = await ClientService.CallAsync("OptionsService", "GetConfig"); + + var newTheme = config.UseDarkMode ? "dark" : "light"; + + if (newTheme != AppState.SelectedTheme) + { + AppState.SelectedTheme = config.UseDarkMode ? "dark" : "light"; + _navigationManager.Refresh(); + } + AppState.OnChange += StateHasChanged; } diff --git a/ColorControl.UI/Components/Layout/NavMenu.razor b/ColorControl.UI/Components/Layout/NavMenu.razor index e450155..514ac68 100644 --- a/ColorControl.UI/Components/Layout/NavMenu.razor +++ b/ColorControl.UI/Components/Layout/NavMenu.razor @@ -1,4 +1,13 @@ -
+@using ColorControl.Shared.Contracts +@using ColorControl.Shared.Services; + +@rendermode InteractiveServer + +@inject RpcUiClientService _rpcClientService +@inject AppState AppState +@inject NavigationManager _navigationManager; + +
ColorControl Web App
@@ -9,29 +18,50 @@
+@code { + private Config? config; + private List? modules; + + protected override async Task OnInitializedAsync() + { + config = await _rpcClientService.CallAsync("OptionsService", "GetConfig"); + modules = config?.Modules?.Select(m => new ModuleDto { DisplayName = m.DisplayName, IsActive = m.IsActive, Link = m.DisplayName.Split(' ')[0] }).ToList(); + } +} \ No newline at end of file diff --git a/ColorControl.UI/Components/Layout/NavMenu.razor.css b/ColorControl.UI/Components/Layout/NavMenu.razor.css index 4e15395..270bf2a 100644 --- a/ColorControl.UI/Components/Layout/NavMenu.razor.css +++ b/ColorControl.UI/Components/Layout/NavMenu.razor.css @@ -46,6 +46,10 @@ background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-list-nested' viewBox='0 0 16 16'%3E%3Cpath fill-rule='evenodd' d='M4.5 11.5A.5.5 0 0 1 5 11h10a.5.5 0 0 1 0 1H5a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 3 7h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 1 3h10a.5.5 0 0 1 0 1H1a.5.5 0 0 1-.5-.5z'/%3E%3C/svg%3E"); } +.bi-list-logging-nav-menu { + background-image: url('data:image/svg+xml,'); +} + .nav-item { font-size: 0.9rem; padding-bottom: 0.5rem; diff --git a/ColorControl.UI/Components/Layout/TopMenu.razor b/ColorControl.UI/Components/Layout/TopMenu.razor index 4646f62..32eaf88 100644 --- a/ColorControl.UI/Components/Layout/TopMenu.razor +++ b/ColorControl.UI/Components/Layout/TopMenu.razor @@ -1,11 +1,13 @@ -@inherits LayoutComponentBase +@using ColorControl.Shared.Contracts +@using ColorControl.Shared.Services +@inherits LayoutComponentBase @inject AppState AppState @inject NavigationManager _navigationManager; @rendermode InteractiveServer -
- +
+ @* *@ GitHub
diff --git a/ColorControl.UI/Components/Pages/AMD/AmdPresetPage.razor b/ColorControl.UI/Components/Pages/AMD/AmdPresetPage.razor new file mode 100644 index 0000000..53dde96 --- /dev/null +++ b/ColorControl.UI/Components/Pages/AMD/AmdPresetPage.razor @@ -0,0 +1,391 @@ +@using ColorControl.Shared.Contracts +@using ColorControl.Shared.Contracts.AMD +@using ColorControl.Shared.Services; +@using ColorControl.UI.Components.Pages.Generic +@using ColorControl.Shared.Common; + +@rendermode InteractiveServer + +@inject RpcUiClientService _rpcClientService + + + +@code { + public AmdPreset? Preset { get; set; } + + [Parameter] + public AmdPreset? PresetParam { get; set; } + + [Parameter] + public Func? AfterApply { get; set; } + + private string? selectedActiveResolution; + private string? selectedVirtualResolution; + private string? selectedRefreshRate; + + private List? resolutions; + private List? refreshRates; + private List? displayPresets; + + private string WasValidated = ""; + private bool IsVisible; + + protected override async Task OnParametersSetAsync() + { + Preset = PresetParam == null ? null : PresetParam.CloneWithId(); + if (Preset != null && PresetParam != null) + { + resolutions = await _rpcClientService.CallAsync>("AmdService", "GetAvailableResolutionsV2", Preset); + refreshRates = await _rpcClientService.CallAsync>("AmdService", "GetAvailableRefreshRatesV2", Preset); + } + selectedActiveResolution = Preset?.DisplayConfig.Resolution?.GetActiveString(); + selectedVirtualResolution = Preset?.DisplayConfig.Resolution?.GetVirtualString(); + selectedRefreshRate = Preset?.DisplayConfig.RefreshRate?.ToString(); + + if (Preset?.IsDisplayPreset != true) + { + displayPresets = await _rpcClientService.CallAsync>("AmdService", "GetDisplayPresets"); + } + } + + private async Task ApplyClick(MouseEventArgs e) + { + if (Preset == null) + { + return; + } + + if (!IsValid()) + { + WasValidated = "was-validated"; + return; + } + + var newResolution = resolutions?.FirstOrDefault(r => r.GetActiveString() == selectedActiveResolution); + if (newResolution != null) + { + if (!string.IsNullOrEmpty(selectedVirtualResolution) && selectedActiveResolution != selectedVirtualResolution) + { + newResolution = new VirtualResolution(newResolution.ActiveWidth, newResolution.ActiveHeight); + var parts = selectedVirtualResolution.Split('x'); + newResolution.VirtualWidth = uint.Parse(parts[0]); + newResolution.VirtualHeight = uint.Parse(parts[1]); + } + Preset.DisplayConfig.Resolution = newResolution; + } + + var newRefreshRate = refreshRates?.FirstOrDefault(r => r.ToString() == selectedRefreshRate); + if (newRefreshRate != null) + { + Preset.DisplayConfig.RefreshRate = newRefreshRate; + } + + if (Preset.IsDisplayPreset) + { + //Preset.UpdateAutoApplySettings(PresetParam); + + await ApplyDisplayPreset(); + return; + } + + var result = await _rpcClientService.CallAsync("AmdService", "UpdatePreset", Preset); + + if (AfterApply != null) + { + await AfterApply.Invoke(Preset); + } + } + + private async Task ApplyDisplayPreset() + { + var result = await _rpcClientService.CallAsync("AmdService", "ApplyPreset", Preset); + } + + private void ModalOnFocus(FocusEventArgs e) + { + if (!IsVisible) + { + WasValidated = ""; + IsVisible = true; + } + } + + private bool IsValid() + { + return Preset?.IsDisplayPreset == true || !string.IsNullOrEmpty(Preset?.name); + } +} \ No newline at end of file diff --git a/ColorControl.UI/Components/Pages/AMD/AmdSettings.razor b/ColorControl.UI/Components/Pages/AMD/AmdSettings.razor new file mode 100644 index 0000000..b9d03de --- /dev/null +++ b/ColorControl.UI/Components/Pages/AMD/AmdSettings.razor @@ -0,0 +1,64 @@ +@using ColorControl.Shared.Contracts +@using ColorControl.Shared.Contracts.AMD +@using ColorControl.Shared.Services; +@using ColorControl.Shared.Common; +@using ColorControl.UI.Components.Pages.Generic + +@rendermode InteractiveServer +@inject RpcUiClientService _rpcClientService + + + +@code { + private AmdServiceConfig? Config { get; set; } + + private async Task ApplyClick(MouseEventArgs e) + { + if (Config == null) + { + return; + } + + var result = await _rpcClientService.CallAsync("AmdService", "UpdateConfig", Config); + + if (result) + { + Config = null; + } + } + + private async Task OnFocus(FocusEventArgs e) + { + if (Config != null) + { + return; + } + + Config = await _rpcClientService.CallAsync("AmdService", "GetConfig"); + } +} \ No newline at end of file diff --git a/ColorControl.UI/Components/Pages/AMD/AmdSummary.razor b/ColorControl.UI/Components/Pages/AMD/AmdSummary.razor new file mode 100644 index 0000000..f949df8 --- /dev/null +++ b/ColorControl.UI/Components/Pages/AMD/AmdSummary.razor @@ -0,0 +1,208 @@ +@page "/AMD" + +@using ColorControl.Shared.Common +@using ColorControl.Shared.Contracts +@using ColorControl.Shared.Contracts.AMD +@using ColorControl.Shared.Services; +@using ColorControl.UI.Components.Pages.Generic +@using ColorControl.UI.Generics +@using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage + +@rendermode InteractiveServer + +@inject RpcUiClientService _rpcClientService +@inject ProtectedLocalStorage _localStorage + +AMD controller + + + +
+

AMD controller

+
+ +
+
+ +

Displays

+ + + + +@if (DisplayPresets == null) +{ +
Loading...
+} +else +{ +
+
+ @if (!DisplayPresets.Any()) + { + No displays found + } + @foreach (var preset in DisplayPresets) + { +
+
+ @preset.displayName + @if (preset.DisplayConfig.IsPrimary == true) + { + Primary + } + +
+
+ @preset.DisplayConfig.Resolution.ToString() @@ @preset.DisplayConfig.RefreshRate.ToString()Hz + @preset.colorDepth, @preset.pixelFormat +
+
+ } +
+
+} + +@if (Presets == null) +{ +
Loading...
+} +else +{ +
+

Presets

+
+ + +
+
+
+
+
+ @foreach (var preset in Presets) + { + +
+
+
+ @preset.name @(preset.primaryDisplay ? "Primary display" : preset.displayName) + @if (preset.ShowInQuickAccess) + { + QA + } +
+
+ + + + + +
+

@preset.DisplayConfig.Resolution.ToString() @@ @preset.DisplayConfig.RefreshRate.ToString()Hz @(preset.applyColorData ? preset.colorDepth : "")

+ @preset.shortcut + + } +
+
+
+} + +@code { + private List? Presets; + private List? DisplayPresets; + private List? Resolutions; + + private AmdPreset? CurrentPreset; + + private PresetOrder PresetOrder; + + protected override async Task OnInitializedAsync() + { + await RefreshPresets(); + DisplayPresets = await _rpcClientService.CallAsync>("AmdService", "GetDisplayPresets"); + Resolutions = await _rpcClientService.CallAsync>("AmdService", "GetAvailableResolutionsV2", DisplayPresets?.FirstOrDefault()); + } + + protected override async Task OnAfterRenderAsync(bool firstTime) + { + if (firstTime) + { + PresetOrder = await _localStorage.TryGet("AmdPresetOrder"); + Presets = Presets?.OrderPresetsBy(PresetOrder); + + StateHasChanged(); + } + } + + private async Task PresetOnClick(AmdPreset preset) + { + await _rpcClientService.CallAsync("AmdService", "ApplyPresetWithId", preset.id); + } + + private async Task PresetOnEditClick(AmdPreset preset) + { + CurrentPreset = preset; + } + + private async Task PresetOnCloneClick(AmdPreset preset) + { + CurrentPreset = new AmdPreset(preset); + CurrentPreset.SetCloneValues(); + } + + private async Task PresetOnDeleteClick(AmdPreset preset) + { + CurrentPreset = preset; + } + + private async Task PresetOnDeleteConfirmed() + { + if (CurrentPreset == null) + { + return; + } + + await _rpcClientService.CallAsync("AmdService", "DeletePreset", CurrentPreset.id); + await RefreshPresets(); + StateHasChanged(); + } + + private async Task DisplayPresetOnClick(AmdPreset preset) + { + CurrentPreset = preset; + } + + private async Task AddPresetOnClick() + { + CurrentPreset = new AmdPreset(); + } + + private async Task AfterPresetApplied(AmdPreset preset) + { + await RefreshPresets(); + StateHasChanged(); + } + + private async Task PresetOrderChanged() + { + await _localStorage.SetAsync("AmdPresetOrder", PresetOrder); + await RefreshPresets(); + } + + private async Task RefreshPresets() + { + Presets = await _rpcClientService.CallAsync>("AmdService", "GetPresets"); + + Presets = Presets?.OrderPresetsBy(PresetOrder); + } +} diff --git a/ColorControl.UI/Components/Pages/Counter.razor b/ColorControl.UI/Components/Pages/Counter.razor deleted file mode 100644 index 1a4f8e7..0000000 --- a/ColorControl.UI/Components/Pages/Counter.razor +++ /dev/null @@ -1,19 +0,0 @@ -@page "/counter" -@rendermode InteractiveServer - -Counter - -

Counter

- -

Current count: @currentCount

- - - -@code { - private int currentCount = 0; - - private void IncrementCount() - { - currentCount++; - } -} diff --git a/ColorControl.UI/Components/Pages/Game/GamePresetPage.razor b/ColorControl.UI/Components/Pages/Game/GamePresetPage.razor new file mode 100644 index 0000000..89e217f --- /dev/null +++ b/ColorControl.UI/Components/Pages/Game/GamePresetPage.razor @@ -0,0 +1,235 @@ +@using ColorControl.Shared.Contracts +@using ColorControl.Shared.Contracts.NVIDIA +@using ColorControl.Shared.Contracts.Game +@using ColorControl.Shared.Services +@using ColorControl.UI.Components.Pages.Generic +@using NvAPIWrapper.Native.Display +@using ColorControl.Shared.Common + +@rendermode InteractiveServer + +@inject RpcUiClientService _rpcClientService +@inject AppState AppState +@inject NavigationManager _navigationManager; + + + +@code { + private GamePreset? Preset; + + [Parameter] + public GamePreset? PresetParam { get; set; } + + [Parameter] + public Func? AfterApply { get; set; } + + public List CpuAffinityLabels = Enumerable.Range(0, Environment.ProcessorCount).Select(i => $"CPU #{i}").ToList(); + + public bool SelectingFile { get; set; } + + private string WasValidated = ""; + private bool IsVisible; + + protected override async Task OnParametersSetAsync() + { + if (PresetParam == null) + { + return; + } + + Preset = PresetParam.CloneWithId(); + } + + private async Task ApplyClick(MouseEventArgs e) + { + if (Preset == null) + { + return; + } + + if (!IsValid()) + { + WasValidated = "was-validated"; + return; + } + + var result = await _rpcClientService.CallAsync("GameService", "UpdatePreset", Preset); + + if (AfterApply != null) + { + await AfterApply.Invoke(Preset); + } + + IsVisible = false; + } + + private bool IsValid() + { + return !string.IsNullOrEmpty(Preset?.name) && !string.IsNullOrEmpty(Preset?.Path); + } + + private async Task SelectFileOnClick(MouseEventArgs e) + { + if (Preset == null) + { + return; + } + + SelectingFile = true; + try + { + var options = new RpcUiClientOptions + { + Timeout = 60000 + }; + + var result = await _rpcClientService.CallWithOptionsAsync("GameService", "SelectPath", options); + + if (result != null) + { + Preset.Path = result; + if (string.IsNullOrEmpty(Preset.name)) + { + Preset.name = Path.GetFileNameWithoutExtension(result); + } + } + } + finally + { + SelectingFile = false; + } + } + + private void ModalOnFocus(FocusEventArgs e) + { + if (!IsVisible) + { + WasValidated = ""; + IsVisible = true; + } + } +} \ No newline at end of file diff --git a/ColorControl.UI/Components/Pages/Game/GameSettings.razor b/ColorControl.UI/Components/Pages/Game/GameSettings.razor new file mode 100644 index 0000000..950373c --- /dev/null +++ b/ColorControl.UI/Components/Pages/Game/GameSettings.razor @@ -0,0 +1,61 @@ +@using ColorControl.Shared.Contracts +@using ColorControl.Shared.Contracts.NVIDIA +@using ColorControl.Shared.Contracts.Game +@using ColorControl.Shared.Services; +@using ColorControl.Shared.Common; +@using ColorControl.UI.Components.Pages.Generic + +@rendermode InteractiveServer +@inject RpcUiClientService _rpcClientService + + + +@code { + private GameServiceConfig? Config { get; set; } + + protected override async Task OnInitializedAsync() + { + Config = await _rpcClientService.CallAsync("GameService", "GetConfig"); + } + + private async Task ApplyClick(MouseEventArgs e) + { + if (Config == null) + { + return; + } + + var result = await _rpcClientService.CallAsync("GameService", "UpdateConfig", Config); + } +} \ No newline at end of file diff --git a/ColorControl.UI/Components/Pages/Game/GameSummary.razor b/ColorControl.UI/Components/Pages/Game/GameSummary.razor new file mode 100644 index 0000000..f70fe0b --- /dev/null +++ b/ColorControl.UI/Components/Pages/Game/GameSummary.razor @@ -0,0 +1,160 @@ +@page "/Game" + +@using ColorControl.Shared.Contracts; +@using ColorControl.Shared.Contracts.Game; +@using ColorControl.Shared.Services; +@using ColorControl.UI.Components.Pages.Generic +@using ColorControl.Shared.Common; +@using ColorControl.UI.Generics +@using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage + +@rendermode InteractiveServer + +@inject RpcUiClientService _rpcClientService +@inject ProtectedLocalStorage _localStorage + +Game launcher + + + +
+

Game launcher

+
+ +
+
+ +
+

Presets

+
+ + +
+
+ + + + +@if (Presets == null) +{ +
Loading...
+} +else +{ +
+
+
+ @foreach (var preset in Presets) + { + +
+
+
+ @preset.name + @if (preset.ShowInQuickAccess) + { + QA + } +
+
+ + + + + +
+ + } +
+
+
+} + +@code { + private List? Presets; + private GamePreset? CurrentPreset; + + private PresetOrder PresetOrder; + + protected override async Task OnInitializedAsync() + { + await RefreshPresets(); + } + + protected override async Task OnAfterRenderAsync(bool firstTime) + { + if (firstTime) + { + PresetOrder = await _localStorage.TryGet("GamePresetOrder"); + Presets = Presets?.OrderPresetsBy(PresetOrder); + + StateHasChanged(); + } + } + + private async Task PresetOnClick(GamePreset preset) + { + await _rpcClientService.CallAsync("GameService", "ApplyPresetWithId", preset.id); + } + + private async Task PresetOnEditClick(GamePreset preset) + { + CurrentPreset = preset; + } + + private async Task PresetOnCloneClick(GamePreset preset) + { + CurrentPreset = new GamePreset(preset); + CurrentPreset.SetCloneValues(); + } + + private async Task PresetOnDeleteClick(GamePreset preset) + { + CurrentPreset = preset; + } + + private async Task PresetOnDeleteConfirmed() + { + if (CurrentPreset == null) + { + return; + } + + await _rpcClientService.CallAsync("GameService", "DeletePreset", CurrentPreset.id); + await RefreshPresets(); + StateHasChanged(); + } + + private async Task AddPresetOnClick() + { + CurrentPreset = new GamePreset(); + } + + private async Task AfterPresetApplied(GamePreset preset) + { + await RefreshPresets(); + StateHasChanged(); + } + + private async Task PresetOrderChanged() + { + await _localStorage.SetAsync("GamePresetOrder", PresetOrder); + await RefreshPresets(); + } + + private async Task RefreshPresets() + { + Presets = await _rpcClientService.CallAsync>("GameService", "GetPresets"); + + Presets = Presets?.OrderPresetsBy(PresetOrder); + } +} diff --git a/ColorControl.UI/Components/Pages/Generic/ConfirmModal.razor b/ColorControl.UI/Components/Pages/Generic/ConfirmModal.razor new file mode 100644 index 0000000..78964d3 --- /dev/null +++ b/ColorControl.UI/Components/Pages/Generic/ConfirmModal.razor @@ -0,0 +1,36 @@ +@using ColorControl.Shared.Contracts +@using ColorControl.Shared.Services; +@using ColorControl.Shared.Common; + +@rendermode InteractiveServer + + + +@code { + [Parameter] + public string? Title { get; set; } + + [Parameter] + public string? Message { get; set; } + + [Parameter] + public Func? OnConfirm { get; set; } + + public List? Fields { get; set; } + + protected override async Task OnParametersSetAsync() + { + if (Message != null) + { + Fields = [new FieldDefinition { FieldType = FieldType.Label, Label = Message }]; + } + } + + private async Task ConfirmClick() + { + if (OnConfirm != null) + { + await OnConfirm(); + } + } +} \ No newline at end of file diff --git a/ColorControl.UI/Components/Pages/Generic/FieldDefs.razor b/ColorControl.UI/Components/Pages/Generic/FieldDefs.razor new file mode 100644 index 0000000..7a56c42 --- /dev/null +++ b/ColorControl.UI/Components/Pages/Generic/FieldDefs.razor @@ -0,0 +1,125 @@ +@using ColorControl.Shared.Contracts +@using ColorControl.Shared.Services; +@using ColorControl.Shared.Common; + +@rendermode InteractiveServer + +@inject NavigationManager _navigationManager; + +@if (Fields == null) +{ + return; +} + +@foreach (var field in Fields) +{ + if (field.FieldType == FieldType.Text) + { + var fieldId = $"fld_{Random.Shared.Next()}"; + +
+ + + @if (field.SubLabel != null) + { +
+ @field.SubLabel +
+ } +
+ } + if (field.FieldType == FieldType.Label) + { + var fieldId = $"fld_{Random.Shared.Next()}"; + +
+ + @if (field.SubLabel != null) + { +
+ @field.SubLabel +
+ } +
+ } + else if (field.FieldType == FieldType.DropDown) + { + var fieldId = $"fld_{Random.Shared.Next()}"; + +
+ + + @if (field.SubLabel != null) + { +
+ @field.SubLabel +
+ } +
+ } + else if (field.FieldType == FieldType.Shortcut) + { + + } + else if (field.FieldType == FieldType.CheckBox) + { + var fieldId = $"fld_{Random.Shared.Next()}"; + +
+ + +
+ } + else if (field.FieldType == FieldType.Numeric && (field.MaxValue - field.MinValue) <= 50) + { + var fieldId = $"fld_{Random.Shared.Next()}"; + +
+ + + @if (field.SubLabel != null) + { +
+ @field.SubLabel +
+ } +
+ } + else if (field.FieldType == FieldType.Numeric && (field.MaxValue - field.MinValue) > 50) + { + var fieldId = $"fld_{Random.Shared.Next()}"; + +
+ + + @if (field.SubLabel != null) + { +
+ @field.SubLabel +
+ } +
+ } +} + +@code { + [Parameter] + public List? Fields { get; set; } +} \ No newline at end of file diff --git a/ColorControl.UI/Components/Pages/Generic/FieldsModal.razor b/ColorControl.UI/Components/Pages/Generic/FieldsModal.razor new file mode 100644 index 0000000..4a91462 --- /dev/null +++ b/ColorControl.UI/Components/Pages/Generic/FieldsModal.razor @@ -0,0 +1,127 @@ +@using ColorControl.Shared.Contracts +@using ColorControl.Shared.Services; +@using ColorControl.Shared.Common; + +@rendermode InteractiveServer + +@inject NavigationManager _navigationManager; + + + +@code { + [Parameter] + public string? ModalId { get; set; } + + [Parameter] + public string? ConfirmCaption { get; set; } = "Yes"; + + [Parameter] + public string? SecondaryCaption { get; set; } + + [Parameter] + public string? Dismiss { get; set; } = "modal"; + + [Parameter] + public string? Title { get; set; } + + [Parameter] + public string? Message { get; set; } + + [Parameter] + public List? Fields { get; set; } + + [Parameter] + public Func? OnConfirm { get; set; } + + [Parameter] + public Func? OnSecondary { get; set; } + + [Parameter] + public Func? OnShow { get; set; } + + private bool IsVisible { get; set; } + private bool IsNextDisabled { get; set; } + + private async Task ConfirmClick(MouseEventArgs e) + { + if (OnConfirm == null) + { + return; + } + + var dismissing = Dismiss == "modal"; + IsNextDisabled = Dismiss == null; + try + { + await OnConfirm(); + } + finally + { + IsNextDisabled = false; + } + + if (dismissing) + { + IsVisible = false; + Dismiss = "modal"; + } + } + + private async Task SecondaryClick(MouseEventArgs e) + { + if (OnSecondary == null) + { + return; + } + + await OnSecondary(); + } + + private async Task ModalFocus(FocusEventArgs e) + { + if (!IsVisible) + { + IsVisible = true; + + if (OnShow != null) + { + await OnShow(); + //StateHasChanged(); + } + } + } + + private async Task OnClose(MouseEventArgs e) + { + IsVisible = false; + } +} \ No newline at end of file diff --git a/ColorControl.UI/Components/Pages/Generic/FlagsInput.razor b/ColorControl.UI/Components/Pages/Generic/FlagsInput.razor new file mode 100644 index 0000000..e899203 --- /dev/null +++ b/ColorControl.UI/Components/Pages/Generic/FlagsInput.razor @@ -0,0 +1,53 @@ +@using ColorControl.Shared.Contracts +@using ColorControl.Shared.EventDispatcher +@using ColorControl.Shared.Services; +@using ColorControl.Shared.Common; + +
+ + + @if (Labels != null) + { + var index = 1; + var checkValue = 1; + foreach (var label in Labels) + { + var name = $"check{index}"; + var checkIndex = index; + +
+ + +
+ + index++; + checkValue *= 2; + } + } +
+ +@code { + [Parameter] + public List? Labels { get; set; } + + [Parameter] + public string? Label { get; set; } + + [Parameter] + public uint Value { get; set; } + + [Parameter] + public EventCallback ValueChanged { get; set; } + + [Parameter] + public int Col { get; set; } = 4; + + private async Task CheckOnChange(ChangeEventArgs e, int index) + { + var checkValue = (uint)Math.Pow(2, index - 1); + + Value += (uint)((e.Value is bool boolValue && boolValue) ? checkValue : -checkValue); + + await ValueChanged.InvokeAsync(Value); + } +} \ No newline at end of file diff --git a/ColorControl.UI/Components/Pages/Generic/ShortcutInput.razor b/ColorControl.UI/Components/Pages/Generic/ShortcutInput.razor new file mode 100644 index 0000000..eac7621 --- /dev/null +++ b/ColorControl.UI/Components/Pages/Generic/ShortcutInput.razor @@ -0,0 +1,63 @@ +@using ColorControl.Shared.Contracts +@using ColorControl.Shared.EventDispatcher +@using ColorControl.Shared.Services; +@using ColorControl.Shared.Common; + +@rendermode InteractiveServer + +@if (Label != null) +{ +
+ + +
+} + +@code { + [Parameter] + public string? Label { get; set; } + + [Parameter] + public string? Shortcut { get; set; } + + [Parameter] + public EventCallback ShortcutChanged { get; set; } + + private async Task ShortcutOnChange(ChangeEventArgs e) + { + Shortcut = e.Value?.ToString(); + await ShortcutChanged.InvokeAsync(Shortcut); + } + + private void ShortcutOnKeyDown(KeyboardEventArgs e) + { + if (e.Key == "Tab") + { + return; + } + + var text = KeyboardShortcutDispatcher.FormatKeyboardShortcut(e.ShiftKey, e.CtrlKey, e.AltKey, e.Key, e.Code); + Shortcut = text; + } + + private async Task ShortcutOnKeyUp(KeyboardEventArgs e) + { + //KeyboardShortcutDispatcher.HandleKeyboardShortcutUp() + await ShortcutChanged.InvokeAsync(Shortcut); + } + + private void ShortcutOnFocus(FocusEventArgs e) + { + KeyboardShortcutDispatcher.IsActive = false; + } + + private void ShortcutOnBlur(FocusEventArgs e) + { + KeyboardShortcutDispatcher.IsActive = true; + } +} \ No newline at end of file diff --git a/ColorControl.UI/Components/Pages/Generic/StepsInput.razor b/ColorControl.UI/Components/Pages/Generic/StepsInput.razor new file mode 100644 index 0000000..1cbe04e --- /dev/null +++ b/ColorControl.UI/Components/Pages/Generic/StepsInput.razor @@ -0,0 +1,402 @@ +@using ColorControl.Shared.Contracts +@using ColorControl.Shared.Contracts.LG +@using ColorControl.Shared.Contracts.NVIDIA +@using ColorControl.Shared.Contracts.Samsung +@using ColorControl.Shared.EventDispatcher +@using ColorControl.Shared.Services; +@using ColorControl.Shared.Common; + +@typeparam TPreset where TPreset : PresetBase +@inject RpcUiClientService _rpcClientService + +@if (Label != null && Steps != null) +{ + var index = 0; + +
+
+ +
+ @if (NvPresets != null || SamsungPresets != null || CustomItems != null) + { +
+ +
+ @if (NvPresets != null && NvPresetsEnabled) + { +
+ + +
+ } + @if (SamsungPresets != null && SamsungPresetsEnabled) + { +
+ + +
+ } + @if (LgPresets != null && LgPresetsEnabled) + { +
+ + +
+ } + @if (CustomItems != null) + { + foreach (var customItem in CustomItems) + { +
+ + +
+ } + } + @if (ActionItems != null) + { + foreach (var customItem in ActionItems) + { +
+ + +
+ + } + } + +
+
+ } +
+
+ +
+ + +
+
+} + +@code { + [Parameter] + public string? Label { get; set; } + + [Parameter] + public List? Steps { get; set; } + + [Parameter] + public EventCallback?> StepsChanged { get; set; } + + [Parameter] + public List? CustomItems { get; set; } + + [Parameter] + public List? ActionItems { get; set; } + + [Parameter] + public bool NvPresetsEnabled { get; set; } = true; + + [Parameter] + public bool SamsungPresetsEnabled { get; set; } = true; + + [Parameter] + public bool LgPresetsEnabled { get; set; } = true; + + public class ActionStepItem + { + public string Name { get; private set; } + public List> Actions { get; private set; } + public string? SelectedActionName { get; set; } + public Dictionary>> GroupedActions; + + public ActionStepItem(string name, List> actions) + { + Name = name; + Actions = actions; + + GroupedActions = actions.GroupBy(a => a.Category).ToDictionary(k => k.Key, v => v.ToList()); + } + + public string GetStepString(List? fields) + { + if (string.IsNullOrEmpty(SelectedActionName)) + { + return ""; + } + + var action = Actions.FirstOrDefault(a => a.Name == SelectedActionName); + + if (action == null) + { + return ""; + } + + var field = fields?.FirstOrDefault(); + + if (field == null || field.Value == null) + { + return $"{action.Name}"; + } + + return $"{action.Name}({field.Value?.ToString()})"; + } + } + + private List? NvPresets { get; set; } + private List? SamsungPresets { get; set; } + private List? LgPresets { get; set; } + + private int? NvPresetToAddId { get; set; } + private int? SamsungPresetToAddId { get; set; } + private int? LgPresetToAddId { get; set; } + + private List PresetSteps = new(); + + private string? RawText; + + private List? ActionFields; + + protected override async Task OnParametersSetAsync() + { + if (Steps != null) + { + PresetSteps.Clear(); + PresetSteps.AddRange(Steps.Select(s => PresetStep.Parse(s))); + RawText = string.Join(", ", PresetSteps); + } + } + + protected override async Task OnInitializedAsync() + { + var config = await _rpcClientService.CallAsync("OptionsService", "GetConfig"); + + if (config.HasModule(Module.NvModule)) + { + NvPresets = (await _rpcClientService.CallAsync>("NvService", "GetPresets"))?.OrderBy(p => p.name).ToList(); + } + + if (config.HasModule(Module.SamsungModule)) + { + SamsungPresets = (await _rpcClientService.CallAsync>("SamsungService", "GetPresets"))?.OrderBy(p => p.name).ToList(); + } + + if (config.HasModule(Module.LgModule)) + { + LgPresets = (await _rpcClientService.CallAsync>("LgService", "GetPresets"))?.OrderBy(p => p.name).ToList(); + } + } + + private async Task RemoveOnClick(int index) + { + if (PresetSteps.Count > index) + { + PresetSteps.RemoveAt(index); + } + + await EmitSteps(); + } + + private async Task AfterDelayChanged() + { + await EmitSteps(); + } + + private async Task AddPresetOnClick() + { + AddPreset(NvPresets, "NvPreset", NvPresetToAddId); + AddPreset(SamsungPresets, "SamsungPreset", SamsungPresetToAddId); + AddPreset(LgPresets, "LgPreset", LgPresetToAddId); + + if (CustomItems != null && Steps != null) + { + foreach (var customItem in CustomItems) + { + if (string.IsNullOrWhiteSpace(customItem.SelectedItem)) + { + continue; + } + + PresetSteps.Add(PresetStep.Parse(customItem.SelectedItem)); + //customItem.SelectedItem = null; + } + } + if (ActionItems != null && Steps != null) + { + foreach (var customItem in ActionItems) + { + if (string.IsNullOrWhiteSpace(customItem.SelectedActionName)) + { + continue; + } + + var stepString = customItem.GetStepString(ActionFields); + + PresetSteps.Add(PresetStep.Parse(stepString)); + //customItem.SelectedItem = null; + } + } + + await EmitSteps(); + } + + private void AddPreset(List? presets, string type, int? id) where T : PresetBase + { + var preset = presets?.FirstOrDefault(p => p.id == id); + + if (preset == null || Steps == null || preset.id == 0) + { + return; + } + + PresetSteps.Add(PresetStep.Parse($"{type}({preset.name})")); + } + + private async Task EmitSteps() + { + if (Steps != null) + { + Steps.Clear(); + Steps.AddRange(PresetSteps.Select(ps => ps.UpdatedRaw)); + RawText = string.Join(", ", PresetSteps); + + await StepsChanged.InvokeAsync(Steps); + } + + StateHasChanged(); + } + + private async Task RawTextOnBlur(FocusEventArgs e) + { + var newSteps = new List(); + + Utils.ParseWords(newSteps, RawText); + + PresetSteps.Clear(); + PresetSteps.AddRange(newSteps.Select(s => PresetStep.Parse(s))); + + await EmitSteps(); + } + + private async Task RawTextOnChange(ChangeEventArgs e) + { + RawText = e.Value?.ToString(); + } + + private void AdvancedItemChanged(ActionStepItem customItem) + { + var action = customItem.Actions.FirstOrDefault(a => a.Name == customItem.SelectedActionName); + + if (action == null) + { + ActionFields = null; + return; + } + + ActionFields = [CreateField(action)]; + } + + private FieldDefinition CreateField(InvokableActionDto action) + { + var fieldType = FieldType.Numeric; + var strValue = default(string); + var subLabel = default(string); + var label = action.Title; + + if (action.EnumType != null) + { + fieldType = FieldType.DropDown; + strValue = Enum.GetNames(action.EnumType).First(); + subLabel = "Note: not all values are available on all models."; + } + else if (action.MinValue == action.MaxValue) + { + fieldType = FieldType.Label; + label = $"This will execute {action.Title}"; + } + + var field = new FieldDefinition + { + FieldType = fieldType, + Label = label, + SubLabel = subLabel, + ValueType = action.EnumType, + MinValue = action.MinValue, + MaxValue = action.MaxValue, + }; + + if (fieldType == FieldType.Numeric) + { + field.IntValue = action.CurrentValue; + } + else + { + field.StringValue = strValue; + } + + return field; + } +} \ No newline at end of file diff --git a/ColorControl.UI/Components/Pages/Generic/TriggerInput.razor b/ColorControl.UI/Components/Pages/Generic/TriggerInput.razor new file mode 100644 index 0000000..b74c14f --- /dev/null +++ b/ColorControl.UI/Components/Pages/Generic/TriggerInput.razor @@ -0,0 +1,49 @@ +@using ColorControl.Shared.Contracts +@using ColorControl.Shared.EventDispatcher +@using ColorControl.Shared.Services; +@using ColorControl.Shared.Common; + +@rendermode InteractiveServer + +@if (Triggers != null) +{ + foreach (var trigger in Triggers) + { +
+ + +
+ +
+ + +
+
+ + +
+ } +} + +@code { + [Parameter] + public List? Triggers { get; set; } + + private List ConditionLabels = Utils.GetDescriptions(fromValue: 1).ToList(); + + public void ConditionsChanged(uint value) + { + if (Triggers == null || !Triggers.Any()) + { + return; + } + + var trigger = Triggers.First(); + trigger.Conditions = (PresetConditionType)value; + } +} \ No newline at end of file diff --git a/ColorControl.UI/Components/Pages/Home.razor b/ColorControl.UI/Components/Pages/Home.razor index 9001e0b..bf51982 100644 --- a/ColorControl.UI/Components/Pages/Home.razor +++ b/ColorControl.UI/Components/Pages/Home.razor @@ -1,7 +1,60 @@ @page "/" +@using ColorControl.Shared.Contracts +@using ColorControl.Shared.Services; + +@rendermode InteractiveServer + +@inject RpcUiClientService _rpcClientService +@inject AppState AppState +@inject NavigationManager _navigationManager; + Home -

Hello, world!

+

Color Control

-Welcome to your new app. +

Modules

+ +@if (Modules == null) +{ +
Loading...
+} +else +{ +
+ @foreach (var module in Modules.Where(m => m.IsActive)) + { +
+
+
+ @module.DisplayName +
+
+ Open module +
    + @foreach (var info in module.Info) + { +
  • @info
    • + } +
+
+
+
+ } +
+} + +@code { + private Config? Config; + private List? Modules; + + protected override async Task OnInitializedAsync() + { + Config = await _rpcClientService.CallAsync("OptionsService", "GetConfig"); + Modules = await _rpcClientService.CallAsync>("OptionsService", "GetModules"); + if (Modules != null) + { + Modules.ForEach(m => m.Link = m.DisplayName.Split(' ')[0]); + } + } +} diff --git a/ColorControl.UI/Components/Pages/Info.razor b/ColorControl.UI/Components/Pages/Info.razor new file mode 100644 index 0000000..5a3a9bb --- /dev/null +++ b/ColorControl.UI/Components/Pages/Info.razor @@ -0,0 +1,50 @@ +@page "/info" + +@using ColorControl.Shared.Common; +@using ColorControl.Shared.Services; + +@rendermode InteractiveServer + +@inject RpcUiClientService _rpcClientService +@inject AppState AppState +@inject NavigationManager _navigationManager; + +Logging + +

Information

+ +@if (info == null) +{ +
Loading...
+} +else +{ +

@info.ApplicationTitle - @info.LegalCopyright

+ +
This app contains the following 3rd party plugins:
+
    +
  • lgtv.net by gr4b4z
    • +
  • Newtonsoft.Json by James Newton-King
    • +
  • NLog by Jarek Kowalski, Kim Christensen, Julian Verdurmen
    • +
  • NvAPIWrapper.Net by Soroush Falahati
    • +
  • NWin32 by zmjack
    • +
  • TaskScheduler by David Hall
    • +
  • NVIDIA Profile Inspector by Orbmu2k
    • +
  • NvidiaML wrapper by LibreHardwareMonitor
    • +
  • Novideo sRGB by ledoge
    • +
  • NLogViewer by dojo90
    • +
  • WPFDarkTheme by AngryCarrot789
    • +
  • Little-CMS by mm2
    • +
  • MHC2 by dantmnf
    • +
+} + +@code { + private InfoDto? info; + + protected override async Task OnInitializedAsync() + { + info = await _rpcClientService.CallAsync("OptionsService", "GetInfo"); + + } +} diff --git a/ColorControl.UI/Components/Pages/LG/LgDevicePage.razor b/ColorControl.UI/Components/Pages/LG/LgDevicePage.razor new file mode 100644 index 0000000..9d40fb3 --- /dev/null +++ b/ColorControl.UI/Components/Pages/LG/LgDevicePage.razor @@ -0,0 +1,215 @@ +@using ColorControl.Shared.Contracts +@using ColorControl.Shared.Contracts.LG +@using ColorControl.Shared.Services +@using NvAPIWrapper.Native.Display +@using ColorControl.Shared.Common + +@rendermode InteractiveServer + +@inject RpcUiClientService _rpcClientService +@inject AppState AppState +@inject NavigationManager _navigationManager; + + + +@code { + private LgDeviceDto? _device; + + [Parameter] + public LgDeviceDto? Device { get; set; } + + [Parameter] + public Func? AfterApply { get; set; } + + private bool IsTestingConnection; + private bool? IsTestConnectionSuccessful; + + + protected override async Task OnParametersSetAsync() + { + if (_device != Device) + { + _device = Device; + } + } + + private async Task ApplyClick(MouseEventArgs e) + { + if (Device == null) + { + return; + } + + var result = await _rpcClientService.CallAsync("LgService", "UpdateDevice", Device); + + if (AfterApply != null) + { + await AfterApply.Invoke(Device); + } + } + + private async Task TestConnectionClick(MouseEventArgs e) + { + IsTestingConnection = true; + try + { + IsTestConnectionSuccessful = await _rpcClientService.CallWithOptionsAsync("LgService", "TestDevice", new RpcUiClientOptions { Timeout = 120000 }, Device); + } + finally + { + IsTestingConnection = false; + } + } +} \ No newline at end of file diff --git a/ColorControl.UI/Components/Pages/LG/LgExecuteActionModal.razor b/ColorControl.UI/Components/Pages/LG/LgExecuteActionModal.razor new file mode 100644 index 0000000..2437ffc --- /dev/null +++ b/ColorControl.UI/Components/Pages/LG/LgExecuteActionModal.razor @@ -0,0 +1,117 @@ +@using ColorControl.Shared.Contracts +@using ColorControl.Shared.Contracts.LG +@using ColorControl.Shared.Services; +@using ColorControl.Shared.Common; +@using ColorControl.UI.Components.Pages.Generic + +@rendermode InteractiveServer + +@inject RpcUiClientService _rpcClientService + + + +@code { + + [Parameter] + public InvokableActionDto? Action { get; set; } + + [Parameter] + public List? Devices { get; set; } + + [Parameter] + public Func? OnConfirm { get; set; } + + public string? Title { get; set; } + + public List? Fields { get; set; } + + private FieldDefinition? Field; + private FieldDefinition? DeviceField; + + protected override async Task OnParametersSetAsync() + { + if (Action == null) + { + return; + } + + Title = $"Execute action {Action.Title}"; + + Field = CreateField(Action); + + if (Devices?.Any() == true) + { + DeviceField = FieldDefinition.CreateDropDownField("Device", Devices.Select(d => d.ToString()).ToList()); + DeviceField.Value = Devices.FirstOrDefault(d => d.IsSelected)?.ToString(); + + Fields = [DeviceField, Field]; + } + else + { + Fields = [Field]; + } + } + + private FieldDefinition CreateField(InvokableActionDto action) + { + var fieldType = FieldType.Numeric; + var strValue = default(string); + var subLabel = default(string); + var label = action.Title; + + if (action.EnumType != null) + { + fieldType = FieldType.DropDown; + strValue = Enum.GetNames(action.EnumType).First(); + subLabel = "Note: not all values are available on all models."; + } + else if (action.MinValue == action.MaxValue) + { + fieldType = FieldType.Label; + label = $"This will execute {action.Title}. Press Apply to continue."; + } + + var field = new FieldDefinition + { + FieldType = fieldType, + Label = label, + SubLabel = subLabel, + ValueType = action.EnumType, + MinValue = action.MinValue, + MaxValue = action.MaxValue, + }; + + if (fieldType == FieldType.Numeric) + { + field.IntValue = action.CurrentValue; + } + else + { + field.StringValue = strValue; + } + + return field; + } + + private async Task ConfirmClick() + { + if (Action == null || Field == null) + { + return; + } + + if (Devices != null && DeviceField != null) + { + Action.SelectedDevice = Devices.FirstOrDefault(d => d.ToString() == DeviceField.Value?.ToString()); + } + + var parameters = new List { Field.StringValue }; + + await _rpcClientService.CallAsync("LgService", "ExecuteInvokableAction", Action, parameters); + + if (OnConfirm != null) + { + await OnConfirm(); + } + } +} \ No newline at end of file diff --git a/ColorControl.UI/Components/Pages/LG/LgPresetPage.razor b/ColorControl.UI/Components/Pages/LG/LgPresetPage.razor new file mode 100644 index 0000000..03addbf --- /dev/null +++ b/ColorControl.UI/Components/Pages/LG/LgPresetPage.razor @@ -0,0 +1,184 @@ +@using ColorControl.Shared.Contracts +@using ColorControl.Shared.Contracts.LG +@using ColorControl.Shared.Services +@using ColorControl.UI.Components.Pages.Generic +@using NvAPIWrapper.Native.Display +@using ColorControl.Shared.Common +@using static ColorControl.UI.Components.Pages.Generic.StepsInput + +@rendermode InteractiveServer + +@inject RpcUiClientService _rpcClientService +@inject AppState AppState +@inject NavigationManager _navigationManager; + +