jkocon/archived-g-helper
1
0
Fork 0
mirror of https://github.com/jkocon/g-helper.git synced 2026-02-23 13:00:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fn+Np Enter support https://github.com/seerge/g-helper/issues/963

Browse Source
This commit is contained in:
Serge
2023-08-01 13:20:11 +02:00
parent 3307a95955
commit d82deb9860
4 changed files with 86 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
app/Extra.Designer.cs generated
View File

@@ -41,7 +41,10 @@ namespace GHelper
labelBindings = new Label(); labelBindings = new Label();
panelBindings = new Panel(); panelBindings = new Panel();
tableBindings = new TableLayoutPanel(); tableBindings = new TableLayoutPanel();
label1 = new Label(); labelFNE = new Label();
comboFNE = new RComboBox();
textFNE = new TextBox();
labelFNC = new Label();
textBox1 = new TextBox(); textBox1 = new TextBox();
textM1 = new TextBox(); textM1 = new TextBox();
comboM1 = new RComboBox(); comboM1 = new RComboBox();
@@ -60,7 +63,6 @@ namespace GHelper
comboFNC = new RComboBox(); comboFNC = new RComboBox();
textFNC = new TextBox(); textFNC = new TextBox();
tableKeys = new TableLayoutPanel(); tableKeys = new TableLayoutPanel();
labelFNC = new Label();
textM2 = new TextBox(); textM2 = new TextBox();
panelBacklightHeader = new Panel(); panelBacklightHeader = new Panel();
sliderBrightness = new Slider(); sliderBrightness = new Slider();
@@ -116,7 +118,6 @@ namespace GHelper
((System.ComponentModel.ISupportInitialize)pictureHelp).BeginInit(); ((System.ComponentModel.ISupportInitialize)pictureHelp).BeginInit();
panelBindings.SuspendLayout(); panelBindings.SuspendLayout();
tableBindings.SuspendLayout(); tableBindings.SuspendLayout();
tableKeys.SuspendLayout();
panelBacklightHeader.SuspendLayout(); panelBacklightHeader.SuspendLayout();
((System.ComponentModel.ISupportInitialize)pictureBacklight).BeginInit(); ((System.ComponentModel.ISupportInitialize)pictureBacklight).BeginInit();
panelBacklight.SuspendLayout(); panelBacklight.SuspendLayout();
@@ -137,7 +138,7 @@ namespace GHelper
panelServices.Controls.Add(labelServices); panelServices.Controls.Add(labelServices);
panelServices.Controls.Add(buttonServices); panelServices.Controls.Add(buttonServices);
panelServices.Dock = DockStyle.Top; panelServices.Dock = DockStyle.Top;
panelServices.Location = new Point(15, 1216); panelServices.Location = new Point(15, 1262);
panelServices.Name = "panelServices"; panelServices.Name = "panelServices";
panelServices.Size = new Size(983, 75); panelServices.Size = new Size(983, 75);
panelServices.TabIndex = 3; panelServices.TabIndex = 3;
@@ -235,7 +236,7 @@ namespace GHelper
panelBindings.Location = new Point(15, 65); panelBindings.Location = new Point(15, 65);
panelBindings.Name = "panelBindings"; panelBindings.Name = "panelBindings";
panelBindings.Padding = new Padding(0, 0, 10, 5); panelBindings.Padding = new Padding(0, 0, 10, 5);
panelBindings.Size = new Size(983, 305); panelBindings.Size = new Size(983, 351);
panelBindings.TabIndex = 5; panelBindings.TabIndex = 5;
// //
// tableBindings // tableBindings
@@ -243,10 +244,13 @@ namespace GHelper
tableBindings.AutoSize = true; tableBindings.AutoSize = true;
tableBindings.AutoSizeMode = AutoSizeMode.GrowAndShrink; tableBindings.AutoSizeMode = AutoSizeMode.GrowAndShrink;
tableBindings.ColumnCount = 3; tableBindings.ColumnCount = 3;
tableBindings.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 15.45389F)); tableBindings.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 15.4538889F));
tableBindings.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 40.94511F)); tableBindings.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 40.9451065F));
tableBindings.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 43.6010056F)); tableBindings.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 43.601F));
tableBindings.Controls.Add(label1, 0, 5); 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(textBox1, 2, 1);
tableBindings.Controls.Add(textM1, 2, 0); tableBindings.Controls.Add(textM1, 2, 0);
tableBindings.Controls.Add(comboM1, 1, 0); tableBindings.Controls.Add(comboM1, 1, 0);
@@ -269,26 +273,60 @@ namespace GHelper
tableBindings.Margin = new Padding(0, 3, 4, 3); tableBindings.Margin = new Padding(0, 3, 4, 3);
tableBindings.Name = "tableBindings"; tableBindings.Name = "tableBindings";
tableBindings.Padding = new Padding(16, 12, 0, 12); 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.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; tableBindings.TabIndex = 12;
// //
// label1 // labelFNE
// //
label1.AutoSize = true; labelFNE.AutoSize = true;
label1.Location = new Point(16, 242); labelFNE.Location = new Point(16, 288);
label1.Margin = new Padding(0); labelFNE.Margin = new Padding(0);
label1.Name = "label1"; labelFNE.Name = "labelFNE";
label1.Padding = new Padding(5, 10, 0, 0); labelFNE.Padding = new Padding(5, 10, 0, 0);
label1.Size = new Size(85, 42); labelFNE.Size = new Size(143, 42);
label1.TabIndex = 15; labelFNE.TabIndex = 20;
label1.Text = "FN+C:"; 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 // textBox1
// //
@@ -487,7 +525,6 @@ namespace GHelper
tableKeys.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 20F)); 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.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.Location = new Point(0, 0);
tableKeys.Name = "tableKeys"; tableKeys.Name = "tableKeys";
tableKeys.RowCount = 6; tableKeys.RowCount = 6;
@@ -500,16 +537,6 @@ namespace GHelper
tableKeys.Size = new Size(200, 100); tableKeys.Size = new Size(200, 100);
tableKeys.TabIndex = 0; 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
// //
textM2.Dock = DockStyle.Top; textM2.Dock = DockStyle.Top;
@@ -528,7 +555,7 @@ namespace GHelper
panelBacklightHeader.Controls.Add(pictureBacklight); panelBacklightHeader.Controls.Add(pictureBacklight);
panelBacklightHeader.Controls.Add(labelBacklightTitle); panelBacklightHeader.Controls.Add(labelBacklightTitle);
panelBacklightHeader.Dock = DockStyle.Top; panelBacklightHeader.Dock = DockStyle.Top;
panelBacklightHeader.Location = new Point(15, 370); panelBacklightHeader.Location = new Point(15, 416);
panelBacklightHeader.Name = "panelBacklightHeader"; panelBacklightHeader.Name = "panelBacklightHeader";
panelBacklightHeader.Padding = new Padding(10, 5, 10, 5); panelBacklightHeader.Padding = new Padding(10, 5, 10, 5);
panelBacklightHeader.Size = new Size(983, 50); panelBacklightHeader.Size = new Size(983, 50);
@@ -574,7 +601,7 @@ namespace GHelper
panelBacklight.Controls.Add(panelXMG); panelBacklight.Controls.Add(panelXMG);
panelBacklight.Controls.Add(tableBacklight); panelBacklight.Controls.Add(tableBacklight);
panelBacklight.Dock = DockStyle.Top; panelBacklight.Dock = DockStyle.Top;
panelBacklight.Location = new Point(15, 420); panelBacklight.Location = new Point(15, 466);
panelBacklight.Name = "panelBacklight"; panelBacklight.Name = "panelBacklight";
panelBacklight.Padding = new Padding(0, 5, 0, 5); panelBacklight.Padding = new Padding(0, 5, 0, 5);
panelBacklight.Size = new Size(983, 402); panelBacklight.Size = new Size(983, 402);
@@ -963,7 +990,7 @@ namespace GHelper
panelSettingsHeader.Controls.Add(pictureSettings); panelSettingsHeader.Controls.Add(pictureSettings);
panelSettingsHeader.Controls.Add(labelSettings); panelSettingsHeader.Controls.Add(labelSettings);
panelSettingsHeader.Dock = DockStyle.Top; panelSettingsHeader.Dock = DockStyle.Top;
panelSettingsHeader.Location = new Point(15, 822); panelSettingsHeader.Location = new Point(15, 868);
panelSettingsHeader.Name = "panelSettingsHeader"; panelSettingsHeader.Name = "panelSettingsHeader";
panelSettingsHeader.Padding = new Padding(10, 5, 10, 5); panelSettingsHeader.Padding = new Padding(10, 5, 10, 5);
panelSettingsHeader.Size = new Size(983, 50); panelSettingsHeader.Size = new Size(983, 50);
@@ -1015,7 +1042,7 @@ namespace GHelper
panelSettings.Controls.Add(checkGpuApps); panelSettings.Controls.Add(checkGpuApps);
panelSettings.Controls.Add(checkFnLock); panelSettings.Controls.Add(checkFnLock);
panelSettings.Dock = DockStyle.Top; panelSettings.Dock = DockStyle.Top;
panelSettings.Location = new Point(15, 872); panelSettings.Location = new Point(15, 918);
panelSettings.Name = "panelSettings"; panelSettings.Name = "panelSettings";
panelSettings.Padding = new Padding(20, 5, 10, 5); panelSettings.Padding = new Padding(20, 5, 10, 5);
panelSettings.Size = new Size(983, 344); panelSettings.Size = new Size(983, 344);
@@ -1163,8 +1190,6 @@ namespace GHelper
panelBindings.PerformLayout(); panelBindings.PerformLayout();
tableBindings.ResumeLayout(false); tableBindings.ResumeLayout(false);
tableBindings.PerformLayout(); tableBindings.PerformLayout();
tableKeys.ResumeLayout(false);
tableKeys.PerformLayout();
panelBacklightHeader.ResumeLayout(false); panelBacklightHeader.ResumeLayout(false);
panelBacklightHeader.PerformLayout(); panelBacklightHeader.PerformLayout();
((System.ComponentModel.ISupportInitialize)pictureBacklight).EndInit(); ((System.ComponentModel.ISupportInitialize)pictureBacklight).EndInit();
@@ -1193,7 +1218,7 @@ namespace GHelper
private Panel panelBindingsHeader; private Panel panelBindingsHeader;
private Panel panelBindings; private Panel panelBindings;
private TableLayoutPanel tableBindings; private TableLayoutPanel tableBindings;
private Label label1; private Label labelFNC;
private TextBox textBox1; private TextBox textBox1;
private TextBox textM1; private TextBox textM1;
private RComboBox comboM1; private RComboBox comboM1;
@@ -1213,7 +1238,6 @@ namespace GHelper
private TextBox textFNC; private TextBox textFNC;
private PictureBox pictureHelp; private PictureBox pictureHelp;
private TableLayoutPanel tableKeys; private TableLayoutPanel tableKeys;
private Label labelFNC;
private TextBox textM2; private TextBox textM2;
private PictureBox pictureBindings; private PictureBox pictureBindings;
private Label labelBindings; private Label labelBindings;
@@ -1265,5 +1289,8 @@ namespace GHelper
private Slider sliderBrightness; private Slider sliderBrightness;
private PictureBox pictureLog; private PictureBox pictureLog;
private CheckBox checkAutoToggleClamshellMode; private CheckBox checkAutoToggleClamshellMode;
private Label labelFNE;
private RComboBox comboFNE;
private TextBox textFNE;
} }
} }

