From e04c4cd46fec4785595cb53e05583eda6d360739 Mon Sep 17 00:00:00 2001 From: Serge <5920850+seerge@users.noreply.github.com> Date: Mon, 29 Jan 2024 12:31:31 +0100 Subject: [PATCH] AMD Overlay button --- app/Properties/Resources.Designer.cs | 10 ++++++++++ app/Properties/Resources.resx | 23 +++++++++++++---------- app/Resources/icons8-heartbeat-32.png | Bin 0 -> 387 bytes app/Settings.Designer.cs | 25 +++++++++++++++++++++++++ app/Settings.cs | 7 +++++++ 5 files changed, 55 insertions(+), 10 deletions(-) create mode 100644 app/Resources/icons8-heartbeat-32.png diff --git a/app/Properties/Resources.Designer.cs b/app/Properties/Resources.Designer.cs index 7afc4654..8ff78342 100644 --- a/app/Properties/Resources.Designer.cs +++ b/app/Properties/Resources.Designer.cs @@ -340,6 +340,16 @@ namespace GHelper.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_heartbeat_32 { + get { + object obj = ResourceManager.GetObject("icons8-heartbeat-32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/app/Properties/Resources.resx b/app/Properties/Resources.resx index 61b20e70..7d0ca668 100644 --- a/app/Properties/Resources.resx +++ b/app/Properties/Resources.resx @@ -136,9 +136,6 @@ ..\Resources\icons8-bicycle-48 (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\standard.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\eco.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -196,6 +193,9 @@ ..\Resources\icons8-remove-64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\icons8-share-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\icons8-function-mac-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -226,6 +226,12 @@ ..\Resources\icons8-keyboard-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\icons8-xbox-rt-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-controller-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\icons8-fan-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -313,8 +319,8 @@ ..\Resources\icons8-software-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\icons8-share-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\standard.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\icons8-soonvibes-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -325,10 +331,7 @@ ..\Resources\icons8-charging-battery-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\icons8-xbox-rt-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\icons8-controller-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\icons8-heartbeat-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/app/Resources/icons8-heartbeat-32.png b/app/Resources/icons8-heartbeat-32.png new file mode 100644 index 0000000000000000000000000000000000000000..3592c445418509cad91d7ae3e912854db24f694d GIT binary patch literal 387 zcmV-}0et?6P)K}G2{V~Yg2lS7AFJ0Fr2Hd+{8t^9|rFBzn%Mv*_{DOl{!=tKnx%SkQs&KnltxV z#fCr5$EOcK%8wHOGowhDbL|6=F=V5aW-9OP0#pHv01N?CLICuX7li;ADsK=1V5z)C z2!KR+zt;w6I4%`g(~|cVi`5*U?EsLqz2sDUpQw+*0PhZfH|2NK`X7J?Yk-LZK-Tt} z=DZhcfG@87umI(GMX%=QoUtXqBY=%MehWTt=)I~vTjf0!1;`xHXOX!)`T2)OOD+Tu zF^={6I$N#@K$7d}10J_3uVw9x0X%bmmqqEC2MXPU_cITqp+~a0MBSYGPBv;*m2McId}Yc2o)002ovPDHLkV1glpo{|6n literal 0 HcmV?d00001 diff --git a/app/Settings.Designer.cs b/app/Settings.Designer.cs index c6e5c94d..d0b30d58 100644 --- a/app/Settings.Designer.cs +++ b/app/Settings.Designer.cs @@ -118,6 +118,7 @@ namespace GHelper panelAllyTitle = new Panel(); pictureAlly = new PictureBox(); labelAlly = new Label(); + buttonOverlay = new RButton(); panelMatrix.SuspendLayout(); tableLayoutMatrix.SuspendLayout(); panelMatrixTitle.SuspendLayout(); @@ -694,6 +695,7 @@ namespace GHelper tableAMD.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33F)); tableAMD.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33F)); tableAMD.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33F)); + tableAMD.Controls.Add(buttonOverlay, 0, 0); tableAMD.Controls.Add(buttonFPS, 0, 0); tableAMD.Dock = DockStyle.Top; tableAMD.Location = new Point(20, 316); @@ -1584,6 +1586,28 @@ namespace GHelper labelAlly.TabIndex = 26; labelAlly.Text = "Ally Controller"; // + // buttonOverlay + // + buttonOverlay.Activated = false; + buttonOverlay.BackColor = SystemColors.ControlLightLight; + buttonOverlay.BorderColor = Color.Transparent; + buttonOverlay.BorderRadius = 5; + buttonOverlay.Dock = DockStyle.Fill; + buttonOverlay.FlatAppearance.BorderSize = 0; + buttonOverlay.FlatStyle = FlatStyle.Flat; + buttonOverlay.ForeColor = SystemColors.ControlText; + buttonOverlay.Image = Properties.Resources.icons8_heartbeat_32; + buttonOverlay.ImageAlign = ContentAlignment.MiddleRight; + buttonOverlay.Location = new Point(266, 4); + buttonOverlay.Margin = new Padding(4); + buttonOverlay.Name = "buttonOverlay"; + buttonOverlay.Secondary = false; + buttonOverlay.Size = new Size(254, 72); + buttonOverlay.TabIndex = 12; + buttonOverlay.Text = "AMD Overlay"; + buttonOverlay.TextImageRelation = TextImageRelation.ImageBeforeText; + buttonOverlay.UseVisualStyleBackColor = false; + // // SettingsForm // AutoScaleDimensions = new SizeF(192F, 192F); @@ -1759,5 +1783,6 @@ namespace GHelper private TableLayoutPanel tableAMD; private RButton buttonFPS; private RButton buttonController; + private RButton buttonOverlay; } } diff --git a/app/Settings.cs b/app/Settings.cs index 0ad3e14f..1b048c89 100644 --- a/app/Settings.cs +++ b/app/Settings.cs @@ -235,7 +235,9 @@ namespace GHelper buttonControllerMode.Click += ButtonControllerMode_Click; buttonBacklight.Click += ButtonBacklight_Click; + buttonFPS.Click += ButtonFPS_Click; + buttonOverlay.Click += ButtonOverlay_Click; Text = "G-Helper " + (ProcessHelper.IsUserAdministrator() ? "—" : "-") + " " + AppConfig.GetModelShort(); TopMost = AppConfig.Is("topmost"); @@ -250,6 +252,11 @@ namespace GHelper panelPerformance.Focus(); } + private void ButtonOverlay_Click(object? sender, EventArgs e) + { + KeyboardHook.KeyKeyKeyPress(Keys.LControlKey, Keys.LShiftKey, Keys.O); + } + private void ButtonHandheld_Click(object? sender, EventArgs e) { if (handheldForm == null || handheldForm.Text == "")