TBF : Saving positions of maximized or minimized forms fixed, ver. 2.18.1119

TBF/ComponentsManagerDlg.cs

@@ -94,13 +94,10 @@ namespace TBF
 
 		private void ComponentsManagerDlg_Load(object sender, EventArgs e)
 		{
-            TBF.LocalSettings ls = Program.LocalSettings;
+            LoadFormPosition();
-            Width  = (ls.ComponentsDlgWidth > 0)  ? ls.ComponentsDlgWidth  : 850;
-            Height = (ls.ComponentsDlgHeight > 0) ? ls.ComponentsDlgHeight : 500;
-            Left   = (ls.ComponentsDlgLeft != 0)  ? ls.ComponentsDlgLeft   : 200;
-            Top    = (ls.ComponentsDlgTop != 0)   ? ls.ComponentsDlgTop    : 100;
 
             Text = Strings.Test_Bench_Components_Configuration;
+            TBF.LocalSettings ls = Program.LocalSettings;
             listViewEx.Columns.Add(Strings.Nr,         (ls.ComponentsColumnCount > 0) ? ls.ComponentsColumnWidths[0] : 40);
             listViewEx.Columns.Add(Strings.Name,       (ls.ComponentsColumnCount > 1) ? ls.ComponentsColumnWidths[1] : 80);
 			listViewEx.Columns.Add(Strings.Type,       (ls.ComponentsColumnCount > 2) ? ls.ComponentsColumnWidths[2] : 120);
@@ -251,16 +248,34 @@ namespace TBF
             }
         }
 
+        private void LoadFormPosition()
+        {
+            TBF.LocalSettings ls = Program.LocalSettings;
+            Width  = (ls.ComponentsDlgWidth > 0)  ? ls.ComponentsDlgWidth  : 850;
+            Height = (ls.ComponentsDlgHeight > 0) ? ls.ComponentsDlgHeight : 500;
+            Left   = (ls.ComponentsDlgLeft != 0)  ? ls.ComponentsDlgLeft   : 200;
+            Top    = (ls.ComponentsDlgTop != 0)   ? ls.ComponentsDlgTop    : 100;
+        }
+
         /// <summary>
         /// Save the dialog position and ListViewEx column widths
         /// </summary>
         void SaveUISettings()
         {
-            Program.LocalSettings.ComponentsDlgLeft = Location.X;
+            if (WindowState == FormWindowState.Normal)
-            Program.LocalSettings.ComponentsDlgTop = Location.Y;
+            {
-            Program.LocalSettings.ComponentsDlgWidth = Size.Width;
+                Program.LocalSettings.ComponentsDlgLeft = Location.X;
-            Program.LocalSettings.ComponentsDlgHeight = Size.Height;
+                Program.LocalSettings.ComponentsDlgTop = Location.Y;
-            Program.LocalSettings.Save();
+                Program.LocalSettings.ComponentsDlgWidth = Size.Width;
+                Program.LocalSettings.ComponentsDlgHeight = Size.Height;
+            }
+            else
+            {
+                Program.LocalSettings.ComponentsDlgLeft = RestoreBounds.Left;
+                Program.LocalSettings.ComponentsDlgTop = RestoreBounds.Top;
+                Program.LocalSettings.ComponentsDlgWidth = RestoreBounds.Width;
+                Program.LocalSettings.ComponentsDlgHeight = RestoreBounds.Height;
+            }
 
             /// Update the column widths
             Program.LocalSettings.ComponentsColumnWidths = new int[(int)Column.ColumnsCount];

TBF/MetrologyDlg.cs

@@ -37,11 +37,7 @@ namespace TBF
 
 		private void MetrologyDlg_Load(object sender, EventArgs e)
 		{
-            TBF.LocalSettings ls = Program.LocalSettings;
+            LoadFormPosition();
-            Width  = (ls.MetrologyDlgWidth > 0)  ? ls.MetrologyDlgWidth  : 900;
-            Height = (ls.MetrologyDlgHeight > 0) ? ls.MetrologyDlgHeight : 500;
-            Left   = (ls.MetrologyDlgLeft != 0)  ? ls.MetrologyDlgLeft   : 200;
-            Top    = (ls.MetrologyDlgTop != 0)   ? ls.MetrologyDlgTop    : 100;
 
             Text = Strings.Metrology;
 
@@ -203,12 +199,7 @@ namespace TBF
                 }
             }
 
