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

Merge branch 'main' into asus-mouse-support

Browse Source 
# Conflicts:
#	app/Settings.Designer.cs
This commit is contained in:
IceStormNG
2023-07-24 18:53:55 +02:00
parent fce0801f3b 7b4e342f04
commit c67f079f30
2 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
app/Settings.Designer.cs generated
View File

@@ -48,8 +48,8 @@ namespace GHelper
panelFooter = new Panel(); panelFooter = new Panel();
tableButtons = new TableLayoutPanel(); tableButtons = new TableLayoutPanel();
buttonKeyboard = new RButton(); buttonKeyboard = new RButton();
buttonQuit = new RButton();
buttonUpdates = new RButton(); buttonUpdates = new RButton();
buttonQuit = new RButton();
checkStartup = new CheckBox(); checkStartup = new CheckBox();
panelPerformance = new Panel(); panelPerformance = new Panel();
tablePerf = new TableLayoutPanel(); tablePerf = new TableLayoutPanel();
@@ -355,13 +355,14 @@ namespace GHelper
// tableButtons // tableButtons
// //
tableButtons.AutoSize = true; tableButtons.AutoSize = true;
tableButtons.ColumnCount = 3; tableButtons.ColumnCount = 4;
tableButtons.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.3333321F));
tableButtons.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.3333321F)); tableButtons.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.3333321F));
tableButtons.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.3333321F)); tableButtons.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.3333321F));
tableButtons.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 8.33083248F));
tableButtons.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25.0024986F));
tableButtons.Controls.Add(buttonKeyboard, 0, 0); tableButtons.Controls.Add(buttonKeyboard, 0, 0);
tableButtons.Controls.Add(buttonQuit, 2, 0);
tableButtons.Controls.Add(buttonUpdates, 1, 0); tableButtons.Controls.Add(buttonUpdates, 1, 0);
tableButtons.Controls.Add(buttonQuit, 3, 0);
tableButtons.Dock = DockStyle.Top; tableButtons.Dock = DockStyle.Top;
tableButtons.Location = new Point(20, 20); tableButtons.Location = new Point(20, 20);
tableButtons.Name = "tableButtons"; tableButtons.Name = "tableButtons";
@@ -392,24 +393,6 @@ namespace GHelper
buttonKeyboard.TextImageRelation = TextImageRelation.ImageBeforeText; buttonKeyboard.TextImageRelation = TextImageRelation.ImageBeforeText;
buttonKeyboard.UseVisualStyleBackColor = false; buttonKeyboard.UseVisualStyleBackColor = false;
// //
// buttonQuit
//
buttonQuit.AccessibleName = "Quit Application";
buttonQuit.Activated = false;
buttonQuit.Anchor = AnchorStyles.Top | AnchorStyles.Right;
buttonQuit.BackColor = SystemColors.ControlLight;
buttonQuit.BorderColor = Color.Transparent;
buttonQuit.BorderRadius = 2;
buttonQuit.FlatStyle = FlatStyle.Flat;
buttonQuit.Image = Properties.Resources.icons8_quit_32;
buttonQuit.Location = new Point(513, 4);
buttonQuit.Margin = new Padding(4);
buttonQuit.Name = "buttonQuit";
buttonQuit.Secondary = true;
buttonQuit.Size = new Size(64, 50);
buttonQuit.TabIndex = 23;
buttonQuit.UseVisualStyleBackColor = false;
//
// buttonUpdates // buttonUpdates
// //
buttonUpdates.AccessibleName = "BIOS and Driver Updates"; buttonUpdates.AccessibleName = "BIOS and Driver Updates";
@@ -431,6 +414,24 @@ namespace GHelper
buttonUpdates.TextImageRelation = TextImageRelation.ImageBeforeText; buttonUpdates.TextImageRelation = TextImageRelation.ImageBeforeText;
buttonUpdates.UseVisualStyleBackColor = false; buttonUpdates.UseVisualStyleBackColor = false;
// //
// buttonQuit
//
buttonQuit.AccessibleName = "Quit Application";
buttonQuit.Activated = false;
buttonQuit.BackColor = SystemColors.ControlLight;
buttonQuit.BorderColor = Color.Transparent;
buttonQuit.BorderRadius = 2;
buttonQuit.Dock = DockStyle.Top;
buttonQuit.FlatStyle = FlatStyle.Flat;
buttonQuit.Location = new Point(580, 4);
buttonQuit.Margin = new Padding(4);
buttonQuit.Name = "buttonQuit";
buttonQuit.Secondary = true;
buttonQuit.Size = new Size(187, 50);
buttonQuit.TabIndex = 23;
buttonQuit.Text = "Quit";
buttonQuit.UseVisualStyleBackColor = false;
//
// checkStartup // checkStartup
// //
checkStartup.AutoSize = true; checkStartup.AutoSize = true;

9
app/Settings.cs
View File

@@ -78,7 +78,7 @@ namespace GHelper
checkStartup.Text = Properties.Strings.RunOnStartup; checkStartup.Text = Properties.Strings.RunOnStartup;
buttonMatrix.Text = Properties.Strings.PictureGif; buttonMatrix.Text = Properties.Strings.PictureGif;
//buttonQuit.Text = Properties.Strings.Quit; buttonQuit.Text = Properties.Strings.Quit;
buttonUpdates.Text = Properties.Strings.Updates; buttonUpdates.Text = Properties.Strings.Updates;
FormClosing += SettingsForm_FormClosing; FormClosing += SettingsForm_FormClosing;
@@ -909,8 +909,11 @@ namespace GHelper
public void AutoKeyboard() public void AutoKeyboard()
{ {
AsusUSB.ApplyAuraPower(); if (!AppConfig.Is("skip_aura"))
AsusUSB.ApplyAura(); {
AsusUSB.ApplyAuraPower();
AsusUSB.ApplyAura();
}
InputDispatcher.SetBacklightAuto(true); InputDispatcher.SetBacklightAuto(true);