From 5b89556ed388c34c8847f5dc2d42c68974bd0871 Mon Sep 17 00:00:00 2001 From: seerge Date: Fri, 17 Mar 2023 22:28:33 +0100 Subject: [PATCH] New UI --- app/GHelper.csproj | 2 +- app/Program.cs | 2 - app/Properties/Resources.Designer.cs | 170 +++++++ app/Properties/Resources.resx | 99 +++- app/Resources/icons8-balance-symbol-96.png | Bin 0 -> 710 bytes app/Resources/icons8-bicycle-48 (1).png | Bin 0 -> 948 bytes app/Resources/icons8-fan-48.png | Bin 0 -> 1082 bytes app/Resources/icons8-fan-speed-48.png | Bin 0 -> 870 bytes app/Resources/icons8-fiat-500-48.png | Bin 0 -> 858 bytes app/Resources/icons8-game-controller-48.png | Bin 0 -> 562 bytes app/Resources/icons8-launch-96.png | Bin 0 -> 648 bytes app/Resources/icons8-leaf-48.png | Bin 0 -> 965 bytes app/Resources/icons8-leaf-96.png | Bin 0 -> 910 bytes app/Resources/icons8-organic-food-96.png | Bin 0 -> 2030 bytes app/Resources/icons8-organic-food-961.png | Bin 0 -> 1145 bytes .../icons8-project-management-48 (1).png | Bin 0 -> 837 bytes .../icons8-project-management-48.png | Bin 0 -> 1024 bytes app/Resources/icons8-rocket-48.png | Bin 0 -> 819 bytes app/Resources/icons8-spa-flower-48.png | Bin 0 -> 1067 bytes app/Resources/icons8-spa-flower-96.png | Bin 0 -> 954 bytes app/Resources/icons8-xbox-controller-96.png | Bin 0 -> 724 bytes app/RoundedButton.cs | 1 + app/Settings.Designer.cs | 472 ++++++++++-------- app/Settings.cs | 98 ++-- 24 files changed, 557 insertions(+), 287 deletions(-) create mode 100644 app/Resources/icons8-balance-symbol-96.png create mode 100644 app/Resources/icons8-bicycle-48 (1).png create mode 100644 app/Resources/icons8-fan-48.png create mode 100644 app/Resources/icons8-fan-speed-48.png create mode 100644 app/Resources/icons8-fiat-500-48.png create mode 100644 app/Resources/icons8-game-controller-48.png create mode 100644 app/Resources/icons8-launch-96.png create mode 100644 app/Resources/icons8-leaf-48.png create mode 100644 app/Resources/icons8-leaf-96.png create mode 100644 app/Resources/icons8-organic-food-96.png create mode 100644 app/Resources/icons8-organic-food-961.png create mode 100644 app/Resources/icons8-project-management-48 (1).png create mode 100644 app/Resources/icons8-project-management-48.png create mode 100644 app/Resources/icons8-rocket-48.png create mode 100644 app/Resources/icons8-spa-flower-48.png create mode 100644 app/Resources/icons8-spa-flower-96.png create mode 100644 app/Resources/icons8-xbox-controller-96.png diff --git a/app/GHelper.csproj b/app/GHelper.csproj index 745a26e8..7376d742 100644 --- a/app/GHelper.csproj +++ b/app/GHelper.csproj @@ -16,7 +16,7 @@ x64 False True - 0.29 + 0.30 diff --git a/app/Program.cs b/app/Program.cs index 602ed9dd..8e1f7027 100644 --- a/app/Program.cs +++ b/app/Program.cs @@ -60,8 +60,6 @@ namespace GHelper settingsForm.InitAura(); settingsForm.InitMatrix(); - settingsForm.VisualiseGPUAuto(config.getConfig("gpu_auto")); - settingsForm.VisualiseScreenAuto(config.getConfig("screen_auto")); settingsForm.SetStartupCheck(Startup.IsScheduled()); SetAutoModes(); diff --git a/app/Properties/Resources.Designer.cs b/app/Properties/Resources.Designer.cs index 82636674..2b9dfe3d 100644 --- a/app/Properties/Resources.Designer.cs +++ b/app/Properties/Resources.Designer.cs @@ -80,6 +80,26 @@ namespace GHelper.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_balance_symbol_96 { + get { + object obj = ResourceManager.GetObject("icons8-balance-symbol-96", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_bicycle_48__1_ { + get { + object obj = ResourceManager.GetObject("icons8-bicycle-48 (1)", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -90,6 +110,16 @@ namespace GHelper.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_fan_48 { + get { + object obj = ResourceManager.GetObject("icons8-fan-48", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -100,6 +130,36 @@ namespace GHelper.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_fan_speed_48 { + get { + object obj = ResourceManager.GetObject("icons8-fan-speed-48", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_fiat_500_48 { + get { + object obj = ResourceManager.GetObject("icons8-fiat-500-48", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_game_controller_48 { + get { + object obj = ResourceManager.GetObject("icons8-game-controller-48", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -120,6 +180,36 @@ namespace GHelper.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_launch_96 { + get { + object obj = ResourceManager.GetObject("icons8-launch-96", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_leaf_48 { + get { + object obj = ResourceManager.GetObject("icons8-leaf-48", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_leaf_96 { + get { + object obj = ResourceManager.GetObject("icons8-leaf-96", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -130,6 +220,26 @@ namespace GHelper.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_organic_food_96 { + get { + object obj = ResourceManager.GetObject("icons8-organic-food-96", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_organic_food_961 { + get { + object obj = ResourceManager.GetObject("icons8-organic-food-961", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -140,6 +250,56 @@ namespace GHelper.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_project_management_48 { + get { + object obj = ResourceManager.GetObject("icons8-project-management-48", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_project_management_48__1_ { + get { + object obj = ResourceManager.GetObject("icons8-project-management-48 (1)", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_rocket_48 { + get { + object obj = ResourceManager.GetObject("icons8-rocket-48", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_spa_flower_48 { + get { + object obj = ResourceManager.GetObject("icons8-spa-flower-48", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_spa_flower_96 { + get { + object obj = ResourceManager.GetObject("icons8-spa-flower-96", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -170,6 +330,16 @@ namespace GHelper.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap icons8_xbox_controller_96 { + get { + object obj = ResourceManager.GetObject("icons8-xbox-controller-96", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// diff --git a/app/Properties/Resources.resx b/app/Properties/Resources.resx index c08865b5..12794545 100644 --- a/app/Properties/Resources.resx +++ b/app/Properties/Resources.resx @@ -118,43 +118,94 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\eco.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\icons8-leaf-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\icons8-matrix-desktop-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\icons8-launch-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-charging-battery-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-organic-food-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-fiat-500-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-video-card-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-project-management-48 (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-bicycle-48 (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-fan-head-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-processor-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-spa-flower-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-spa-flower-96.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-keyboard-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\icons8-fan-speed-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-speed-96.png;System.Drawing.Bitmap, 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 + + + ..\Resources\icons8-laptop-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-rocket-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-organic-food-961.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-balance-symbol-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 + + + ..\Resources\icons8-matrix-desktop-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-xbox-controller-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-project-management-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons8-leaf-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\ultimate.ico;System.Drawing.Icon, 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-speed-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\everything-is-fine-itsfine.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\icons8-speed-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\icons8-video-card-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\icons8-fan-head-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\icons8-charging-battery-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\icons8-laptop-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\icons8-processor-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\icons8-game-controller-48.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-balance-symbol-96.png b/app/Resources/icons8-balance-symbol-96.png new file mode 100644 index 0000000000000000000000000000000000000000..e1ad7907c4c49d3315d9025a71e6954f7d12e7af GIT binary patch literal 710 zcmV;%0y+JOP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf6951U69E94oEQKA0$WK$K~!i%?bthO z6j2z)@%4tmOCg8}A}V4!8$W=JX{^$xh=}?TR4fE71T73+&_*#yoi5-9un_B@B8Zq^ zVWE{51QopeAI%Gg!#kHV?##}>Jn&<)*)zM(yF0Tp$)Hc4KDA^cZs7~=tl#fURQ5i8 z2jw@)$UY z>##DqeE_etd5Ez5Ib8VnW3xGfpNLE8w(NP}3hc3~`bAR-%bTJh^2(b=hB%A3ywUCx z4q?|q`pPUSZ!V*@c<+2H-pAwQl{d8vk@wEW^hs<$92N7{dxk#58oU?se8T~R*@jQ> z)_b&8+w|$vWOP>j0dJp7^#+HbOkx$@x>V|S4Q{@|+o-DZP;{x_JzkZ1y15B&gDT!5 z`~*J0TUW&#GII&uMk!w45W*b9Yk2F+(s}423UdlokA+9r2`{_x6yA14bV)Le(m8?8 z@SZHo4TRT1+9l)v3+d#v3~&1^Z*c_4If{4io;36wr(sdq_-b?kHpC{}MfiA@Cm2WN z?8i%ZPcAw*kHO-VH{lS9zNLP_TPus$ivP|oJVyKi@xhu`-o!)9K-W&;n$ibrO2)7R zdy)8HEmPjaLmbCP=&|I3H6?n{*>zz7{ap07a4a4|=L-FOtlP$O4_?V4`ou<_33%no z+J}*5Ggjc0EAk9mF!Jodb9g1Qyux0zCMiR-uDqqp5Unk5$s3~eV)R4j84-(Kv=zG;)!vFvP07*qoM6N<$f|>PCEdT%j literal 0 HcmV?d00001 diff --git a/app/Resources/icons8-bicycle-48 (1).png b/app/Resources/icons8-bicycle-48 (1).png new file mode 100644 index 0000000000000000000000000000000000000000..bdc94b800aab5288dd2a80b3baf6784220ae2850 GIT binary patch literal 948 zcmV;l155mgP)qANuq*Y6;W@B8u5kTE9(>EDri7437VM4NJ}rYMbAv{>@JKr zKMd@4SIuADRb5rR3keb=NbtX5Esz1ckf$H$1oi->#0Vc8jQ7Oz5ST_x@H4^!Jm3M4 zA_lk~aRDB%n;2k+FzT6)+;rfQkiA0;Fa`J}44dmCJ449z5))hzh8_CX7O-6y*5zaT zu)ot}SuYKOeH_CW?$EK{y1=&!LHv2Hz6j-vMKaW&Au#0dn23$w0Tz zeGF9SuG1V}S`6dI>Ktqmy$8x2^-ozmmyP#}V(wU>j9vsB1+D>KEbdn!;eutrh|p~` z<~NHu<>ep1C(V6C9PUso0q#0vnXAC;kavv-(n2q-$FtbrnAJMR@JPsX>ultgQa$mk2Wo(3V9?^p6gkA`NOh|rL#(ot# zPmF?A7jWoPmSWfg+z9ZN^5#d&MX1D<1qK|8Q?y{%$yNPBjj82>CP ze5J(`8`VUI7*t{7iguyf3f#2puIhoZxZtzXr53L)7ktfPzD*6j6oY0gn}~YgRQGA( zt(dPi=32$vX`x$fNy&e@K6B8ox<)Zx_5Bhuyef>j)yDW!OUj&NyJGehX#wAXnU?ni z@uh%+`o?C1bpc(D%~USNt1wyV^Bz||8)}5E%ATARgC}rDM?kjmLq2>hLbu&7jmitQ z-)_h>y2U{+Dqodf8ckU;Q6}W2DjR$gI=C4 literal 0 HcmV?d00001 diff --git a/app/Resources/icons8-fan-48.png b/app/Resources/icons8-fan-48.png new file mode 100644 index 0000000000000000000000000000000000000000..f1ca3a7276a512faf5f160d4f9b4f9b80bf08f49 GIT binary patch literal 1082 zcmV-A1jYM_P)`6pHRCt{2nMr6=K@f(&I3{kmpqVJ*0_s5o38+L|z=Iby~x-@JbPUi30Q zGz{~qs;k~qSN&ZBMHEp)8pr_4fdjx*;0Z7Q49YT}yX09TuuOFRJ7xpTz#AYRa~Yi@ zz^wn__*9@x-flkO8U$K^?7wn;Gw?A5$Mxz5>W0(tGT>|h2TY!y2etr9fO4QzR#v_< z&n}2;n4MP9NfqOOn;{!M0yY7oV%RgXwZP*Ln>S?7)ZVV1ks6XB{p9G%6)? zhqa+2!jV@>eg$wpLZ?mXwEHx&We!xL#9=aV*aqizoEFDmf0&hnIumOK$fTzB68X5QLshgP|1W{eUdDDT% zBnV)yvX_%W5DP7qE@`F*LF~6UKOpDG7nO1*f;Lb27|L3jTBl48f>;C`lTLgv;jlIf zytHtnAiYR*E6U60!!P-%JdUegF0N@dKajen8LdXhgX zGIC&b&YN{T%^~l&kRbBHo$96WxMH-_`KKW^uctZO9YSeHIt{H)!Xz7{V`im6mC5HS zdDd>}uz8g>sgKu#sI^q5G*(|42i6r?c~enz!e!;8&U=^2B$z3jr`N-A!)=;;I_z*@ zgiIs$3(fA7G|S2Am+@qWP~xhDe~c7SL=pVOAL%lcRA8Wo@&Et;07*qoM6N<$f(Rty A;Q#;t literal 0 HcmV?d00001 diff --git a/app/Resources/icons8-fan-speed-48.png b/app/Resources/icons8-fan-speed-48.png new file mode 100644 index 0000000000000000000000000000000000000000..573458ba8ab23a7ac86104a808d98c5d48669fef GIT binary patch literal 870 zcmV-s1DX7ZP)K6rpL1~MK7PTuS}iy2%uVg_%-?Bb4$EioKD z3h=D-6uglP7#SC0II$L4dwhq#z z3HvTVRf#3!xAgP1c=iRJ|CB}E37iJDN#QFP>?gmj5D?bG&(8DCgtQ*3 z3n^q3&>kVfl!v@qt{8y!jCJB2Hkcj2Ny%1y8KRm)-bpB@;h0R{DML%Z`8N?*Cbm<4 z(AnZaHibyJRkN^YRbP0Y* zo+_!a-@sw%m0BG+mTC9IJswBUF7h<09XXC_1T=e|0ya~nambP5!QX7;P6%&VjA{8^ zBjBxP0b7N4PYjMBjeyS{gZ}}{6y9VEo~IfCuRRL565#EP!E;U{;Ic;nYXZDaV(@Iz z2x#yW{Iv|;Hb(l1_6#YEMdz(d&JjNEA^-5&Zl31OK)swuZpXjQ{`u07*qoM6N<$g59@*o&W#< literal 0 HcmV?d00001 diff --git a/app/Resources/icons8-fiat-500-48.png b/app/Resources/icons8-fiat-500-48.png new file mode 100644 index 0000000000000000000000000000000000000000..41de29879bb843764679b9cd162ff9817f747c7d GIT binary patch literal 858 zcmV-g1Eu_lP)A=x>KEWPone> z1)=KIU;pcLy`>>Wj2JQgWsCzh0cU`hz&GG4@B+9AoB-AVQ>ZhH1r7s0fIp7oI_7sqel7%-$i#c%Ks^BmY?nV$n}1kM3JJ@#Hv_b76# zv^@D9AOj3mHl{coqqq}WEC;Riuyu6+6-rN8_Oyp7z5)1P9B|slK8ORTyVGge*A|BO zF~Io{!liBK7!KSu)_(z)fDYgQFh6MWn*=kvquu=HXu<>e50ykq7v`* zYRv||JM0xlTfD?e1h^fsc)z>R;`s0+i?6p49JCmp1%}bTNB~n+@;nZFwCIwgI#1u! zWXZIW=7&;yGywb6<<|8*0|ph1I*i3vQDw#|u-sCLtd@m|>b=qz($pso89GlEOJsfW z2K9?3L#u@QLb&Cgi)$1>k`(p9fl1`aMzOqy}&)-sOnp+n5IH! zmqV*({>4{u$F&OhrNDGX#&XHp)Kh6xHkux1@@8&c*j2}%wu^ZD!;27du798$dqsTApm`TJg{eZU=60m`_g!mqpvVSL8P kD9$MOW5kFNBgTJZxmU?)%A@_b%?Qp51xwbIx=>-T^EYi^XEG zn8yGB$FS;;5@6E+!w%I(lmJ%-7voYx1%frm09x zImAbfycB{OS^!k3DUJ9@lb5RU=*bW@yaVV!e6$02BTs{V4XY$R_0jSni%J$i1wa`< z#z%KXbHt-31ro3QV*oM!)BEhBTaR)Mo=7}mK!8!2BOYDpA>nJlf%$6y**0Zme#%GJ z3ZO=_#H+?UiOvHI2UR1vptZ%T#x{xe4GM5TYj3%UPDr$DP=FO$TfA!Al4!!90F$(~ zc-43zQE$MajW(S1c^CR0G%{TylOmPhcJgcd6Q3mjRg{Y02oI6qyT)9w>dXq8-Pa=R$>m3a=9H#01{pevo3pE z(jTdP7<8~3K~l}iyZrJ}(?JXD{o>JTR^`I{0`djAYk*mYYA5LLBr~J-TinJ=VYZDI z3H9kJ*VY|?dJ_!S)vThrZ9EUG#bU8oEEdGfH%DAD79G|$v;Y7A07*qoM6N<$f*~FB ACIA2c literal 0 HcmV?d00001 diff --git a/app/Resources/icons8-launch-96.png b/app/Resources/icons8-launch-96.png new file mode 100644 index 0000000000000000000000000000000000000000..a59eeb584d0d88d74b52a09f2eed47df39f64c2b GIT binary patch literal 648 zcmV;30(bq1P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf6951U69E94oEQKA0v$<2K~!i%?U_9< z1VJ3ej}W0mftEr=d;*F10KS1vLnFcGAhbG4A&5eJ1tCh6#7p6&Kq7+RdEESyF&S&_ zW_E6t{UyKb-2Y~8o|#*AZ?{rXk|xb?23{$rRjm+o!2|eV$XYi{nqGJc&F~`M>w`(s z4o{#hxGwv2z~oqgw!k)*VNwjhS7-}s^9A-pZ$kZNn1U_UrW37@`y|5=w5@cOhcFo) zp)F*V573(?we^L8YK8lFAHsQ_9rqy53q5d`1%ptF7Xf$>f)TZi#t^)zHoq`WP_7Dh zFxn)z@(iyBFoU@&upMO*dU!KHJqq$V*GZV+Z2@Xk&}+F&Vi20)sbJP!70f!v;+VnM zhvpzuu)XJ^V0({a{)+3>;4^HiHoqbJbHIAY+Mi?cW?3e#=K+4Dv2hyHbpnfO8G~p0000l literal 0 HcmV?d00001 diff --git a/app/Resources/icons8-leaf-48.png b/app/Resources/icons8-leaf-48.png new file mode 100644 index 0000000000000000000000000000000000000000..559bed1bda94ee7e2d158315e9541d9d9713341b GIT binary patch literal 965 zcmV;$13LVPP)ip|_ zIj!%%{%h^EzV%=0Kn59fc=QDN(t*$&m<8+s>VV(CBcL~F3?*(Ea31&$#0+r(=tLSJ z3z!TX0lp>>9TTyYG+EQDfyRKMW1je<2mN0#0N4RE1rYiMI0LLREU70zxAqj?6<7~^ z@e$nslmo>gf0d!FnuvD6OyFq}(LaF`K#9)=y(sd20Qpf0?+2VsBD@)>00sr*E7XJa zavX|E{3PII0^y&54M45~Z@J)ViQ+4i>dz~Mw*epzRXT-)mC97Q?bx>cCSX1nu`J(XFD-;jW&hDWuxGTkst9X@6I=S5DR%rGn%m z(96-4z7SlqeRB4S_6J-Ba9oh6S#-fv!K18oPJpTx^F)nH$8~~aikp7U37*pda*9Qc z@>|xB>p#zdqtH;-l@;+rp2+#&(Dy$t;w5o85swLudlnWwCVY`KehCs)m25E5P!1Od z%*{3I8*981Bt@3_(&IPknGJ$`gD0}abwRSyB6ptQ0JJ&1M~U3W4*J<7NNNM-_1CAZ zH}{5R-*ZI%O$Yr9G1%w10rILvj&iZ%Ec>ny9Q$xYjbSYgPSSpjVdMb^I90i8Ehx*MK+YPg-yv=k^n=$$#?``ufpndjRKFZjoge=3l zj>j#1)qE>{Z*#QW1$y8qJ5h-oLtRf6n;rVd2CfR8_hDXHv-G7~dK(#4j^e8gTsBGKjLvp4>S%{u|@|tv}z4pP8Qk^YE#}$Aih$F?*iP>Rjf)sz2xeuqm0Gcix7M}%Qv30E_=(O~T2(VXCPo|xbf%r7qKXZp}^ z(5JIxpSjH9PmTw`d?J9n+Qsw+4qBT#1Jm^1O!xKUuc~6tfGfZ*eF#R1dM&&~3o+S< nw8kR+^qtDfa|Rh?Ks5LZ+4uVDY&q%T00000NkvXXu0mjfL&UyK literal 0 HcmV?d00001 diff --git a/app/Resources/icons8-leaf-96.png b/app/Resources/icons8-leaf-96.png new file mode 100644 index 0000000000000000000000000000000000000000..f005f8555b4ff74b609ee2a59f845c7acf210bfa GIT binary patch literal 910 zcmV;919AL`P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf6951U69E94oEQKA10zX9K~!i%?b%tV zO;H@j@nas7u?!C)V@V-HA(Bilro0eRqC6<2M2VE)NropSi8rMbNj#8CDdk0o2XiE3 z%9Qc@>#SY-?(;u;uXFY~=bnf2t50ip@49=fJ*~a=x`k$%$(MGntasGzM9jxPJjEHj zL_=p14&oX9C49p=G+g>(3mzcZ>7+l`_pmw;!eZ1Uy>S*+qan2*c*fxgtOjdgDuQJp zKErCLR`h%Y$x{4;)krOUL^tHhT(m{!BP&pKM&T2z9oNfARFy8c18b*wZAVY+i2bab zSE%Zpph=ju!@M*Qbb`_YR-L4=C`o%)T2TXAi<`l73%`n+g)y$o%4AozO4qHW|^c1GCFa(O+Ub@m!uD(lB8XM zVXh3FbI{CHnGMaWd@{h5t&(;Cy<8bO@iBdgD}7RNf8N2mlzH4m6uo2K!m4M9My*y! zy8@bngw7#XD$CHnxapN2uJq1DSZAVIdU$o#qg;bkuN(A0nDMC>LPWOLH6*M=u;}XO&unC_4LAoh%zsakPH<8`che#n*Ur z%ie}nFN^P-sU!zr?a;?_XlXHu&Z1Q>%Og~sj?mlF+Ho2^u<^yIq41qHB<)15=$rI1 zteuy$9#J~rI;?tGw6;13xuYv_1U@6vZp5<(Ry`kw5j1mfA68>>6!Fi$m8f<&euF*; z9*rh@k!dCm1JU0#pqe+3H=Jl&yNLX)egF`eOEh(}*qc^1JoBWUy{T?5TY;ti>j z%Ms5ARNHx-m`wrV$I_>AZ;?J=&SA+ z(yoT?^{ZF~4Yw5~Yq97HwD=T79oK`ZdA)w;8%?99Kx;c1RXRiadJIi1^n$BN_Tww` kfxi}A(M&VVG)xMG|8wmn5dB>ZC;$Ke07*qoM6N<$f;ae=;{X5v literal 0 HcmV?d00001 diff --git a/app/Resources/icons8-organic-food-96.png b/app/Resources/icons8-organic-food-96.png new file mode 100644 index 0000000000000000000000000000000000000000..09abca8c7f2e7390c33986f1d8d33ae1ab4da66d GIT binary patch literal 2030 zcmV2aesEGdX$s3CX5Y(tBQ7VKWqNqO<@GVW17!_J7DYnqZT{Fq4xi&kq zJG*mc=l1TGoP?CSbIzQZojI?W1yZC)ks?Kk6e&`;hv5LK04xBo3czjv2LaRqI1Zo{ zz-jt-E&ZSP%}RQvirPpK5<>yZ1h5{!uK+wlR0m)kwOyW$#{ba|z*GR+0JIrYx{Nvi z>;*6fKuIAF#)SY@12}0x=`v~}8AhOhFc!cDOS9e6cq_ykcqzIu1_O8%K-K|;dlJgh z{xb;O2t@#90XXJ>g1wN`2w*ON9>{Z?3*b`+6zWAJu~}ClPjMrF1_zYr#iYLh+=4uU zcx{(EzSeu1B>J)pKn9MZH-OC!D9mG`w*mBpqv#LdBL|e^G1D#pXTUKCkMau#l;c^V z{VsXYy$fXKdp>VM9~U;j+@<^wntk;mqw zH|FIIDB2?uF{P~(WIJE89}8meeHsbjCI?K-4genjxD`NgjJ}k{kU{8R3KH;elXSA0 z0lWxcq@n%{j44k&fC^YbCc*GR8)dtO8Sc|V24wrh)_!nrLdxFCH_(;cr=Tey3rX z*MbS-EL%N00SpK!+eH9g0&qgoRx7;`e)xyMG8+vBY_h2Q%^|(a3Yu~4A(jR|oXI5r z>l_L6piY{iO(8N-B@`ZR(eR4>P|nnccGHRe)s~e1K7d{UvWPw5#|SA#KMY{(izp;B zW~SLF9r>1csqjF=xJ{ent;$5rwY$2r<}wFY=xC29W+#(wQEQLEX(to#~D>Xb^UD_z&c^-3L zCr258IC;__`b!aBUdPDysDke=jC|)s8Gu!c0tqF{Vm!?e_L4l=AmLNe_SdI$`U25Yr zlQ6Q7z+}zYFA4)_na?OPu-c!Q!K)|z&idfE1 zA^F!SGH`X4_dO*zQ*~mwiDCwdvK2p!(cryQ(#8dh{T216PKBdo`Ps1n<&R4hgX=O?IuNeEeCe8pviO+|nlK{#jeEX2? zocsG$i3QXv#LQRKo0>eJVZ1D*oVhS-g@U(OqW0XU&c{$K{6#O-rj2!W#O4dG?DN1Y(1`I_^6~f&`SqJ)#I`l}XxF&AeiU zqe*^rI}D&dm0EKOS{-63+@Tr5C{vsX*lR)g#>&%e9ne@9AcM?`$w*2VAC)+ITxmz0 zvP&nAC}rtLX%zhC(_TAyx8-EME@U{6C!;nBZ5YKy3xcsE z^{N7adlGo1U!XGsGW1lOlDA2B!vZpv>}anG9iyeDUxYBW4ccS#`m##KvK24liOQs| z(dnEV=fE;2T723tExkrokTkL$3B+@vv5U(!oLV&Qp9r!V@ZAPnlB5BJA({e=bQAcx}HJGlC_ighO2`q2|8<@L8_-J z!MsET-6-qjDeXzZ!{z#n)lml&>V>4^-Q_b@xhSQZuedLO@?ua2#q&k2QMbitM?Yn_ zh3mpqS22Q8iQFYGDrzDbj3?0Z34Ig%oNdrGnFWV3swP`QCkss}y_VXXZlYGRkWfjd zOXg7_?=GsEK1{jk(?kvQx3B3pE9jZ)^Z8qlDN>|Jks?Kk6zI127xc^f@gpguS^xk5 M07*qoM6N<$f^sUKxc~qF literal 0 HcmV?d00001 diff --git a/app/Resources/icons8-organic-food-961.png b/app/Resources/icons8-organic-food-961.png new file mode 100644 index 0000000000000000000000000000000000000000..9b44855704e4709a29a27310fa7bc0868f367684 GIT binary patch literal 1145 zcmV-<1cv*GP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf6951U69E94oEQKA1P)0=K~!i%?b$i3 zR8<_u@dpAbt6MCzAp(H{&_qp8qXr>Ts5DeqLc~Z%!ID@Ag+@gQh0)j$V=PPv8ka&v zrNRh`(E<=GltkkOvbdn4!uR`zBbUSf-kCcq#rq|n%)GpN&OLYLZ1>L4NJi3GMxA}_ zG~;j^=Ho`p#I=|N^DBPB0epcS_!xg-pt%Vz;1`^($ugF;j=pCO-o}538dryPSl3+i zJeOf3P9bVcC#>@sc#fWA8ulPMc{hEA>F8>1hJ!FVVJ~bVN@DyrgHvUFb*&x`KaGfaIO1y~&8gFaGf%h(U z;}HJD6_|lLa3{v1ow(Sw)Fzkqx-0B=co>(XDpz6^JU*(Yifw9X+wmNt3d+2M$*2=A z)G_uCqB_giw#vAx{25WQ+qco2pDwKN_#Vp2eh>p!Uuvem(Tk!{?<8$j#n%58& zD*6`AEGhS+o!#kX6lcK|h>pv>j?(N!RH*1dq>P6Bdkr4PEBF+xUeE@lcrn`%9appu zr70W0PJ5fM05-Z=yp>#nH(=k7>XiSx7b)H-RUIz}eQCT$%?mhKFG0I;(0Un%pj`S`2`aPoKRM~}E8N_w?D3RQY7KA^bQ~>*`}^XZ*41ZU&Gm@N>%6T*J_|Vm zc@I2g_^;-1`FGavF=2}L(aSIoenU=^JK-n1A2y;{+^t%7p5yS5<#|(S9(RxVRaZF* zXQ+1K2RI&MhW|PjZ+fD0*|w%}evb-QabNE|ehsQ(m+@j<4?aSAT;uBN`mq#V&|2i@ z&;>U%c^69Y_U*pL+gkB!ch&s>U*RPD%KcD$a_wzpv%9vkyoW`Nx6R`oy%*0v+htqa zC)LWch$x9ow>pp^vSjSti&c4SL)@}3=M2)Lr z8OwI`Gi%vaqHf&9y8DcN==L1`(CxrXKXiYHU8vkuj$|Y~&(P2r5%n+#AtKcx00000 LNkvXXu0mjfQMxHj literal 0 HcmV?d00001 diff --git a/app/Resources/icons8-project-management-48 (1).png b/app/Resources/icons8-project-management-48 (1).png new file mode 100644 index 0000000000000000000000000000000000000000..0bf8a033a7cd437ef9291fae94193af072ba844b GIT binary patch literal 837 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 literal 0 HcmV?d00001 diff --git a/app/Resources/icons8-spa-flower-96.png b/app/Resources/icons8-spa-flower-96.png new file mode 100644 index 0000000000000000000000000000000000000000..b353220b6c97790ce085f121ceb7b80b2696f013 GIT binary patch literal 954 zcmV;r14aCaP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf6951U69E94oEQKA15ZgrK~!i%?b$i3 z4N)A&@n@&7MTmU~Dv7N@h^4VL8iE2Hi5C<|Y&8WMA+bcS5)_t1BuFSw5G0n$P9!Ku z?7lxaCpquT#!QSvcWgjCauh%D0yl93-%*$77~PJSu=Zdhs4cZw^Z79r_h2>B z5$<9lN@YA=!&-5Qix`ICxa7*pcm?&PQ1sK)y65%l`HX{ACzXDQo=DC%SSu=`AAB@# z)hS{tlF}8=VXdTyrSQ?bRi}t&P~Y0*p8_%ox=hxZ6>h35chg!j3L3WLW-Y8eV7ZMW zco39%AJNCreEhwZ(Xw}fvOMZrZdze296JyH3wFZ}=;jmFS>uFds-wDEM$tMhAgt4# zjmXV9SPRFjG0Yrl_*Z9a?eyThMoLw2svK z#0<2FH5Sqs=M4t^{gfR&U7dp-P;{NvvIC%-*LrCDr0B3Y4&9V=KK#Hp^v5!!Jlwp; zP-x7Qn}e|SKr zgv(phrrNGK8i;*?)rhAnOc>qr<2q9j<^g&bi&3_S$HE`UM(Wb`5NPaT?V(0en}bo8oPpIyBb`RwG6nI&N+YSQ z$*5~~!D_4#a!=ke(NI7`TC2hKJaVk>+Or=;-q{w8-Z137cG1JiA!ryPhh3Rf*V8%+ zzr85CrF#0(lhhLESRDxcnWsNHuHqE*^c6-U(bdrKK>v~H?VrZ^dh4dwkY}NdtWu@Q c|C5%MKbnR>AQDPZegFUf07*qoM6N<$g7xdb4gdfE literal 0 HcmV?d00001 diff --git a/app/Resources/icons8-xbox-controller-96.png b/app/Resources/icons8-xbox-controller-96.png new file mode 100644 index 0000000000000000000000000000000000000000..e428d9220c1bc8b76b285824affda23c9419de5f GIT binary patch literal 724 zcmV;_0xSKAP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf6951U69E94oEQKA0%=J^K~!i%?U>7I z6hRb*N5#v+3kpWF6LF<0QAE_Zjt>xbF$A|>9zeXjiTViQ1>L&M#sm}tDskZj!7Pj* zD5&4>R7+2Js`^$P2CNT0x~He=oYU1+-90nNWHOmd=6_=sUco2$3BTecY>N7*uVN_H zWmN25Igan~m*F?#SjbRY#a519*oez$B~GbwC|6Rp<3qF(_Td9m&LnKY$7m($Q>_c- z?#xxR60C>H-HF|}idOI{U*RFA_N_Kmen!<0q-wFuVKhL5d#J*t_CuV(sp0NF?7<7e z-F7UYH8NVz`*9!McgK9|UICqew7!$7p%q8a3Mf^4!6aI3syvP5!u`)>52HzJ3eC8! zg@SfvgWDGPpUa$g+eSP`eEmPW*;Pim{yK%r`?%`LQobg|CD zkExn!6PrGkuTi781$9e&gMOQ?3%~X>YBPOQd>NgD-$o-}(Du$%YZ~1|t8+|^e3`B2 zw@I<^Z(t=0XmyV1KS|G`)vl|mEs93xCt96jYR>BVCvebh$C;5D{THb3xOuocwx~wkrvKny0j=_;=n=0t z8jL2YPoviZhZb^>Mf6vF$RBtSyE2c8W#zDZhC!~Q)yY@?sGY-9Oyd`{a`|4vAUp9b zS{(~N;4w_iQGAD1&cYSkfl*H48d?Ef;sNXn#eRWSZe4ZNRtx<~`iSKKPf`C8^o?>T zS2?$?`YCM01l~r?&AYe_*9+ykgUYQM_F^WJ$z(DfgTZfJ5P!^YM5FWo0000 0) Program.wmi.DeviceSet(ASUSWmi.ScreenOverdrive, overdrive); + //Program.config.setConfig("screen_auto", 0); InitScreen(); + Logger.WriteLine("Screen " + frequency.ToString() + "Hz"); } @@ -572,6 +583,8 @@ namespace GHelper int frequency = NativeMethods.GetRefreshRate(); int maxFrequency = Program.config.getConfig("max_frequency"); + bool screenAuto = (Program.config.getConfig("screen_auto") == 1); + if (frequency < 0) { button60Hz.Enabled = false; @@ -586,7 +599,7 @@ namespace GHelper button120Hz.Enabled = true; button60Hz.BackColor = SystemColors.ControlLightLight; button120Hz.BackColor = SystemColors.ControlLightLight; - labelSreen.Text = "Laptop Screen"; + labelSreen.Text = "Laptop Screen: " + frequency + "Hz"; } int overdrive = 0; @@ -601,8 +614,13 @@ namespace GHelper button60Hz.Activated = false; button120Hz.Activated = false; + buttonScreenAuto.Activated = false; - if (frequency == 60) + if (screenAuto) + { + buttonScreenAuto.Activated = true; + } + else if (frequency == 60) { button60Hz.Activated = true; } @@ -857,8 +875,7 @@ namespace GHelper public void AutoScreen(PowerLineStatus Plugged = PowerLineStatus.Online) { - int ScreenAuto = Program.config.getConfig("screen_auto"); - if (ScreenAuto != 1) return; + if (Program.config.getConfig("screen_auto") != 1) return; if (Plugged == PowerLineStatus.Online) SetScreen(1000, 1); @@ -871,8 +888,8 @@ namespace GHelper public bool AutoGPUMode(PowerLineStatus Plugged = PowerLineStatus.Online) { - int GpuAuto = Program.config.getConfig("gpu_auto"); - if (GpuAuto != 1) return false; + bool GpuAuto = Program.config.getConfig("gpu_auto") == 1; + if (!GpuAuto) return false; int eco = Program.wmi.DeviceGet(ASUSWmi.GPUEco); int mux = Program.wmi.DeviceGet(ASUSWmi.GPUMux); @@ -917,6 +934,7 @@ namespace GHelper buttonUltimate.Visible = (mux == 1); } + ButtonEnabled(buttonOptimized, true); ButtonEnabled(buttonEco, true); ButtonEnabled(buttonStandard, true); ButtonEnabled(buttonUltimate, true); @@ -932,6 +950,7 @@ namespace GHelper public void SetEcoGPU(int eco) { + ButtonEnabled(buttonOptimized, false); ButtonEnabled(buttonEco, false); ButtonEnabled(buttonStandard, false); ButtonEnabled(buttonUltimate, false); @@ -968,9 +987,13 @@ namespace GHelper { int CurrentGPU = Program.config.getConfig("gpu_mode"); + Program.config.setConfig("gpu_auto", 0); if (CurrentGPU == GPUMode) + { + VisualiseGPUMode(); return; + } var restart = false; var changed = false; @@ -987,7 +1010,7 @@ namespace GHelper } else if (GPUMode == ASUSWmi.GPUModeUltimate) { - DialogResult dialogResult = MessageBox.Show(" Ultimate Mode requires restart", "Reboot now?", MessageBoxButtons.YesNo); + DialogResult dialogResult = MessageBox.Show("Ultimate Mode requires restart", "Reboot now?", MessageBoxButtons.YesNo); if (dialogResult == DialogResult.Yes) { Program.wmi.DeviceSet(ASUSWmi.GPUMux, 0); @@ -1012,60 +1035,55 @@ namespace GHelper if (changed) { Program.config.setConfig("gpu_mode", GPUMode); - HardwareMonitor.RecreateGpuTemperatureProviderWithRetry(); } if (restart) { - VisualiseGPUMode(GPUMode); + VisualiseGPUMode(); Process.Start("shutdown", "/r /t 1"); } } - public void VisualiseGPUAuto(int GPUAuto) - { - checkGPU.Checked = (GPUAuto == 1); - } - - public void VisualiseScreenAuto(int ScreenAuto) - { - checkScreen.Checked = (ScreenAuto == 1); - } - public void VisualiseGPUMode(int GPUMode = -1) { if (GPUMode == -1) - { GPUMode = Program.config.getConfig("gpu_mode"); - } + + bool GPUAuto = (Program.config.getConfig("gpu_auto") == 1); buttonEco.Activated = false; buttonStandard.Activated = false; buttonUltimate.Activated = false; + buttonOptimized.Activated = false; switch (GPUMode) { case ASUSWmi.GPUModeEco: - buttonEco.Activated = true; + buttonOptimized.BorderColor = colorEco; + buttonEco.Activated = !GPUAuto; + buttonOptimized.Activated = GPUAuto; labelGPU.Text = "GPU Mode: iGPU only"; - Program.trayIcon.Icon = GHelper.Properties.Resources.eco; + Program.trayIcon.Icon = Properties.Resources.eco; break; case ASUSWmi.GPUModeUltimate: buttonUltimate.Activated = true; labelGPU.Text = "GPU Mode: dGPU exclusive"; - Program.trayIcon.Icon = GHelper.Properties.Resources.ultimate; + Program.trayIcon.Icon = Properties.Resources.ultimate; break; default: - buttonStandard.Activated = true; + buttonOptimized.BorderColor = colorStandard; + buttonStandard.Activated = !GPUAuto; + buttonOptimized.Activated = GPUAuto; labelGPU.Text = "GPU Mode: iGPU + dGPU"; - Program.trayIcon.Icon = GHelper.Properties.Resources.standard; + Program.trayIcon.Icon = Properties.Resources.standard; break; } + } @@ -1123,14 +1141,6 @@ namespace GHelper } - private void checkScreen_CheckedChanged(object? sender, EventArgs e) - { - if (sender is null) return; - CheckBox check = (CheckBox)sender; - Program.config.setConfig("screen_auto", check.Checked ? 1 : 0); - } - - }