Skip to content

Commit 9e8e77d

Browse files
MaassoftMaassoft
committed
fix some issues after new release
1 parent 18f32e1 commit 9e8e77d

File tree

12 files changed

+2841
-2874
lines changed

12 files changed

+2841
-2874
lines changed

‎ColorControl.UI/Components/Pages/AMD/AmdPresetPage.razor‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
{
9494
<input class="form-check-input me-1" style="font-size: 1rem" title="Apply these settings" type="checkbox" @bind="Preset.DisplayConfig.ApplyResolution" id="applyResolution">
9595
}
96-
<button class="accordion-button py-2 @(Preset.DisplayConfig.ApplyResolution ? "text-warning fw-bold" : "")" type="button" data-bs-toggle="collapse" data-bs-target="#resolutionSettings">
96+
<button class="accordion-button py-2 @(!Preset.IsDisplayPreset ? "collapsed" : "") @(Preset.DisplayConfig.ApplyResolution ? "text-warning fw-bold" : "")" type="button" data-bs-toggle="collapse" data-bs-target="#resolutionSettings">
9797
Resolution
9898
</button>
9999
</span>
@@ -157,7 +157,7 @@
157157
</button>
158158
</span>
159159
</h2>
160-
<div id="refreshRateSettings" class="accordion-collapse collapse show" data-bs-parent="#presetAccordion">
160+
<div id="refreshRateSettings" class="accordion-collapse collapse" data-bs-parent="#presetAccordion">
161161
<div class="accordion-body">
162162
<div class="mb-2">
163163
<label class="form-label" for="refreshRate">Refresh Rate</label>
@@ -356,7 +356,7 @@
356356

