user definded text, background color

SK21 · Dec 8, 2024 · a8f49da · a8f49da
1 parent b5e4490
commit a8f49da
Show file tree

Hide file tree

Showing 38 changed files with 211 additions and 345 deletions.
diff --git a/RateAppSource/RateController/App.config b/RateAppSource/RateController/App.config
@@ -41,7 +41,10 @@
                 <value>False</value>
             </setting>
             <setting name="ForeColour" serializeAs="String">
-                <value>Yellow</value>
+                <value>Black</value>
+            </setting>
+            <setting name="BackColour" serializeAs="String">
+                <value>210, 220, 230</value>
             </setting>
         </RateController.Properties.Settings>
     </userSettings>

diff --git a/RateAppSource/RateController/Classes/clsTools.cs b/RateAppSource/RateController/Classes/clsTools.cs
@@ -40,7 +40,7 @@ public class clsTools
         private string cPropertiesApp;
         private string cPropertiesFile;
         private string cSettingsDir;
-        private string cVersionDate = "03-Dec-2024";
+        private string cVersionDate = "08-Dec-2024";
         private FormStart mf;
         private Form[] OpenForms = new Form[30];    // make sure to allocate enough
         private SortedDictionary<string, string> Props = new SortedDictionary<string, string>();

diff --git a/RateAppSource/RateController/FormStart.Designer.cs b/RateAppSource/RateController/FormStart.Designer.cs
diff --git a/RateAppSource/RateController/FormStart.cs b/RateAppSource/RateController/FormStart.cs
@@ -80,17 +80,15 @@ public partial class FormStart : Form
         private bool cUseDualAuto;
         private bool cUseLargeScreen = false;
         private bool cUseTransparent = false;
-        private Label[] Indicators;
         private bool LoadError = false;
+        private MouseButtons MouseButtonClicked;
         private int mouseX = 0;
         private int mouseY = 0;
         private Label[] ProdName;
         private Label[] Rates;
         private PGN32501[] RelaySettings;
-        private Label[] Targets;
         private int windowLeft = 0;
         private int windowTop = 0;
-        private MouseButtons MouseButtonClicked;
 
         public FormStart()
         {
@@ -146,8 +144,6 @@ public FormStart()
 
             ProdName = new Label[] { prd0, prd1, prd2, prd3, prd4, prd5 };
             Rates = new Label[] { rt0, rt1, rt2, rt3, rt4, rt5 };
-            Indicators = new Label[] { idc0, idc1, idc2, idc3, idc4, idc5 };
-            Targets = new Label[] { tg0, tg1, tg2, tg3 };
 
             cUseInches = true;
 
@@ -792,19 +788,6 @@ public void UpdateStatus()
                         ProdName[i].BorderStyle = BorderStyle.None;
 
                         Rates[i].Text = Products.Item(i).SmoothRate().ToString("N1");
-                        if (i < 4)
-                        {
-                            Targets[i].Text = Products.Item(i).TargetRate().ToString("N1");
-                        }
-
-                        if (Products.Item(i).RateSensor.Connected())
-                        {
-                            Indicators[i].Image = Properties.Resources.OnSmall;
-                        }
-                        else
-                        {
-                            Indicators[i].Image = Properties.Resources.OffSmall;
-                        }
                     }
                     lbArduinoConnected.Visible = false;
                 }
