From ddcfa71273096bbb836d82ab3d98fde3b0a5d2fb Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Mon, 23 Nov 2015 15:11:46 +0100 Subject: [PATCH] Column withs in Components and Procedures forms are saved, version 1.5.144. --- TestBenchFramework/ComponentsManagerDlg.cs | 20 +++++++++++++------ TestBenchFramework/LocalSettings.cs | 10 ++++++++++ TestBenchFramework/Properties/AssemblyInfo.cs | 4 ++-- .../UiControls/ProceduresCtrl.cs | 13 ++++++++++-- 4 files changed, 37 insertions(+), 10 deletions(-) diff --git a/TestBenchFramework/ComponentsManagerDlg.cs b/TestBenchFramework/ComponentsManagerDlg.cs index 31213caa6..7de5020df 100644 --- a/TestBenchFramework/ComponentsManagerDlg.cs +++ b/TestBenchFramework/ComponentsManagerDlg.cs @@ -88,12 +88,12 @@ namespace TBF Top = (ls.ComponentsDlgTop != 0) ? ls.ComponentsDlgTop : 100; Text = Strings.Test_Bench_Components_Configuration; - listViewEx.Columns.Add(Strings.Name, 80); - listViewEx.Columns.Add(Strings.Type, 120); - listViewEx.Columns.Add(Strings.Parent, 55); - listViewEx.Columns.Add(Strings.Mode, 55); - listViewEx.Columns.Add(Strings.Logging, 55); - listViewEx.Columns.Add(Strings.Parameters, 600); + listViewEx.Columns.Add(Strings.Name, (ls.ComponentsColumnCount > 0) ? ls.ComponentsColumnWidths[0] : 80); + listViewEx.Columns.Add(Strings.Type, (ls.ComponentsColumnCount > 1) ? ls.ComponentsColumnWidths[1] : 120); + listViewEx.Columns.Add(Strings.Parent, (ls.ComponentsColumnCount > 2) ? ls.ComponentsColumnWidths[2] : 55); + listViewEx.Columns.Add(Strings.Mode, (ls.ComponentsColumnCount > 3) ? ls.ComponentsColumnWidths[3] : 55); + listViewEx.Columns.Add(Strings.Logging, (ls.ComponentsColumnCount > 4) ? ls.ComponentsColumnWidths[4] : 55); + listViewEx.Columns.Add(Strings.Parameters, (ls.ComponentsColumnCount > 5) ? ls.ComponentsColumnWidths[5] : 600); debugCB = new ComboBox(); for (DebugMode level = 0; level < DebugMode.Count; level++) debugCB.Items.Add(level.ToString()); @@ -211,6 +211,14 @@ namespace TBF Program.LocalSettings.Save(); } + /// Update the column widths + Program.LocalSettings.ComponentsColumnWidths = new int[(int)Column.ColumnsCount]; + for (int i = 0; i < (int)Column.ColumnsCount; i++) + { + Program.LocalSettings.ComponentsColumnWidths[i] = listViewEx.Columns[i].Width; + } + Program.LocalSettings.Save(); + DialogResult = DialogResult.OK; Close(); return; diff --git a/TestBenchFramework/LocalSettings.cs b/TestBenchFramework/LocalSettings.cs index 825a98342..eccc2b66c 100644 --- a/TestBenchFramework/LocalSettings.cs +++ b/TestBenchFramework/LocalSettings.cs @@ -63,6 +63,11 @@ namespace TBF public int ComponentsDlgWidth; public int ComponentsDlgHeight; + [XmlArrayAttribute("ComponentsColumnWidths")] + public int[] ComponentsColumnWidths; + [XmlIgnore] + public int ComponentsColumnCount { get { return (ComponentsColumnWidths != null) ? ComponentsColumnWidths.Length : 0; } } + /// Paths public int PathsDlgLeft; public int PathsDlgTop; @@ -116,6 +121,11 @@ namespace TBF public int ProceduresDlgWidth; public int ProceduresDlgHeight; + [XmlArrayAttribute("ProceduresColumnWidths")] + public int[] ProceduresColumnWidths; + [XmlIgnore] + public int ProceduresColumnCount { get { return (ProceduresColumnWidths != null) ? ProceduresColumnWidths.Length : 0; } } + /// OneProcedure public int OneProcedureDlgLeft; public int OneProcedureDlgTop; diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 8c3256951..c8c686a99 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("1.5.143.1")] -[assembly: AssemblyFileVersion("1.5.143.1")] +[assembly: AssemblyVersion("1.5.144.1")] +[assembly: AssemblyFileVersion("1.5.144.1")] diff --git a/TestBenchFramework/UiControls/ProceduresCtrl.cs b/TestBenchFramework/UiControls/ProceduresCtrl.cs index 4cd152a8e..50c708f8b 100644 --- a/TestBenchFramework/UiControls/ProceduresCtrl.cs +++ b/TestBenchFramework/UiControls/ProceduresCtrl.cs @@ -49,8 +49,9 @@ namespace TBF.UiControls SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); /// ListViewEx columns - Columns.Add(Strings.Name, 100 * parent.Dpi / PathsDlg.Dpi100pct); - Columns.Add(Strings.DescriptionColHdr, 300 * parent.Dpi / PathsDlg.Dpi100pct); + TBF.LocalSettings ls = Program.LocalSettings; + Columns.Add(Strings.Name, (ls.ProceduresColumnCount > 0) ? ls.ProceduresColumnWidths[0] : (100 * parent.Dpi / PathsDlg.Dpi100pct)); + Columns.Add(Strings.DescriptionColHdr, (ls.ProceduresColumnCount > 1) ? ls.ProceduresColumnWidths[1] : (300 * parent.Dpi / PathsDlg.Dpi100pct)); editors = new Control[columnsCount]; /// @@ -114,6 +115,14 @@ namespace TBF.UiControls FluentCommon.SaveToDb(session, entity); } + /// Update the column widths + Program.LocalSettings.ProceduresColumnWidths = new int[Columns.Count]; + for (int i = 0; i < Columns.Count; i++) + { + Program.LocalSettings.ProceduresColumnWidths[i] = Columns[i].Width; + } + Program.LocalSettings.Save(); + Program.MainWnd.ReloadProcedures(); }