357357
if (Preset.IsDisplayPreset)
358358
{
359-
//Preset.UpdateAutoApplySettings(PresetParam);
359+
Preset.UpdateAutoApplySettings(PresetParam);
360360

361361
await ApplyDisplayPreset();
362362
return;

‎ColorControl.UI/Components/Pages/AMD/AmdSummary.razor‎

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -38,31 +38,35 @@
3838
else
3939
{
4040
<div class="row mb-3">
41-
<div class="col">
42-
@if (!DisplayPresets.Any())
43-
{
44-
<span>No displays found</span>
45-
}
46-
@foreach (var preset in DisplayPresets)
47-
{
48-
<div class="card">
49-
<div class="card-header">
50-
@preset.displayName
51-
@if (preset.DisplayConfig.IsPrimary == true)
52-
{
53-
<small class="text-muted ms-2">Primary</small>
54-
}
55-
<button type="button" class="btn btn-sm btn-primary ms-2" data-bs-toggle="modal" data-bs-target="#presetModal" @onclick="() => DisplayPresetOnClick(preset)">
56-
Settings
57-
</button>
41+
@if (!DisplayPresets.Any())
42+
{
43+
<span>No displays found</span>
44+
}
45+
@foreach (var preset in DisplayPresets)
46+
{
47+
<div class="col-lg-6 mb-3">
48+
<div class="card h-100">
49+
<div class="card-header d-flex align-items-baseline">
50+
<span>
51+
@preset.displayName
52+
@if (preset.DisplayConfig.IsPrimary == true)
53+
{
54+
<small class="text-muted ms-2">Primary</small>
55+
}
56+
</span>
57+
<div class="d-flex ms-auto">
58+
<button type="button" class="btn btn-sm btn-primary ms-2" data-bs-toggle="modal" data-bs-target="#presetModal" @onclick="() => DisplayPresetOnClick(preset)">
59+
Settings
60+
</button>
61+
</div>
5862
</div>
5963
<div class="card-body">
6064
<small class="text-body">@preset.DisplayConfig.Resolution.ToString() @@ @preset.DisplayConfig.RefreshRate.ToString()Hz</small>
6165
<small class="text-muted">@preset.colorDepth, @preset.pixelFormat</small>
6266
</div>
6367
</div>
64-
}
65-
</div>
68+
</div>
69+
}
6670
</div>
6771
}
6872

@@ -157,6 +161,7 @@ else
157161
private async Task PresetOnCloneClick(AmdPreset preset)
158162
{
159163
CurrentPreset = new AmdPreset(preset);
164+
CurrentPreset.name = preset.name;
160165
CurrentPreset.SetCloneValues();
161166
}
162167

‎ColorControl.UI/Components/Pages/Generic/StepsInput.razor‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<div class="mb-2">
2828
<label class="form-label" for="nvPreset">NVIDIA preset</label>
2929
<select class="form-select" id="nvPreset" @bind="NvPresetToAddId">
30-
<option value="null">Select preset</option>
30+
<option value="">Select preset</option>
3131
@foreach (var preset in NvPresets)
3232
{
3333
<option value="@preset.id">@preset.IdOrName</option>
@@ -40,7 +40,7 @@
4040
<div class="mb-2">
4141
<label class="form-label" for="samsungPreset">Samsung preset</label>
4242
<select class="form-select" id="samsungPreset" @bind="SamsungPresetToAddId">
43-
<option value="null">Select preset</option>
43+
<option value="">Select preset</option>
4444
@foreach (var preset in SamsungPresets)
4545
{
4646
<option value="@preset.id">@preset.IdOrName</option>
@@ -53,7 +53,7 @@
5353
<div class="mb-2">
5454
<label class="form-label" for="lgPreset">LG preset</label>
5555
<select class="form-select" id="lgPreset" @bind="LgPresetToAddId">
56-
<option value="null">Select preset</option>
56+
<option value="">Select preset</option>
5757
@foreach (var preset in LgPresets)
5858
{
5959
<option value="@preset.id">@preset.IdOrName</option>
@@ -68,7 +68,7 @@
6868
<div class="mb-2">
6969
<label class="form-label" for="customItem">@customItem.Name</label>
7070
<select class="form-select" id="customItem" @bind="customItem.SelectedItem">
71-
<option value="null">Select item</option>
71+
<option value="">Select item</option>
7272
@foreach (var item in customItem.Items)
7373
{
7474
<option value="@item">@item</option>
@@ -84,7 +84,7 @@
8484
<div class="mb-2">
8585
<label class="form-label" for="advancedCustomItem">@customItem.Name</label>
8686
<select class="form-select" id="advancedCustomItem" @bind="customItem.SelectedActionName" @bind:after="() => AdvancedItemChanged(customItem)">
87-
<option value="null">Select action</option>
87+
<option value="">Select action</option>
8888
@foreach (var keyValue in customItem.GroupedActions)
8989
{
9090
<optgroup label="@keyValue.Key">

‎ColorControl.UI/Components/Pages/Nvidia/NvidiaSummary.razor‎

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -49,31 +49,35 @@
4949
else
5050
{
5151
<div class="row mb-3">
52-
<div class="col">
53-
@if (!DisplayPresets.Any())
54-
{
55-
<span>No displays found</span>
56-
}
57-
@foreach (var preset in DisplayPresets)
58-
{
59-
<div class="card mb-3">
60-
<div class="card-header">
61-
@preset.displayName
62-
@if (preset.DisplayConfig.IsPrimary == true)
63-
{
64-
<span class="ms-2 badge text-bg-primary" title="Primary display">Primary</span>
65-
}
66-
<button type="button" class="btn btn-sm btn-primary ms-2" data-bs-toggle="modal" data-bs-target="#presetModal" @onclick="() => DisplayPresetOnClick(preset)">
67-
Settings
68-
</button>
52+
@if (!DisplayPresets.Any())
53+
{
54+
<span>No displays found</span>
55+
}
56+
@foreach (var preset in DisplayPresets)
57+
{
58+
<div class="col-lg-6 mb-3">
59+
<div class="card h-100">
60+
<div class="card-header d-flex align-items-baseline">
61+
<span>
62+
@preset.displayName
63+
@if (preset.DisplayConfig.IsPrimary == true)
64+
{
65+
<span class="ms-2 badge text-bg-primary" title="Primary display">Primary</span>
66+
}
67+
</span>
68+
<div class="d-flex ms-auto">
69+
<button type="button" class="btn btn-sm btn-primary ms-2" data-bs-toggle="modal" data-bs-target="#presetModal" @onclick="() => DisplayPresetOnClick(preset)">
70+
Settings
71+
</button>
72+
</div>
6973
</div>
7074
<div class="card-body">
7175
<small class="text-body">@preset.DisplayConfig.Resolution.ToString() @@ @preset.DisplayConfig.RefreshRate.ToString()Hz</small>
7276
<small class="text-muted">@preset.colorData</small>
7377
</div>
7478
</div>
75-
}
76-
</div>
79+
</div>
80+
}
7781
</div>
7882
}
7983

@@ -187,6 +191,7 @@ else
187191
private async Task PresetOnCloneClick(NvPreset preset)
188192
{
189193
CurrentPreset = new NvPreset(preset);
194+
CurrentPreset.name = preset.name;
190195
CurrentPreset.SetCloneValues();
191196
}
192197

‎ColorControl.UI/Components/Pages/Options.razor‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ else
4949
<label class="form-label" for="elevationMethod">
5050
Elevation Method
5151
</label>
52-
<select class="form-select" @bind="elevationMethod" id="elevationMethod" @oninput="ElevationMethodInput" aria-describedby="elevationMethodHelp">
53-
<option value="0">None</option>
54-
<option value="1">Run as administrator</option>
55-
<option value="2">Use service</option>
56-
<option value="3">Use elevated process</option>
52+
<select class="form-select" @bind="config.ElevationMethod" id="elevationMethod" @oninput="ElevationMethodInput" aria-describedby="elevationMethodHelp">
53+
@foreach (var method in Enum.GetValues<ElevationMethod>())
54+
{
55+
<option value="@method">@method.GetDescription()</option>
56+
}
5757
</select>
5858
<div id="elevationMethodHelp" class="form-text">
5959
Elevation is needed in some cases where ColorControl needs administrator rights.
@@ -186,12 +186,10 @@ else
186186

187187
@code {
188188
private Config? config;
189-
private string elevationMethod = "0";
190189

191190
protected override async Task OnInitializedAsync()
192191
{
193192
config = await _rpcClientService.CallAsync<Config>("OptionsService", "GetConfig");
194-
elevationMethod = ((int)config.ElevationMethod).ToString();
195193
}
196194

197195
private async Task SaveConfig()
@@ -299,8 +297,6 @@ else
299297
{
300298
var value = e.Value != null ? (ElevationMethod)int.Parse((string)e.Value) : ElevationMethod.None;
301299
await _rpcClientService.CallAsync<bool>("OptionsService", "SetElevationMethod", value);
302-
303-
config!.ElevationMethod = value;
304300
}
305301

306302
private async Task UiTypeOnInput(ChangeEventArgs e)

‎ColorControl/ColorControl.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
<PublisherName>Maassoft</PublisherName>
1919
<Company>Maassoft</Company>
2020
<ApplicationRevision>0</ApplicationRevision>
21-
<ApplicationVersion>10.0.0.0</ApplicationVersion>
22-
<Version>10.0.0.0</Version>
21+
<ApplicationVersion>10.0.0.1</ApplicationVersion>
22+
<Version>10.0.0.1</Version>
2323
<UseApplicationTrust>false</UseApplicationTrust>
2424
<PublishWizardCompleted>true</PublishWizardCompleted>
2525
<BootstrapperEnabled>false</BootstrapperEnabled>

‎ColorControl/MainWorker.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,11 @@ private async Task Init()
107107

108108
_keyboardShortcutDispatcher.RegisterShortcut(SHORTCUTID_SCREENSAVER, _config.ScreenSaverShortcut);
109109
_keyboardShortcutDispatcher.RegisterEventHandler(KeyboardShortcutDispatcher.Event_HotKey, HandleHotKeyEvent);
110+
111+
if (_config.UiType != UiType.WinForms)
112+
{
113+
await Program.StartUiServer();
114+
}
110115
}
111116

112117
private bool _startupSent = false;

0 commit comments

Comments
 (0)