-            Program.LocalSettings.MetrologyDlgLeft = Location.X;
+            SaveFormPosition();
-            Program.LocalSettings.MetrologyDlgTop = Location.Y;
-            Program.LocalSettings.MetrologyDlgWidth = Size.Width;
-            Program.LocalSettings.MetrologyDlgHeight = Size.Height;
-            Program.LocalSettings.Save();
-
             DialogResult = DialogResult.OK;
             Close();
 		}
@@ -220,16 +211,40 @@ namespace TBF
 				(tabPage.Tag as IMetrologyDlgTab).CancelBtnClicked();
 			}
 
-            Program.LocalSettings.MetrologyDlgLeft = Location.X;
+            SaveFormPosition();
-            Program.LocalSettings.MetrologyDlgTop = Location.Y;
-            Program.LocalSettings.MetrologyDlgWidth = Size.Width;
-            Program.LocalSettings.MetrologyDlgHeight = Size.Height;
-            Program.LocalSettings.Save();
-
             DialogResult = DialogResult.Cancel;
             Close();
 		}
 
+        private void SaveFormPosition()
+        {
+            TBF.LocalSettings ls = Program.LocalSettings;
+            if (WindowState == FormWindowState.Normal)
+            {
+                ls.MetrologyDlgLeft = Location.X;
+                ls.MetrologyDlgTop = Location.Y;
+                ls.MetrologyDlgWidth = Size.Width;
+                ls.MetrologyDlgHeight = Size.Height;
+            }
+            else
+            {
+                ls.MetrologyDlgLeft = RestoreBounds.Left;
+                ls.MetrologyDlgTop = RestoreBounds.Top;
+                ls.MetrologyDlgWidth = RestoreBounds.Width;
+                ls.MetrologyDlgHeight = RestoreBounds.Height;
+            }
+            ls.Save();
+        }
+
+        private void LoadFormPosition()
+        {
+            TBF.LocalSettings ls = Program.LocalSettings;
+            Width  = (ls.MetrologyDlgWidth > 0)  ? ls.MetrologyDlgWidth  : 900;
+            Height = (ls.MetrologyDlgHeight > 0) ? ls.MetrologyDlgHeight : 500;
+            Left   = (ls.MetrologyDlgLeft != 0)  ? ls.MetrologyDlgLeft   : 200;
+            Top    = (ls.MetrologyDlgTop != 0)   ? ls.MetrologyDlgTop    : 100;
+        }
+
 		private void addButton_Click(object sender, EventArgs e)
 		{
 			(metrologyTabControl.SelectedTab.Tag as IMetrologyDlgTab).AddOne();

TBF/PathsDlg.cs

@@ -134,11 +134,7 @@ namespace TBF
 		private void PathsDlg_Load(object sender, EventArgs e)
 		{
 			Localize();
-            TBF.LocalSettings ls = Program.LocalSettings;
+            LoadFormPosition();
-            Width  = (ls.PathsDlgWidth > 0)  ? ls.PathsDlgWidth  : 1050;
-            Height = (ls.PathsDlgHeight > 0) ? ls.PathsDlgHeight : 360;
-            Left   = (ls.PathsDlgLeft != 0)  ? ls.PathsDlgLeft   : 150;
-            Top    = (ls.PathsDlgTop != 0)   ? ls.PathsDlgTop    : 150;
         }
 
 		private void Localize()
@@ -227,32 +223,51 @@ namespace TBF
 
             Cursor.Current = Cursors.Default;
 
-            Program.LocalSettings.PathsDlgLeft = Location.X;
+            SaveFormPosition();
-            Program.LocalSettings.PathsDlgTop = Location.Y;
-            Program.LocalSettings.PathsDlgWidth = Size.Width;
-            Program.LocalSettings.PathsDlgHeight = Size.Height;
-            Program.LocalSettings.Save();
-
             DialogResult = DialogResult.OK;
 			Close();
 		}
 
 		private void cancelButton_Click(object sender, EventArgs e)
 		{
-            Program.LocalSettings.PathsDlgLeft = Location.X;
-            Program.LocalSettings.PathsDlgTop = Location.Y;
-            Program.LocalSettings.PathsDlgWidth = Size.Width;
-            Program.LocalSettings.PathsDlgHeight = Size.Height;
-            Program.LocalSettings.Save();
-
             foreach (TabPage tab in pathsTabControl.TabPages)
 			{
 				(tab.Tag as ITabWithListViewEx).CancelBtnClicked();
 			}
-			DialogResult = DialogResult.Cancel;
+            SaveFormPosition();
+            DialogResult = DialogResult.Cancel;
 			Close();
 		}
 
