Add Icons, On-Screen Display with config items

infra223 · Sep 25, 2020 · a2770b8 · a2770b8
1 parent 1b1d61a
commit a2770b8
Show file tree

Hide file tree

Showing 17 changed files with 1,835 additions and 47 deletions.
diff --git a/LogiLockLED/App.config b/LogiLockLED/App.config
@@ -40,6 +40,33 @@
             <setting name="EnableKeyLockLEDs" serializeAs="String">
                 <value>True</value>
             </setting>
+            <setting name="OsdFont" serializeAs="String">
+                <value>Arial, 48pt, style=Bold, Italic</value>
+            </setting>
+            <setting name="OsdPosition" serializeAs="String">
+                <value>Centre</value>
+            </setting>
+            <setting name="OsdPadding" serializeAs="String">
+                <value>8</value>
+            </setting>
+            <setting name="OsdMargin" serializeAs="String">
+                <value>8</value>
+            </setting>
+            <setting name="OsdRoundedCorners" serializeAs="String">
+                <value>True</value>
+            </setting>
+            <setting name="OsdEnabled" serializeAs="String">
+                <value>True</value>
+            </setting>
+            <setting name="OsdTextColour" serializeAs="String">
+                <value>White</value>
+            </setting>
+            <setting name="OsdBackColour" serializeAs="String">
+                <value>3, 3, 3</value>
+            </setting>
+            <setting name="OsdOpacity" serializeAs="String">
+                <value>75</value>
+            </setting>
         </LogiLockLED.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/LogiLockLED/ConfigurationForm.Designer.cs b/LogiLockLED/ConfigurationForm.Designer.cs
diff --git a/LogiLockLED/ConfigurationForm.cs b/LogiLockLED/ConfigurationForm.cs
@@ -1,19 +1,26 @@
 using Microsoft.Win32;
 using System;
+using System.ComponentModel;
 using System.Drawing;
 using System.Windows.Forms;
 
 namespace LogiLockLED
 {
+    public enum OSDPosition { Centre = 1, Top_Left, Top_Right, Bottom_Left, Bottom_Right }
     public partial class ConfigurationForm : Form
     {
         private readonly LedSettings ledSettings;
         public event EventHandler SettingsUpdated;        
 
+
+
         public ConfigurationForm(ref LedSettings settings)
         {
             InitializeComponent();
             ledSettings = settings;
+            cbOSDPosition.DataSource = Enum.GetValues(typeof(OSDPosition));
+            cbOSDPosition.SelectedIndex = 0;
+
             PopulateSettingsToUI();
         }
 
@@ -44,6 +51,12 @@ private void SetSettingValue(object sender, Color color)
                 ledSettings.ScrollOffColour = color;
             if (sender == btnScrollOnColour)
                 ledSettings.ScrollOnColour = color;
+
+            if (sender == btnOsdTxtColour)
+                ledSettings.OsdTextColour = color == Color.Black ? Color.FromArgb(3, 3, 3) : color;
+            if (sender == btnOsdBkColour)
+                ledSettings.OsdBackColour = color == Color.Black ? Color.FromArgb(3, 3, 3) : color;
+
         }
 
         private void PopulateSettingsToUI()
@@ -63,11 +76,28 @@ private void PopulateSettingsToUI()
             btnScrollOnColour.BackColor = ledSettings.ScrollOnColour;
 
             cbAutoStartApp.Checked = ledSettings.AutoStartApp;
-
+
+            cbOsdEnabled.Checked = ledSettings.OsdEnabled;
+            cbOSDPosition.SelectedItem = ledSettings.OsdPosition;
+            btnOsdFont.Text = ledSettings.OsdFont.SizeInPoints.ToString() + ", " + ledSettings.OsdFont.FontFamily.Name;
+            fontDialog.Font = ledSettings.OsdFont;
+            cbOsdPadding.Value = ledSettings.OsdPadding;
+            cbOsdMargin.Value = ledSettings.OsdMargin;
+            cbOsdRoundedCorners.Checked = ledSettings.OsdRoundedCorners;
+            btnOsdTxtColour.BackColor = ledSettings.OsdTextColour;
+            btnOsdBkColour.BackColor = ledSettings.OsdBackColour;
+            cbOsdOpacity.Value = ledSettings.OsdOpacity;
         }
 
         private void ApplySettings()
         {
+            ledSettings.OsdEnabled = cbOsdEnabled.Checked;
+            ledSettings.OsdPosition = (OSDPosition)cbOSDPosition.SelectedItem;
+            ledSettings.OsdPadding = (int)cbOsdPadding.Value;
+            ledSettings.OsdMargin = (int)cbOsdMargin.Value;
+            ledSettings.OsdRoundedCorners = cbOsdRoundedCorners.Checked;
+            ledSettings.OsdOpacity = (int)cbOsdOpacity.Value;
+
             ledSettings.SaveSettings();
             SettingsUpdated?.Invoke(this, new EventArgs());
         }
@@ -114,5 +144,14 @@ private void cbAutoStartApp_CheckedChanged(object sender, EventArgs e)
         {
             ledSettings.AutoStartApp = cbAutoStartApp.Checked;
         }
+
+        private void btnFont_Click(object sender, EventArgs e)
+        {
+            if( fontDialog.ShowDialog(this) == DialogResult.OK)
+            {
+                ledSettings.OsdFont = fontDialog.Font;
+                btnOsdFont.Text = ledSettings.OsdFont.SizeInPoints.ToString() + ", " + ledSettings.OsdFont.FontFamily.Name;
+            }                       
+        }
     }
 }