Merge config and logging libraries into common library

- UI scale factor fix for some elements

YAMDCC.Config/ChargeLimitConf.cs → YAMDCC.Common/Configs/ChargeLimitConf.cs

@@ -16,7 +16,7 @@
 
 using System.Xml.Serialization;
 
-namespace YAMDCC.Config;
+namespace YAMDCC.Common.Configs;
 
 /// <summary>
 /// Represents a charge limit config for a laptop.

YAMDCC.Common/CommonConfig.cs → YAMDCC.Common/Configs/CommonConfig.cs

@@ -18,9 +18,9 @@
 using System.IO;
 using System.Xml;
 using System.Xml.Serialization;
-using YAMDCC.Logs;
+using YAMDCC.Common.Logs;
 
-namespace YAMDCC.Common;
+namespace YAMDCC.Common.Configs;
 
 public class CommonConfig
 {

YAMDCC.Config/FanConf.cs → YAMDCC.Common/Configs/FanConf.cs

@@ -17,7 +17,7 @@
 using System.Collections.Generic;
 using System.Xml.Serialization;
 
-namespace YAMDCC.Config;
+namespace YAMDCC.Common.Configs;
 
 /// <summary>
 /// Represents a configuration for a fan in the target laptop.

YAMDCC.Config/FanCurveConf.cs → YAMDCC.Common/Configs/FanCurveConf.cs

@@ -17,7 +17,7 @@
 using System.Collections.Generic;
 using System.Xml.Serialization;
 
-namespace YAMDCC.Config;
+namespace YAMDCC.Common.Configs;
 
 /// <summary>
 /// Represents a fan profile (a.k.a. fan curve) config.

YAMDCC.Config/FanMode.cs → YAMDCC.Common/Configs/FanMode.cs

@@ -16,7 +16,7 @@
 
 using System.Xml.Serialization;
 
-namespace YAMDCC.Config;
+namespace YAMDCC.Common.Configs;
 
 /// <summary>
 /// Represents a configuration for an

YAMDCC.Config/FanModeConf.cs → YAMDCC.Common/Configs/FanModeConf.cs

@@ -17,7 +17,7 @@
 using System.Collections.Generic;
 using System.Xml.Serialization;
 
-namespace YAMDCC.Config;
+namespace YAMDCC.Common.Configs;
 
 /// <summary>
 /// Contains an MSI laptop's various fan modes

YAMDCC.Config/FanRPMConf.cs → YAMDCC.Common/Configs/FanRPMConf.cs

@@ -16,7 +16,7 @@
 
 using System.Xml.Serialization;
 
-namespace YAMDCC.Config;
+namespace YAMDCC.Common.Configs;
 
 /// <summary>
 /// Represents a configuration describing how

YAMDCC.Config/FullBlastConf.cs → YAMDCC.Common/Configs/FullBlastConf.cs

@@ -16,7 +16,7 @@
 
 using System.Xml.Serialization;
 
-namespace YAMDCC.Config;
+namespace YAMDCC.Common.Configs;
 
 /// <summary>
 /// Represents a Full Blast configuration.

YAMDCC.Common/InvalidConfigException.cs → YAMDCC.Common/Configs/InvalidConfigException.cs

@@ -16,7 +16,7 @@
 
 using System;
 
-namespace YAMDCC.Common;
+namespace YAMDCC.Common.Configs;
 
 /// <summary>
 /// The exception thrown when an invalid <see cref="YAMDCC_Config"/> is loaded.

YAMDCC.Config/KeyLightConf.cs → YAMDCC.Common/Configs/KeyLightConf.cs

@@ -16,7 +16,7 @@
 
 using System.Xml.Serialization;
 
-namespace YAMDCC.Config;
+namespace YAMDCC.Common.Configs;
 
 /// <summary>
 /// Represents a configuration for the keyboard backlight in a laptop.

YAMDCC.Config/KeySwapConf.cs → YAMDCC.Common/Configs/KeySwapConf.cs

@@ -16,7 +16,7 @@
 
 using System.Xml.Serialization;
 
-namespace YAMDCC.Config;
+namespace YAMDCC.Common.Configs;
 
 /// <summary>
 /// Represents a configuration for the Win/Fn key swap feature of a laptop.

YAMDCC.Config/PerfMode.cs → YAMDCC.Common/Configs/PerfMode.cs

@@ -16,7 +16,7 @@
 
 using System.Xml.Serialization;
 
-namespace YAMDCC.Config;
+namespace YAMDCC.Common.Configs;
 
 /// <summary>
 /// Represents a configuration for an

YAMDCC.Config/PerfModeConf.cs → YAMDCC.Common/Configs/PerfModeConf.cs

@@ -17,7 +17,7 @@
 using System.Collections.Generic;
 using System.Xml.Serialization;
 
-namespace YAMDCC.Config;
+namespace YAMDCC.Common.Configs;
 
 /// <summary>
 /// Represents a configuration for the performance modes of a laptop

YAMDCC.Config/RegConf.cs → YAMDCC.Common/Configs/RegConf.cs

@@ -16,7 +16,7 @@
 
 using System.Xml.Serialization;
 
-namespace YAMDCC.Config;
+namespace YAMDCC.Common.Configs;
 
 /// <summary>
 /// Represents miscellaneous EC register configurations for the target

YAMDCC.Config/TempThreshold.cs → YAMDCC.Common/Configs/TempThreshold.cs

@@ -16,7 +16,7 @@
 
 using System.Xml.Serialization;
 
-namespace YAMDCC.Config;
+namespace YAMDCC.Common.Configs;
 
 /// <summary>
 /// Represents a fan speed/temperature threshold setting for a fan curve.

YAMDCC.Config/YAMDCC_Config.cs → YAMDCC.Common/Configs/YAMDCC_Config.cs

@@ -19,9 +19,8 @@
 using System.IO;
 using System.Xml;
 using System.Xml.Serialization;
-using YAMDCC.Common;
 
-namespace YAMDCC.Config;
+namespace YAMDCC.Common.Configs;
 
 // IDE0079: Remove unnecessary suppression (even though it *is* necessary)
 #pragma warning disable IDE0079

YAMDCC.Logs/LogLevel.cs → YAMDCC.Common/Logs/LogLevel.cs

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License along with
 // YAMDCC. If not, see <https://www.gnu.org/licenses/>.
 
-namespace YAMDCC.Logs;
+namespace YAMDCC.Common.Logs;
 
 /// <summary>
 /// The verbosity of logs

YAMDCC.Logs/Logger.cs → YAMDCC.Common/Logs/Logger.cs

@@ -19,7 +19,7 @@
 using System.IO.Compression;
 using System.Reflection;
 
-namespace YAMDCC.Logs;
+namespace YAMDCC.Common.Logs;
 
 /// <summary>
 /// A simple logger class for writing logs to

YAMDCC.Common/Paths.cs

@@ -70,4 +70,12 @@ public static class Paths
     /// (C:\ProgramData\Sparronator9999\YAMDCC\CurrentConfig.xml on Windows)
     /// </remarks>
     public static readonly string CurrentConf = Path.Combine(Data, "CurrentConfig.xml");
+
+    /// <summary>
+    /// The path where the currently applied Hotkey Handler config is saved.
+    /// </summary>
+    /// <remarks>
+    /// (C:\ProgramData\Sparronator9999\YAMDCC\HotkeyConfig.xml on Windows)
+    /// </remarks>
+    public static readonly string HotkeyConf = Path.Combine(Data, "HotkeyConfig.xml");
 }

