Multizone Toggle UI

This commit is contained in:
Serge
2024-01-20 16:28:43 +01:00
parent f8624c8954
commit 6e3fde8537
4 changed files with 57 additions and 17 deletions

View File

@@ -104,7 +104,6 @@ namespace GHelper.Display
Logger.WriteLine($"Miniled: {miniled1} {miniled2}");
int miniled = (miniled1 >= 0) ? miniled1 : miniled2;
bool hdr = false;
if (miniled >= 0)
@@ -127,7 +126,8 @@ namespace GHelper.Display
maxFrequency: maxFrequency,
overdrive: overdrive,
overdriveSetting: overdriveSetting,
miniled: miniled,
miniled1: miniled1,
miniled2: miniled2,
hdr: hdr
);
});

View File

@@ -1215,7 +1215,7 @@ namespace GHelper.Properties {
}
/// <summary>
/// Looks up a localized string similar to Multizone.
/// Looks up a localized string similar to Multi Zone.
/// </summary>
internal static string Multizone {
get {
@@ -1223,6 +1223,15 @@ namespace GHelper.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to Multi Zone Strong.
/// </summary>
internal static string MultizoneStrong {
get {
return ResourceManager.GetString("MultizoneStrong", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Mute Mic.
/// </summary>
@@ -1268,6 +1277,15 @@ namespace GHelper.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to One Zone.
/// </summary>
internal static string OneZone {
get {
return ResourceManager.GetString("OneZone", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Open G-Helper window.
/// </summary>

View File

@@ -504,7 +504,10 @@ Do you still want to continue?</value>
<value>Synchronize with mouse</value>
</data>
<data name="Multizone" xml:space="preserve">
<value>Multizone</value>
<value>Multi Zone</value>
</data>
<data name="MultizoneStrong" xml:space="preserve">
<value>Multi Zone Strong</value>
</data>
<data name="MuteMic" xml:space="preserve">
<value>Mute Mic</value>
@@ -521,6 +524,9 @@ Do you still want to continue?</value>
<data name="NotConnected" xml:space="preserve">
<value>Not Connected</value>
</data>
<data name="OneZone" xml:space="preserve">
<value>One Zone</value>
</data>
<data name="OpenGHelper" xml:space="preserve">
<value>Open G-Helper window</value>
</data>

View File

@@ -929,7 +929,7 @@ namespace GHelper
public void VisualiseScreen(bool screenEnabled, bool screenAuto, int frequency, int maxFrequency, int overdrive, bool overdriveSetting, int miniled, bool hdr)
public void VisualiseScreen(bool screenEnabled, bool screenAuto, int frequency, int maxFrequency, int overdrive, bool overdriveSetting, int miniled1, int miniled2, bool hdr)
{
ButtonEnabled(button60Hz, screenEnabled);
@@ -968,20 +968,36 @@ namespace GHelper
panelScreen.Visible = false;
}
if (miniled >= 0)
if (miniled1 >= 0)
{
if (miniled == 2)
{
buttonMiniled.Text = Properties.Strings.Multizone + " Strong";
buttonMiniled.BorderColor = colorStandard;
} else
{
buttonMiniled.Text = Properties.Strings.Multizone;
buttonMiniled.BorderColor = colorTurbo;
}
buttonMiniled.Activated = (miniled > 0) || hdr;
buttonMiniled.Enabled = !hdr;
buttonMiniled.Activated = miniled1 == 1 || hdr;
}
else if (miniled2 >= 0)
{
buttonMiniled.Enabled = !hdr;
switch (miniled2)
{
// Multizone On
case 0:
buttonMiniled.Text = Properties.Strings.Multizone;
buttonMiniled.BorderColor = colorStandard;
buttonMiniled.Activated = true;
break;
// Multizone Strong
case 1:
buttonMiniled.Text = Properties.Strings.MultizoneStrong;
buttonMiniled.BorderColor = colorTurbo;
buttonMiniled.Activated = true;
break;
// Multizone Off
case 2:
buttonMiniled.Text = hdr ? Properties.Strings.Multizone : Properties.Strings.OneZone;
buttonMiniled.BorderColor = colorStandard;
buttonMiniled.Activated = hdr;
break;
}
}
else
{