+        private void SaveFormPosition()
+        {
+            TBF.LocalSettings ls = Program.LocalSettings;
+            if (WindowState == FormWindowState.Normal)
+            {
+                ls.PathsDlgLeft = Location.X;
+                ls.PathsDlgTop = Location.Y;
+                ls.PathsDlgWidth = Size.Width;
+                ls.PathsDlgHeight = Size.Height;
+            }
+            else
+            {
+                ls.PathsDlgLeft = RestoreBounds.Left;
+                ls.PathsDlgTop = RestoreBounds.Top;
+                ls.PathsDlgWidth = RestoreBounds.Width;
+                ls.PathsDlgHeight = RestoreBounds.Height;
+            }
+            ls.Save();
+        }
+
+        private void LoadFormPosition()
+        {
+            TBF.LocalSettings ls = Program.LocalSettings;
+            Width  = (ls.PathsDlgWidth > 0)  ? ls.PathsDlgWidth  : 1050;
+            Height = (ls.PathsDlgHeight > 0) ? ls.PathsDlgHeight : 360;
+            Left   = (ls.PathsDlgLeft != 0)  ? ls.PathsDlgLeft   : 150;
+            Top    = (ls.PathsDlgTop != 0)   ? ls.PathsDlgTop    : 150;
+        }
+
 		private void addButton_Click(object sender, EventArgs e)
 		{
 			(pathsTabControl.SelectedTab.Tag as ITabWithListViewEx).AddOne();

TBF/ProcedureDlg.cs

@@ -303,11 +303,7 @@ namespace TBF
 
 			if (LoadedProcedure == null) return;	/// return in case the dialog is open in the designer
 
-            TBF.LocalSettings ls = Program.LocalSettings;
+            LoadFormPosition();
-            Width  = (ls.OneProcedureDlgWidth > 0)  ? ls.OneProcedureDlgWidth  : 1050;
-            Height = (ls.OneProcedureDlgHeight > 0) ? ls.OneProcedureDlgHeight : 420;
-            Left   = (ls.OneProcedureDlgLeft != 0)  ? ls.OneProcedureDlgLeft   : 150;
-            Top    = (ls.OneProcedureDlgTop != 0)   ? ls.OneProcedureDlgTop    : 150;
 
             /// Enable/disable/show/hide controls in General tab
 #if IPERL
@@ -1771,12 +1767,7 @@ namespace TBF
 				return;
 			}
 
-            Program.LocalSettings.OneProcedureDlgLeft = Location.X;
+            SaveFormPosition();
-            Program.LocalSettings.OneProcedureDlgTop = Location.Y;
-            Program.LocalSettings.OneProcedureDlgWidth = Size.Width;
-            Program.LocalSettings.OneProcedureDlgHeight = Size.Height;
-            Program.LocalSettings.Save();
-
             DialogResult = DialogResult.OK;
 			Close();
 			return;
@@ -1784,17 +1775,41 @@ namespace TBF
 
 		private void cancelButton_Click(object sender, EventArgs e)
 		{
-            Program.LocalSettings.OneProcedureDlgLeft = Location.X;
+            SaveFormPosition();
-            Program.LocalSettings.OneProcedureDlgTop = Location.Y;
-            Program.LocalSettings.OneProcedureDlgWidth = Size.Width;
-            Program.LocalSettings.OneProcedureDlgHeight = Size.Height;
-            Program.LocalSettings.Save();
-
             DialogResult = DialogResult.Cancel;
 			Close();
 			return;
 		}
 
