diff --git a/app/Aura.cs b/app/Aura.cs index 23d36a77..e0718982 100644 --- a/app/Aura.cs +++ b/app/Aura.cs @@ -15,14 +15,14 @@ namespace GHelper SleepKeyb = 1 << 5, ShutdownLogo = 1 << 6, ShutdownKeyb = 1 << 7, - BootBar = 1u << (7 + 2), - AwakeBar = 1u << (7 + 3), - SleepBar = 1u << (7 + 4), - ShutdownBar = 1u << (7 + 5), - BootLid = 1u << (15 + 1), - AwakeLid = 1u << (15 + 2), - SleepLid = 1u << (15 + 3), - ShutdownLid = 1u << (15 + 4) + BootBar = 1 << (7 + 2), + AwakeBar = 1 << (7 + 3), + SleepBar = 1 << (7 + 4), + ShutdownBar = 1 << (7 + 5), + BootLid = 1 << (15 + 1), + AwakeLid = 1 << (15 + 2), + SleepLid = 1 << (15 + 3), + ShutdownLid = 1 << (15 + 4) } public static class AuraDev19b6Extensions @@ -206,41 +206,8 @@ namespace GHelper } - public static void ApplyAuraPower(bool awake = true, bool boot = false, bool sleep = false, bool shutdown = false) + public static void ApplyAuraPower(List flags) { - List flags = new List(); - - if (awake) - { - flags.Add(AuraDev19b6.AwakeKeyb); - flags.Add(AuraDev19b6.AwakeBar); - flags.Add(AuraDev19b6.AwakeLid); - flags.Add(AuraDev19b6.AwakeLogo); - } - - if (boot) - { - flags.Add(AuraDev19b6.BootKeyb); - flags.Add(AuraDev19b6.BootBar); - flags.Add(AuraDev19b6.BootLid); - flags.Add(AuraDev19b6.BootLogo); - } - - if (sleep) - { - flags.Add(AuraDev19b6.SleepKeyb); - flags.Add(AuraDev19b6.SleepBar); - flags.Add(AuraDev19b6.SleepLid); - flags.Add(AuraDev19b6.SleepLogo); - } - - if (shutdown) - { - flags.Add(AuraDev19b6.ShutdownKeyb); - flags.Add(AuraDev19b6.ShutdownBar); - flags.Add(AuraDev19b6.ShutdownLid); - flags.Add(AuraDev19b6.ShutdownLogo); - } byte[] msg = AuraDev19b6Extensions.ToBytes(flags.ToArray()); @@ -255,8 +222,12 @@ namespace GHelper Logger.WriteLine("USB-KB = " + BitConverter.ToString(msg)); - if (Program.config.ContainsModel("TUF")) - Program.wmi.TUFKeyboardPower(awake, boot, sleep, shutdown); + //if (Program.config.ContainsModel("TUF")) + Program.wmi.TUFKeyboardPower( + flags.Contains(AuraDev19b6.AwakeKeyb), + flags.Contains(AuraDev19b6.BootKeyb), + flags.Contains(AuraDev19b6.SleepKeyb), + flags.Contains(AuraDev19b6.ShutdownKeyb)); } diff --git a/app/Extra.Designer.cs b/app/Extra.Designer.cs index eb4caf0c..5e1cb3b1 100644 --- a/app/Extra.Designer.cs +++ b/app/Extra.Designer.cs @@ -43,14 +43,31 @@ namespace GHelper comboM3 = new RComboBox(); labelM3 = new Label(); groupLight = new GroupBox(); + tableBacklight = new TableLayoutPanel(); + checkBootLid = new CheckBox(); + checkShutdown = new CheckBox(); + checkAwake = new CheckBox(); + checkBoot = new CheckBox(); + checkSleep = new CheckBox(); + labelBacklight = new Label(); + checkSleepBar = new CheckBox(); + checkShutdownBar = new CheckBox(); + labelBacklightBar = new Label(); + checkAwakeBar = new CheckBox(); + checkBootBar = new CheckBox(); + checkSleepLid = new CheckBox(); + checkShutdownLid = new CheckBox(); + labelBacklightLid = new Label(); + checkAwakeLid = new CheckBox(); + labelBacklightLogo = new Label(); + checkAwakeLogo = new CheckBox(); + checkBootLogo = new CheckBox(); + checkSleepLogo = new CheckBox(); + checkShutdownLogo = new CheckBox(); labelBrightness = new Label(); trackBrightness = new TrackBar(); labelSpeed = new Label(); comboKeyboardSpeed = new RComboBox(); - checkShutdown = new CheckBox(); - checkSleep = new CheckBox(); - checkBoot = new CheckBox(); - checkAwake = new CheckBox(); groupOther = new GroupBox(); checkUSBC = new CheckBox(); checkNoOverdrive = new CheckBox(); @@ -59,6 +76,7 @@ namespace GHelper groupBindings.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)pictureHelp).BeginInit(); groupLight.SuspendLayout(); + tableBacklight.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)trackBrightness).BeginInit(); groupOther.SuspendLayout(); SuspendLayout(); @@ -78,7 +96,7 @@ namespace GHelper groupBindings.Dock = DockStyle.Top; groupBindings.Location = new Point(10, 10); groupBindings.Name = "groupBindings"; - groupBindings.Size = new Size(844, 242); + groupBindings.Size = new Size(848, 242); groupBindings.TabIndex = 0; groupBindings.TabStop = false; groupBindings.Text = "Key Bindings"; @@ -179,25 +197,283 @@ namespace GHelper // // groupLight // + groupLight.Controls.Add(tableBacklight); groupLight.Controls.Add(labelBrightness); groupLight.Controls.Add(trackBrightness); groupLight.Controls.Add(labelSpeed); groupLight.Controls.Add(comboKeyboardSpeed); - groupLight.Controls.Add(checkShutdown); - groupLight.Controls.Add(checkSleep); - groupLight.Controls.Add(checkBoot); - groupLight.Controls.Add(checkAwake); groupLight.Dock = DockStyle.Top; groupLight.Location = new Point(10, 252); groupLight.Name = "groupLight"; - groupLight.Size = new Size(844, 395); + groupLight.Size = new Size(848, 444); groupLight.TabIndex = 1; groupLight.TabStop = false; groupLight.Text = "Keyboard Backlight"; // + // tableBacklight + // + tableBacklight.AutoSize = true; + tableBacklight.ColumnCount = 4; + tableBacklight.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F)); + tableBacklight.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F)); + tableBacklight.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F)); + tableBacklight.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F)); + tableBacklight.Controls.Add(checkBootLid, 2, 2); + tableBacklight.Controls.Add(checkShutdown, 0, 4); + tableBacklight.Controls.Add(checkAwake, 0, 1); + tableBacklight.Controls.Add(checkBoot, 0, 2); + tableBacklight.Controls.Add(checkSleep, 0, 3); + tableBacklight.Controls.Add(labelBacklight, 0, 0); + tableBacklight.Controls.Add(checkSleepBar, 1, 3); + tableBacklight.Controls.Add(checkShutdownBar, 1, 4); + tableBacklight.Controls.Add(labelBacklightBar, 1, 0); + tableBacklight.Controls.Add(checkAwakeBar, 1, 1); + tableBacklight.Controls.Add(checkBootBar, 1, 2); + tableBacklight.Controls.Add(checkSleepLid, 2, 3); + tableBacklight.Controls.Add(checkShutdownLid, 2, 4); + tableBacklight.Controls.Add(labelBacklightLid, 2, 0); + tableBacklight.Controls.Add(checkAwakeLid, 2, 1); + tableBacklight.Controls.Add(labelBacklightLogo, 3, 0); + tableBacklight.Controls.Add(checkAwakeLogo, 3, 1); + tableBacklight.Controls.Add(checkBootLogo, 3, 2); + tableBacklight.Controls.Add(checkSleepLogo, 3, 3); + tableBacklight.Controls.Add(checkShutdownLogo, 3, 4); + tableBacklight.Dock = DockStyle.Top; + tableBacklight.Location = new Point(3, 35); + tableBacklight.Margin = new Padding(0); + tableBacklight.Name = "tableBacklight"; + tableBacklight.RowCount = 5; + tableBacklight.RowStyles.Add(new RowStyle()); + tableBacklight.RowStyles.Add(new RowStyle()); + tableBacklight.RowStyles.Add(new RowStyle()); + tableBacklight.RowStyles.Add(new RowStyle()); + tableBacklight.RowStyles.Add(new RowStyle()); + tableBacklight.Size = new Size(842, 226); + tableBacklight.TabIndex = 41; + // + // checkBootLid + // + checkBootLid.AutoSize = true; + checkBootLid.Location = new Point(423, 91); + checkBootLid.Name = "checkBootLid"; + checkBootLid.Padding = new Padding(15, 2, 5, 2); + checkBootLid.Size = new Size(116, 40); + checkBootLid.TabIndex = 13; + checkBootLid.Text = Strings.Boot; + checkBootLid.UseVisualStyleBackColor = true; + // + // checkShutdown + // + checkShutdown.AutoSize = true; + checkShutdown.Location = new Point(3, 183); + checkShutdown.Name = "checkShutdown"; + checkShutdown.Padding = new Padding(15, 2, 5, 2); + checkShutdown.Size = new Size(174, 40); + checkShutdown.TabIndex = 4; + checkShutdown.Text = Strings.Shutdown; + checkShutdown.UseVisualStyleBackColor = true; + // + // checkAwake + // + checkAwake.AutoSize = true; + checkAwake.Location = new Point(3, 45); + checkAwake.Name = "checkAwake"; + checkAwake.Padding = new Padding(15, 2, 5, 2); + checkAwake.Size = new Size(135, 40); + checkAwake.TabIndex = 1; + checkAwake.Text = Strings.Awake; + checkAwake.UseVisualStyleBackColor = true; + // + // checkBoot + // + checkBoot.AutoSize = true; + checkBoot.Location = new Point(3, 91); + checkBoot.Name = "checkBoot"; + checkBoot.Padding = new Padding(15, 2, 5, 2); + checkBoot.Size = new Size(116, 40); + checkBoot.TabIndex = 2; + checkBoot.Text = Strings.Boot; + checkBoot.UseVisualStyleBackColor = true; + // + // checkSleep + // + checkSleep.AutoSize = true; + checkSleep.Location = new Point(3, 137); + checkSleep.Name = "checkSleep"; + checkSleep.Padding = new Padding(15, 2, 5, 2); + checkSleep.Size = new Size(125, 40); + checkSleep.TabIndex = 3; + checkSleep.Text = Strings.Sleep; + checkSleep.UseVisualStyleBackColor = true; + // + // labelBacklight + // + labelBacklight.AutoSize = true; + labelBacklight.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); + labelBacklight.Location = new Point(3, 0); + labelBacklight.Name = "labelBacklight"; + labelBacklight.Padding = new Padding(10, 5, 5, 5); + labelBacklight.Size = new Size(139, 42); + labelBacklight.TabIndex = 6; + labelBacklight.Text = "Keyboard"; + // + // checkSleepBar + // + checkSleepBar.AutoSize = true; + checkSleepBar.Location = new Point(213, 137); + checkSleepBar.Name = "checkSleepBar"; + checkSleepBar.Padding = new Padding(15, 2, 5, 2); + checkSleepBar.Size = new Size(125, 40); + checkSleepBar.TabIndex = 9; + checkSleepBar.Text = Strings.Sleep; + checkSleepBar.UseVisualStyleBackColor = true; + // + // checkShutdownBar + // + checkShutdownBar.AutoSize = true; + checkShutdownBar.Location = new Point(213, 183); + checkShutdownBar.Name = "checkShutdownBar"; + checkShutdownBar.Padding = new Padding(15, 2, 5, 2); + checkShutdownBar.Size = new Size(174, 40); + checkShutdownBar.TabIndex = 10; + checkShutdownBar.Text = Strings.Shutdown; + checkShutdownBar.UseVisualStyleBackColor = true; + // + // labelBacklightBar + // + labelBacklightBar.AutoSize = true; + labelBacklightBar.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); + labelBacklightBar.Location = new Point(213, 0); + labelBacklightBar.Name = "labelBacklightBar"; + labelBacklightBar.Padding = new Padding(10, 5, 5, 5); + labelBacklightBar.Size = new Size(124, 42); + labelBacklightBar.TabIndex = 11; + labelBacklightBar.Text = "Lightbar"; + // + // checkAwakeBar + // + checkAwakeBar.AutoSize = true; + checkAwakeBar.Location = new Point(213, 45); + checkAwakeBar.Name = "checkAwakeBar"; + checkAwakeBar.Padding = new Padding(15, 2, 5, 2); + checkAwakeBar.Size = new Size(135, 40); + checkAwakeBar.TabIndex = 7; + checkAwakeBar.Text = Strings.Awake; + checkAwakeBar.UseVisualStyleBackColor = true; + // + // checkBootBar + // + checkBootBar.AutoSize = true; + checkBootBar.Location = new Point(213, 91); + checkBootBar.Name = "checkBootBar"; + checkBootBar.Padding = new Padding(15, 2, 5, 2); + checkBootBar.Size = new Size(116, 40); + checkBootBar.TabIndex = 8; + checkBootBar.Text = Strings.Boot; + checkBootBar.UseVisualStyleBackColor = true; + // + // checkSleepLid + // + checkSleepLid.AutoSize = true; + checkSleepLid.Location = new Point(423, 137); + checkSleepLid.Name = "checkSleepLid"; + checkSleepLid.Padding = new Padding(15, 2, 5, 2); + checkSleepLid.Size = new Size(125, 40); + checkSleepLid.TabIndex = 14; + checkSleepLid.Text = Strings.Sleep; + checkSleepLid.UseVisualStyleBackColor = true; + // + // checkShutdownLid + // + checkShutdownLid.AutoSize = true; + checkShutdownLid.Location = new Point(423, 183); + checkShutdownLid.Name = "checkShutdownLid"; + checkShutdownLid.Padding = new Padding(15, 2, 5, 2); + checkShutdownLid.Size = new Size(174, 40); + checkShutdownLid.TabIndex = 15; + checkShutdownLid.Text = Strings.Shutdown; + checkShutdownLid.UseVisualStyleBackColor = true; + // + // labelBacklightLid + // + labelBacklightLid.AutoSize = true; + labelBacklightLid.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); + labelBacklightLid.Location = new Point(423, 0); + labelBacklightLid.Name = "labelBacklightLid"; + labelBacklightLid.Padding = new Padding(10, 5, 5, 5); + labelBacklightLid.Size = new Size(63, 42); + labelBacklightLid.TabIndex = 16; + labelBacklightLid.Text = "Lid"; + // + // checkAwakeLid + // + checkAwakeLid.AutoSize = true; + checkAwakeLid.Location = new Point(423, 45); + checkAwakeLid.Name = "checkAwakeLid"; + checkAwakeLid.Padding = new Padding(15, 2, 5, 2); + checkAwakeLid.Size = new Size(135, 40); + checkAwakeLid.TabIndex = 12; + checkAwakeLid.Text = Strings.Awake; + checkAwakeLid.UseVisualStyleBackColor = true; + // + // labelBacklightLogo + // + labelBacklightLogo.AutoSize = true; + labelBacklightLogo.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); + labelBacklightLogo.Location = new Point(633, 0); + labelBacklightLogo.Name = "labelBacklightLogo"; + labelBacklightLogo.Padding = new Padding(10, 5, 5, 5); + labelBacklightLogo.Size = new Size(86, 42); + labelBacklightLogo.TabIndex = 21; + labelBacklightLogo.Text = "Logo"; + // + // checkAwakeLogo + // + checkAwakeLogo.AutoSize = true; + checkAwakeLogo.Location = new Point(633, 45); + checkAwakeLogo.Name = "checkAwakeLogo"; + checkAwakeLogo.Padding = new Padding(15, 2, 5, 2); + checkAwakeLogo.Size = new Size(135, 40); + checkAwakeLogo.TabIndex = 17; + checkAwakeLogo.Text = Strings.Awake; + checkAwakeLogo.UseVisualStyleBackColor = true; + // + // checkBootLogo + // + checkBootLogo.AutoSize = true; + checkBootLogo.Location = new Point(633, 91); + checkBootLogo.Name = "checkBootLogo"; + checkBootLogo.Padding = new Padding(15, 2, 5, 2); + checkBootLogo.Size = new Size(116, 40); + checkBootLogo.TabIndex = 18; + checkBootLogo.Text = Strings.Boot; + checkBootLogo.UseVisualStyleBackColor = true; + // + // checkSleepLogo + // + checkSleepLogo.AutoSize = true; + checkSleepLogo.Location = new Point(633, 137); + checkSleepLogo.Name = "checkSleepLogo"; + checkSleepLogo.Padding = new Padding(15, 2, 5, 2); + checkSleepLogo.Size = new Size(125, 40); + checkSleepLogo.TabIndex = 19; + checkSleepLogo.Text = Strings.Sleep; + checkSleepLogo.UseVisualStyleBackColor = true; + // + // checkShutdownLogo + // + checkShutdownLogo.AutoSize = true; + checkShutdownLogo.Location = new Point(633, 183); + checkShutdownLogo.Name = "checkShutdownLogo"; + checkShutdownLogo.Padding = new Padding(15, 2, 5, 2); + checkShutdownLogo.Size = new Size(174, 40); + checkShutdownLogo.TabIndex = 20; + checkShutdownLogo.Text = Strings.Shutdown; + checkShutdownLogo.UseVisualStyleBackColor = true; + // // labelBrightness // - labelBrightness.Location = new Point(25, 304); + labelBrightness.Location = new Point(15, 357); labelBrightness.Name = "labelBrightness"; labelBrightness.Size = new Size(197, 49); labelBrightness.TabIndex = 0; @@ -205,7 +481,7 @@ namespace GHelper // // trackBrightness // - trackBrightness.Location = new Point(228, 294); + trackBrightness.Location = new Point(218, 341); trackBrightness.Maximum = 3; trackBrightness.Name = "trackBrightness"; trackBrightness.Size = new Size(600, 90); @@ -215,7 +491,7 @@ namespace GHelper // labelSpeed // labelSpeed.AutoSize = true; - labelSpeed.Location = new Point(25, 235); + labelSpeed.Location = new Point(15, 296); labelSpeed.MaximumSize = new Size(200, 0); labelSpeed.Name = "labelSpeed"; labelSpeed.Size = new Size(198, 32); @@ -231,53 +507,13 @@ namespace GHelper comboKeyboardSpeed.FormattingEnabled = true; comboKeyboardSpeed.ItemHeight = 32; comboKeyboardSpeed.Items.AddRange(new object[] { "Slow", "Normal", "Fast" }); - comboKeyboardSpeed.Location = new Point(230, 232); + comboKeyboardSpeed.Location = new Point(222, 293); comboKeyboardSpeed.Margin = new Padding(4, 10, 4, 8); comboKeyboardSpeed.Name = "comboKeyboardSpeed"; comboKeyboardSpeed.Size = new Size(291, 40); comboKeyboardSpeed.TabIndex = 39; comboKeyboardSpeed.TabStop = false; // - // checkShutdown - // - checkShutdown.AutoSize = true; - checkShutdown.Location = new Point(25, 185); - checkShutdown.Name = "checkShutdown"; - checkShutdown.Size = new Size(154, 36); - checkShutdown.TabIndex = 3; - checkShutdown.Text = Strings.Shutdown; - checkShutdown.UseVisualStyleBackColor = true; - // - // checkSleep - // - checkSleep.AutoSize = true; - checkSleep.Location = new Point(25, 143); - checkSleep.Name = "checkSleep"; - checkSleep.Size = new Size(105, 36); - checkSleep.TabIndex = 2; - checkSleep.Text = Strings.Sleep; - checkSleep.UseVisualStyleBackColor = true; - // - // checkBoot - // - checkBoot.AutoSize = true; - checkBoot.Location = new Point(25, 101); - checkBoot.Name = "checkBoot"; - checkBoot.Size = new Size(96, 36); - checkBoot.TabIndex = 1; - checkBoot.Text = Strings.Boot; - checkBoot.UseVisualStyleBackColor = true; - // - // checkAwake - // - checkAwake.AutoSize = true; - checkAwake.Location = new Point(25, 59); - checkAwake.Name = "checkAwake"; - checkAwake.Size = new Size(115, 36); - checkAwake.TabIndex = 0; - checkAwake.Text = Strings.Awake; - checkAwake.UseVisualStyleBackColor = true; - // // groupOther // groupOther.Controls.Add(checkUSBC); @@ -285,9 +521,9 @@ namespace GHelper groupOther.Controls.Add(checkKeyboardAuto); groupOther.Controls.Add(checkTopmost); groupOther.Dock = DockStyle.Top; - groupOther.Location = new Point(10, 647); + groupOther.Location = new Point(10, 696); groupOther.Name = "groupOther"; - groupOther.Size = new Size(844, 293); + groupOther.Size = new Size(848, 293); groupOther.TabIndex = 2; groupOther.TabStop = false; groupOther.Text = "Other"; @@ -337,7 +573,7 @@ namespace GHelper // AutoScaleDimensions = new SizeF(13F, 32F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(864, 953); + ClientSize = new Size(868, 1011); Controls.Add(groupOther); Controls.Add(groupLight); Controls.Add(groupBindings); @@ -355,6 +591,8 @@ namespace GHelper ((System.ComponentModel.ISupportInitialize)pictureHelp).EndInit(); groupLight.ResumeLayout(false); groupLight.PerformLayout(); + tableBacklight.ResumeLayout(false); + tableBacklight.PerformLayout(); ((System.ComponentModel.ISupportInitialize)trackBrightness).EndInit(); groupOther.ResumeLayout(false); groupOther.PerformLayout(); @@ -374,10 +612,6 @@ namespace GHelper private RComboBox comboFNF4; private Label labelFNF4; private GroupBox groupLight; - private CheckBox checkSleep; - private CheckBox checkBoot; - private CheckBox checkAwake; - private CheckBox checkShutdown; private Label labelSpeed; private RComboBox comboKeyboardSpeed; private GroupBox groupOther; @@ -388,5 +622,26 @@ namespace GHelper private TrackBar trackBrightness; private Label labelBrightness; private CheckBox checkUSBC; + private TableLayoutPanel tableBacklight; + private CheckBox checkShutdown; + private CheckBox checkAwake; + private CheckBox checkBoot; + private CheckBox checkSleep; + private CheckBox checkBootLid; + private Label labelBacklight; + private CheckBox checkSleepBar; + private CheckBox checkShutdownBar; + private Label labelBacklightBar; + private CheckBox checkAwakeBar; + private CheckBox checkBootBar; + private CheckBox checkSleepLid; + private CheckBox checkShutdownLid; + private Label labelBacklightLid; + private CheckBox checkAwakeLid; + private Label labelBacklightLogo; + private CheckBox checkAwakeLogo; + private CheckBox checkBootLogo; + private CheckBox checkSleepLogo; + private CheckBox checkShutdownLogo; } } \ No newline at end of file diff --git a/app/Extra.cs b/app/Extra.cs index 7debb981..62a8fcfc 100644 --- a/app/Extra.cs +++ b/app/Extra.cs @@ -58,7 +58,7 @@ namespace GHelper InitializeComponent(); groupBindings.Text = Properties.Strings.KeyBindings; - groupLight.Text = Properties.Strings.KeyboardBacklight; + groupLight.Text = " " + Properties.Strings.KeyboardBacklight; groupOther.Text = Properties.Strings.Other; checkAwake.Text = Properties.Strings.Awake; @@ -91,16 +91,61 @@ namespace GHelper comboKeyboardSpeed.SelectedValue = Aura.Speed; comboKeyboardSpeed.SelectedValueChanged += ComboKeyboardSpeed_SelectedValueChanged; + // Keyboard checkAwake.Checked = !(Program.config.getConfig("keyboard_awake") == 0); checkBoot.Checked = !(Program.config.getConfig("keyboard_boot") == 0); checkSleep.Checked = !(Program.config.getConfig("keyboard_sleep") == 0); checkShutdown.Checked = !(Program.config.getConfig("keyboard_shutdown") == 0); + // Lightbar + checkAwakeBar.Checked = !(Program.config.getConfig("keyboard_awake_bar") == 0); + checkBootBar.Checked = !(Program.config.getConfig("keyboard_boot_bar") == 0); + checkSleepBar.Checked = !(Program.config.getConfig("keyboard_sleep_bar") == 0); + checkShutdownBar.Checked = !(Program.config.getConfig("keyboard_shutdown_bar") == 0); + + // Lid + checkAwakeLid.Checked = !(Program.config.getConfig("keyboard_awake_lid") == 0); + checkBootLid.Checked = !(Program.config.getConfig("keyboard_boot_lid") == 0); + checkSleepLid.Checked = !(Program.config.getConfig("keyboard_sleep_lid") == 0); + checkShutdownLid.Checked = !(Program.config.getConfig("keyboard_shutdown_lid") == 0); + + // Logo + checkAwakeLogo.Checked = !(Program.config.getConfig("keyboard_awake_logo") == 0); + checkBootLogo.Checked = !(Program.config.getConfig("keyboard_boot_logo") == 0); + checkSleepLogo.Checked = !(Program.config.getConfig("keyboard_sleep_logo") == 0); + checkShutdownLogo.Checked = !(Program.config.getConfig("keyboard_shutdown_logo") == 0); + checkAwake.CheckedChanged += CheckPower_CheckedChanged; checkBoot.CheckedChanged += CheckPower_CheckedChanged; checkSleep.CheckedChanged += CheckPower_CheckedChanged; checkShutdown.CheckedChanged += CheckPower_CheckedChanged; + checkAwakeBar.CheckedChanged += CheckPower_CheckedChanged; + checkBootBar.CheckedChanged += CheckPower_CheckedChanged; + checkSleepBar.CheckedChanged += CheckPower_CheckedChanged; + checkShutdownBar.CheckedChanged += CheckPower_CheckedChanged; + + checkAwakeLid.CheckedChanged += CheckPower_CheckedChanged; + checkBootLid.CheckedChanged += CheckPower_CheckedChanged; + checkSleepLid.CheckedChanged += CheckPower_CheckedChanged; + checkShutdownLid.CheckedChanged += CheckPower_CheckedChanged; + + checkAwakeLogo.CheckedChanged += CheckPower_CheckedChanged; + checkBootLogo.CheckedChanged += CheckPower_CheckedChanged; + checkSleepLogo.CheckedChanged += CheckPower_CheckedChanged; + checkShutdownLogo.CheckedChanged += CheckPower_CheckedChanged; + + /* + if (!Program.config.ContainsModel("Strix")) + { + labelBacklightBar.Visible = false; + checkAwakeBar.Visible = false; + checkBootBar.Visible = false; + checkSleepBar.Visible = false; + checkShutdownBar.Visible = false; + } + */ + checkTopmost.Checked = (Program.config.getConfig("topmost") == 1); checkTopmost.CheckedChanged += CheckTopmost_CheckedChanged; ; @@ -161,7 +206,45 @@ namespace GHelper Program.config.setConfig("keyboard_sleep", (checkSleep.Checked ? 1 : 0)); Program.config.setConfig("keyboard_shutdown", (checkShutdown.Checked ? 1 : 0)); - Aura.ApplyAuraPower(checkAwake.Checked, checkBoot.Checked, checkSleep.Checked, checkShutdown.Checked); + Program.config.setConfig("keyboard_awake_bar", (checkAwakeBar.Checked ? 1 : 0)); + Program.config.setConfig("keyboard_boot_bar", (checkBootBar.Checked ? 1 : 0)); + Program.config.setConfig("keyboard_sleep_bar", (checkSleepBar.Checked ? 1 : 0)); + Program.config.setConfig("keyboard_shutdown_bar", (checkShutdownBar.Checked ? 1 : 0)); + + Program.config.setConfig("keyboard_awake_lid", (checkAwakeLid.Checked ? 1 : 0)); + Program.config.setConfig("keyboard_boot_lid", (checkBootLid.Checked ? 1 : 0)); + Program.config.setConfig("keyboard_sleep_lid", (checkSleepLid.Checked ? 1 : 0)); + Program.config.setConfig("keyboard_shutdown_lid", (checkShutdownLid.Checked ? 1 : 0)); + + Program.config.setConfig("keyboard_awake_logo", (checkAwakeLogo.Checked ? 1 : 0)); + Program.config.setConfig("keyboard_boot_logo", (checkBootLogo.Checked ? 1 : 0)); + Program.config.setConfig("keyboard_sleep_logo", (checkSleepLogo.Checked ? 1 : 0)); + Program.config.setConfig("keyboard_shutdown_logo", (checkShutdownLogo.Checked ? 1 : 0)); + + List flags = new List(); + + if (checkAwake.Checked) flags.Add(AuraDev19b6.AwakeKeyb); + if (checkBoot.Checked) flags.Add(AuraDev19b6.BootKeyb); + if (checkSleep.Checked) flags.Add(AuraDev19b6.SleepKeyb); + if (checkShutdown.Checked) flags.Add(AuraDev19b6.ShutdownKeyb); + + if (checkAwakeBar.Checked) flags.Add(AuraDev19b6.AwakeBar); + if (checkBootBar.Checked) flags.Add(AuraDev19b6.BootBar); + if (checkSleepBar.Checked) flags.Add(AuraDev19b6.SleepBar); + if (checkShutdownBar.Checked) flags.Add(AuraDev19b6.ShutdownBar); + + if (checkAwakeLid.Checked) flags.Add(AuraDev19b6.AwakeLid); + if (checkBootLid.Checked) flags.Add(AuraDev19b6.BootLid); + if (checkSleepLid.Checked) flags.Add(AuraDev19b6.SleepLid); + if (checkShutdownLid.Checked) flags.Add(AuraDev19b6.ShutdownLid); + + if (checkAwakeLogo.Checked) flags.Add(AuraDev19b6.AwakeLogo); + if (checkBootLogo.Checked) flags.Add(AuraDev19b6.BootLogo); + if (checkSleepLogo.Checked) flags.Add(AuraDev19b6.SleepLogo); + if (checkShutdownLogo.Checked) flags.Add(AuraDev19b6.ShutdownLogo); + + Aura.ApplyAuraPower(flags); + } private void ComboKeyboardSpeed_SelectedValueChanged(object? sender, EventArgs e) diff --git a/app/Fans.cs b/app/Fans.cs index b7580988..e66d8a15 100644 --- a/app/Fans.cs +++ b/app/Fans.cs @@ -506,6 +506,7 @@ namespace GHelper checkApplyFans.Checked = false; checkApplyPower.Checked = false; + /* trackGPUCore.Value = 0; trackGPUMemory.Value = 0; trackGPUBoost.Value = ASUSWmi.MaxGPUBoost; @@ -513,6 +514,7 @@ namespace GHelper Program.config.setConfig("gpu_core", ASUSWmi.MaxGPUBoost); Program.config.setConfig("gpu_memory", ASUSWmi.MaxGPUTemp); + */ Program.config.setConfigPerf("auto_apply", 0); Program.config.setConfigPerf("auto_apply_power", 0); diff --git a/app/HardwareControl.cs b/app/HardwareControl.cs index 6d5fe661..de1b274b 100644 --- a/app/HardwareControl.cs +++ b/app/HardwareControl.cs @@ -124,6 +124,15 @@ public static class HardwareControl return false; } + + public static NvidiaGpuControl? GetNvidiaGpuControl() + { + if ((bool)GpuControl?.IsNvidia) + return (NvidiaGpuControl)GpuControl; + else + return null; + } + public static void RecreateGpuControlWithDelay(int delay = 3) { // Re-enabling the discrete GPU takes a bit of time, diff --git a/app/Program.cs b/app/Program.cs index 22953563..b8b15882 100644 --- a/app/Program.cs +++ b/app/Program.cs @@ -292,12 +292,7 @@ namespace GHelper if (action == "gpu") { - if (HardwareControl.GpuControl is not null) - { - NvidiaGpuControl nvcontrol = (NvidiaGpuControl)HardwareControl.GpuControl; - nvcontrol.SetClocksFromConfig(); - } - + HardwareControl.GetNvidiaGpuControl()?.SetClocksFromConfig(); settingsForm.FansToggle(); } } diff --git a/app/Properties/Strings.Designer.cs b/app/Properties/Strings.Designer.cs index 52169529..bfdd6190 100644 --- a/app/Properties/Strings.Designer.cs +++ b/app/Properties/Strings.Designer.cs @@ -556,7 +556,7 @@ namespace GHelper.Properties { } /// - /// Looks up a localized string similar to Keyboard Backlight. + /// Looks up a localized string similar to Laptop Backlight. /// internal static string KeyboardBacklight { get { diff --git a/app/Properties/Strings.resx b/app/Properties/Strings.resx index 865b2219..3f823efa 100644 --- a/app/Properties/Strings.resx +++ b/app/Properties/Strings.resx @@ -283,7 +283,7 @@ Lower backlight brightness on battery and back when plugged - Keyboard Backlight + Laptop Backlight Laptop Keyboard