@@ -937,6 +920,21 @@ public void UpdateStatus()
             }
         }
 
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            base.OnPaint(e);
+
+            // Define the border color and thickness
+            Color borderColor = Properties.Settings.Default.ForeColour;
+            int borderWidth = 1;
+
+            // Draw the border
+            using (Pen pen = new Pen(borderColor, borderWidth))
+            {
+                e.Graphics.DrawRectangle(pen, 0, 0, this.ClientSize.Width - 1, this.ClientSize.Height - 1);
+            }
+        }
+
         private void AreaDone_Click(object sender, EventArgs e)
         {
             if (MouseButtonClicked == MouseButtons.Left)
@@ -1045,7 +1043,7 @@ private void FormatDisplay()
                 if (ID < 0) ID = 0;
                 clsProduct Prd = Products.Item(ID);
 
-                this.Width = 277;
+                this.Width = 283;
 
                 btAlarm.Top = 21;
                 btAlarm.Left = 33;
@@ -1057,8 +1055,8 @@ private void FormatDisplay()
                     panSummary.Visible = true;
                     panFan.Visible = false;
                     panProducts.Visible = false;
-                    panSummary.Top = 0;
-                    panSummary.Left = 0;
+                    panSummary.Top = 6;
+                    panSummary.Left = 6;
 
                     this.Height = 248;
                     btnSettings.Top = 180;
@@ -1075,8 +1073,8 @@ private void FormatDisplay()
                         // fan panel
                         panProducts.Visible = false;
                         panFan.Visible = true;
-                        panFan.Top = 0;
-                        panFan.Left = 0;
+                        panFan.Top = 6;
+                        panFan.Left = 6;
 
                         this.Height = 222;
                         btnSettings.Top = 154;
@@ -1089,8 +1087,8 @@ private void FormatDisplay()
                     {
                         panProducts.Visible = true;
                         panFan.Visible = false;
-                        panProducts.Top = 0;
-                        panProducts.Left = 0;
+                        panProducts.Top = 6;
+                        panProducts.Left = 6;
 
                         // product panel
                         this.Height = 222;
@@ -1101,6 +1099,7 @@ private void FormatDisplay()
                         lbAogConnected.Top = 188;
                     }
                 }
+                Invalidate();
             }
             catch (Exception ex)
             {
@@ -1228,6 +1227,19 @@ private void FormStart_Load(object sender, EventArgs e)
             cStartTime = DateTime.Now;
         }
 
+        private void FormStart_Paint(object sender, PaintEventArgs e)
+        {
+            Rectangle borderRectangle = this.ClientRectangle;
+            borderRectangle.Inflate(-10, -10);
+            ControlPaint.DrawBorder3D(e.Graphics, borderRectangle,
+                Border3DStyle.Raised);
+        }
+
+        private void FormStart_Resize(object sender, EventArgs e)
+        {
+            Invalidate();
+        }
+
         private void groupBox3_Paint(object sender, PaintEventArgs e)
         {
             GroupBox box = sender as GroupBox;
@@ -1258,7 +1270,7 @@ private void lbArduinoConnected_Click(object sender, EventArgs e)
             {
                 int prod = CurrentPage - 1;
                 if (prod < 0) prod = 0;
-                Form restoreform = new RCRestore(this, RateType, Products.Item(prod));
+                Form restoreform = new RCRestore(this, RateType, Products.Item(prod),this);
                 restoreform.Show();
             }
         }