13
app/Extra.cs
View File

@@ -54,6 +54,9 @@ namespace GHelper
customActions[""] = Properties.Strings.ToggleFnLock; customActions[""] = Properties.Strings.ToggleFnLock;
customActions.Remove("fnlock"); customActions.Remove("fnlock");
break; break;
case "fne":
customActions[""] = "Calculator";
break;
} }
combo.DropDownStyle = ComboBoxStyle.DropDownList; combo.DropDownStyle = ComboBoxStyle.DropDownList;
@@ -129,12 +132,15 @@ namespace GHelper
labelM1.Text = "FN+F2"; labelM1.Text = "FN+F2";
labelM2.Text = "FN+F3"; labelM2.Text = "FN+F3";
labelM3.Text = "FN+F4"; 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; 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) if (Program.acpi.DeviceGet(AsusACPI.GPUEco) < 0)
{ {
checkGpuApps.Visible = false; checkGpuApps.Visible = false;
@@ -149,6 +155,7 @@ namespace GHelper
SetKeyCombo(comboM4, textM4, "m4"); SetKeyCombo(comboM4, textM4, "m4");
SetKeyCombo(comboFNF4, textFNF4, "fnf4"); SetKeyCombo(comboFNF4, textFNF4, "fnf4");
SetKeyCombo(comboFNC, textFNC, "fnc"); SetKeyCombo(comboFNC, textFNC, "fnc");
SetKeyCombo(comboFNE, textFNE, "fne");
Shown += Keyboard_Shown; Shown += Keyboard_Shown;

17
app/Gpu/GPUModeControl.cs
View File

@@ -204,8 +204,6 @@ namespace GHelper.Gpu
else else
{ {
if (ReEnableGPU()) return true;
if (eco == 1) if (eco == 1)
if ((GpuAuto && IsPlugged()) || (ForceGPU && GpuMode == AsusACPI.GPUModeStandard)) 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() public void InitXGM()
{ {
bool connected = Program.acpi.IsXGConnected(); bool connected = Program.acpi.IsXGConnected();

14
app/Input/InputDispatcher.cs
View File

@@ -322,6 +322,8 @@ namespace GHelper.Input
action = "micmute"; action = "micmute";
if (name == "fnc") if (name == "fnc")
action = "fnlock"; action = "fnlock";
if (name == "fne")
action = "calculator";
} }
switch (action) switch (action)
@@ -362,10 +364,10 @@ namespace GHelper.Input
Program.toast.RunToast(muteStatus ? "Muted" : "Unmuted", muteStatus ? ToastIcon.MicrophoneMute : ToastIcon.Microphone); Program.toast.RunToast(muteStatus ? "Muted" : "Unmuted", muteStatus ? ToastIcon.MicrophoneMute : ToastIcon.Microphone);
break; break;
case "brightness_up": case "brightness_up":
HandleOptimizationEvent(32); BrightnessUp();
break; break;
case "brightness_down": case "brightness_down":
HandleOptimizationEvent(16); BrightnessDown();
break; break;
case "screenpad_up": case "screenpad_up":
SetScreenpad(10); SetScreenpad(10);
@@ -376,7 +378,9 @@ namespace GHelper.Input
case "custom": case "custom":
CustomKey(name); CustomKey(name);
break; break;
case "calculator":
LaunchProcess("calc");
break;
default: default:
break; break;
} }
@@ -425,9 +429,11 @@ namespace GHelper.Input
KeyProcess("m3"); KeyProcess("m3");
return; return;
case 56: // M4 / Rog button case 56: // M4 / Rog button
case 181: // FN + Numpad Enter
KeyProcess("m4"); KeyProcess("m4");
return; return;
case 181: // FN + Numpad Enter
KeyProcess("fne");
return;
case 174: // FN+F5 case 174: // FN+F5
modeControl.CyclePerformanceMode(); modeControl.CyclePerformanceMode();
return; return;