+        private void SaveFormPosition()
+        {
+            TBF.LocalSettings ls = Program.LocalSettings;
+            if (WindowState == FormWindowState.Normal)
+            {
+                ls.OneProcedureDlgLeft = Location.X;
+                ls.OneProcedureDlgTop = Location.Y;
+                ls.OneProcedureDlgWidth = Size.Width;
+                ls.OneProcedureDlgHeight = Size.Height;
+            }
+            else
+            {
+                ls.OneProcedureDlgLeft = RestoreBounds.Left;
+                ls.OneProcedureDlgTop = RestoreBounds.Top;
+                ls.OneProcedureDlgWidth = RestoreBounds.Width;
+                ls.OneProcedureDlgHeight = RestoreBounds.Height;
+            }
+            ls.Save();
+        }
+
+        private void LoadFormPosition()
+        {
+            TBF.LocalSettings ls = Program.LocalSettings;
+            Width  = (ls.OneProcedureDlgWidth > 0)  ? ls.OneProcedureDlgWidth  : 800;
+            Height = (ls.OneProcedureDlgHeight > 0) ? ls.OneProcedureDlgHeight : 420;
+            Left   = (ls.OneProcedureDlgLeft != 0)  ? ls.OneProcedureDlgLeft   : 150;
+            Top    = (ls.OneProcedureDlgTop != 0)   ? ls.OneProcedureDlgTop    : 150;
+        }
+
         #region Tab switching
 
 		enum ProcedureTabs

TBF/ProceduresDlg.cs

@@ -49,12 +49,7 @@ namespace TBF
 
 		private void ProceduresDlg_Load(object sender, EventArgs e)
 		{
-            TBF.LocalSettings ls = Program.LocalSettings;
+            LoadFormPosition();
-            Width  = (ls.ProceduresDlgWidth > 0)  ? ls.ProceduresDlgWidth  : 600;
-            Height = (ls.ProceduresDlgHeight > 0) ? ls.ProceduresDlgHeight : 500;
-            Left   = (ls.ProceduresDlgLeft != 0)  ? ls.ProceduresDlgLeft   : 200;
-            Top    = (ls.ProceduresDlgTop != 0)   ? ls.ProceduresDlgTop    : 100;
-            
             Text = Strings.Procedures;
 			proceduresCtrl.Initialize(this, splitContainer.Panel1);
 		}
@@ -98,29 +93,49 @@ namespace TBF
         private void ProceduresDlg_FormClosed(object sender, FormClosedEventArgs e)
         {
             proceduresCtrl.OkBtnClicked();
-
+            SaveFormPosition();
-            Program.LocalSettings.ProceduresDlgLeft = Location.X;
-            Program.LocalSettings.ProceduresDlgTop = Location.Y;
-            Program.LocalSettings.ProceduresDlgWidth = Size.Width;
-            Program.LocalSettings.ProceduresDlgHeight = Size.Height;
-            Program.LocalSettings.Save();
         }
 
 		private void cancelButton_Click(object sender, EventArgs e)
 		{
 			proceduresCtrl.CancelBtnClicked();
-
+            SaveFormPosition();
-            Program.LocalSettings.ProceduresDlgLeft = Location.X;
-            Program.LocalSettings.ProceduresDlgTop = Location.Y;
-            Program.LocalSettings.ProceduresDlgWidth = Size.Width;
-            Program.LocalSettings.ProceduresDlgHeight = Size.Height;
-            Program.LocalSettings.Save();
-
             DialogResult = DialogResult.Cancel;
 			Close();
 		}
 
-		private void addButton_Click(object sender, EventArgs e)
+
+        private void SaveFormPosition()
+        {
+            TBF.LocalSettings ls = Program.LocalSettings;
+            if (WindowState == FormWindowState.Normal)
+            {
+                ls.ProceduresDlgLeft = Location.X;
+                ls.ProceduresDlgTop = Location.Y;
+                ls.ProceduresDlgWidth = Size.Width;
+                ls.ProceduresDlgHeight = Size.Height;
+            }
+            else
+            {
+                ls.ProceduresDlgLeft = RestoreBounds.Left;
+                ls.ProceduresDlgTop = RestoreBounds.Top;
+                ls.ProceduresDlgWidth = RestoreBounds.Width;
+                ls.ProceduresDlgHeight = RestoreBounds.Height;
+            }
+            ls.Save();
+        }
+
+        private void LoadFormPosition()
+        {
+            TBF.LocalSettings ls = Program.LocalSettings;
+            Width  = (ls.ProceduresDlgWidth > 0)  ? ls.ProceduresDlgWidth  : 600;
+            Height = (ls.ProceduresDlgHeight > 0) ? ls.ProceduresDlgHeight : 500;
+            Left   = (ls.ProceduresDlgLeft != 0)  ? ls.ProceduresDlgLeft   : 200;
+            Top    = (ls.ProceduresDlgTop != 0)   ? ls.ProceduresDlgTop    : 100;
+        }
+
+
+        private void addButton_Click(object sender, EventArgs e)
 		{
 			proceduresCtrl.AddOne();
 		}