YAMDCC.Common/YAMDCC.Common.csproj

@@ -12,8 +12,8 @@
         <RuntimeIdentifiers>win7-x64;win7-x86;win-x64;win-x86</RuntimeIdentifiers>
         <TargetFramework>net48</TargetFramework>
         <Title>YAMDCC common code library</Title>
-        <VersionPrefix>1.0.3</VersionPrefix>
-        <VersionSuffix>release</VersionSuffix>
+        <VersionPrefix>1.0.4</VersionPrefix>
+        <VersionSuffix>dev</VersionSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)'=='Release'">
         <DebugType>none</DebugType>
@@ -28,9 +28,6 @@
       <None Include="Dialogs\ProgressDialog.resx" />
       <None Include="Dialogs\TextInputDialog.resx" />
     </ItemGroup>
-    <ItemGroup>
-      <ProjectReference Include="..\YAMDCC.Logs\YAMDCC.Logs.csproj" />
-    </ItemGroup>
     <ItemGroup>
       <Reference Include="System.ServiceProcess" />
       <Reference Include="System.Windows.Forms" />

YAMDCC.ConfigEditor/MainForm.cs

@@ -21,10 +21,10 @@
 using System.IO;
 using System.Windows.Forms;
 using YAMDCC.Common;
+using YAMDCC.Common.Configs;
 using YAMDCC.Common.Dialogs;
