mirror of
https://github.com/jkocon/g-helper.git
synced 2026-02-23 13:00:52 +01:00
Multizone Toggle UI
This commit is contained in:
@@ -104,7 +104,6 @@ namespace GHelper.Display
|
|||||||
Logger.WriteLine($"Miniled: {miniled1} {miniled2}");
|
Logger.WriteLine($"Miniled: {miniled1} {miniled2}");
|
||||||
|
|
||||||
int miniled = (miniled1 >= 0) ? miniled1 : miniled2;
|
int miniled = (miniled1 >= 0) ? miniled1 : miniled2;
|
||||||
|
|
||||||
bool hdr = false;
|
bool hdr = false;
|
||||||
|
|
||||||
if (miniled >= 0)
|
if (miniled >= 0)
|
||||||
@@ -127,7 +126,8 @@ namespace GHelper.Display
|
|||||||
maxFrequency: maxFrequency,
|
maxFrequency: maxFrequency,
|
||||||
overdrive: overdrive,
|
overdrive: overdrive,
|
||||||
overdriveSetting: overdriveSetting,
|
overdriveSetting: overdriveSetting,
|
||||||
miniled: miniled,
|
miniled1: miniled1,
|
||||||
|
miniled2: miniled2,
|
||||||
hdr: hdr
|
hdr: hdr
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|||||||
20
app/Properties/Strings.Designer.cs
generated
20
app/Properties/Strings.Designer.cs
generated
@@ -1215,7 +1215,7 @@ namespace GHelper.Properties {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Looks up a localized string similar to Multizone.
|
/// Looks up a localized string similar to Multi Zone.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
internal static string Multizone {
|
internal static string Multizone {
|
||||||
get {
|
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>
|
/// <summary>
|
||||||
/// Looks up a localized string similar to Mute Mic.
|
/// Looks up a localized string similar to Mute Mic.
|
||||||
/// </summary>
|
/// </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>
|
/// <summary>
|
||||||
/// Looks up a localized string similar to Open G-Helper window.
|
/// Looks up a localized string similar to Open G-Helper window.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -504,7 +504,10 @@ Do you still want to continue?</value>
|
|||||||
<value>Synchronize with mouse</value>
|
<value>Synchronize with mouse</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Multizone" xml:space="preserve">
|
<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>
|
||||||
<data name="MuteMic" xml:space="preserve">
|
<data name="MuteMic" xml:space="preserve">
|
||||||
<value>Mute Mic</value>
|
<value>Mute Mic</value>
|
||||||
@@ -521,6 +524,9 @@ Do you still want to continue?</value>
|
|||||||
<data name="NotConnected" xml:space="preserve">
|
<data name="NotConnected" xml:space="preserve">
|
||||||
<value>Not Connected</value>
|
<value>Not Connected</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="OneZone" xml:space="preserve">
|
||||||
|
<value>One Zone</value>
|
||||||
|
</data>
|
||||||
<data name="OpenGHelper" xml:space="preserve">
|
<data name="OpenGHelper" xml:space="preserve">
|
||||||
<value>Open G-Helper window</value>
|
<value>Open G-Helper window</value>
|
||||||
</data>
|
</data>
|
||||||
|
|||||||
@@ -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);
|
ButtonEnabled(button60Hz, screenEnabled);
|
||||||
@@ -968,20 +968,36 @@ namespace GHelper
|
|||||||
panelScreen.Visible = false;
|
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.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
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user