From 50194001d9a8ddafd6bc3813cae206447feaf291 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Fri, 19 Aug 2016 10:43:48 +0200 Subject: [PATCH] There is only one ListViewEx in Results.Forms now. --- Results/Forms/ListViewEx.cs | 2 +- .../ComponentsManagerDlg.Designer.cs | 4 +- TestBenchFramework/ComponentsManagerDlg.cs | 8 +- TestBenchFramework/PathsDlg.cs | 2 +- TestBenchFramework/ProcedureDlg.Designer.cs | 20 +- TestBenchFramework/ProcedureDlg.cs | 60 +-- TestBenchFramework/ProceduresDlg.cs | 2 +- TestBenchFramework/TBF.csproj | 6 - TestBenchFramework/TransitionsDlg.cs | 4 +- .../UiControls/BaseWithListViewEx.cs | 2 +- TestBenchFramework/UiControls/ListViewEx.cs | 486 ------------------ TestBenchFramework/UiControls/ListViewEx.resx | 42 -- .../MetrologyDlgBalanceTab.Designer.cs | 4 +- .../UiControls/MetrologyDlgBalanceTab.cs | 12 +- .../MetrologyDlgFlowMeterTab.Designer.cs | 4 +- .../UiControls/MetrologyDlgFlowMeterTab.cs | 12 +- .../MetrologyDlgPressMeterTab.Designer.cs | 4 +- .../UiControls/MetrologyDlgPressMeterTab.cs | 12 +- .../UiControls/PathsBenchCtrl.cs | 12 +- .../UiControls/PathsFeedingCtrl.cs | 12 +- .../UiControls/PathsHeatMetersCtrl.cs | 12 +- .../UiControls/PathsMetersCtrl.cs | 12 +- .../UiControls/PathsOutputCtrl.cs | 12 +- .../ProcedureParamsCtrl.Designer.cs | 4 +- .../UiControls/ProcedureParamsCtrl.cs | 12 +- .../UiControls/ProceduresCtrl.cs | 8 +- .../UiControls/TestParamsCtrl.Designer.cs | 4 +- .../UiControls/TestParamsCtrl.cs | 12 +- .../UiControls/TransitionStepsCtrl.cs | 12 +- .../UiControls/VirtualBenchStepsCtrl.cs | 12 +- 30 files changed, 138 insertions(+), 672 deletions(-) delete mode 100644 TestBenchFramework/UiControls/ListViewEx.cs delete mode 100644 TestBenchFramework/UiControls/ListViewEx.resx diff --git a/Results/Forms/ListViewEx.cs b/Results/Forms/ListViewEx.cs index 0785c295b..cd28a2144 100644 --- a/Results/Forms/ListViewEx.cs +++ b/Results/Forms/ListViewEx.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2016 Sensus Metering Systems /// using System; using System.Collections; diff --git a/TestBenchFramework/ComponentsManagerDlg.Designer.cs b/TestBenchFramework/ComponentsManagerDlg.Designer.cs index 445323e88..06b46ae11 100644 --- a/TestBenchFramework/ComponentsManagerDlg.Designer.cs +++ b/TestBenchFramework/ComponentsManagerDlg.Designer.cs @@ -33,7 +33,7 @@ namespace TBF { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ComponentsManagerDlg)); this.splitContainer = new System.Windows.Forms.SplitContainer(); - this.listViewEx = new TBF.UiControls.ListViewEx(); + this.listViewEx = new Results.Forms.ListViewEx(); this.sharedButtons = new TBF.UiControls.SharedButtons(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit(); this.splitContainer.Panel1.SuspendLayout(); @@ -91,7 +91,7 @@ namespace TBF #endregion - private TBF.UiControls.ListViewEx listViewEx; + private Results.Forms.ListViewEx listViewEx; private System.Windows.Forms.SplitContainer splitContainer; private UiControls.SharedButtons sharedButtons; } diff --git a/TestBenchFramework/ComponentsManagerDlg.cs b/TestBenchFramework/ComponentsManagerDlg.cs index 2122e2e30..e9f89f10f 100644 --- a/TestBenchFramework/ComponentsManagerDlg.cs +++ b/TestBenchFramework/ComponentsManagerDlg.cs @@ -102,8 +102,8 @@ namespace TBF for (LogLevel level = 0; level < LogLevel.Count; level++) logCB.Items.Add(level.ToString()); splitContainer.Panel1.Controls.Add(logCB); - listViewEx.SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked); - listViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); + listViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked); + listViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); sharedButtons.DisableButtons(UiControls.SharedButtons.Buttons.Remove | UiControls.SharedButtons.Buttons.Edit); @@ -115,7 +115,7 @@ namespace TBF RedrawAll(); } - void listViewEx_SubItemClicked(object sender, SubItemEventArgs e) + void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) { if (unlocked && e.SubItem == (int)Column.DebugMode) { @@ -127,7 +127,7 @@ namespace TBF } } - void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) + void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) { Component cmpnt = (Component)e.Item.Tag; diff --git a/TestBenchFramework/PathsDlg.cs b/TestBenchFramework/PathsDlg.cs index 2f7251e5a..6369d465d 100644 --- a/TestBenchFramework/PathsDlg.cs +++ b/TestBenchFramework/PathsDlg.cs @@ -200,7 +200,7 @@ namespace TBF /// void SelectedIndexChanged(object sender, EventArgs e) { - ListViewEx listViewEx = sender as ListViewEx; + Results.Forms.ListViewEx listViewEx = sender as Results.Forms.ListViewEx; if (listViewEx.SelectedItems.Count != 1) { /// No item selected diff --git a/TestBenchFramework/ProcedureDlg.Designer.cs b/TestBenchFramework/ProcedureDlg.Designer.cs index a1380b449..891e4b516 100644 --- a/TestBenchFramework/ProcedureDlg.Designer.cs +++ b/TestBenchFramework/ProcedureDlg.Designer.cs @@ -70,15 +70,15 @@ namespace TBF this.procNameTextBox = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); this.historyTabPage = new System.Windows.Forms.TabPage(); - this.historyListViewEx = new TBF.UiControls.ListViewEx(); + this.historyListViewEx = new Results.Forms.ListViewEx(); this.metrology1TabPage = new System.Windows.Forms.TabPage(); - this.metrology1ListViewEx = new TBF.UiControls.ListViewEx(); + this.metrology1ListViewEx = new Results.Forms.ListViewEx(); this.metrology2TabPage = new System.Windows.Forms.TabPage(); - this.metrology2ListViewEx = new TBF.UiControls.ListViewEx(); + this.metrology2ListViewEx = new Results.Forms.ListViewEx(); this.processTabPage = new System.Windows.Forms.TabPage(); - this.processListViewEx = new TBF.UiControls.ListViewEx(); + this.processListViewEx = new Results.Forms.ListViewEx(); this.parametersTabPage = new System.Windows.Forms.TabPage(); - this.parametersListViewEx = new TBF.UiControls.ListViewEx(); + this.parametersListViewEx = new Results.Forms.ListViewEx(); this.sharedButtons = new TBF.UiControls.SharedButtons(); this.metersKindRadioButton3 = new System.Windows.Forms.RadioButton(); ((System.ComponentModel.ISupportInitialize)(this.mainSplitContainer)).BeginInit(); @@ -478,13 +478,13 @@ namespace TBF private System.Windows.Forms.SplitContainer mainSplitContainer; private System.Windows.Forms.TabControl tabControl; private System.Windows.Forms.TabPage historyTabPage; - private UiControls.ListViewEx historyListViewEx; + private Results.Forms.ListViewEx historyListViewEx; private System.Windows.Forms.TabPage metrology1TabPage; - private UiControls.ListViewEx metrology1ListViewEx; + private Results.Forms.ListViewEx metrology1ListViewEx; private System.Windows.Forms.TabPage metrology2TabPage; - private UiControls.ListViewEx metrology2ListViewEx; + private Results.Forms.ListViewEx metrology2ListViewEx; private System.Windows.Forms.TabPage processTabPage; - private UiControls.ListViewEx processListViewEx; + private Results.Forms.ListViewEx processListViewEx; private UiControls.SharedButtons sharedButtons; private System.Windows.Forms.TabPage generalTabPage; private System.Windows.Forms.ComboBox fileWriter1ComboBox; @@ -516,7 +516,7 @@ namespace TBF private System.Windows.Forms.RadioButton metersKindRadioButton2; private System.Windows.Forms.RadioButton metersKindRadioButton1; private System.Windows.Forms.TabPage parametersTabPage; - private UiControls.ListViewEx parametersListViewEx; + private Results.Forms.ListViewEx parametersListViewEx; private System.Windows.Forms.TextBox protocolTitleTextBox; private System.Windows.Forms.Label protocolTitleLabel; private System.Windows.Forms.ComboBox fileWriter2ComboBox; diff --git a/TestBenchFramework/ProcedureDlg.cs b/TestBenchFramework/ProcedureDlg.cs index 4dc4ddb91..e9ec9df24 100644 --- a/TestBenchFramework/ProcedureDlg.cs +++ b/TestBenchFramework/ProcedureDlg.cs @@ -71,21 +71,21 @@ namespace TBF sharedButtons.DownClicked += downButton_Click; /// ListViewEx-es configuration - metrology1ListViewEx.SubItemClicked += new SubItemEventHandler(metrology1ListViewEx_SubItemClicked); - metrology1ListViewEx.SubItemRightClicked += new SubItemEventHandler(metrology1ListViewEx_SubItemRightClicked); - metrology1ListViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(metrology1ListViewEx_SubItemEndEditing); + metrology1ListViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(metrology1ListViewEx_SubItemClicked); + metrology1ListViewEx.SubItemRightClicked += new Results.Forms.SubItemEventHandler(metrology1ListViewEx_SubItemRightClicked); + metrology1ListViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(metrology1ListViewEx_SubItemEndEditing); - metrology2ListViewEx.SubItemClicked += new SubItemEventHandler(metrology2ListViewEx_SubItemClicked); - metrology2ListViewEx.SubItemRightClicked += new SubItemEventHandler(metrology2ListViewEx_SubItemRightClicked); - metrology2ListViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(metrology2ListViewEx_SubItemEndEditing); + metrology2ListViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(metrology2ListViewEx_SubItemClicked); + metrology2ListViewEx.SubItemRightClicked += new Results.Forms.SubItemEventHandler(metrology2ListViewEx_SubItemRightClicked); + metrology2ListViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(metrology2ListViewEx_SubItemEndEditing); - processListViewEx.SubItemClicked += new SubItemEventHandler(processListViewEx_SubItemClicked); - processListViewEx.SubItemRightClicked += new SubItemEventHandler(processListViewEx_SubItemRightClicked); - processListViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(processListViewEx_SubItemEndEditing); + processListViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(processListViewEx_SubItemClicked); + processListViewEx.SubItemRightClicked += new Results.Forms.SubItemEventHandler(processListViewEx_SubItemRightClicked); + processListViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(processListViewEx_SubItemEndEditing); - parametersListViewEx.SubItemClicked += new SubItemEventHandler(parametersListViewEx_SubItemClicked); - parametersListViewEx.SubItemRightClicked += new SubItemEventHandler(parametersListViewEx_SubItemRightClicked); - parametersListViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(parametersListViewEx_SubItemEndEditing); + parametersListViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(parametersListViewEx_SubItemClicked); + parametersListViewEx.SubItemRightClicked += new Results.Forms.SubItemEventHandler(parametersListViewEx_SubItemRightClicked); + parametersListViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(parametersListViewEx_SubItemEndEditing); } public ProcedureDlg(Config.Entities.Procedure procedure) @@ -1108,7 +1108,7 @@ namespace TBF } } - private void metrology1ListViewEx_SubItemClicked(object sender, SubItemEventArgs e) + private void metrology1ListViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) { if (unlocked && (e.SubItem < (int)MtrlgyClmn.MtrlgyClmnCount)) { @@ -1116,7 +1116,7 @@ namespace TBF } } - void metrology1ListViewEx_SubItemRightClicked(object sender, SubItemEventArgs e) + void metrology1ListViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) { if (!unlocked || e.SubItem >= (int)MtrlgyClmn.MtrlgyClmnCount) return; @@ -1142,7 +1142,7 @@ namespace TBF } } - private void metrology1ListViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) + private void metrology1ListViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) { int dummy; if (e.SubItem == (int)MtrlgyClmn.Part) @@ -1230,7 +1230,7 @@ namespace TBF } } - private void metrology2ListViewEx_SubItemClicked(object sender, SubItemEventArgs e) + private void metrology2ListViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) { if (!unlocked || e.SubItem == (int)Mtrlgy2Clmn.Qfrom || @@ -1243,7 +1243,7 @@ namespace TBF metrology2ListViewEx.StartEditing(metrology2Editors[e.SubItem], e.Item, e.SubItem); } - void metrology2ListViewEx_SubItemRightClicked(object sender, SubItemEventArgs e) + void metrology2ListViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) { if (!unlocked || e.SubItem == (int)Mtrlgy2Clmn.Qfrom || @@ -1275,7 +1275,7 @@ namespace TBF } } - private void metrology2ListViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) + private void metrology2ListViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) { int dummy; if (e.SubItem == (int)Mtrlgy2Clmn.Part) @@ -1300,7 +1300,7 @@ namespace TBF } } - private void processListViewEx_SubItemClicked(object sender, SubItemEventArgs e) + private void processListViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) { if (!unlocked || e.SubItem == (int)ProcessClmn.Qfrom || @@ -1313,7 +1313,7 @@ namespace TBF processListViewEx.StartEditing(processEditors[e.SubItem], e.Item, e.SubItem); } - void processListViewEx_SubItemRightClicked(object sender, SubItemEventArgs e) + void processListViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) { if (!unlocked || e.SubItem == (int)ProcessClmn.Qfrom || @@ -1345,7 +1345,7 @@ namespace TBF } } - private void processListViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) + private void processListViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) { int dummy; if (e.SubItem == (int)ProcessClmn.Part) @@ -1371,7 +1371,7 @@ namespace TBF } } - private void parametersListViewEx_SubItemClicked(object sender, SubItemEventArgs e) + private void parametersListViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) { if (!unlocked || e.SubItem == (int)ParametersClmn.Qfrom || @@ -1384,7 +1384,7 @@ namespace TBF parametersListViewEx.StartEditing(parametersEditors[e.SubItem], e.Item, e.SubItem); } - void parametersListViewEx_SubItemRightClicked(object sender, SubItemEventArgs e) + void parametersListViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) { if (!unlocked || e.SubItem == (int)ParametersClmn.Qfrom || @@ -1416,7 +1416,7 @@ namespace TBF } } - private void parametersListViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) + private void parametersListViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) { int dummy; if (e.SubItem == (int)ParametersClmn.Part) @@ -1494,7 +1494,7 @@ namespace TBF transitionEndComboBox.Enabled = true; notesTextBox.Enabled = true; - ListViewEx listViewEx; + Results.Forms.ListViewEx listViewEx; switch (selectedTab) { @@ -1609,7 +1609,7 @@ namespace TBF private void addButton_Click(object sender, EventArgs e) { - ListViewEx listViewEx; + Results.Forms.ListViewEx listViewEx; switch (selectedTab) { @@ -1731,7 +1731,7 @@ namespace TBF private void removeButton_Click(object sender, EventArgs e) { - ListViewEx listViewEx; + Results.Forms.ListViewEx listViewEx; switch (selectedTab) { @@ -1784,7 +1784,7 @@ namespace TBF private void upButton_Click(object sender, EventArgs e) { - ListViewEx listViewEx; + Results.Forms.ListViewEx listViewEx; switch (selectedTab) { @@ -1833,7 +1833,7 @@ namespace TBF private void downButton_Click(object sender, EventArgs e) { - ListViewEx listViewEx; + Results.Forms.ListViewEx listViewEx; switch (selectedTab) { @@ -1930,7 +1930,7 @@ namespace TBF /// void SelectedIndexChanged(object sender, EventArgs e) { - ListViewEx listViewEx = sender as ListViewEx; + Results.Forms.ListViewEx listViewEx = sender as Results.Forms.ListViewEx; if (listViewEx.SelectedItems.Count != 1) { UpdateButtonStates(SharedButtons.SelectedItemPos.None); diff --git a/TestBenchFramework/ProceduresDlg.cs b/TestBenchFramework/ProceduresDlg.cs index c88411d5a..a5ed413fe 100644 --- a/TestBenchFramework/ProceduresDlg.cs +++ b/TestBenchFramework/ProceduresDlg.cs @@ -136,7 +136,7 @@ namespace TBF /// void SelectedIndexChanged(object sender, EventArgs e) { - ListViewEx listViewEx = sender as ListViewEx; + Results.Forms.ListViewEx listViewEx = sender as Results.Forms.ListViewEx; if (listViewEx.SelectedItems.Count != 1) { /// No item selected diff --git a/TestBenchFramework/TBF.csproj b/TestBenchFramework/TBF.csproj index a14730942..7d5307570 100644 --- a/TestBenchFramework/TBF.csproj +++ b/TestBenchFramework/TBF.csproj @@ -1446,9 +1446,6 @@ Component - - Component - Component @@ -1994,9 +1991,6 @@ MetrologyDlgPressMeterTab.cs - - ListViewEx.cs - ProcedureParamsCtrl.cs diff --git a/TestBenchFramework/TransitionsDlg.cs b/TestBenchFramework/TransitionsDlg.cs index 080c96471..8a15216e2 100644 --- a/TestBenchFramework/TransitionsDlg.cs +++ b/TestBenchFramework/TransitionsDlg.cs @@ -170,7 +170,7 @@ namespace TBF void RefreshAllTabs() { - foreach (var ctrl in seqStepsCtrls) (ctrl as ListViewEx).Refresh(); + foreach (var ctrl in seqStepsCtrls) (ctrl as Results.Forms.ListViewEx).Refresh(); } private void Unlocked(object sender, EventArgs e) @@ -358,7 +358,7 @@ namespace TBF /// void SelectedIndexChanged(object sender, EventArgs e) { - ListViewEx listViewEx = sender as ListViewEx; + Results.Forms.ListViewEx listViewEx = sender as Results.Forms.ListViewEx; if (listViewEx.SelectedItems.Count != 1) { UpdateButtonStates(SharedButtons.SelectedItemPos.None); diff --git a/TestBenchFramework/UiControls/BaseWithListViewEx.cs b/TestBenchFramework/UiControls/BaseWithListViewEx.cs index 0e0bb827e..95ee82648 100644 --- a/TestBenchFramework/UiControls/BaseWithListViewEx.cs +++ b/TestBenchFramework/UiControls/BaseWithListViewEx.cs @@ -8,7 +8,7 @@ using Config.Entities; namespace TBF.UiControls { - public class BaseWithListViewEx : ListViewEx + public class BaseWithListViewEx : Results.Forms.ListViewEx { /// /// List of items to be edited diff --git a/TestBenchFramework/UiControls/ListViewEx.cs b/TestBenchFramework/UiControls/ListViewEx.cs deleted file mode 100644 index 0d58a4ae6..000000000 --- a/TestBenchFramework/UiControls/ListViewEx.cs +++ /dev/null @@ -1,486 +0,0 @@ -/// -/// Copyright (c) 2013-2015 Sensus Metering Systems -/// -using System; -using System.Collections; -using System.ComponentModel; -using System.Drawing; -using System.Data; -using System.Windows.Forms; -using System.Runtime.InteropServices; - -namespace TBF.UiControls -{ - /// - /// Event Handler for SubItem events - /// - public delegate void SubItemEventHandler(object sender, SubItemEventArgs e); - /// - /// Event Handler for SubItemEndEditing events - /// - public delegate void SubItemEndEditingEventHandler(object sender, SubItemEndEditingEventArgs e); - - - /// - /// Inherited ListView to allow in-place editing of subitems - /// - public class ListViewEx : System.Windows.Forms.ListView - { - #region Interop structs, imports and constants - /// - /// MessageHeader for WM_NOTIFY - /// - private struct NMHDR - { -#pragma warning disable - public IntPtr hwndFrom; - public Int32 idFrom; - public Int32 code; -#pragma warning restore - } - - - [DllImport("user32.dll")] - private static extern IntPtr SendMessage(IntPtr hWnd, int msg, IntPtr wPar, IntPtr lPar); - [DllImport("user32.dll", CharSet=CharSet.Ansi)] - private static extern IntPtr SendMessage(IntPtr hWnd, int msg, int len, ref int [] order); - - // ListView messages - private const int LVM_FIRST = 0x1000; - private const int LVM_GETCOLUMNORDERARRAY = (LVM_FIRST + 59); - - // Windows Messages that will abort editing - private const int WM_HSCROLL = 0x114; - private const int WM_VSCROLL = 0x115; - private const int WM_SIZE = 0x05; - private const int WM_NOTIFY = 0x4E; - - private const int HDN_FIRST = -300; - private const int HDN_BEGINDRAG = (HDN_FIRST-10); - private const int HDN_ITEMCHANGINGA = (HDN_FIRST-0); - private const int HDN_ITEMCHANGINGW = (HDN_FIRST-20); - #endregion - - /// - /// Required designer variable. - /// - private System.ComponentModel.Container components = null; - - public event SubItemEventHandler SubItemClicked; - public event SubItemEventHandler SubItemRightClicked; - public event SubItemEventHandler SubItemBeginEditing; - public event SubItemEndEditingEventHandler SubItemEndEditing; - - public ListViewEx() - { - // This call is required by the Windows.Forms Form Designer. - InitializeComponent(); - - base.FullRowSelect = true; - base.View = View.Details; - base.AllowColumnReorder = true; - } - - /// - /// Clean up any resources being used. - /// - protected override void Dispose( bool disposing ) - { - if( disposing ) - { - if( components != null ) - components.Dispose(); - } - base.Dispose( disposing ); - } - - #region Component Designer generated code - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - components = new System.ComponentModel.Container(); - } - #endregion - - private bool _doubleClickActivation = false; - /// - /// Is a double click required to start editing a cell? - /// - public bool DoubleClickActivation - { - get { return _doubleClickActivation; } - set { _doubleClickActivation = value; } - } - - - /// - /// Retrieve the order in which columns appear - /// - /// Current display order of column indices - public int[] GetColumnOrder() - { - IntPtr lPar = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(int)) * Columns.Count); - - IntPtr res = SendMessage(Handle, LVM_GETCOLUMNORDERARRAY, new IntPtr(Columns.Count), lPar); - if (res.ToInt32() == 0) // Something went wrong - { - Marshal.FreeHGlobal(lPar); - return null; - } - - int [] order = new int[Columns.Count]; - Marshal.Copy(lPar, order, 0, Columns.Count); - - Marshal.FreeHGlobal(lPar); - - return order; - } - - - /// - /// Find ListViewItem and SubItem Index at position (x,y) - /// - /// relative to ListView - /// relative to ListView - /// Item at position (x,y) - /// SubItem index - public int GetSubItemAt(int x, int y, out ListViewItem item) - { - item = this.GetItemAt(x, y); - - if (item != null) - { - int[] order = GetColumnOrder(); - Rectangle lviBounds; - int subItemX; - - lviBounds = item.GetBounds(ItemBoundsPortion.Entire); - subItemX = lviBounds.Left; - for (int i=0; i - /// Get bounds for a SubItem - /// - /// Target ListViewItem - /// Target SubItem index - /// Bounds of SubItem (relative to ListView) - public Rectangle GetSubItemBounds(ListViewItem Item, int SubItem) - { - int[] order = GetColumnOrder(); - - Rectangle subItemRect = Rectangle.Empty; - if (SubItem >= order.Length) - throw new IndexOutOfRangeException("SubItem "+SubItem+" out of range"); - - if (Item == null) - throw new ArgumentNullException("Item"); - - Rectangle lviBounds = Item.GetBounds(ItemBoundsPortion.Entire); - int subItemX = lviBounds.Left; - - ColumnHeader col; - int i; - for (i=0; i - /// Fire SubItemClicked - /// - ///Point of click/doubleclick - private void EditSubitemAt(Point p) - { - ListViewItem item; - int idx = GetSubItemAt(p.X, p.Y, out item); - if (idx >= 0) - { - OnSubItemClicked(new SubItemEventArgs(item, idx)); - } - } - - /// - /// Fire SubItemRightClicked - /// - ///Point of click/doubleclick - private void RightClickFunctionSubitemAt(Point p) - { - ListViewItem item; - int idx = GetSubItemAt(p.X, p.Y, out item); - if (idx >= 0) - { - OnSubItemRightClicked(new SubItemEventArgs(item, idx)); - } - } - - #endregion - - #region In-place editing functions - // The control performing the actual editing - private Control _editingControl; - // The LVI being edited - private ListViewItem _editItem; - // The SubItem being edited - private int _editSubItem; - - protected void OnSubItemBeginEditing(SubItemEventArgs e) - { - if (SubItemBeginEditing != null) SubItemBeginEditing(this, e); - } - - protected void OnSubItemEndEditing(SubItemEndEditingEventArgs e) - { - if (SubItemEndEditing != null) SubItemEndEditing(this, e); - } - - protected void OnSubItemClicked(SubItemEventArgs e) - { - if (SubItemClicked != null) SubItemClicked(this, e); - } - - protected void OnSubItemRightClicked(SubItemEventArgs e) - { - if (SubItemRightClicked != null) SubItemRightClicked(this, e); - } - - - /// - /// Begin in-place editing of given cell - /// - /// Control used as cell editor - /// ListViewItem to edit - /// SubItem index to edit - public void StartEditing(Control c, ListViewItem Item, int SubItem) - { - OnSubItemBeginEditing(new SubItemEventArgs(Item, SubItem)); - - Rectangle rcSubItem = GetSubItemBounds(Item, SubItem); - - if (rcSubItem.X < 0) - { - // Left edge of SubItem not visible - adjust rectangle position and width - rcSubItem.Width += rcSubItem.X; - rcSubItem.X=0; - } - if (rcSubItem.X+rcSubItem.Width > this.Width) - { - // Right edge of SubItem not visible - adjust rectangle width - rcSubItem.Width = this.Width-rcSubItem.Left; - } - - // Subitem bounds are relative to the location of the ListView! - rcSubItem.Offset(Left, Top); - - // In case the editing control and the listview are on different parents, - // account for different origins - Point origin = new Point(0,0); - Point lvOrigin = this.Parent.PointToScreen(origin); - Point ctlOrigin = c.Parent.PointToScreen(origin); - - rcSubItem.Offset(lvOrigin.X-ctlOrigin.X, lvOrigin.Y-ctlOrigin.Y); - - // Position and show editor - c.Bounds = rcSubItem; - c.Text = Item.SubItems[SubItem].Text; - c.Visible = true; - c.BringToFront(); - c.Focus(); - - _editingControl = c; - _editingControl.Leave += new EventHandler(_editControl_Leave); - _editingControl.KeyPress += new KeyPressEventHandler(_editControl_KeyPress); - - _editItem = Item; - _editSubItem = SubItem; - } - - - private void _editControl_Leave(object sender, EventArgs e) - { - // cell editor losing focus - EndEditing(true); - } - - private void _editControl_KeyPress(object sender, System.Windows.Forms.KeyPressEventArgs e) - { - switch (e.KeyChar) - { - case (char)(int)Keys.Escape: - { - EndEditing(false); - break; - } - - case (char)(int)Keys.Enter: - { - EndEditing(true); - break; - } - } - } - - /// - /// Accept or discard current value of cell editor control - /// - /// Use the _editingControl's Text as new SubItem text or discard changes? - public void EndEditing(bool AcceptChanges) - { - if (_editingControl == null) - return; - - SubItemEndEditingEventArgs e = new SubItemEndEditingEventArgs( - _editItem, // The item being edited - _editSubItem, // The subitem index being edited - AcceptChanges ? - _editingControl.Text : // Use editControl text if changes are accepted - _editItem.SubItems[_editSubItem].Text, // or the original subitem's text, if changes are discarded - !AcceptChanges // Cancel? - ); - - OnSubItemEndEditing(e); - - _editItem.SubItems[_editSubItem].Text = e.DisplayText; - - _editingControl.Leave -= new EventHandler(_editControl_Leave); - _editingControl.KeyPress -= new KeyPressEventHandler(_editControl_KeyPress); - - _editingControl.Visible = false; - - _editingControl = null; - _editItem = null; - _editSubItem = -1; - } - #endregion - } - - - /// - /// Event Args for SubItemClicked event - /// - public class SubItemEventArgs : EventArgs - { - int subItem = -1; /// Sub-item index - ListViewItem item = null; - - public int SubItem { get { return subItem; } } - public ListViewItem Item { get { return item; } } - - public SubItemEventArgs(ListViewItem item, int subItem) - { - this.subItem = subItem; - this.item = item; - } - } - - - /// - /// Event Args for SubItemEndEditingClicked event - /// - public class SubItemEndEditingEventArgs : SubItemEventArgs - { - string displayText = string.Empty; - bool cancel = true; - - public SubItemEndEditingEventArgs(ListViewItem item, int subItem, string displayText, bool cancel) : - base(item, subItem) - { - this.displayText = displayText; - this.cancel = cancel; - } - public string DisplayText - { - get { return displayText; } - set { displayText = value; } - } - public bool Cancel - { - get { return cancel; } - set { cancel = value; } - } - } -} diff --git a/TestBenchFramework/UiControls/ListViewEx.resx b/TestBenchFramework/UiControls/ListViewEx.resx deleted file mode 100644 index 7e323966c..000000000 --- a/TestBenchFramework/UiControls/ListViewEx.resx +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 1.0.0.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3102.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3102.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - diff --git a/TestBenchFramework/UiControls/MetrologyDlgBalanceTab.Designer.cs b/TestBenchFramework/UiControls/MetrologyDlgBalanceTab.Designer.cs index 7a557b415..e2b991d5c 100644 --- a/TestBenchFramework/UiControls/MetrologyDlgBalanceTab.Designer.cs +++ b/TestBenchFramework/UiControls/MetrologyDlgBalanceTab.Designer.cs @@ -57,7 +57,7 @@ namespace TBF.UiControls this.measuredTextBox = new System.Windows.Forms.TextBox(); this.correctedLabel = new System.Windows.Forms.Label(); this.measuredLabel = new System.Windows.Forms.Label(); - this.listViewEx = new TBF.UiControls.ListViewEx(); + this.listViewEx = new Results.Forms.ListViewEx(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -369,7 +369,7 @@ namespace TBF.UiControls private System.Windows.Forms.Label cmpntNameLabel; private System.Windows.Forms.SplitContainer splitContainer1; - private ListViewEx listViewEx; + private Results.Forms.ListViewEx listViewEx; private System.Windows.Forms.Label measuredLabel; private System.Windows.Forms.GroupBox testGroupBox; private System.Windows.Forms.TextBox correctedTextBox; diff --git a/TestBenchFramework/UiControls/MetrologyDlgBalanceTab.cs b/TestBenchFramework/UiControls/MetrologyDlgBalanceTab.cs index ffc664f44..807bad843 100644 --- a/TestBenchFramework/UiControls/MetrologyDlgBalanceTab.cs +++ b/TestBenchFramework/UiControls/MetrologyDlgBalanceTab.cs @@ -72,9 +72,9 @@ namespace TBF.UiControls this.Controls.Add(measurementTextBox); this.Controls.Add(correctionTextBox); - listViewEx.SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked); - listViewEx.SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked); - listViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); + listViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked); + listViewEx.SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked); + listViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Nr, Width = 60 }); listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Mass_kg, Width = 100 }); @@ -132,7 +132,7 @@ namespace TBF.UiControls listViewEx.Items.Add(lvi); } - void listViewEx_SubItemClicked(object sender, SubItemEventArgs e) + void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) { if (unlocked && e.SubItem == 1) { @@ -144,7 +144,7 @@ namespace TBF.UiControls } } - void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e) + void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) { if (!unlocked || e.SubItem < 1 || e.SubItem > 2) return; @@ -172,7 +172,7 @@ namespace TBF.UiControls } } - void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) + void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) { if (ParseItem(e.Item, e.SubItem, e.DisplayText)) return; diff --git a/TestBenchFramework/UiControls/MetrologyDlgFlowMeterTab.Designer.cs b/TestBenchFramework/UiControls/MetrologyDlgFlowMeterTab.Designer.cs index ef508bc6f..b8cdd541a 100644 --- a/TestBenchFramework/UiControls/MetrologyDlgFlowMeterTab.Designer.cs +++ b/TestBenchFramework/UiControls/MetrologyDlgFlowMeterTab.Designer.cs @@ -38,7 +38,7 @@ namespace TBF.UiControls this.correctedLabel = new System.Windows.Forms.Label(); this.measuredLabel = new System.Windows.Forms.Label(); this.cmpntNameLabel = new System.Windows.Forms.Label(); - this.listViewEx = new TBF.UiControls.ListViewEx(); + this.listViewEx = new Results.Forms.ListViewEx(); this.nameGroupBox = new System.Windows.Forms.GroupBox(); this.calibrationGroupBox = new System.Windows.Forms.GroupBox(); this.calibValidDateTextBox = new System.Windows.Forms.TextBox(); @@ -250,7 +250,7 @@ namespace TBF.UiControls private System.Windows.Forms.SplitContainer splitContainer1; private System.Windows.Forms.Label cmpntNameLabel; - private ListViewEx listViewEx; + private Results.Forms.ListViewEx listViewEx; private System.Windows.Forms.GroupBox testGroupBox; private System.Windows.Forms.TextBox correctedTextBox; private System.Windows.Forms.TextBox measuredTextBox; diff --git a/TestBenchFramework/UiControls/MetrologyDlgFlowMeterTab.cs b/TestBenchFramework/UiControls/MetrologyDlgFlowMeterTab.cs index 1eeef1fa4..dff16cf16 100644 --- a/TestBenchFramework/UiControls/MetrologyDlgFlowMeterTab.cs +++ b/TestBenchFramework/UiControls/MetrologyDlgFlowMeterTab.cs @@ -75,9 +75,9 @@ namespace TBF.UiControls this.Controls.Add(measurementTextBox); this.Controls.Add(correctionTextBox); - listViewEx.SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked); - listViewEx.SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked); - listViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); + listViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked); + listViewEx.SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked); + listViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Nr, Width = 60 }); listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Flow_m3h, Width = 100 }); @@ -123,7 +123,7 @@ namespace TBF.UiControls listViewEx.Items.Add(lvi); } - void listViewEx_SubItemClicked(object sender, SubItemEventArgs e) + void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) { if (unlocked && e.SubItem == 1) { @@ -135,7 +135,7 @@ namespace TBF.UiControls } } - void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e) + void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) { if (!unlocked || e.SubItem < 1 || e.SubItem > 2) return; @@ -163,7 +163,7 @@ namespace TBF.UiControls } } - void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) + void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) { if (ParseItem(e.Item, e.SubItem, e.DisplayText)) return; diff --git a/TestBenchFramework/UiControls/MetrologyDlgPressMeterTab.Designer.cs b/TestBenchFramework/UiControls/MetrologyDlgPressMeterTab.Designer.cs index 15cd328eb..e9e82a65f 100644 --- a/TestBenchFramework/UiControls/MetrologyDlgPressMeterTab.Designer.cs +++ b/TestBenchFramework/UiControls/MetrologyDlgPressMeterTab.Designer.cs @@ -39,7 +39,7 @@ namespace TBF.UiControls this.measuredLabel = new System.Windows.Forms.Label(); this.componentLabel = new System.Windows.Forms.Label(); this.cmpntNameLabel = new System.Windows.Forms.Label(); - this.listViewEx = new TBF.UiControls.ListViewEx(); + this.listViewEx = new Results.Forms.ListViewEx(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -172,7 +172,7 @@ namespace TBF.UiControls private System.Windows.Forms.SplitContainer splitContainer1; private System.Windows.Forms.Label componentLabel; private System.Windows.Forms.Label cmpntNameLabel; - private ListViewEx listViewEx; + private Results.Forms.ListViewEx listViewEx; private System.Windows.Forms.GroupBox testGroupBox; private System.Windows.Forms.TextBox correctedTextBox; private System.Windows.Forms.TextBox measuredTextBox; diff --git a/TestBenchFramework/UiControls/MetrologyDlgPressMeterTab.cs b/TestBenchFramework/UiControls/MetrologyDlgPressMeterTab.cs index 5d39c5d38..94dba83bb 100644 --- a/TestBenchFramework/UiControls/MetrologyDlgPressMeterTab.cs +++ b/TestBenchFramework/UiControls/MetrologyDlgPressMeterTab.cs @@ -69,9 +69,9 @@ namespace TBF.UiControls this.Controls.Add(measurementTextBox); this.Controls.Add(correctionTextBox); - listViewEx.SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked); - listViewEx.SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked); - listViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); + listViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked); + listViewEx.SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked); + listViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Nr, Width = 60 }); listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Pressure_bar, Width = 100 }); @@ -96,7 +96,7 @@ namespace TBF.UiControls listViewEx.Items.Add(lvi); } - void listViewEx_SubItemClicked(object sender, SubItemEventArgs e) + void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) { if (unlocked && e.SubItem == 1) { @@ -108,7 +108,7 @@ namespace TBF.UiControls } } - void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e) + void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) { if (!unlocked || e.SubItem < 1 || e.SubItem > 2) return; @@ -136,7 +136,7 @@ namespace TBF.UiControls } } - void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) + void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) { if (ParseItem(e.Item, e.SubItem, e.DisplayText)) return; diff --git a/TestBenchFramework/UiControls/PathsBenchCtrl.cs b/TestBenchFramework/UiControls/PathsBenchCtrl.cs index e7bd3b21a..c2670d541 100644 --- a/TestBenchFramework/UiControls/PathsBenchCtrl.cs +++ b/TestBenchFramework/UiControls/PathsBenchCtrl.cs @@ -53,9 +53,9 @@ namespace TBF.UiControls .CreateQuery("FROM BenchPath ORDER BY ItemNr") .List(); - SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked); - SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked); - SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); + SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked); + SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked); + SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); /// ListViewEx columns TBF.LocalSettings ls = Program.LocalSettings; @@ -131,7 +131,7 @@ namespace TBF.UiControls base.RedrawAll(); } - void listViewEx_SubItemClicked(object sender, SubItemEventArgs e) + void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) { if (!Unlocked || e.SubItem >= editors.Length) return; if ((e.Item.Tag is Config.Entities.IHasItemNr) && @@ -143,7 +143,7 @@ namespace TBF.UiControls StartEditing(editors[e.SubItem], e.Item, e.SubItem); } - void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e) + void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) { if (!Unlocked || e.SubItem >= editors.Length) return; @@ -169,7 +169,7 @@ namespace TBF.UiControls } } - void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) + void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) { if (e.SubItem >= fixedColumnsCount) { diff --git a/TestBenchFramework/UiControls/PathsFeedingCtrl.cs b/TestBenchFramework/UiControls/PathsFeedingCtrl.cs index 8763d8be9..eb8dcefe2 100644 --- a/TestBenchFramework/UiControls/PathsFeedingCtrl.cs +++ b/TestBenchFramework/UiControls/PathsFeedingCtrl.cs @@ -50,9 +50,9 @@ namespace TBF.UiControls .CreateQuery("FROM FeedingPath ORDER BY ItemNr") .List(); - SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked); - SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked); - SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); + SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked); + SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked); + SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); /// ListViewEx columns TBF.LocalSettings ls = Program.LocalSettings; @@ -103,7 +103,7 @@ namespace TBF.UiControls base.RedrawAll(); } - void listViewEx_SubItemClicked(object sender, SubItemEventArgs e) + void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) { if (!Unlocked || e.SubItem >= editors.Length) return; if ((e.Item.Tag is IHasItemNr) && @@ -115,7 +115,7 @@ namespace TBF.UiControls StartEditing(editors[e.SubItem], e.Item, e.SubItem); } - void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e) + void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) { if (!Unlocked || e.SubItem >= editors.Length) return; @@ -141,7 +141,7 @@ namespace TBF.UiControls } } - void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) + void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) { if (e.SubItem >= fixedColumnsCount) { diff --git a/TestBenchFramework/UiControls/PathsHeatMetersCtrl.cs b/TestBenchFramework/UiControls/PathsHeatMetersCtrl.cs index 97ad7027f..bdbcdba20 100644 --- a/TestBenchFramework/UiControls/PathsHeatMetersCtrl.cs +++ b/TestBenchFramework/UiControls/PathsHeatMetersCtrl.cs @@ -57,9 +57,9 @@ namespace TBF.UiControls .CreateQuery("FROM HeatMetersPath ORDER BY ItemNr") .List(); - SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked); - SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked); - SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); + SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked); + SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked); + SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); IList tempMeters = new List(); foreach (var cmpnt in parent.TbfComponents) @@ -116,7 +116,7 @@ namespace TBF.UiControls #endif } - void listViewEx_SubItemClicked(object sender, SubItemEventArgs e) + void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) { if (!Unlocked || e.SubItem >= editors.Length) return; if ((e.Item.Tag is Config.Entities.IHasItemNr) && @@ -128,7 +128,7 @@ namespace TBF.UiControls StartEditing(editors[e.SubItem], e.Item, e.SubItem); } - void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e) + void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) { if (!Unlocked || e.SubItem >= editors.Length) return; @@ -154,7 +154,7 @@ namespace TBF.UiControls } } - void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) + void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) { if (e.SubItem >= (int)Column.TWarmFrom && e.SubItem <= (int)Column.TColdTo) { diff --git a/TestBenchFramework/UiControls/PathsMetersCtrl.cs b/TestBenchFramework/UiControls/PathsMetersCtrl.cs index 3bd50cb7d..06a206f63 100644 --- a/TestBenchFramework/UiControls/PathsMetersCtrl.cs +++ b/TestBenchFramework/UiControls/PathsMetersCtrl.cs @@ -44,9 +44,9 @@ namespace TBF.UiControls .CreateQuery("FROM MetersPath ORDER BY ItemNr") .List(); - SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked); - SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked); - SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); + SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked); + SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked); + SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); IList readers = new List(); foreach (var cmpnt in parent.TbfComponents) @@ -85,13 +85,13 @@ namespace TBF.UiControls base.RedrawAll(); } - void listViewEx_SubItemClicked(object sender, SubItemEventArgs e) + void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) { if (!Unlocked || e.SubItem >= editors.Length) return; StartEditing(editors[e.SubItem], e.Item, e.SubItem); } - void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e) + void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) { if (!Unlocked || e.SubItem >= editors.Length) return; @@ -117,7 +117,7 @@ namespace TBF.UiControls } } - void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) + void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) { } diff --git a/TestBenchFramework/UiControls/PathsOutputCtrl.cs b/TestBenchFramework/UiControls/PathsOutputCtrl.cs index 138adfb54..e1e1a5401 100644 --- a/TestBenchFramework/UiControls/PathsOutputCtrl.cs +++ b/TestBenchFramework/UiControls/PathsOutputCtrl.cs @@ -57,9 +57,9 @@ namespace TBF.UiControls .CreateQuery("FROM OutputPath ORDER BY ItemNr") .List(); - SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked); - SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked); - SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); + SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked); + SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked); + SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); /// ListViewEx columns TBF.LocalSettings ls = Program.LocalSettings; @@ -145,7 +145,7 @@ namespace TBF.UiControls base.RedrawAll(); } - void listViewEx_SubItemClicked(object sender, SubItemEventArgs e) + void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) { if (!Unlocked || e.SubItem >= editors.Length) return; if ((e.Item.Tag is IHasItemNr) && @@ -157,7 +157,7 @@ namespace TBF.UiControls StartEditing(editors[e.SubItem], e.Item, e.SubItem); } - void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e) + void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) { if (!Unlocked || e.SubItem >= editors.Length) return; @@ -183,7 +183,7 @@ namespace TBF.UiControls } } - void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) + void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) { if (e.SubItem >= fixedColumnsCount) { diff --git a/TestBenchFramework/UiControls/ProcedureParamsCtrl.Designer.cs b/TestBenchFramework/UiControls/ProcedureParamsCtrl.Designer.cs index e96547ff1..5dfc45d99 100644 --- a/TestBenchFramework/UiControls/ProcedureParamsCtrl.Designer.cs +++ b/TestBenchFramework/UiControls/ProcedureParamsCtrl.Designer.cs @@ -31,7 +31,7 @@ namespace TBF.UiControls /// private void InitializeComponent() { - this.listViewEx = new TBF.UiControls.ListViewEx(); + this.listViewEx = new Results.Forms.ListViewEx(); this.SuspendLayout(); // // listViewEx @@ -60,6 +60,6 @@ namespace TBF.UiControls #endregion - private ListViewEx listViewEx; + private Results.Forms.ListViewEx listViewEx; } } diff --git a/TestBenchFramework/UiControls/ProcedureParamsCtrl.cs b/TestBenchFramework/UiControls/ProcedureParamsCtrl.cs index 77e38cc57..ffd2ad977 100644 --- a/TestBenchFramework/UiControls/ProcedureParamsCtrl.cs +++ b/TestBenchFramework/UiControls/ProcedureParamsCtrl.cs @@ -95,20 +95,20 @@ namespace TBF.UiControls } } - listViewEx.SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked); - listViewEx.SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked); - listViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); + listViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked); + listViewEx.SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked); + listViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); RedrawAll(); } - private void listViewEx_SubItemClicked(object sender, SubItemEventArgs e) + private void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) { if (!unlocked || e.Item.Tag == null || e.SubItem < nrFixedColumns || e.SubItem >= nrFixedColumns + editors.Length) return; listViewEx.StartEditing(editors[e.SubItem - nrFixedColumns], e.Item, e.SubItem); } - void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e) + void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) { if (!unlocked || e.Item.Tag == null || e.SubItem < nrFixedColumns || e.SubItem >= nrFixedColumns + editors.Length) return; @@ -141,7 +141,7 @@ namespace TBF.UiControls } } - private void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) + private void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) { string message; if ((e.Item.Tag as IParamsProvider).ValidateParam(e.SubItem - nrFixedColumns, e.DisplayText, out message)) diff --git a/TestBenchFramework/UiControls/ProceduresCtrl.cs b/TestBenchFramework/UiControls/ProceduresCtrl.cs index f935e707a..d8078f348 100644 --- a/TestBenchFramework/UiControls/ProceduresCtrl.cs +++ b/TestBenchFramework/UiControls/ProceduresCtrl.cs @@ -47,8 +47,8 @@ namespace TBF.UiControls this.parent = parent; this.parentControl = parentControl; - SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked); - SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); + SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked); + SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); /// ListViewEx columns TBF.LocalSettings ls = Program.LocalSettings; @@ -82,11 +82,11 @@ namespace TBF.UiControls base.RedrawAll(); } - void listViewEx_SubItemClicked(object sender, SubItemEventArgs e) + void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) { } - void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) + void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) { } diff --git a/TestBenchFramework/UiControls/TestParamsCtrl.Designer.cs b/TestBenchFramework/UiControls/TestParamsCtrl.Designer.cs index 719896b4d..3624dae93 100644 --- a/TestBenchFramework/UiControls/TestParamsCtrl.Designer.cs +++ b/TestBenchFramework/UiControls/TestParamsCtrl.Designer.cs @@ -31,7 +31,7 @@ namespace TBF.UiControls /// private void InitializeComponent() { - this.listViewEx = new TBF.UiControls.ListViewEx(); + this.listViewEx = new Results.Forms.ListViewEx(); this.SuspendLayout(); // // listViewEx @@ -60,6 +60,6 @@ namespace TBF.UiControls #endregion - private ListViewEx listViewEx; + private Results.Forms.ListViewEx listViewEx; } } diff --git a/TestBenchFramework/UiControls/TestParamsCtrl.cs b/TestBenchFramework/UiControls/TestParamsCtrl.cs index ec263e8f3..1d6e8df0f 100644 --- a/TestBenchFramework/UiControls/TestParamsCtrl.cs +++ b/TestBenchFramework/UiControls/TestParamsCtrl.cs @@ -99,14 +99,14 @@ namespace TBF.UiControls } } - listViewEx.SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked); - listViewEx.SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked); - listViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); + listViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked); + listViewEx.SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked); + listViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); RedrawAll(); } - private void listViewEx_SubItemClicked(object sender, SubItemEventArgs e) + private void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) { int itemNr = showTestsColumn ? (e.SubItem - 1) : e.SubItem; if (!unlocked || e.Item.Tag == null || itemNr >= editors.Length || itemNr < 0) return; @@ -114,7 +114,7 @@ namespace TBF.UiControls listViewEx.StartEditing(editors[itemNr], e.Item, e.SubItem); } - void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e) + void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) { int itemNr = showTestsColumn ? (e.SubItem - 1) : e.SubItem; if (!unlocked || e.Item.Tag == null || itemNr >= editors.Length || itemNr < 0) return; @@ -147,7 +147,7 @@ namespace TBF.UiControls } } - private void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) + private void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) { string message; int itemNr = showTestsColumn ? (e.SubItem - 1) : e.SubItem; diff --git a/TestBenchFramework/UiControls/TransitionStepsCtrl.cs b/TestBenchFramework/UiControls/TransitionStepsCtrl.cs index b7ca82db0..2b602e479 100644 --- a/TestBenchFramework/UiControls/TransitionStepsCtrl.cs +++ b/TestBenchFramework/UiControls/TransitionStepsCtrl.cs @@ -51,9 +51,9 @@ namespace TBF.UiControls Name = sequence.Name; MyItems = sequence.TransitionSteps; - SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked); - SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked); - SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); + SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked); + SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked); + SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); vCount = 0; fmPumpCount = 0; @@ -163,13 +163,13 @@ namespace TBF.UiControls base.RedrawAll(); } - void listViewEx_SubItemClicked(object sender, SubItemEventArgs e) + void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) { if (!Unlocked || e.SubItem >= editors.Length) return; StartEditing(editors[e.SubItem], e.Item, e.SubItem); } - void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e) + void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) { if (!Unlocked || e.SubItem >= editors.Length) return; @@ -195,7 +195,7 @@ namespace TBF.UiControls } } - void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) + void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) { if (e.SubItem == (int)Column.Duration) { diff --git a/TestBenchFramework/UiControls/VirtualBenchStepsCtrl.cs b/TestBenchFramework/UiControls/VirtualBenchStepsCtrl.cs index 8effa1a35..0310fdf2d 100644 --- a/TestBenchFramework/UiControls/VirtualBenchStepsCtrl.cs +++ b/TestBenchFramework/UiControls/VirtualBenchStepsCtrl.cs @@ -49,9 +49,9 @@ namespace TBF.UiControls Name = sequence.Name; MyItems = sequence.VirtualBenchSteps; - SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked); - SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked); - SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); + SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked); + SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked); + SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); vCount = 0; fmPumpCount = 0; @@ -131,13 +131,13 @@ namespace TBF.UiControls base.RedrawAll(); } - void listViewEx_SubItemClicked(object sender, SubItemEventArgs e) + void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) { if (!Unlocked || e.SubItem >= editors.Length) return; StartEditing(editors[e.SubItem], e.Item, e.SubItem); } - void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e) + void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) { if (!Unlocked || e.SubItem >= editors.Length) return; @@ -163,7 +163,7 @@ namespace TBF.UiControls } } - void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) + void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) { if (e.SubItem == (int)Column.Duration) {