Merge pull request #10 from Virenbar/feat-settings-form

Virenbar · Sep 4, 2024 · ccd3c2d · ccd3c2d
2 parents 6874be1 + 84b60d7
commit ccd3c2d
Show file tree

Hide file tree

Showing 21 changed files with 561 additions and 160 deletions.
diff --git a/.github/workflows/build-artifact.yml b/.github/workflows/build-artifact.yml
@@ -70,4 +70,5 @@ jobs:
           GDPIControl\publish\${{ matrix.framework }}\*.dll
           GDPIControl\publish\${{ matrix.framework }}\GDPI\**\*
           GDPIControl\publish\${{ matrix.framework }}\GDPIControl.runtimeconfig.json
+          GDPIControl\publish\${{ matrix.framework }}\GDPIControl.exe.config
         if-no-files-found: error
diff --git a/GDPIControl/App.config b/GDPIControl/App.config
@@ -14,7 +14,7 @@
                 <value>Black</value>
             </setting>
             <setting name="Font" serializeAs="String">
-                <value>Segoe UI, 8.25pt</value>
+                <value>Segoe UI, 9pt</value>
             </setting>
         </GDPIControl.Properties.Settings>
     </userSettings>

diff --git a/GDPIControl/Config.cs b/GDPIControl/Config.cs
@@ -14,7 +14,8 @@ internal static class Config
             Modeset = Modeset.M9,
             CustomSettings1 = new GDPISettings(),
             CustomSettings2 = new GDPISettings(),
-            CustomSettings3 = new GDPISettings()
+            CustomSettings3 = new GDPISettings(),
+            StopDriver = true
         };
 
         public static void Load()

diff --git a/GDPIControl/Extensions/FormExtensions.cs b/GDPIControl/Extensions/FormExtensions.cs
@@ -1,10 +1,18 @@
-using System;
+using GDPIControl.Properties;
+using System;
 using System.Windows.Forms;
 
 namespace GDPIControl.Extensions
 {
     internal static class FormExtensions
     {
+        public static void BindSettings(this Form form)
+        {
+            form.DataBindings.Add(new Binding("Font", Settings.Default, "Font", true, DataSourceUpdateMode.OnPropertyChanged));
+            form.DataBindings.Add(new Binding("ForeColor", Settings.Default, "ForeColor", true, DataSourceUpdateMode.OnPropertyChanged));
+            form.DataBindings.Add(new Binding("BackColor", Settings.Default, "BackColor", true, DataSourceUpdateMode.OnPropertyChanged));
+        }
+
         public static DialogResult ShowError(this Form form, Exception exception)
         {
             return MessageBox.Show(form, exception.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);

diff --git a/GDPIControl/FormMain.Designer.cs b/GDPIControl/FormMain.Designer.cs
diff --git a/GDPIControl/FormMain.cs b/GDPIControl/FormMain.cs
@@ -21,6 +21,7 @@ public partial class FormMain : Form
         public FormMain()
         {
             InitializeComponent();
+            this.BindSettings();
             CustomModesets = new() {
                 Modeset.Custom1,
                 Modeset.Custom2,
@@ -42,10 +43,6 @@ public FormMain()
                 (RB_Custom_3,Modeset.Custom3)
             };
             RBModesets.First(X => X.Modeset == Settings.Modeset).Button.Checked = true;
-            MI_Autostart.Checked = Settings.AutostartGDPI;
-            MI_Minimized.Checked = Settings.LaunchMinimazed;
-            MI_Logon.Checked = ControlTask.IsRegistered;
-
             BS_ControlSettings.DataSource = Settings;
 
             RefreshUI();
@@ -60,6 +57,10 @@ private void CloseGDPIControl()
             TrayControl.Visible = false;
             TrayControl.Dispose();
             RefreshArguments();
+            if (Settings.StopDriver)
+            {
+                GDPIProcess.StopDriver();
+            }
             Application.Exit();
         }
 
@@ -159,6 +160,12 @@ private void MI_About_Click(object sender, EventArgs e)
             F.ShowDialog(this);
         }
 
+        private void MI_Settings_Click(object sender, EventArgs e)
+        {
+            using var F = new FormSettings();
+            F.ShowDialog(this);
+        }
+
         private void RB_CheckedChanged(object sender, EventArgs e)
         {
             var RB = (RadioButton)sender;
@@ -191,33 +198,6 @@ private void MI_Userlist_Click(object sender, EventArgs e)
 
         #endregion Lists
 
-        #region Control settings
-
-        private void MI_Autostart_CheckedChanged(object sender, EventArgs e)
-        {
-            Config.Current.AutostartGDPI = MI_Autostart.Checked;
-        }
-
-        private void MI_Logon_Click(object sender, EventArgs e)
-        {
-            if (!ControlTask.IsRegistered)
-            {
-                ControlTask.Register();
-            }
-            else
-            {
-                ControlTask.Delete();
-            }
-            MI_Logon.Checked = ControlTask.IsRegistered;
-        }
-
-        private void MI_Minimized_CheckedChanged(object sender, EventArgs e)
-        {
-            Config.Current.LaunchMinimazed = MI_Minimized.Checked;
-        }
-
-        #endregion Control settings
-
         #region Tray
 
         private void MI_Close_Click(object sender, EventArgs e) => CloseGDPIControl();

diff --git a/GDPIControl/Forms/FormAbout.cs b/GDPIControl/Forms/FormAbout.cs
@@ -1,4 +1,5 @@
-using System.Diagnostics;
+using GDPIControl.Extensions;
+using System.Diagnostics;
 using System.Windows.Forms;
 
 namespace GDPIControl
@@ -8,6 +9,7 @@ public partial class FormAbout : Form
         public FormAbout()
         {
             InitializeComponent();
+            this.BindSettings();
             L_Version.Text = $"v{Application.ProductVersion}";
         }
 

diff --git a/GDPIControl/Forms/FormBlacklist.cs b/GDPIControl/Forms/FormBlacklist.cs
@@ -18,6 +18,7 @@ public partial class FormBlacklist : Form
         public FormBlacklist()
         {
             InitializeComponent();
+            this.BindSettings();
             RBtoURI.Add(RB_AZ, @"https://antizapret.prostovpn.org/domains-export.txt");
             RBtoURI.Add(RB_AZ1, @"https://p.thenewone.lol/domains-export.txt");
             RBtoURI.Add(RB_AZ2, @"https://mirror.thetahex.ru/?key=blacklist-gdpi");