TBF/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.18.1118.0")]
+[assembly: AssemblyVersion("2.18.1119.0")]
-[assembly: AssemblyFileVersion("2.18.1118.0")]
+[assembly: AssemblyFileVersion("2.18.1119.0")]

TBF/TransitionsDlg.cs

@@ -149,12 +149,7 @@ namespace TBF
 		private void TransitionsDlg_Load(object sender, EventArgs e)
         {
             Localize();
-
+            LoadFormPosition();
-            TBF.LocalSettings ls = Program.LocalSettings;
-            Width  = (ls.TransitionsDlgWidth > 0)  ? ls.TransitionsDlgWidth  : 1050;
-            Height = (ls.TransitionsDlgHeight > 0) ? ls.TransitionsDlgHeight : 360;
-            Left   = (ls.TransitionsDlgLeft != 0)  ? ls.TransitionsDlgLeft   : 150;
-            Top    = (ls.TransitionsDlgTop != 0)   ? ls.TransitionsDlgTop    : 150;
 
             /// Now refresh the content of the dialog
 			RefreshAllTabs();
@@ -498,32 +493,51 @@ namespace TBF
 				}
 			}
 
-			Cursor.Current = Cursors.Default; 
+			Cursor.Current = Cursors.Default;
 
-            Program.LocalSettings.TransitionsDlgLeft = Location.X;
+            SaveFormPosition();
-            Program.LocalSettings.TransitionsDlgTop = Location.Y;
+            DialogResult = DialogResult.OK;
-            Program.LocalSettings.TransitionsDlgWidth = Size.Width;
-            Program.LocalSettings.TransitionsDlgHeight = Size.Height;
-            Program.LocalSettings.Save();
-
-			DialogResult = DialogResult.OK;
 			Close();
 			return;
 		}
 
 		private void cancelButton_Click(object sender, EventArgs e)
 		{
-            Program.LocalSettings.TransitionsDlgLeft = Location.X;
+            SaveFormPosition();
-            Program.LocalSettings.TransitionsDlgTop = Location.Y;
-            Program.LocalSettings.TransitionsDlgWidth = Size.Width;
-            Program.LocalSettings.TransitionsDlgHeight = Size.Height;
-            Program.LocalSettings.Save();
-
             DialogResult = DialogResult.Cancel;
 			Close();
 			return;
 		}
 
+        private void SaveFormPosition()
+        {
+            TBF.LocalSettings ls = Program.LocalSettings;
+            if (WindowState == FormWindowState.Normal)
+            {
+                ls.TransitionsDlgLeft = Location.X;
+                ls.TransitionsDlgTop = Location.Y;
+                ls.TransitionsDlgWidth = Size.Width;
+                ls.TransitionsDlgHeight = Size.Height;
+            }
+            else
+            {
+                ls.TransitionsDlgLeft = RestoreBounds.Left;
+                ls.TransitionsDlgTop = RestoreBounds.Top;
+                ls.TransitionsDlgWidth = RestoreBounds.Width;
+                ls.TransitionsDlgHeight = RestoreBounds.Height;
+            }
+            ls.Save();
+        }
+
+        private void LoadFormPosition()
+        {
+            TBF.LocalSettings ls = Program.LocalSettings;
+            Width  = (ls.TransitionsDlgWidth > 0)  ? ls.TransitionsDlgWidth  : 1050;
+            Height = (ls.TransitionsDlgHeight > 0) ? ls.TransitionsDlgHeight : 360;
+            Left   = (ls.TransitionsDlgLeft != 0)  ? ls.TransitionsDlgLeft   : 150;
+            Top    = (ls.TransitionsDlgTop != 0)   ? ls.TransitionsDlgTop    : 150;
+        }
+
 
 
 		int slctdTab;