@@ -1523,19 +1535,14 @@ private void sectionsToolStripMenuItem_Click(object sender, EventArgs e)
 
         private void SetDisplay()
         {
-            this.BackColor = Color.Black;
+            this.BackColor = Properties.Settings.Default.BackColour;
             foreach (Control c in this.Controls)
             {
                 c.ForeColor = Properties.Settings.Default.ForeColour;
             }
             lbAogConnected.ForeColor = Color.Black;
             lbArduinoConnected.ForeColor = Color.Black;
 
-            for (int i = 0; i < 6; i++)
-            {
-                Indicators[i].BackColor = Color.Transparent;
-            }
-
             lbOn.BackColor = Color.Transparent;
             lbOff.BackColor = Color.Transparent;
 

diff --git a/RateAppSource/RateController/FormStart.resx b/RateAppSource/RateController/FormStart.resx
@@ -120,102 +120,6 @@
   <metadata name="timerMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="idc5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAb
-        rQAAG60BIeRSlQAAACp0RVh0U29mdHdhcmUAUGhvdG9EZW1vbiA4LjAgYWxwaGEgKGJ1aWxkIDE5MDUp
-        H7M+9QAAAsNJREFUOE+NVEFI22AUDjuIgnqTKWwMwQ09qQcRPHoRdvFgFRVBREFWQZmK7uShOBAPgigU
-        RdhEp5dR3IawUskh4HA4FLsWO12wpRJrSgpGEitZ8u39WWSMxeqDD5I/7/vy3v++/+dui4ODgycAXhHC
-        BPwCNN0wPiTPzjzl5eV5TlrukESxkrhvCBkmgstLGKIIKx4HDMNeIuEjSZaHAz5fgUP7PyjPQ0gxgrix
-        gS/Dw4j29+OstxdqZyeM1lZgcBCIRFgKUqoaDIVCjx363zBNs4W+Z6GqeN/Tg+jYGK4XFoClJWB+Hpia
-        AsbHgbY2oLoaGB21BU8VZScYDJY6MhynquozWj+3Li6w4vFAnpuDtbYGzM4C09OAz/dHaGAAoErR1QVU
-        VADd3bZg+Pj4nZ/jHthi9L7MFlc7OnBK5CxVZLJKJieBvj6gvh4oKwMKC4GiIqC0FKikrS0oAGZmcJrN
-        QhCEJk4URTY19ZAqEeiPV9SSwSqhNqyaGoD9KxeKi2lUGWxHoyucRQ2wqj6TkDQygquJCVjUjl5SAsuN
-        7IbFReylUkf0hO/QNPCNjdBoeiYJXVFLphvpNtCkw4qi0xONkHz0ra4OJm2u1dBw/4puQIUcyjK4LKCb
-        iQSOq6qA5mYgL8+dkAtNTThMp01O1fWPsCyk2WYzQbfku0BGjihKhktIEjMrTDKqa+J9wPPYEcWvnNfr
-        zadWfyIWc0+8C7W10K+vERSESdu0yWTyJavOPnduhFzY28PuyUk6EAhU2GJ+vz8/LsshW7C93Z3khkAA
-        cbJVcGvrhS10E8Lm5iNRlndsQToi9tFxE2Bgx4sqitP1xPP8a0fi3/i0vPxwPxZbPdE0C4piO5sZkvmI
-        jR9DQ/Zmsz3aTSTO6frxOtTbg66U53TW3u5L0o9IJqMxQzIfhdNphU2N3972ra+vP3XSneC433MeNwVV
-        F+wqAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="idc4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAb
-        rQAAG60BIeRSlQAAACp0RVh0U29mdHdhcmUAUGhvdG9EZW1vbiA4LjAgYWxwaGEgKGJ1aWxkIDE5MDUp
-        H7M+9QAAAsNJREFUOE+NVEFI22AUDjuIgnqTKWwMwQ09qQcRPHoRdvFgFRVBREFWQZmK7uShOBAPgigU
-        RdhEp5dR3IawUskh4HA4FLsWO12wpRJrSgpGEitZ8u39WWSMxeqDD5I/7/vy3v++/+dui4ODgycAXhHC
-        BPwCNN0wPiTPzjzl5eV5TlrukESxkrhvCBkmgstLGKIIKx4HDMNeIuEjSZaHAz5fgUP7PyjPQ0gxgrix
-        gS/Dw4j29+OstxdqZyeM1lZgcBCIRFgKUqoaDIVCjx363zBNs4W+Z6GqeN/Tg+jYGK4XFoClJWB+Hpia
-        AsbHgbY2oLoaGB21BU8VZScYDJY6MhynquozWj+3Li6w4vFAnpuDtbYGzM4C09OAz/dHaGAAoErR1QVU
-        VADd3bZg+Pj4nZ/jHthi9L7MFlc7OnBK5CxVZLJKJieBvj6gvh4oKwMKC4GiIqC0FKikrS0oAGZmcJrN
-        QhCEJk4URTY19ZAqEeiPV9SSwSqhNqyaGoD9KxeKi2lUGWxHoyucRQ2wqj6TkDQygquJCVjUjl5SAsuN
-        7IbFReylUkf0hO/QNPCNjdBoeiYJXVFLphvpNtCkw4qi0xONkHz0ra4OJm2u1dBw/4puQIUcyjK4LKCb
-        iQSOq6qA5mYgL8+dkAtNTThMp01O1fWPsCyk2WYzQbfku0BGjihKhktIEjMrTDKqa+J9wPPYEcWvnNfr
-        zadWfyIWc0+8C7W10K+vERSESdu0yWTyJavOPnduhFzY28PuyUk6EAhU2GJ+vz8/LsshW7C93Z3khkAA
-        cbJVcGvrhS10E8Lm5iNRlndsQToi9tFxE2Bgx4sqitP1xPP8a0fi3/i0vPxwPxZbPdE0C4piO5sZkvmI
-        jR9DQ/Zmsz3aTSTO6frxOtTbg66U53TW3u5L0o9IJqMxQzIfhdNphU2N3972ra+vP3XSneC433MeNwVV
-        F+wqAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="idc3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAb
-        rQAAG60BIeRSlQAAACp0RVh0U29mdHdhcmUAUGhvdG9EZW1vbiA4LjAgYWxwaGEgKGJ1aWxkIDE5MDUp
-        H7M+9QAAAsNJREFUOE+NVEFI22AUDjuIgnqTKWwMwQ09qQcRPHoRdvFgFRVBREFWQZmK7uShOBAPgigU
-        RdhEp5dR3IawUskh4HA4FLsWO12wpRJrSgpGEitZ8u39WWSMxeqDD5I/7/vy3v++/+dui4ODgycAXhHC
-        BPwCNN0wPiTPzjzl5eV5TlrukESxkrhvCBkmgstLGKIIKx4HDMNeIuEjSZaHAz5fgUP7PyjPQ0gxgrix
-        gS/Dw4j29+OstxdqZyeM1lZgcBCIRFgKUqoaDIVCjx363zBNs4W+Z6GqeN/Tg+jYGK4XFoClJWB+Hpia
-        AsbHgbY2oLoaGB21BU8VZScYDJY6MhynquozWj+3Li6w4vFAnpuDtbYGzM4C09OAz/dHaGAAoErR1QVU
-        VADd3bZg+Pj4nZ/jHthi9L7MFlc7OnBK5CxVZLJKJieBvj6gvh4oKwMKC4GiIqC0FKikrS0oAGZmcJrN
-        QhCEJk4URTY19ZAqEeiPV9SSwSqhNqyaGoD9KxeKi2lUGWxHoyucRQ2wqj6TkDQygquJCVjUjl5SAsuN
-        7IbFReylUkf0hO/QNPCNjdBoeiYJXVFLphvpNtCkw4qi0xONkHz0ra4OJm2u1dBw/4puQIUcyjK4LKCb
-        iQSOq6qA5mYgL8+dkAtNTThMp01O1fWPsCyk2WYzQbfku0BGjihKhktIEjMrTDKqa+J9wPPYEcWvnNfr
-        zadWfyIWc0+8C7W10K+vERSESdu0yWTyJavOPnduhFzY28PuyUk6EAhU2GJ+vz8/LsshW7C93Z3khkAA
-        cbJVcGvrhS10E8Lm5iNRlndsQToi9tFxE2Bgx4sqitP1xPP8a0fi3/i0vPxwPxZbPdE0C4piO5sZkvmI
-        jR9DQ/Zmsz3aTSTO6frxOtTbg66U53TW3u5L0o9IJqMxQzIfhdNphU2N3972ra+vP3XSneC433MeNwVV
-        F+wqAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="idc2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAb
-        rQAAG60BIeRSlQAAACp0RVh0U29mdHdhcmUAUGhvdG9EZW1vbiA4LjAgYWxwaGEgKGJ1aWxkIDE5MDUp
-        H7M+9QAAAsNJREFUOE+NVEFI22AUDjuIgnqTKWwMwQ09qQcRPHoRdvFgFRVBREFWQZmK7uShOBAPgigU
-        RdhEp5dR3IawUskh4HA4FLsWO12wpRJrSgpGEitZ8u39WWSMxeqDD5I/7/vy3v++/+dui4ODgycAXhHC
-        BPwCNN0wPiTPzjzl5eV5TlrukESxkrhvCBkmgstLGKIIKx4HDMNeIuEjSZaHAz5fgUP7PyjPQ0gxgrix
-        gS/Dw4j29+OstxdqZyeM1lZgcBCIRFgKUqoaDIVCjx363zBNs4W+Z6GqeN/Tg+jYGK4XFoClJWB+Hpia
-        AsbHgbY2oLoaGB21BU8VZScYDJY6MhynquozWj+3Li6w4vFAnpuDtbYGzM4C09OAz/dHaGAAoErR1QVU
-        VADd3bZg+Pj4nZ/jHthi9L7MFlc7OnBK5CxVZLJKJieBvj6gvh4oKwMKC4GiIqC0FKikrS0oAGZmcJrN
-        QhCEJk4URTY19ZAqEeiPV9SSwSqhNqyaGoD9KxeKi2lUGWxHoyucRQ2wqj6TkDQygquJCVjUjl5SAsuN
-        7IbFReylUkf0hO/QNPCNjdBoeiYJXVFLphvpNtCkw4qi0xONkHz0ra4OJm2u1dBw/4puQIUcyjK4LKCb
-        iQSOq6qA5mYgL8+dkAtNTThMp01O1fWPsCyk2WYzQbfku0BGjihKhktIEjMrTDKqa+J9wPPYEcWvnNfr
-        zadWfyIWc0+8C7W10K+vERSESdu0yWTyJavOPnduhFzY28PuyUk6EAhU2GJ+vz8/LsshW7C93Z3khkAA
-        cbJVcGvrhS10E8Lm5iNRlndsQToi9tFxE2Bgx4sqitP1xPP8a0fi3/i0vPxwPxZbPdE0C4piO5sZkvmI
-        jR9DQ/Zmsz3aTSTO6frxOtTbg66U53TW3u5L0o9IJqMxQzIfhdNphU2N3972ra+vP3XSneC433MeNwVV
-        F+wqAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="idc1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAb
-        rQAAG60BIeRSlQAAACp0RVh0U29mdHdhcmUAUGhvdG9EZW1vbiA4LjAgYWxwaGEgKGJ1aWxkIDE5MDUp
-        H7M+9QAAAsNJREFUOE+NVEFI22AUDjuIgnqTKWwMwQ09qQcRPHoRdvFgFRVBREFWQZmK7uShOBAPgigU
-        RdhEp5dR3IawUskh4HA4FLsWO12wpRJrSgpGEitZ8u39WWSMxeqDD5I/7/vy3v++/+dui4ODgycAXhHC
-        BPwCNN0wPiTPzjzl5eV5TlrukESxkrhvCBkmgstLGKIIKx4HDMNeIuEjSZaHAz5fgUP7PyjPQ0gxgrix
-        gS/Dw4j29+OstxdqZyeM1lZgcBCIRFgKUqoaDIVCjx363zBNs4W+Z6GqeN/Tg+jYGK4XFoClJWB+Hpia
-        AsbHgbY2oLoaGB21BU8VZScYDJY6MhynquozWj+3Li6w4vFAnpuDtbYGzM4C09OAz/dHaGAAoErR1QVU
-        VADd3bZg+Pj4nZ/jHthi9L7MFlc7OnBK5CxVZLJKJieBvj6gvh4oKwMKC4GiIqC0FKikrS0oAGZmcJrN
-        QhCEJk4URTY19ZAqEeiPV9SSwSqhNqyaGoD9KxeKi2lUGWxHoyucRQ2wqj6TkDQygquJCVjUjl5SAsuN
-        7IbFReylUkf0hO/QNPCNjdBoeiYJXVFLphvpNtCkw4qi0xONkHz0ra4OJm2u1dBw/4puQIUcyjK4LKCb
-        iQSOq6qA5mYgL8+dkAtNTThMp01O1fWPsCyk2WYzQbfku0BGjihKhktIEjMrTDKqa+J9wPPYEcWvnNfr
-        zadWfyIWc0+8C7W10K+vERSESdu0yWTyJavOPnduhFzY28PuyUk6EAhU2GJ+vz8/LsshW7C93Z3khkAA
-        cbJVcGvrhS10E8Lm5iNRlndsQToi9tFxE2Bgx4sqitP1xPP8a0fi3/i0vPxwPxZbPdE0C4piO5sZkvmI
-        jR9DQ/Zmsz3aTSTO6frxOtTbg66U53TW3u5L0o9IJqMxQzIfhdNphU2N3972ra+vP3XSneC433MeNwVV
-        F+wqAAAAAElFTkSuQmCC
-</value>
-  </data>
   <metadata name="mnuSettings.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>214, 17</value>
   </metadata>
@@ -231,6 +135,7 @@
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>53</value>
   </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAsAAAAAAAEAIABloAAAtgAAAAAAAAABACAA1jMAABuhAABAQAAAAQAgAChCAADx1AAAMDAAAAEA

diff --git a/RateAppSource/RateController/Properties/Settings.Designer.cs b/RateAppSource/RateController/Properties/Settings.Designer.cs
diff --git a/RateAppSource/RateController/Properties/Settings.settings b/RateAppSource/RateController/Properties/Settings.settings
@@ -33,7 +33,10 @@
       <Value Profile="(Default)">False</Value>
     </Setting>
     <Setting Name="ForeColour" Type="System.Drawing.Color" Scope="User">
-      <Value Profile="(Default)">Yellow</Value>
+      <Value Profile="(Default)">Black</Value>
+    </Setting>
+    <Setting Name="BackColour" Type="System.Drawing.Color" Scope="User">
+      <Value Profile="(Default)">210, 220, 230</Value>
     </Setting>
   </Settings>
 </SettingsFile>
diff --git a/RateAppSource/RateController/RCRestore.cs b/RateAppSource/RateController/RCRestore.cs
@@ -22,15 +22,37 @@ public partial class RCRestore : Form
         private int windowLeft = 0;
         private int windowTop = 0;
 
-        public RCRestore(Form CallingForm, int RateType, clsProduct CurrentProduct)
+        public RCRestore(Form CallingForm, int RateType, clsProduct CurrentProduct, FormStart Main)
         {
             FormToHide = CallingForm;
             cRateType = RateType;
             cCurrentProduct = CurrentProduct;
             this.TransparencyKey = this.BackColor;
+            Main.ColorChanged += Main_ColorChanged;
             InitializeComponent();
         }
 
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            base.OnPaint(e);
+
+            // Define the border color and thickness
+            Color borderColor = Properties.Settings.Default.ForeColour;
+            int borderWidth = 1;
+
+            // Draw the border
+            using (Pen pen = new Pen(borderColor, borderWidth))
+            {
+                e.Graphics.DrawRectangle(pen, 0, 0, this.ClientSize.Width - 1, this.ClientSize.Height - 1);
+            }
+        }
+
+        private void Main_ColorChanged(object sender, EventArgs e)
+        {
+            lbRateAmount.ForeColor = Properties.Settings.Default.ForeColour;
+            this.BackColor = Properties.Settings.Default.BackColour;
+        }
+
         private void mouseMove_MouseDown(object sender, MouseEventArgs e)
         {
             // Log the current window location and the mouse location.
@@ -66,6 +88,8 @@ private void RCRestore_Load(object sender, EventArgs e)
 
             FormToHide.WindowState = FormWindowState.Minimized;
             timer1.Enabled = true;
+            this.BackColor = Properties.Settings.Default.BackColour;
+            lbRateAmount.ForeColor = Properties.Settings.Default.ForeColour;
         }
 
         private void RestoreLC_Click(object sender, EventArgs e)

diff --git a/RateAppSource/RateController/Resources/Pins.PNG b/RateAppSource/RateController/Resources/Pins.PNG
diff --git a/RateAppSource/RateController/frmLargeScreen.cs b/RateAppSource/RateController/frmLargeScreen.cs
@@ -158,7 +158,7 @@ private void btMaster_MouseUp(object sender, MouseEventArgs e)
 
         private void btMinimize_Click(object sender, EventArgs e)
         {
-            Form restoreform = new RCRestore(this, mf.RateType, Prd);
+            Form restoreform = new RCRestore(this, mf.RateType, Prd,mf);
             restoreform.Show();
         }