diff --git a/app/Extra.Designer.cs b/app/Extra.Designer.cs index e90320d9..92e757b1 100644 --- a/app/Extra.Designer.cs +++ b/app/Extra.Designer.cs @@ -41,7 +41,10 @@ namespace GHelper labelBindings = new Label(); panelBindings = new Panel(); tableBindings = new TableLayoutPanel(); - label1 = new Label(); + labelFNE = new Label(); + comboFNE = new RComboBox(); + textFNE = new TextBox(); + labelFNC = new Label(); textBox1 = new TextBox(); textM1 = new TextBox(); comboM1 = new RComboBox(); @@ -60,7 +63,6 @@ namespace GHelper comboFNC = new RComboBox(); textFNC = new TextBox(); tableKeys = new TableLayoutPanel(); - labelFNC = new Label(); textM2 = new TextBox(); panelBacklightHeader = new Panel(); sliderBrightness = new Slider(); @@ -116,7 +118,6 @@ namespace GHelper ((System.ComponentModel.ISupportInitialize)pictureHelp).BeginInit(); panelBindings.SuspendLayout(); tableBindings.SuspendLayout(); - tableKeys.SuspendLayout(); panelBacklightHeader.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)pictureBacklight).BeginInit(); panelBacklight.SuspendLayout(); @@ -137,7 +138,7 @@ namespace GHelper panelServices.Controls.Add(labelServices); panelServices.Controls.Add(buttonServices); panelServices.Dock = DockStyle.Top; - panelServices.Location = new Point(15, 1216); + panelServices.Location = new Point(15, 1262); panelServices.Name = "panelServices"; panelServices.Size = new Size(983, 75); panelServices.TabIndex = 3; @@ -235,7 +236,7 @@ namespace GHelper panelBindings.Location = new Point(15, 65); panelBindings.Name = "panelBindings"; panelBindings.Padding = new Padding(0, 0, 10, 5); - panelBindings.Size = new Size(983, 305); + panelBindings.Size = new Size(983, 351); panelBindings.TabIndex = 5; // // tableBindings @@ -243,10 +244,13 @@ namespace GHelper tableBindings.AutoSize = true; tableBindings.AutoSizeMode = AutoSizeMode.GrowAndShrink; tableBindings.ColumnCount = 3; - tableBindings.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 15.45389F)); - tableBindings.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 40.94511F)); - tableBindings.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 43.6010056F)); - tableBindings.Controls.Add(label1, 0, 5); + tableBindings.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 15.4538889F)); + tableBindings.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 40.9451065F)); + tableBindings.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 43.601F)); + tableBindings.Controls.Add(labelFNE, 0, 6); + tableBindings.Controls.Add(comboFNE, 0, 6); + tableBindings.Controls.Add(textFNE, 0, 6); + tableBindings.Controls.Add(labelFNC, 0, 5); tableBindings.Controls.Add(textBox1, 2, 1); tableBindings.Controls.Add(textM1, 2, 0); tableBindings.Controls.Add(comboM1, 1, 0); @@ -269,26 +273,60 @@ namespace GHelper tableBindings.Margin = new Padding(0, 3, 4, 3); tableBindings.Name = "tableBindings"; tableBindings.Padding = new Padding(16, 12, 0, 12); - tableBindings.RowCount = 6; + tableBindings.RowCount = 7; tableBindings.RowStyles.Add(new RowStyle()); tableBindings.RowStyles.Add(new RowStyle()); tableBindings.RowStyles.Add(new RowStyle()); tableBindings.RowStyles.Add(new RowStyle()); tableBindings.RowStyles.Add(new RowStyle()); tableBindings.RowStyles.Add(new RowStyle()); - tableBindings.Size = new Size(973, 300); + tableBindings.RowStyles.Add(new RowStyle()); + tableBindings.Size = new Size(973, 346); tableBindings.TabIndex = 12; // - // label1 + // labelFNE // - label1.AutoSize = true; - label1.Location = new Point(16, 242); - label1.Margin = new Padding(0); - label1.Name = "label1"; - label1.Padding = new Padding(5, 10, 0, 0); - label1.Size = new Size(85, 42); - label1.TabIndex = 15; - label1.Text = "FN+C:"; + labelFNE.AutoSize = true; + labelFNE.Location = new Point(16, 288); + labelFNE.Margin = new Padding(0); + labelFNE.Name = "labelFNE"; + labelFNE.Padding = new Padding(5, 10, 0, 0); + labelFNE.Size = new Size(143, 42); + labelFNE.TabIndex = 20; + labelFNE.Text = "FN+NmEnt:"; + // + // comboFNE + // + comboFNE.BorderColor = Color.White; + comboFNE.ButtonColor = Color.FromArgb(255, 255, 255); + comboFNE.Dock = DockStyle.Top; + comboFNE.FormattingEnabled = true; + comboFNE.Location = new Point(167, 291); + comboFNE.Margin = new Padding(4, 3, 4, 3); + comboFNE.Name = "comboFNE"; + comboFNE.Size = new Size(383, 40); + comboFNE.TabIndex = 19; + // + // textFNE + // + textFNE.Dock = DockStyle.Top; + textFNE.Location = new Point(558, 291); + textFNE.Margin = new Padding(4, 3, 4, 3); + textFNE.Name = "textFNE"; + textFNE.PlaceholderText = "action"; + textFNE.Size = new Size(411, 39); + textFNE.TabIndex = 18; + // + // labelFNC + // + labelFNC.AutoSize = true; + labelFNC.Location = new Point(16, 242); + labelFNC.Margin = new Padding(0); + labelFNC.Name = "labelFNC"; + labelFNC.Padding = new Padding(5, 10, 0, 0); + labelFNC.Size = new Size(85, 42); + labelFNC.TabIndex = 15; + labelFNC.Text = "FN+C:"; // // textBox1 // @@ -487,7 +525,6 @@ namespace GHelper tableKeys.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 20F)); tableKeys.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 40F)); tableKeys.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 40F)); - tableKeys.Controls.Add(labelFNC, 0, 5); tableKeys.Location = new Point(0, 0); tableKeys.Name = "tableKeys"; tableKeys.RowCount = 6; @@ -500,16 +537,6 @@ namespace GHelper tableKeys.Size = new Size(200, 100); tableKeys.TabIndex = 0; // - // labelFNC - // - labelFNC.AutoSize = true; - labelFNC.Location = new Point(4, 100); - labelFNC.Margin = new Padding(4, 0, 4, 0); - labelFNC.Name = "labelFNC"; - labelFNC.Size = new Size(32, 20); - labelFNC.TabIndex = 15; - labelFNC.Text = "FN+C:"; - // // textM2 // textM2.Dock = DockStyle.Top; @@ -528,7 +555,7 @@ namespace GHelper panelBacklightHeader.Controls.Add(pictureBacklight); panelBacklightHeader.Controls.Add(labelBacklightTitle); panelBacklightHeader.Dock = DockStyle.Top; - panelBacklightHeader.Location = new Point(15, 370); + panelBacklightHeader.Location = new Point(15, 416); panelBacklightHeader.Name = "panelBacklightHeader"; panelBacklightHeader.Padding = new Padding(10, 5, 10, 5); panelBacklightHeader.Size = new Size(983, 50); @@ -574,7 +601,7 @@ namespace GHelper panelBacklight.Controls.Add(panelXMG); panelBacklight.Controls.Add(tableBacklight); panelBacklight.Dock = DockStyle.Top; - panelBacklight.Location = new Point(15, 420); + panelBacklight.Location = new Point(15, 466); panelBacklight.Name = "panelBacklight"; panelBacklight.Padding = new Padding(0, 5, 0, 5); panelBacklight.Size = new Size(983, 402); @@ -963,7 +990,7 @@ namespace GHelper panelSettingsHeader.Controls.Add(pictureSettings); panelSettingsHeader.Controls.Add(labelSettings); panelSettingsHeader.Dock = DockStyle.Top; - panelSettingsHeader.Location = new Point(15, 822); + panelSettingsHeader.Location = new Point(15, 868); panelSettingsHeader.Name = "panelSettingsHeader"; panelSettingsHeader.Padding = new Padding(10, 5, 10, 5); panelSettingsHeader.Size = new Size(983, 50); @@ -1015,7 +1042,7 @@ namespace GHelper panelSettings.Controls.Add(checkGpuApps); panelSettings.Controls.Add(checkFnLock); panelSettings.Dock = DockStyle.Top; - panelSettings.Location = new Point(15, 872); + panelSettings.Location = new Point(15, 918); panelSettings.Name = "panelSettings"; panelSettings.Padding = new Padding(20, 5, 10, 5); panelSettings.Size = new Size(983, 344); @@ -1163,8 +1190,6 @@ namespace GHelper panelBindings.PerformLayout(); tableBindings.ResumeLayout(false); tableBindings.PerformLayout(); - tableKeys.ResumeLayout(false); - tableKeys.PerformLayout(); panelBacklightHeader.ResumeLayout(false); panelBacklightHeader.PerformLayout(); ((System.ComponentModel.ISupportInitialize)pictureBacklight).EndInit(); @@ -1193,7 +1218,7 @@ namespace GHelper private Panel panelBindingsHeader; private Panel panelBindings; private TableLayoutPanel tableBindings; - private Label label1; + private Label labelFNC; private TextBox textBox1; private TextBox textM1; private RComboBox comboM1; @@ -1213,7 +1238,6 @@ namespace GHelper private TextBox textFNC; private PictureBox pictureHelp; private TableLayoutPanel tableKeys; - private Label labelFNC; private TextBox textM2; private PictureBox pictureBindings; private Label labelBindings; @@ -1265,5 +1289,8 @@ namespace GHelper private Slider sliderBrightness; private PictureBox pictureLog; private CheckBox checkAutoToggleClamshellMode; + private Label labelFNE; + private RComboBox comboFNE; + private TextBox textFNE; } } \ No newline at end of file diff --git a/app/Extra.cs b/app/Extra.cs index a67863ca..07740941 100644 --- a/app/Extra.cs +++ b/app/Extra.cs @@ -54,6 +54,9 @@ namespace GHelper customActions[""] = Properties.Strings.ToggleFnLock; customActions.Remove("fnlock"); break; + case "fne": + customActions[""] = "Calculator"; + break; } combo.DropDownStyle = ComboBoxStyle.DropDownList; @@ -129,12 +132,15 @@ namespace GHelper labelM1.Text = "FN+F2"; labelM2.Text = "FN+F3"; labelM3.Text = "FN+F4"; - labelM4.Text = "FN+NmEnter"; - - //labelM4.Visible = comboM4.Visible = textM4.Visible = false; + labelM4.Visible = comboM4.Visible = textM4.Visible = false; labelFNF4.Visible = comboFNF4.Visible = textFNF4.Visible = false; } + if (!AppConfig.ContainsModel("TUF")) + { + labelFNE.Visible = comboFNE.Visible = textFNE.Visible = false; + } + if (Program.acpi.DeviceGet(AsusACPI.GPUEco) < 0) { checkGpuApps.Visible = false; @@ -149,6 +155,7 @@ namespace GHelper SetKeyCombo(comboM4, textM4, "m4"); SetKeyCombo(comboFNF4, textFNF4, "fnf4"); SetKeyCombo(comboFNC, textFNC, "fnc"); + SetKeyCombo(comboFNE, textFNE, "fne"); Shown += Keyboard_Shown; diff --git a/app/Gpu/GPUModeControl.cs b/app/Gpu/GPUModeControl.cs index d5767529..15aa4a0d 100644 --- a/app/Gpu/GPUModeControl.cs +++ b/app/Gpu/GPUModeControl.cs @@ -204,8 +204,6 @@ namespace GHelper.Gpu else { - if (ReEnableGPU()) return true; - if (eco == 1) if ((GpuAuto && IsPlugged()) || (ForceGPU && GpuMode == AsusACPI.GPUModeStandard)) { @@ -266,21 +264,6 @@ namespace GHelper.Gpu } - public bool ReEnableGPU() - { - - if (AppConfig.Get("gpu_reenable") != 1) return false; - if (Screen.AllScreens.Length <= 1) return false; - - Logger.WriteLine("Re-enabling gpu for 503 model"); - - Thread.Sleep(1000); - SetGPUEco(1); - Thread.Sleep(1000); - SetGPUEco(0); - return true; - } - public void InitXGM() { bool connected = Program.acpi.IsXGConnected(); diff --git a/app/Input/InputDispatcher.cs b/app/Input/InputDispatcher.cs index 5511c08f..88a6bed8 100644 --- a/app/Input/InputDispatcher.cs +++ b/app/Input/InputDispatcher.cs @@ -322,6 +322,8 @@ namespace GHelper.Input action = "micmute"; if (name == "fnc") action = "fnlock"; + if (name == "fne") + action = "calculator"; } switch (action) @@ -362,10 +364,10 @@ namespace GHelper.Input Program.toast.RunToast(muteStatus ? "Muted" : "Unmuted", muteStatus ? ToastIcon.MicrophoneMute : ToastIcon.Microphone); break; case "brightness_up": - HandleOptimizationEvent(32); + BrightnessUp(); break; case "brightness_down": - HandleOptimizationEvent(16); + BrightnessDown(); break; case "screenpad_up": SetScreenpad(10); @@ -376,7 +378,9 @@ namespace GHelper.Input case "custom": CustomKey(name); break; - + case "calculator": + LaunchProcess("calc"); + break; default: break; } @@ -425,9 +429,11 @@ namespace GHelper.Input KeyProcess("m3"); return; case 56: // M4 / Rog button - case 181: // FN + Numpad Enter KeyProcess("m4"); return; + case 181: // FN + Numpad Enter + KeyProcess("fne"); + return; case 174: // FN+F5 modeControl.CyclePerformanceMode(); return;