Version 3.13.3.0

jonaskohl · Aug 18, 2021 · 1f18b42 · 1f18b42
1 parent 389ba1a
commit 1f18b42
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 27 deletions.
diff --git a/CapsLockIndicatorV3/MainForm.cs b/CapsLockIndicatorV3/MainForm.cs
@@ -234,21 +234,8 @@ public MainForm()
                 Visible = true;
         }
 
-        //bool allowShow = false;
-        //protected override void OnVisibleChanged(EventArgs e)
-        //{
-        //    base.OnVisibleChanged(e);
-
-        //    if (!allowShow && SettingsManager.Get<bool>("hideOnStartup"))
-        //    {
-        //        Visible = false;
-        //        allowShow = true;
-        //    }
-        //}
-
         private void TabControl1_SelectedIndexChanged(object sender, EventArgs e)
         {
-            //MessageBox.Show(tabControl1.SelectedTab.Text);
             var sz = ClientSize;
             sz.Height = int.Parse(tabControl1.SelectedTab.Tag.ToString());
             ClientSize = sz;
@@ -906,7 +893,8 @@ void ExitApplicationClick(object sender, EventArgs e)
             if (MessageBox.Show(strings.exitMessage, "CapsLock Indicator", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) == DialogResult.Yes)
             {
                 shouldClose = true;
-                Close();
+                //Close();
+                Exit();
             }
         }
         void HideWindowClick(object sender, EventArgs e)
@@ -1000,7 +988,7 @@ private void MainForm_FormClosing(object sender, FormClosingEventArgs e)
                 return;
             }
 
-            Application.Exit();
+            Exit();
         }
 
         private void lnkLabel1_Click(object sender, EventArgs e)
@@ -1020,7 +1008,8 @@ private void showToolStripMenuItem_Click(object sender, EventArgs e)
         private void exitToolStripMenuItem_Click(object sender, EventArgs e)
         {
             shouldClose = true;
-            Close();
+            //Close();
+            Exit();
         }
 
         private void appNameLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
@@ -1096,7 +1085,17 @@ private void showMenuItem_Click(object sender, EventArgs e)
         private void exitMenuItem_Click(object sender, EventArgs e)
         {
             shouldClose = true;
-            Close();
+            Exit();
+        }
+
+        private void Exit()
+        {
+            capsLockIcon.Visible =
+            numLockIcon.Visible =
+            scrollLockIcon.Visible =
+            generalIcon.Visible =
+            false;
+            Application.Exit();
         }
 
         private void advSettings_Click(object sender, EventArgs e)
@@ -1117,13 +1116,6 @@ private void displayTimeSlider_Scroll(object sender, EventArgs e)
             displayTimeLabel.Text = displayTimeSlider.Value < 2001 ? string.Format("{0} ms", displayTimeSlider.Value) : strings.permanentIndicator;
         }
 
-        private void button1b_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.OK;
-            SettingsManager.Save();
-            Close();
-        }
-
         private void displayTimeLabel_Click(object sender, EventArgs e)
         {
             if (displayTimeSlider.Value > 2000)

diff --git a/CapsLockIndicatorV3/Properties/AssemblyInfo.cs b/CapsLockIndicatorV3/Properties/AssemblyInfo.cs
@@ -24,6 +24,6 @@
 //
 // You can specify all the values or you can use the default the Revision and 
 // Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion("3.13.2.0")]
-[assembly: AssemblyFileVersion("3.13.2.0")]
+[assembly: AssemblyVersion("3.13.3.0")]
+[assembly: AssemblyFileVersion("3.13.3.0")]
 [assembly: Guid ("6f54c357-0542-4d7d-9225-338bc3cd7834")]
diff --git a/CapsLockIndicatorV3/Resources/defaultSettings.txt b/CapsLockIndicatorV3/Resources/defaultSettings.txt
@@ -25,7 +25,7 @@ f:indFont=Segoe UI; 12pt
 i:indDisplayTime=500
 i:indOpacity=100
 i:bdSize=4
-s:versionNo=3.13.2.0
+s:versionNo=3.13.3.0
 s:overlayPosition=BottomRight
 s:customMessageCapsOn=
 s:customMessageCapsOff=