-using YAMDCC.Config;
+using YAMDCC.Common.Logs;
 using YAMDCC.IPC;
-using YAMDCC.Logs;
 
 namespace YAMDCC.ConfigEditor;
 
@@ -154,8 +154,9 @@ public MainForm()
     }
 
     #region Events
-    private void MainWindow_Load(object sender, EventArgs e)
+    protected override void OnLoad(EventArgs e)
     {
+        base.OnLoad(e);
         IPCClient.ServerMessage += new EventHandler<PipeMessageEventArgs<ServiceResponse, ServiceCommand>>(IPCMessage);
         IPCClient.Error += new EventHandler<PipeErrorEventArgs<ServiceResponse, ServiceCommand>>(IPCError);
         IPCClient.Start();
@@ -197,8 +198,9 @@ private void MainWindow_Load(object sender, EventArgs e)
         }
     }
 
-    private void MainWindow_Closing(object sender, FormClosingEventArgs e)
+    protected override void OnFormClosing(FormClosingEventArgs e)
     {
+        base.OnFormClosing(e);
         // Disable Full Blast if it was enabled while the program was running:
         if (chkFullBlast.Checked)
         {
@@ -645,7 +647,7 @@ private void FanSelChanged(object sender, EventArgs e)
         if (numFanSpds is null || numFanSpds.Length != cfg.FanCurveRegs.Length)
         {
             tblCurve.SuspendLayout();
-            float scale = CurrentAutoScaleDimensions.Height / 72;
+            float scale = CurrentAutoScaleDimensions.Height / 96;
 
             tblCurve.Controls.Clear();
             numUpTs = new NumericUpDown[cfg.UpThresholdRegs.Length];
@@ -675,7 +677,7 @@ private void FanSelChanged(object sender, EventArgs e)
                 {
                     Dock = DockStyle.Fill,
                     LargeChange = 10,
-                    Margin = new Padding((int)(10 * scale), 0, (int)(10 * scale), 0),
+                    Margin = new Padding((int)(12 * scale), 0, (int)(12 * scale), 0),
                     Orientation = Orientation.Vertical,
                     Tag = i,
                     TickFrequency = 5,
@@ -1217,7 +1219,7 @@ private static Label FanCurveLabel(string text, float scale, ContentAlignment al
         {
             AutoSize = true,
             Dock = DockStyle.Fill,
-            Margin = new Padding((int)(2 * scale)),
+            Margin = new Padding((int)(3 * scale)),
             Padding = new Padding(0, 0, 0, (int)(3 * scale)),
             Text = text,
             TextAlign = align,
@@ -1230,7 +1232,7 @@ private static NumericUpDown FanCurveNUD(int tag, float scale)
         {
             Dock = DockStyle.Fill,
             Height = (int)(23 * scale),
-            Margin = new Padding((int)(2 * scale)),
+            Margin = new Padding((int)(3 * scale)),
             Tag = tag,
         };
     }