From a4a583c41a0b69e0477e3dbe29d53df3b7e97a6e Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Sun, 23 Jan 2022 13:58:54 +0100 Subject: [PATCH] Everything uses Common.Forms.ListViewEx, other LIstViewEx-es removed. --- Common/Common.csproj | 15 +- Common/UIControls/ListViewEx.cs | 486 ------------------ Common/UIControls/ListViewEx.resx | 42 -- Common/UIControls/ListViewExtensions.cs | 107 ---- .../UIControls/LviDateTimeColumnComparer.cs | 46 -- Common/UIControls/LviIntColumnComparer.cs | 34 -- Common/UIControls/LviTextColumnComparer.cs | 34 -- EventViewer/EventViewerWnd.Designer.cs | 4 +- EventViewer/EventViewerWnd.cs | 8 +- Results/Forms/ListViewEx.cs | 486 ------------------ Results/Forms/ListViewEx.resx | 42 -- Results/Forms/ListViewExtensions.cs | 104 ---- Results/Forms/LviIntColumnComparer.cs | 31 -- Results/Forms/LviTextColumnComparer.cs | 31 -- .../Forms/ManualEntryConfigCtrl.Designer.cs | 4 +- Results/Forms/ManualEntryConfigCtrl.cs | 1 + Results/Forms/ResultsConfigCtrl.Designer.cs | 4 +- Results/Forms/ResultsConfigCtrl.cs | 1 + Results/Results.csproj | 9 - .../ParamsProvider/ComponentCfgCtrl.cs | 9 +- .../ComponentCfgCtrl.designer.cs | 8 +- TBF/Rig/TestMethods/Endurance/CycleDlg.cs | 7 +- .../TestMethods/Endurance/CycleStepsCtrl.cs | 13 +- TBF/TBF.csproj | 4 +- .../ComponentsManagerDlg.Designer.cs | 6 +- .../Bench/Components/ComponentsManagerDlg.cs | 8 +- .../MetrologyDlgBalanceTab.Designer.cs | 4 +- .../Bench/Metrology/MetrologyDlgBalanceTab.cs | 2 +- .../MetrologyDlgDiverterTab.Designer.cs | 4 +- .../Metrology/MetrologyDlgDiverterTab.cs | 2 +- .../MetrologyDlgEvaporationTab.Designer.cs | 4 +- .../Metrology/MetrologyDlgEvaporationTab.cs | 2 +- .../MetrologyDlgFlowMeterTab.Designer.cs | 4 +- .../Metrology/MetrologyDlgFlowMeterTab.cs | 2 +- .../MetrologyDlgLevelMeterTab.Designer.cs | 4 +- .../Metrology/MetrologyDlgLevelMeterTab.cs | 2 +- .../MetrologyDlgPressMeterTab.Designer.cs | 4 +- .../Metrology/MetrologyDlgPressMeterTab.cs | 2 +- .../MetrologyDlgTempMeterTab.Designer.cs | 4 +- .../Metrology/MetrologyDlgTempMeterTab.cs | 2 +- TBF/UI/Bench/Paths/PathsBenchCtrl.cs | 2 +- TBF/UI/Bench/Paths/PathsDlg.cs | 2 +- TBF/UI/Bench/Paths/PathsFeedingCtrl.cs | 2 +- TBF/UI/Bench/Paths/PathsHeatMetersCtrl.cs | 2 +- TBF/UI/Bench/Paths/PathsMetersCtrl.cs | 2 +- TBF/UI/Bench/Paths/PathsOutputCtrl.cs | 2 +- TBF/UI/Bench/TestProfiles/TestProfileDlg.cs | 2 +- .../TestProfiles/TestProfileDlg.designer.cs | 12 +- TBF/UI/Bench/TestProfiles/TestProfilesCtrl.cs | 2 +- TBF/UI/Bench/TestProfiles/TestProfilesDlg.cs | 3 +- .../Bench/Transitions/TransitionStepsCtrl.cs | 2 +- TBF/UI/Bench/Transitions/TransitionsDlg.cs | 2 +- .../Transitions/VirtualBenchStepsCtrl.cs | 2 +- .../Uncertainties/UncertntDlgDensityTab.cs | 2 +- .../UncertntDlgDensityTab.designer.cs | 4 +- .../Uncertainties/UncertntDlgPressMeterTab.cs | 2 +- .../UncertntDlgPressMeterTab.designer.cs | 4 +- .../Uncertainties/UncertntDlgScaleTab.cs | 2 +- .../UncertntDlgScaleTab.designer.cs | 4 +- .../Uncertainties/UncertntDlgTempMeterTab.cs | 2 +- .../UncertntDlgTempMeterTab.designer.cs | 4 +- .../Calendar/CalendarTabPageCtrl.designer.cs | 4 +- TBF/UI/EventLogs/EventLogsTabPageCtrl.cs | 9 +- .../EventLogsTabPageCtrl.designer.cs | 4 +- TBF/UI/Procedures/ProcedureDlg.Designer.cs | 20 +- TBF/UI/Procedures/ProcedureDlg.cs | 2 +- .../ProcedureParamsCtrl.Designer.cs | 4 +- TBF/UI/Procedures/ProcedureParamsCtrl.cs | 2 +- .../ProcedureParamsMixedCtrl.Designer.cs | 4 +- TBF/UI/Procedures/ProcedureParamsMixedCtrl.cs | 2 +- TBF/UI/Procedures/ProceduresCtrl.Designer.cs | 4 +- TBF/UI/Procedures/ProceduresDlg.cs | 3 +- TBF/UI/Procedures/TestParamsCtrl.Designer.cs | 4 +- TBF/UI/Procedures/TestParamsCtrl.cs | 2 +- .../OracleWZTypSelection.Designer.cs | 8 +- .../TestWizard/OracleWZTypSelection.cs | 5 +- TBF/UI/ResultsMI/ResultsTabPageCtrl.cs | 1 + TBF/UI/Shared/BaseWithListViewEx.cs | 2 +- TracingDB/Forms/ListViewEx.cs | 466 ----------------- TracingDB/Forms/ListViewEx.resx | 42 -- TracingDB/Forms/ListViewExtensions.cs | 104 ---- TracingDB/Forms/LviIntColumnComparer.cs | 31 -- TracingDB/Forms/LviTextColumnComparer.cs | 31 -- TracingDB/Forms/ResultsConfigDlg.cs | 1 + TracingDB/Forms/ResultsConfigDlg.designer.cs | 8 +- TracingDB/TracingDB.csproj | 15 +- Users/Forms/ListViewExtensions.cs | 104 ---- Users/Forms/LviIntColumnComparer.cs | 32 -- Users/Forms/LviNameSurnameColumnComparer.cs | 55 -- Users/Forms/LviTextColumnComparer.cs | 32 -- Users/Forms/UserManagementDlg.cs | 1 + Users/Forms/UserManagementDlg.designer.cs | 4 +- Users/Users.csproj | 4 - 93 files changed, 154 insertions(+), 2503 deletions(-) delete mode 100644 Common/UIControls/ListViewEx.cs delete mode 100644 Common/UIControls/ListViewEx.resx delete mode 100644 Common/UIControls/ListViewExtensions.cs delete mode 100644 Common/UIControls/LviDateTimeColumnComparer.cs delete mode 100644 Common/UIControls/LviIntColumnComparer.cs delete mode 100644 Common/UIControls/LviTextColumnComparer.cs delete mode 100644 Results/Forms/ListViewEx.cs delete mode 100644 Results/Forms/ListViewEx.resx delete mode 100644 Results/Forms/ListViewExtensions.cs delete mode 100644 Results/Forms/LviIntColumnComparer.cs delete mode 100644 Results/Forms/LviTextColumnComparer.cs delete mode 100644 TracingDB/Forms/ListViewEx.cs delete mode 100644 TracingDB/Forms/ListViewEx.resx delete mode 100644 TracingDB/Forms/ListViewExtensions.cs delete mode 100644 TracingDB/Forms/LviIntColumnComparer.cs delete mode 100644 TracingDB/Forms/LviTextColumnComparer.cs delete mode 100644 Users/Forms/ListViewExtensions.cs delete mode 100644 Users/Forms/LviIntColumnComparer.cs delete mode 100644 Users/Forms/LviNameSurnameColumnComparer.cs delete mode 100644 Users/Forms/LviTextColumnComparer.cs diff --git a/Common/Common.csproj b/Common/Common.csproj index 62a509876..213b79628 100644 --- a/Common/Common.csproj +++ b/Common/Common.csproj @@ -43,14 +43,18 @@ - + + Component + - + + Form + ModelessForm.cs @@ -63,16 +67,9 @@ CoolButtonCtrl.cs - - - Component - - - - diff --git a/Common/UIControls/ListViewEx.cs b/Common/UIControls/ListViewEx.cs deleted file mode 100644 index 01b68166d..000000000 --- a/Common/UIControls/ListViewEx.cs +++ /dev/null @@ -1,486 +0,0 @@ -/// -/// Copyright (c) 2013-2020 Sensus Slovensko a.s. -/// -using System; -using System.Collections; -using System.ComponentModel; -using System.Drawing; -using System.Data; -using System.Windows.Forms; -using System.Runtime.InteropServices; - -namespace Common.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/Common/UIControls/ListViewEx.resx b/Common/UIControls/ListViewEx.resx deleted file mode 100644 index 7e323966c..000000000 --- a/Common/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/Common/UIControls/ListViewExtensions.cs b/Common/UIControls/ListViewExtensions.cs deleted file mode 100644 index acb5c1ce0..000000000 --- a/Common/UIControls/ListViewExtensions.cs +++ /dev/null @@ -1,107 +0,0 @@ -/// -/// Copyright (c) 2019-2020 Sensus Slovensko a.s. -/// -using System; -using System.ComponentModel; -using System.Runtime.InteropServices; -using System.Windows.Forms; - -namespace Common.UIControls -{ - [EditorBrowsable(EditorBrowsableState.Never)] - public static class ListViewExtensions - { - [StructLayout(LayoutKind.Sequential)] - public struct HDITEM - { - public Mask mask; - public int cxy; - [MarshalAs(UnmanagedType.LPTStr)] - public string pszText; - public IntPtr hbm; - public int cchTextMax; - public Format fmt; - public IntPtr lParam; - // _WIN32_IE >= 0x0300 - public int iImage; - public int iOrder; - // _WIN32_IE >= 0x0500 - public uint type; - public IntPtr pvFilter; - // _WIN32_WINNT >= 0x0600 - public uint state; - - [Flags] - public enum Mask - { - Format = 0x4, // HDI_FORMAT - }; - - [Flags] - public enum Format - { - SortDown = 0x200, // HDF_SORTDOWN - SortUp = 0x400, // HDF_SORTUP - }; - }; - - public const int LVM_FIRST = 0x1000; - public const int LVM_GETHEADER = LVM_FIRST + 31; - - public const int HDM_FIRST = 0x1200; - public const int HDM_GETITEM = HDM_FIRST + 11; - public const int HDM_SETITEM = HDM_FIRST + 12; - - [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)] - public static extern IntPtr SendMessage(IntPtr hWnd, UInt32 msg, IntPtr wParam, IntPtr lParam); - - [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)] - public static extern IntPtr SendMessage(IntPtr hWnd, UInt32 msg, IntPtr wParam, ref HDITEM lParam); - - public static void SetSortIcon(this ListViewEx listViewControl, int columnIndex, SortOrder order) - { - IntPtr columnHeader = SendMessage(listViewControl.Handle, LVM_GETHEADER, IntPtr.Zero, IntPtr.Zero); - for (int columnNumber = 0; columnNumber <= listViewControl.Columns.Count - 1; columnNumber++) - { - var columnPtr = new IntPtr(columnNumber); - var item = new HDITEM - { - mask = HDITEM.Mask.Format - }; - - if (SendMessage(columnHeader, HDM_GETITEM, columnPtr, ref item) == IntPtr.Zero) - { - throw new Win32Exception(); - } - - if (order != SortOrder.None && columnNumber == columnIndex) - { - switch (order) - { - case SortOrder.Ascending: - item.fmt &= ~HDITEM.Format.SortDown; - item.fmt |= HDITEM.Format.SortUp; - break; - - case SortOrder.Descending: - item.fmt &= ~HDITEM.Format.SortUp; - item.fmt |= HDITEM.Format.SortDown; - break; - - default: - break; - } - } - else - { - item.fmt &= ~HDITEM.Format.SortDown & ~HDITEM.Format.SortUp; - } - - if (SendMessage(columnHeader, HDM_SETITEM, columnPtr, ref item) == IntPtr.Zero) - { - throw new Win32Exception(); - } - } - } - } -} diff --git a/Common/UIControls/LviDateTimeColumnComparer.cs b/Common/UIControls/LviDateTimeColumnComparer.cs deleted file mode 100644 index a9a78324a..000000000 --- a/Common/UIControls/LviDateTimeColumnComparer.cs +++ /dev/null @@ -1,46 +0,0 @@ -/// -/// Copyright (c) 2019-2020 Sensus Slovensko a.s. -/// -using System; -using System.Collections; -using System.Windows.Forms; - -namespace Common.UIControls -{ - public class LviDateTimeColumnComparer : IComparer - { - int column; - SortOrder order; - - public LviDateTimeColumnComparer() - { - column = 0; - order = SortOrder.Ascending; - } - - public LviDateTimeColumnComparer(int column, SortOrder order) - { - this.column = column; - this.order = order; - } - - public int Compare(object x, object y) - { - DateTime valX = DateTime.Parse(((ListViewItem)x).SubItems[column].Text); - DateTime valY = DateTime.Parse(((ListViewItem)y).SubItems[column].Text); - - if (valX == valY) - { - return 0; - } - else if (order == SortOrder.Ascending) - { - return (valX > valY) ? 1 : -1; - } - else - { - return (valY > valX) ? 1 : -1; - } - } - } -} diff --git a/Common/UIControls/LviIntColumnComparer.cs b/Common/UIControls/LviIntColumnComparer.cs deleted file mode 100644 index 15efb4194..000000000 --- a/Common/UIControls/LviIntColumnComparer.cs +++ /dev/null @@ -1,34 +0,0 @@ -/// -/// Copyright (c) 2019-2020 Sensus Slovensko a.s. -/// -using System; -using System.Collections; -using System.Windows.Forms; - -namespace Common.UIControls -{ - public class LviIntColumnComparer : IComparer - { - int column; - SortOrder order; - - public LviIntColumnComparer() - { - column = 0; - order = SortOrder.Ascending; - } - - public LviIntColumnComparer(int column, SortOrder order) - { - this.column = column; - this.order = order; - } - - public int Compare(object x, object y) - { - int valX = int.Parse(((ListViewItem)x).SubItems[column].Text); - int valY = int.Parse(((ListViewItem)y).SubItems[column].Text); - return (order == SortOrder.Descending) ? (valY - valX) : (valX - valY); - } - } -} diff --git a/Common/UIControls/LviTextColumnComparer.cs b/Common/UIControls/LviTextColumnComparer.cs deleted file mode 100644 index 7f3118129..000000000 --- a/Common/UIControls/LviTextColumnComparer.cs +++ /dev/null @@ -1,34 +0,0 @@ -/// -/// Copyright (c) 2019-2020 Sensus Slovensko a.s. -/// -using System; -using System.Collections; -using System.Windows.Forms; - -namespace Common.UIControls -{ - public class LviTextColumnComparer : IComparer - { - private int column; - SortOrder order; - - public LviTextColumnComparer() - { - column = 0; - order = SortOrder.Ascending; - } - - public LviTextColumnComparer(int column, SortOrder order) - { - this.column = column; - this.order = order; - } - - public int Compare(object x, object y) - { - string txtX = ((ListViewItem)x).SubItems[column].Text; - string txtY = ((ListViewItem)y).SubItems[column].Text; - return (order == SortOrder.Descending) ? String.Compare(txtY, txtX) : String.Compare(txtX, txtY); - } - } -} diff --git a/EventViewer/EventViewerWnd.Designer.cs b/EventViewer/EventViewerWnd.Designer.cs index 6cec6793f..619cd4278 100644 --- a/EventViewer/EventViewerWnd.Designer.cs +++ b/EventViewer/EventViewerWnd.Designer.cs @@ -35,7 +35,7 @@ this.unreadEventsRadioButton = new System.Windows.Forms.RadioButton(); this.allEventsRadioButton = new System.Windows.Forms.RadioButton(); this.settingsButton = new System.Windows.Forms.Button(); - this.eventsListView = new Common.UIControls.ListViewEx(); + this.eventsListView = new Common.Forms.ListViewEx(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -176,7 +176,7 @@ private System.Windows.Forms.SplitContainer splitContainer1; private System.Windows.Forms.Button settingsButton; - private Common.UIControls.ListViewEx eventsListView; + private Common.Forms.ListViewEx eventsListView; private System.Windows.Forms.GroupBox eventsSelectionGroupBox; private System.Windows.Forms.RadioButton unreadEventsRadioButton; private System.Windows.Forms.RadioButton allEventsRadioButton; diff --git a/EventViewer/EventViewerWnd.cs b/EventViewer/EventViewerWnd.cs index 4a354d8f7..511625c3d 100644 --- a/EventViewer/EventViewerWnd.cs +++ b/EventViewer/EventViewerWnd.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Windows.Forms; using NHibernate; using Common; -using Common.UIControls; +using Common.Forms; using Events; using Events.Entities; using EventViewer.Resources; @@ -33,7 +33,7 @@ namespace EventViewer ISession session; IList subscribers; IList events; - SortOrder sortOrder = SortOrder.Ascending; + MySortOrder sortOrder = MySortOrder.Ascending; int sortColumn = -1; /// 0-based index of column to be used for sorting EViewerOption eViewerOption; @@ -222,13 +222,13 @@ namespace EventViewer { if (e.Column == sortColumn) { - sortOrder = (sortOrder == SortOrder.Ascending) ? SortOrder.Descending : SortOrder.Ascending; + sortOrder = (sortOrder == MySortOrder.Ascending) ? MySortOrder.Descending : MySortOrder.Ascending; } else { /// Clicked on another column header => set sortOrder to SortOrder.Ascending sortColumn = e.Column; - sortOrder = SortOrder.Ascending; + sortOrder = MySortOrder.Ascending; } switch ((Column)sortColumn) diff --git a/Results/Forms/ListViewEx.cs b/Results/Forms/ListViewEx.cs deleted file mode 100644 index cd28a2144..000000000 --- a/Results/Forms/ListViewEx.cs +++ /dev/null @@ -1,486 +0,0 @@ -/// -/// Copyright (c) 2013-2016 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 Results.Forms -{ - /// - /// 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/Results/Forms/ListViewEx.resx b/Results/Forms/ListViewEx.resx deleted file mode 100644 index 7e323966c..000000000 --- a/Results/Forms/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/Results/Forms/ListViewExtensions.cs b/Results/Forms/ListViewExtensions.cs deleted file mode 100644 index 426d3f07f..000000000 --- a/Results/Forms/ListViewExtensions.cs +++ /dev/null @@ -1,104 +0,0 @@ -using System; -using System.ComponentModel; -using System.Runtime.InteropServices; -using System.Windows.Forms; - -namespace Results.Forms -{ - [EditorBrowsable(EditorBrowsableState.Never)] - public static class ListViewExtensions - { - [StructLayout(LayoutKind.Sequential)] - public struct HDITEM - { - public Mask mask; - public int cxy; - [MarshalAs(UnmanagedType.LPTStr)] - public string pszText; - public IntPtr hbm; - public int cchTextMax; - public Format fmt; - public IntPtr lParam; - // _WIN32_IE >= 0x0300 - public int iImage; - public int iOrder; - // _WIN32_IE >= 0x0500 - public uint type; - public IntPtr pvFilter; - // _WIN32_WINNT >= 0x0600 - public uint state; - - [Flags] - public enum Mask - { - Format = 0x4, // HDI_FORMAT - }; - - [Flags] - public enum Format - { - SortDown = 0x200, // HDF_SORTDOWN - SortUp = 0x400, // HDF_SORTUP - }; - }; - - public const int LVM_FIRST = 0x1000; - public const int LVM_GETHEADER = LVM_FIRST + 31; - - public const int HDM_FIRST = 0x1200; - public const int HDM_GETITEM = HDM_FIRST + 11; - public const int HDM_SETITEM = HDM_FIRST + 12; - - [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)] - public static extern IntPtr SendMessage(IntPtr hWnd, UInt32 msg, IntPtr wParam, IntPtr lParam); - - [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)] - public static extern IntPtr SendMessage(IntPtr hWnd, UInt32 msg, IntPtr wParam, ref HDITEM lParam); - - public static void SetSortIcon(this ListViewEx listViewControl, int columnIndex, SortOrder order) - { - IntPtr columnHeader = SendMessage(listViewControl.Handle, LVM_GETHEADER, IntPtr.Zero, IntPtr.Zero); - for (int columnNumber = 0; columnNumber <= listViewControl.Columns.Count - 1; columnNumber++) - { - var columnPtr = new IntPtr(columnNumber); - var item = new HDITEM - { - mask = HDITEM.Mask.Format - }; - - if (SendMessage(columnHeader, HDM_GETITEM, columnPtr, ref item) == IntPtr.Zero) - { - throw new Win32Exception(); - } - - if (order != SortOrder.None && columnNumber == columnIndex) - { - switch (order) - { - case SortOrder.Ascending: - item.fmt &= ~HDITEM.Format.SortDown; - item.fmt |= HDITEM.Format.SortUp; - break; - - case SortOrder.Descending: - item.fmt &= ~HDITEM.Format.SortUp; - item.fmt |= HDITEM.Format.SortDown; - break; - - default: - break; - } - } - else - { - item.fmt &= ~HDITEM.Format.SortDown & ~HDITEM.Format.SortUp; - } - - if (SendMessage(columnHeader, HDM_SETITEM, columnPtr, ref item) == IntPtr.Zero) - { - throw new Win32Exception(); - } - } - } - } -} diff --git a/Results/Forms/LviIntColumnComparer.cs b/Results/Forms/LviIntColumnComparer.cs deleted file mode 100644 index d9343e87d..000000000 --- a/Results/Forms/LviIntColumnComparer.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Collections; -using System.Windows.Forms; - -namespace Results.Forms -{ - public class LviIntColumnComparer : IComparer - { - int column; - SortOrder order; - - public LviIntColumnComparer() - { - column = 0; - order = SortOrder.Ascending; - } - - public LviIntColumnComparer(int column, SortOrder order) - { - this.column = column; - this.order = order; - } - - public int Compare(object x, object y) - { - int valX = int.Parse(((ListViewItem)x).SubItems[column].Text); - int valY = int.Parse(((ListViewItem)y).SubItems[column].Text); - return (order == SortOrder.Descending) ? (valY - valX) : (valX - valY); - } - } -} diff --git a/Results/Forms/LviTextColumnComparer.cs b/Results/Forms/LviTextColumnComparer.cs deleted file mode 100644 index 884c0d1b3..000000000 --- a/Results/Forms/LviTextColumnComparer.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Collections; -using System.Windows.Forms; - -namespace Results.Forms -{ - public class LviTextColumnComparer : IComparer - { - private int column; - SortOrder order; - - public LviTextColumnComparer() - { - column = 0; - order = SortOrder.Ascending; - } - - public LviTextColumnComparer(int column, SortOrder order) - { - this.column = column; - this.order = order; - } - - public int Compare(object x, object y) - { - string txtX = ((ListViewItem)x).SubItems[column].Text; - string txtY = ((ListViewItem)y).SubItems[column].Text; - return (order == SortOrder.Descending) ? String.Compare(txtY, txtX) : String.Compare(txtX, txtY); - } - } -} diff --git a/Results/Forms/ManualEntryConfigCtrl.Designer.cs b/Results/Forms/ManualEntryConfigCtrl.Designer.cs index c13797079..6a88c515f 100644 --- a/Results/Forms/ManualEntryConfigCtrl.Designer.cs +++ b/Results/Forms/ManualEntryConfigCtrl.Designer.cs @@ -37,7 +37,7 @@ this.availableAlphabeticTreeView = new System.Windows.Forms.TreeView(); this.downButton = new System.Windows.Forms.Button(); this.upButton = new System.Windows.Forms.Button(); - this.selectedResultsListViewEx = new Results.Forms.ListViewEx(); + this.selectedResultsListViewEx = new Common.Forms.ListViewEx(); this.removeAllButton = new System.Windows.Forms.Button(); this.removeButton = new System.Windows.Forms.Button(); this.addButton = new System.Windows.Forms.Button(); @@ -247,7 +247,7 @@ private System.Windows.Forms.TreeView availableAlphabeticTreeView; private System.Windows.Forms.Button downButton; private System.Windows.Forms.Button upButton; - private ListViewEx selectedResultsListViewEx; + private Common.Forms.ListViewEx selectedResultsListViewEx; private System.Windows.Forms.Button removeAllButton; private System.Windows.Forms.Button removeButton; private System.Windows.Forms.Button addButton; diff --git a/Results/Forms/ManualEntryConfigCtrl.cs b/Results/Forms/ManualEntryConfigCtrl.cs index 246b94791..d6e9aa83e 100644 --- a/Results/Forms/ManualEntryConfigCtrl.cs +++ b/Results/Forms/ManualEntryConfigCtrl.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Windows.Forms; using Common; +using Common.Forms; using Config.Entities; using Results.Resources; diff --git a/Results/Forms/ResultsConfigCtrl.Designer.cs b/Results/Forms/ResultsConfigCtrl.Designer.cs index e14460d7f..b8a98cd06 100644 --- a/Results/Forms/ResultsConfigCtrl.Designer.cs +++ b/Results/Forms/ResultsConfigCtrl.Designer.cs @@ -37,7 +37,7 @@ this.availableAlphabeticTreeView = new System.Windows.Forms.TreeView(); this.downButton = new System.Windows.Forms.Button(); this.upButton = new System.Windows.Forms.Button(); - this.selectedResultsListViewEx = new Results.Forms.ListViewEx(); + this.selectedResultsListViewEx = new Common.Forms.ListViewEx(); this.removeAllButton = new System.Windows.Forms.Button(); this.removeButton = new System.Windows.Forms.Button(); this.addButton = new System.Windows.Forms.Button(); @@ -247,7 +247,7 @@ private System.Windows.Forms.TreeView availableAlphabeticTreeView; private System.Windows.Forms.Button downButton; private System.Windows.Forms.Button upButton; - private ListViewEx selectedResultsListViewEx; + private Common.Forms.ListViewEx selectedResultsListViewEx; private System.Windows.Forms.Button removeAllButton; private System.Windows.Forms.Button removeButton; private System.Windows.Forms.Button addButton; diff --git a/Results/Forms/ResultsConfigCtrl.cs b/Results/Forms/ResultsConfigCtrl.cs index df68dd2f0..e565dce59 100644 --- a/Results/Forms/ResultsConfigCtrl.cs +++ b/Results/Forms/ResultsConfigCtrl.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Windows.Forms; using Common; +using Common.Forms; using Results.Resources; namespace Results.Forms diff --git a/Results/Results.csproj b/Results/Results.csproj index d8be5008b..8507ae71e 100644 --- a/Results/Results.csproj +++ b/Results/Results.csproj @@ -82,12 +82,6 @@ BatchResultsDlg.cs - - Component - - - - UserControl @@ -225,9 +219,6 @@ BatchResultsDlg.cs - - ListViewEx.cs - ManualEntryConfigCtrl.cs diff --git a/TBF/Rig/Configs/ParamsProvider/ComponentCfgCtrl.cs b/TBF/Rig/Configs/ParamsProvider/ComponentCfgCtrl.cs index f441a0441..1c721589e 100644 --- a/TBF/Rig/Configs/ParamsProvider/ComponentCfgCtrl.cs +++ b/TBF/Rig/Configs/ParamsProvider/ComponentCfgCtrl.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Windows.Forms; using log4net; using Common; +using Common.Forms; using Config.Entities; using TBF.Rig.Generic; using TBF.Resources; @@ -80,8 +81,8 @@ namespace TBF.Rig.Configs.ParamsProvider flags = CfgUpdateFlags.None; - paramsListViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(paramsListViewEx_SubItemClicked); - paramsListViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(paramsListViewEx_SubItemEndEditing); + paramsListViewEx.SubItemClicked += new SubItemEventHandler(paramsListViewEx_SubItemClicked); + paramsListViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(paramsListViewEx_SubItemEndEditing); } void Localize() @@ -172,14 +173,14 @@ namespace TBF.Rig.Configs.ParamsProvider return f; } - private void paramsListViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) + private void paramsListViewEx_SubItemClicked(object sender, SubItemEventArgs e) { if (e.SubItem != 1) return; int itemNr = (int)e.Item.Tag; paramsListViewEx.StartEditing(editors[itemNr], e.Item, e.SubItem); } - private void paramsListViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) + private void paramsListViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) { if (e.SubItem != 1) return; int itemNr = (int)e.Item.Tag; diff --git a/TBF/Rig/Configs/ParamsProvider/ComponentCfgCtrl.designer.cs b/TBF/Rig/Configs/ParamsProvider/ComponentCfgCtrl.designer.cs index 923fa92d1..fad3d6e40 100644 --- a/TBF/Rig/Configs/ParamsProvider/ComponentCfgCtrl.designer.cs +++ b/TBF/Rig/Configs/ParamsProvider/ComponentCfgCtrl.designer.cs @@ -38,7 +38,7 @@ namespace TBF.Rig.Configs.ParamsProvider this.parentLabel = new System.Windows.Forms.Label(); this.componentClassLabel = new System.Windows.Forms.Label(); this.componentClassTextBox = new System.Windows.Forms.TextBox(); - this.paramsListViewEx = new Results.Forms.ListViewEx(); + this.paramsListViewEx = new Common.Forms.ListViewEx(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -137,8 +137,8 @@ namespace TBF.Rig.Configs.ParamsProvider this.paramsListViewEx.TabIndex = 0; this.paramsListViewEx.UseCompatibleStateImageBehavior = false; this.paramsListViewEx.View = System.Windows.Forms.View.Details; - this.paramsListViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(this.paramsListViewEx_SubItemClicked); - this.paramsListViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(this.paramsListViewEx_SubItemEndEditing); + this.paramsListViewEx.SubItemClicked += new Common.Forms.SubItemEventHandler(this.paramsListViewEx_SubItemClicked); + this.paramsListViewEx.SubItemEndEditing += new Common.Forms.SubItemEndEditingEventHandler(this.paramsListViewEx_SubItemEndEditing); // // ComponentCfgCtrl // @@ -166,6 +166,6 @@ namespace TBF.Rig.Configs.ParamsProvider private System.Windows.Forms.Label parentLabel; private System.Windows.Forms.Label componentClassLabel; private System.Windows.Forms.TextBox componentClassTextBox; - private Results.Forms.ListViewEx paramsListViewEx; + private Common.Forms.ListViewEx paramsListViewEx; } } diff --git a/TBF/Rig/TestMethods/Endurance/CycleDlg.cs b/TBF/Rig/TestMethods/Endurance/CycleDlg.cs index ae0d90f64..1baeda58d 100644 --- a/TBF/Rig/TestMethods/Endurance/CycleDlg.cs +++ b/TBF/Rig/TestMethods/Endurance/CycleDlg.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.Windows.Forms; using log4net; +using Common.Forms; using TBF.Rig.GenericDevices; using TBF.Resources; using TBF.UI.Shared; @@ -115,7 +116,7 @@ namespace TBF.Rig.TestMethods.Endurance void RefreshAllTabs() { - if (seqStepsCtrl != null) (seqStepsCtrl as Results.Forms.ListViewEx).Refresh(); + if (seqStepsCtrl != null) (seqStepsCtrl as ListViewEx).Refresh(); } private void Unlocked(object sender, EventArgs e) @@ -237,8 +238,8 @@ namespace TBF.Rig.TestMethods.Endurance /// void SelectedIndexChanged(object sender, EventArgs e) { - Results.Forms.ListViewEx listViewEx = sender as Results.Forms.ListViewEx; - if (listViewEx.SelectedItems.Count != 1) + var listViewEx = sender as ListViewEx; + if (listViewEx.SelectedItems.Count != 1) { UpdateButtonStates(SharedButtons.SelectedItemPos.None); } diff --git a/TBF/Rig/TestMethods/Endurance/CycleStepsCtrl.cs b/TBF/Rig/TestMethods/Endurance/CycleStepsCtrl.cs index 60f348083..d1039f6b6 100644 --- a/TBF/Rig/TestMethods/Endurance/CycleStepsCtrl.cs +++ b/TBF/Rig/TestMethods/Endurance/CycleStepsCtrl.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Drawing; using System.Windows.Forms; using log4net; +using Common.Forms; using TBF.Rig.GenericDevices; using TBF.Resources; using TBF.UI.Shared; @@ -47,9 +48,9 @@ namespace TBF.Rig.TestMethods.Endurance Name = "Dummy"; MyItems = sequence; - SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked); - SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked); - SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); + SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked); + SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked); + SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); /// @@ -97,14 +98,14 @@ namespace TBF.Rig.TestMethods.Endurance } - void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) + void listViewEx_SubItemClicked(object sender, SubItemEventArgs e) { if (!Unlocked || e.SubItem >= editors.Length) return; StartEditing(editors[e.SubItem], e.Item, e.SubItem); } - void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) + void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e) { if (!Unlocked || e.SubItem >= editors.Length) return; @@ -131,7 +132,7 @@ namespace TBF.Rig.TestMethods.Endurance } - void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) + void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) { if (e.SubItem == (int)Column.Duration) { diff --git a/TBF/TBF.csproj b/TBF/TBF.csproj index c7029f696..58556edfe 100644 --- a/TBF/TBF.csproj +++ b/TBF/TBF.csproj @@ -2291,9 +2291,7 @@ Component - - Component - + Component diff --git a/TBF/UI/Bench/Components/ComponentsManagerDlg.Designer.cs b/TBF/UI/Bench/Components/ComponentsManagerDlg.Designer.cs index dd95eddf2..b499368bf 100644 --- a/TBF/UI/Bench/Components/ComponentsManagerDlg.Designer.cs +++ b/TBF/UI/Bench/Components/ComponentsManagerDlg.Designer.cs @@ -33,7 +33,7 @@ namespace TBF.UI.Bench.Components { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ComponentsManagerDlg)); this.splitContainer = new System.Windows.Forms.SplitContainer(); - this.listViewEx = new Results.Forms.ListViewEx(); + this.listViewEx = new Common.Forms.ListViewEx(); this.sharedButtons = new TBF.UI.Shared.SharedButtons(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit(); this.splitContainer.Panel1.SuspendLayout(); @@ -68,7 +68,7 @@ namespace TBF.UI.Bench.Components this.listViewEx.Name = "listViewEx"; this.listViewEx.UseCompatibleStateImageBehavior = false; this.listViewEx.View = System.Windows.Forms.View.Details; - this.listViewEx.SubItemRightClicked += new Results.Forms.SubItemEventHandler(this.listViewEx_SubItemRightClicked); + this.listViewEx.SubItemRightClicked += new Common.Forms.SubItemEventHandler(this.listViewEx_SubItemRightClicked); this.listViewEx.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.listViewEx_ColumnClick); this.listViewEx.SelectedIndexChanged += new System.EventHandler(this.componentsListView_SelectedIndexChanged); this.listViewEx.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.listViewEx_MouseDoubleClick); @@ -96,7 +96,7 @@ namespace TBF.UI.Bench.Components #endregion - private Results.Forms.ListViewEx listViewEx; + private Common.Forms.ListViewEx listViewEx; private System.Windows.Forms.SplitContainer splitContainer; private TBF.UI.Shared.SharedButtons sharedButtons; } diff --git a/TBF/UI/Bench/Components/ComponentsManagerDlg.cs b/TBF/UI/Bench/Components/ComponentsManagerDlg.cs index c436a451e..37d8a5749 100644 --- a/TBF/UI/Bench/Components/ComponentsManagerDlg.cs +++ b/TBF/UI/Bench/Components/ComponentsManagerDlg.cs @@ -9,7 +9,7 @@ using log4net; using NHibernate; using Common; using Config.Entities; -using Results.Forms; +using Common.Forms; using TBF.Rig; using TBF.Rig.Generic; using TBF.Resources; @@ -49,7 +49,7 @@ namespace TBF.UI.Bench.Components ColumnsCount, } - SortOrder sortOrder = SortOrder.Ascending; + MySortOrder sortOrder = MySortOrder.Ascending; int sortColumn = -1; /// 0-based index of column to be used for sorting /// Editors used by listViewEx @@ -785,13 +785,13 @@ namespace TBF.UI.Bench.Components { if (e.Column == sortColumn) { - sortOrder = (sortOrder == SortOrder.Ascending) ? SortOrder.Descending : SortOrder.Ascending; + sortOrder = (sortOrder == MySortOrder.Ascending) ? MySortOrder.Descending : MySortOrder.Ascending; } else { /// Clicked on another column header => set sortOrder to SortOrder.Ascending sortColumn = e.Column; - sortOrder = SortOrder.Ascending; + sortOrder = MySortOrder.Ascending; } if (sortColumn == (int)Column.Number) diff --git a/TBF/UI/Bench/Metrology/MetrologyDlgBalanceTab.Designer.cs b/TBF/UI/Bench/Metrology/MetrologyDlgBalanceTab.Designer.cs index 480832ab6..af7a12eb0 100644 --- a/TBF/UI/Bench/Metrology/MetrologyDlgBalanceTab.Designer.cs +++ b/TBF/UI/Bench/Metrology/MetrologyDlgBalanceTab.Designer.cs @@ -57,7 +57,7 @@ namespace TBF.UI.Bench.Metrology this.measuredTextBox = new System.Windows.Forms.TextBox(); this.correctedLabel = new System.Windows.Forms.Label(); this.measuredLabel = new System.Windows.Forms.Label(); - this.listViewEx = new Results.Forms.ListViewEx(); + this.listViewEx = new Common.Forms.ListViewEx(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -373,7 +373,7 @@ namespace TBF.UI.Bench.Metrology private System.Windows.Forms.Label cmpntNameLabel; private System.Windows.Forms.SplitContainer splitContainer1; - private Results.Forms.ListViewEx listViewEx; + private Common.Forms.ListViewEx listViewEx; private System.Windows.Forms.Label measuredLabel; private System.Windows.Forms.GroupBox testGroupBox; private System.Windows.Forms.TextBox correctedTextBox; diff --git a/TBF/UI/Bench/Metrology/MetrologyDlgBalanceTab.cs b/TBF/UI/Bench/Metrology/MetrologyDlgBalanceTab.cs index 719e55597..886ac9a43 100644 --- a/TBF/UI/Bench/Metrology/MetrologyDlgBalanceTab.cs +++ b/TBF/UI/Bench/Metrology/MetrologyDlgBalanceTab.cs @@ -7,7 +7,7 @@ using System.Globalization; using System.Windows.Forms; using log4net; using Config.Entities; -using Results.Forms; +using Common.Forms; using TBF.Resources; using TBF.UI.Shared; diff --git a/TBF/UI/Bench/Metrology/MetrologyDlgDiverterTab.Designer.cs b/TBF/UI/Bench/Metrology/MetrologyDlgDiverterTab.Designer.cs index c05d22a43..a529308f8 100644 --- a/TBF/UI/Bench/Metrology/MetrologyDlgDiverterTab.Designer.cs +++ b/TBF/UI/Bench/Metrology/MetrologyDlgDiverterTab.Designer.cs @@ -46,7 +46,7 @@ namespace TBF.UI.Bench.Metrology this.measuredTextBox = new System.Windows.Forms.TextBox(); this.correctedLabel = new System.Windows.Forms.Label(); this.measuredLabel = new System.Windows.Forms.Label(); - this.listViewEx = new Results.Forms.ListViewEx(); + this.listViewEx = new Common.Forms.ListViewEx(); this.calibExpirationDateTimePicker = new System.Windows.Forms.DateTimePicker(); this.calibDateTimePicker = new System.Windows.Forms.DateTimePicker(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); @@ -274,7 +274,7 @@ namespace TBF.UI.Bench.Metrology private System.Windows.Forms.SplitContainer splitContainer1; private System.Windows.Forms.Label cmpntNameLabel; - private Results.Forms.ListViewEx listViewEx; + private Common.Forms.ListViewEx listViewEx; private System.Windows.Forms.GroupBox testGroupBox; private System.Windows.Forms.TextBox correctedTextBox; private System.Windows.Forms.TextBox measuredTextBox; diff --git a/TBF/UI/Bench/Metrology/MetrologyDlgDiverterTab.cs b/TBF/UI/Bench/Metrology/MetrologyDlgDiverterTab.cs index e5b327271..6f81e5d7a 100644 --- a/TBF/UI/Bench/Metrology/MetrologyDlgDiverterTab.cs +++ b/TBF/UI/Bench/Metrology/MetrologyDlgDiverterTab.cs @@ -7,7 +7,7 @@ using System.Globalization; using System.Windows.Forms; using log4net; using Config.Entities; -using Results.Forms; +using Common.Forms; using TBF.Resources; using TBF.UI.Shared; diff --git a/TBF/UI/Bench/Metrology/MetrologyDlgEvaporationTab.Designer.cs b/TBF/UI/Bench/Metrology/MetrologyDlgEvaporationTab.Designer.cs index 1e6981638..a7f85f94c 100644 --- a/TBF/UI/Bench/Metrology/MetrologyDlgEvaporationTab.Designer.cs +++ b/TBF/UI/Bench/Metrology/MetrologyDlgEvaporationTab.Designer.cs @@ -46,7 +46,7 @@ namespace TBF.UI.Bench.Metrology this.measuredTextBox = new System.Windows.Forms.TextBox(); this.correctedLabel = new System.Windows.Forms.Label(); this.measuredLabel = new System.Windows.Forms.Label(); - this.listViewEx = new Results.Forms.ListViewEx(); + this.listViewEx = new Common.Forms.ListViewEx(); this.calibExpirationDateTimePicker = new System.Windows.Forms.DateTimePicker(); this.calibDateTimePicker = new System.Windows.Forms.DateTimePicker(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); @@ -274,7 +274,7 @@ namespace TBF.UI.Bench.Metrology private System.Windows.Forms.SplitContainer splitContainer1; private System.Windows.Forms.Label cmpntNameLabel; - private Results.Forms.ListViewEx listViewEx; + private Common.Forms.ListViewEx listViewEx; private System.Windows.Forms.GroupBox testGroupBox; private System.Windows.Forms.TextBox correctedTextBox; private System.Windows.Forms.TextBox measuredTextBox; diff --git a/TBF/UI/Bench/Metrology/MetrologyDlgEvaporationTab.cs b/TBF/UI/Bench/Metrology/MetrologyDlgEvaporationTab.cs index 26af1f58d..c44323f50 100644 --- a/TBF/UI/Bench/Metrology/MetrologyDlgEvaporationTab.cs +++ b/TBF/UI/Bench/Metrology/MetrologyDlgEvaporationTab.cs @@ -7,7 +7,7 @@ using System.Globalization; using System.Windows.Forms; using log4net; using Config.Entities; -using Results.Forms; +using Common.Forms; using TBF.Resources; using TBF.UI.Shared; diff --git a/TBF/UI/Bench/Metrology/MetrologyDlgFlowMeterTab.Designer.cs b/TBF/UI/Bench/Metrology/MetrologyDlgFlowMeterTab.Designer.cs index c8f836973..62915ebbf 100644 --- a/TBF/UI/Bench/Metrology/MetrologyDlgFlowMeterTab.Designer.cs +++ b/TBF/UI/Bench/Metrology/MetrologyDlgFlowMeterTab.Designer.cs @@ -46,7 +46,7 @@ namespace TBF.UI.Bench.Metrology this.measuredTextBox = new System.Windows.Forms.TextBox(); this.correctedLabel = new System.Windows.Forms.Label(); this.measuredLabel = new System.Windows.Forms.Label(); - this.listViewEx = new Results.Forms.ListViewEx(); + this.listViewEx = new Common.Forms.ListViewEx(); this.calibExpirationDateTimePicker = new System.Windows.Forms.DateTimePicker(); this.calibDateTimePicker = new System.Windows.Forms.DateTimePicker(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); @@ -274,7 +274,7 @@ namespace TBF.UI.Bench.Metrology private System.Windows.Forms.SplitContainer splitContainer1; private System.Windows.Forms.Label cmpntNameLabel; - private Results.Forms.ListViewEx listViewEx; + private Common.Forms.ListViewEx listViewEx; private System.Windows.Forms.GroupBox testGroupBox; private System.Windows.Forms.TextBox correctedTextBox; private System.Windows.Forms.TextBox measuredTextBox; diff --git a/TBF/UI/Bench/Metrology/MetrologyDlgFlowMeterTab.cs b/TBF/UI/Bench/Metrology/MetrologyDlgFlowMeterTab.cs index 1acef91f5..736b239e5 100644 --- a/TBF/UI/Bench/Metrology/MetrologyDlgFlowMeterTab.cs +++ b/TBF/UI/Bench/Metrology/MetrologyDlgFlowMeterTab.cs @@ -7,7 +7,7 @@ using System.Globalization; using System.Windows.Forms; using log4net; using Config.Entities; -using Results.Forms; +using Common.Forms; using TBF.Resources; using TBF.UI.Shared; diff --git a/TBF/UI/Bench/Metrology/MetrologyDlgLevelMeterTab.Designer.cs b/TBF/UI/Bench/Metrology/MetrologyDlgLevelMeterTab.Designer.cs index 50dbfaaf6..d90381e20 100644 --- a/TBF/UI/Bench/Metrology/MetrologyDlgLevelMeterTab.Designer.cs +++ b/TBF/UI/Bench/Metrology/MetrologyDlgLevelMeterTab.Designer.cs @@ -46,7 +46,7 @@ namespace TBF.UI.Bench.Metrology this.measuredTextBox = new System.Windows.Forms.TextBox(); this.correctedLabel = new System.Windows.Forms.Label(); this.measuredLabel = new System.Windows.Forms.Label(); - this.listViewEx = new Results.Forms.ListViewEx(); + this.listViewEx = new Common.Forms.ListViewEx(); this.calibExpirationDateTimePicker = new System.Windows.Forms.DateTimePicker(); this.calibDateTimePicker = new System.Windows.Forms.DateTimePicker(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); @@ -274,7 +274,7 @@ namespace TBF.UI.Bench.Metrology private System.Windows.Forms.SplitContainer splitContainer1; private System.Windows.Forms.Label cmpntNameLabel; - private Results.Forms.ListViewEx listViewEx; + private Common.Forms.ListViewEx listViewEx; private System.Windows.Forms.GroupBox testGroupBox; private System.Windows.Forms.TextBox correctedTextBox; private System.Windows.Forms.TextBox measuredTextBox; diff --git a/TBF/UI/Bench/Metrology/MetrologyDlgLevelMeterTab.cs b/TBF/UI/Bench/Metrology/MetrologyDlgLevelMeterTab.cs index 1c64df133..63f8cd8a6 100644 --- a/TBF/UI/Bench/Metrology/MetrologyDlgLevelMeterTab.cs +++ b/TBF/UI/Bench/Metrology/MetrologyDlgLevelMeterTab.cs @@ -7,7 +7,7 @@ using System.Globalization; using System.Windows.Forms; using log4net; using Config.Entities; -using Results.Forms; +using Common.Forms; using TBF.Resources; using TBF.UI.Shared; diff --git a/TBF/UI/Bench/Metrology/MetrologyDlgPressMeterTab.Designer.cs b/TBF/UI/Bench/Metrology/MetrologyDlgPressMeterTab.Designer.cs index 2c41d97e1..9f2353bcd 100644 --- a/TBF/UI/Bench/Metrology/MetrologyDlgPressMeterTab.Designer.cs +++ b/TBF/UI/Bench/Metrology/MetrologyDlgPressMeterTab.Designer.cs @@ -44,7 +44,7 @@ namespace TBF.UI.Bench.Metrology this.measuredLabel = new System.Windows.Forms.Label(); this.componentLabel = new System.Windows.Forms.Label(); this.cmpntNameLabel = new System.Windows.Forms.Label(); - this.listViewEx = new Results.Forms.ListViewEx(); + this.listViewEx = new Common.Forms.ListViewEx(); this.calibExpirationDateTimePicker = new System.Windows.Forms.DateTimePicker(); this.calibDateTimePicker = new System.Windows.Forms.DateTimePicker(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); @@ -253,7 +253,7 @@ namespace TBF.UI.Bench.Metrology private System.Windows.Forms.SplitContainer splitContainer1; private System.Windows.Forms.Label componentLabel; private System.Windows.Forms.Label cmpntNameLabel; - private Results.Forms.ListViewEx listViewEx; + private Common.Forms.ListViewEx listViewEx; private System.Windows.Forms.GroupBox testGroupBox; private System.Windows.Forms.TextBox correctedTextBox; private System.Windows.Forms.TextBox measuredTextBox; diff --git a/TBF/UI/Bench/Metrology/MetrologyDlgPressMeterTab.cs b/TBF/UI/Bench/Metrology/MetrologyDlgPressMeterTab.cs index d13c6c096..ba519d7f3 100644 --- a/TBF/UI/Bench/Metrology/MetrologyDlgPressMeterTab.cs +++ b/TBF/UI/Bench/Metrology/MetrologyDlgPressMeterTab.cs @@ -7,7 +7,7 @@ using System.Globalization; using System.Windows.Forms; using log4net; using Config.Entities; -using Results.Forms; +using Common.Forms; using TBF.Resources; using TBF.UI.Shared; diff --git a/TBF/UI/Bench/Metrology/MetrologyDlgTempMeterTab.Designer.cs b/TBF/UI/Bench/Metrology/MetrologyDlgTempMeterTab.Designer.cs index 8b3021f10..278383285 100644 --- a/TBF/UI/Bench/Metrology/MetrologyDlgTempMeterTab.Designer.cs +++ b/TBF/UI/Bench/Metrology/MetrologyDlgTempMeterTab.Designer.cs @@ -44,7 +44,7 @@ namespace TBF.UI.Bench.Metrology this.measuredLabel = new System.Windows.Forms.Label(); this.componentLabel = new System.Windows.Forms.Label(); this.cmpntNameLabel = new System.Windows.Forms.Label(); - this.listViewEx = new Results.Forms.ListViewEx(); + this.listViewEx = new Common.Forms.ListViewEx(); this.calibExpirationDateTimePicker = new System.Windows.Forms.DateTimePicker(); this.calibDateTimePicker = new System.Windows.Forms.DateTimePicker(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); @@ -253,7 +253,7 @@ namespace TBF.UI.Bench.Metrology private System.Windows.Forms.SplitContainer splitContainer1; private System.Windows.Forms.Label componentLabel; private System.Windows.Forms.Label cmpntNameLabel; - private Results.Forms.ListViewEx listViewEx; + private Common.Forms.ListViewEx listViewEx; private System.Windows.Forms.GroupBox testGroupBox; private System.Windows.Forms.TextBox correctedTextBox; private System.Windows.Forms.TextBox measuredTextBox; diff --git a/TBF/UI/Bench/Metrology/MetrologyDlgTempMeterTab.cs b/TBF/UI/Bench/Metrology/MetrologyDlgTempMeterTab.cs index b6dd0e4d1..163fdedb1 100644 --- a/TBF/UI/Bench/Metrology/MetrologyDlgTempMeterTab.cs +++ b/TBF/UI/Bench/Metrology/MetrologyDlgTempMeterTab.cs @@ -7,7 +7,7 @@ using System.Globalization; using System.Windows.Forms; using log4net; using Config.Entities; -using Results.Forms; +using Common.Forms; using TBF.Resources; using TBF.UI.Shared; diff --git a/TBF/UI/Bench/Paths/PathsBenchCtrl.cs b/TBF/UI/Bench/Paths/PathsBenchCtrl.cs index 48f99b6be..0e8ca3ce5 100644 --- a/TBF/UI/Bench/Paths/PathsBenchCtrl.cs +++ b/TBF/UI/Bench/Paths/PathsBenchCtrl.cs @@ -8,7 +8,7 @@ using System.Globalization; using System.Windows.Forms; using log4net; using NHibernate; -using Results.Forms; +using Common.Forms; using TBF.Rig; using TBF.Rig.GenericDevices; using TBF.Resources; diff --git a/TBF/UI/Bench/Paths/PathsDlg.cs b/TBF/UI/Bench/Paths/PathsDlg.cs index a0e700819..3ba81e1ea 100644 --- a/TBF/UI/Bench/Paths/PathsDlg.cs +++ b/TBF/UI/Bench/Paths/PathsDlg.cs @@ -8,7 +8,7 @@ using System.Windows.Forms; using NHibernate; using log4net; using Config.Entities; -using Results.Forms; +using Common.Forms; using TBF.Rig; using TBF.Rig.GenericDevices; using TBF.Resources; diff --git a/TBF/UI/Bench/Paths/PathsFeedingCtrl.cs b/TBF/UI/Bench/Paths/PathsFeedingCtrl.cs index e69ce5c04..65bcfd9e0 100644 --- a/TBF/UI/Bench/Paths/PathsFeedingCtrl.cs +++ b/TBF/UI/Bench/Paths/PathsFeedingCtrl.cs @@ -8,7 +8,7 @@ using System.Globalization; using System.Windows.Forms; using log4net; using Config.Entities; -using Results.Forms; +using Common.Forms; using TBF.Rig.GenericDevices; using TBF.Resources; using TBF.UI.Shared; diff --git a/TBF/UI/Bench/Paths/PathsHeatMetersCtrl.cs b/TBF/UI/Bench/Paths/PathsHeatMetersCtrl.cs index 75f9ee1e6..9d55e29a6 100644 --- a/TBF/UI/Bench/Paths/PathsHeatMetersCtrl.cs +++ b/TBF/UI/Bench/Paths/PathsHeatMetersCtrl.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Globalization; using System.Windows.Forms; using log4net; -using Results.Forms; +using Common.Forms; using TBF.Rig; using TBF.Rig.GenericDevices; using TBF.Resources; diff --git a/TBF/UI/Bench/Paths/PathsMetersCtrl.cs b/TBF/UI/Bench/Paths/PathsMetersCtrl.cs index 93620f205..ce20ade17 100644 --- a/TBF/UI/Bench/Paths/PathsMetersCtrl.cs +++ b/TBF/UI/Bench/Paths/PathsMetersCtrl.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Globalization; using System.Windows.Forms; using log4net; -using Results.Forms; +using Common.Forms; using TBF.Rig; using TBF.Rig.GenericDevices; using TBF.Resources; diff --git a/TBF/UI/Bench/Paths/PathsOutputCtrl.cs b/TBF/UI/Bench/Paths/PathsOutputCtrl.cs index 9a254ea9f..0705b8e9f 100644 --- a/TBF/UI/Bench/Paths/PathsOutputCtrl.cs +++ b/TBF/UI/Bench/Paths/PathsOutputCtrl.cs @@ -7,7 +7,7 @@ using System.Drawing; using System.Windows.Forms; using log4net; using Config.Entities; -using Results.Forms; +using Common.Forms; using TBF.Rig; using TBF.Rig.GenericDevices; using TBF.Resources; diff --git a/TBF/UI/Bench/TestProfiles/TestProfileDlg.cs b/TBF/UI/Bench/TestProfiles/TestProfileDlg.cs index da64330c4..4acd4011f 100644 --- a/TBF/UI/Bench/TestProfiles/TestProfileDlg.cs +++ b/TBF/UI/Bench/TestProfiles/TestProfileDlg.cs @@ -9,7 +9,7 @@ using System.Windows.Forms; using log4net; using Common; using Config.Entities; -using Results.Forms; +using Common.Forms; using TBF.Rig.Generic; using TBF.Rig.GenericDevices; using TBF.Resources; diff --git a/TBF/UI/Bench/TestProfiles/TestProfileDlg.designer.cs b/TBF/UI/Bench/TestProfiles/TestProfileDlg.designer.cs index 395495fd2..c7dc40a8c 100644 --- a/TBF/UI/Bench/TestProfiles/TestProfileDlg.designer.cs +++ b/TBF/UI/Bench/TestProfiles/TestProfileDlg.designer.cs @@ -57,11 +57,11 @@ namespace TBF.UI.Bench.TestProfiles this.procNameTextBox = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); this.metrologyTabPage = new System.Windows.Forms.TabPage(); - this.metrologyListViewEx = new Results.Forms.ListViewEx(); + this.metrologyListViewEx = new Common.Forms.ListViewEx(); this.errorFlagsTabPage = new System.Windows.Forms.TabPage(); - this.errorFlagsListViewEx = new Results.Forms.ListViewEx(); + this.errorFlagsListViewEx = new Common.Forms.ListViewEx(); this.errorFlags2TabPage = new System.Windows.Forms.TabPage(); - this.errorFlags2ListViewEx = new Results.Forms.ListViewEx(); + this.errorFlags2ListViewEx = new Common.Forms.ListViewEx(); this.sharedButtons = new TBF.UI.Shared.SharedButtons(); ((System.ComponentModel.ISupportInitialize)(this.mainSplitContainer)).BeginInit(); this.mainSplitContainer.Panel1.SuspendLayout(); @@ -341,7 +341,7 @@ namespace TBF.UI.Bench.TestProfiles private System.Windows.Forms.SplitContainer mainSplitContainer; private System.Windows.Forms.TabControl tabControl; private System.Windows.Forms.TabPage metrologyTabPage; - private Results.Forms.ListViewEx metrologyListViewEx; + private Common.Forms.ListViewEx metrologyListViewEx; private TBF.UI.Shared.SharedButtons sharedButtons; private System.Windows.Forms.TabPage generalTabPage; private System.Windows.Forms.TextBox lastChangedOnTextBox; @@ -359,7 +359,7 @@ namespace TBF.UI.Bench.TestProfiles private System.Windows.Forms.RadioButton profileTypeRadioButton2; private System.Windows.Forms.RadioButton profileTypeRadioButton1; private System.Windows.Forms.TabPage errorFlagsTabPage; - private Results.Forms.ListViewEx errorFlagsListViewEx; + private Common.Forms.ListViewEx errorFlagsListViewEx; private System.Windows.Forms.RadioButton profileTypeRadioButton3; private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.RadioButton errorCalculationRadioButton2; @@ -368,6 +368,6 @@ namespace TBF.UI.Bench.TestProfiles private System.Windows.Forms.RadioButton profileTypeRadioButton5; private System.Windows.Forms.RadioButton profileTypeRadioButton4; private System.Windows.Forms.TabPage errorFlags2TabPage; - private Results.Forms.ListViewEx errorFlags2ListViewEx; + private Common.Forms.ListViewEx errorFlags2ListViewEx; } } \ No newline at end of file diff --git a/TBF/UI/Bench/TestProfiles/TestProfilesCtrl.cs b/TBF/UI/Bench/TestProfiles/TestProfilesCtrl.cs index 3cad2f0b8..419d012ff 100644 --- a/TBF/UI/Bench/TestProfiles/TestProfilesCtrl.cs +++ b/TBF/UI/Bench/TestProfiles/TestProfilesCtrl.cs @@ -10,7 +10,7 @@ using System.Windows.Forms; using NHibernate; using log4net; using Config.Entities; -using Results.Forms; +using Common.Forms; using TBF.Rig; using TBF.Rig.GenericDevices; using TBF.Resources; diff --git a/TBF/UI/Bench/TestProfiles/TestProfilesDlg.cs b/TBF/UI/Bench/TestProfiles/TestProfilesDlg.cs index 9419f016e..8f813ebca 100644 --- a/TBF/UI/Bench/TestProfiles/TestProfilesDlg.cs +++ b/TBF/UI/Bench/TestProfiles/TestProfilesDlg.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.Windows.Forms; using log4net; +using Common.Forms; using TBF.Resources; using TBF.UI.Shared; @@ -179,7 +180,7 @@ namespace TBF.UI.Bench.TestProfiles /// void SelectedIndexChanged(object sender, EventArgs e) { - Results.Forms.ListViewEx listViewEx = sender as Results.Forms.ListViewEx; + var listViewEx = sender as ListViewEx; if (listViewEx.SelectedItems.Count != 1) { /// No item selected diff --git a/TBF/UI/Bench/Transitions/TransitionStepsCtrl.cs b/TBF/UI/Bench/Transitions/TransitionStepsCtrl.cs index 5a6fdad80..7c7ca4621 100644 --- a/TBF/UI/Bench/Transitions/TransitionStepsCtrl.cs +++ b/TBF/UI/Bench/Transitions/TransitionStepsCtrl.cs @@ -6,7 +6,7 @@ using System.Drawing; using System.Windows.Forms; using log4net; using Config.Entities; -using Results.Forms; +using Common.Forms; using TBF.Rig; using TBF.Rig.GenericDevices; using TBF.Resources; diff --git a/TBF/UI/Bench/Transitions/TransitionsDlg.cs b/TBF/UI/Bench/Transitions/TransitionsDlg.cs index ed2796bac..e3aa265f0 100644 --- a/TBF/UI/Bench/Transitions/TransitionsDlg.cs +++ b/TBF/UI/Bench/Transitions/TransitionsDlg.cs @@ -9,7 +9,7 @@ using System.Windows.Forms; using log4net; using NHibernate; using Config.Entities; -using Results.Forms; +using Common.Forms; using TBF.Rig.Generic; using TBF.Rig.GenericDevices; using TBF.Resources; diff --git a/TBF/UI/Bench/Transitions/VirtualBenchStepsCtrl.cs b/TBF/UI/Bench/Transitions/VirtualBenchStepsCtrl.cs index 4ceaf8ea7..d95ae10f4 100644 --- a/TBF/UI/Bench/Transitions/VirtualBenchStepsCtrl.cs +++ b/TBF/UI/Bench/Transitions/VirtualBenchStepsCtrl.cs @@ -6,7 +6,7 @@ using System.Drawing; using System.Windows.Forms; using log4net; using Config.Entities; -using Results.Forms; +using Common.Forms; using TBF.Resources; using TBF.UI.Shared; diff --git a/TBF/UI/Bench/Uncertainties/UncertntDlgDensityTab.cs b/TBF/UI/Bench/Uncertainties/UncertntDlgDensityTab.cs index 393b887ad..b6a3a4dcb 100644 --- a/TBF/UI/Bench/Uncertainties/UncertntDlgDensityTab.cs +++ b/TBF/UI/Bench/Uncertainties/UncertntDlgDensityTab.cs @@ -7,7 +7,7 @@ using System.Globalization; using System.Windows.Forms; using log4net; using Config.Entities; -using Results.Forms; +using Common.Forms; using TBF.Resources; using TBF.UI.Shared; diff --git a/TBF/UI/Bench/Uncertainties/UncertntDlgDensityTab.designer.cs b/TBF/UI/Bench/Uncertainties/UncertntDlgDensityTab.designer.cs index 4c4aea4f0..16fd5761f 100644 --- a/TBF/UI/Bench/Uncertainties/UncertntDlgDensityTab.designer.cs +++ b/TBF/UI/Bench/Uncertainties/UncertntDlgDensityTab.designer.cs @@ -34,7 +34,7 @@ namespace TBF.UI.Bench.Uncertainties this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.cmpntLabel = new System.Windows.Forms.Label(); this.cmpntNameLabel = new System.Windows.Forms.Label(); - this.listViewEx = new Results.Forms.ListViewEx(); + this.listViewEx = new Common.Forms.ListViewEx(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -116,7 +116,7 @@ namespace TBF.UI.Bench.Uncertainties private System.Windows.Forms.SplitContainer splitContainer1; private System.Windows.Forms.Label cmpntLabel; private System.Windows.Forms.Label cmpntNameLabel; - private Results.Forms.ListViewEx listViewEx; + private Common.Forms.ListViewEx listViewEx; } } diff --git a/TBF/UI/Bench/Uncertainties/UncertntDlgPressMeterTab.cs b/TBF/UI/Bench/Uncertainties/UncertntDlgPressMeterTab.cs index 53d8f5e78..37e9c3523 100644 --- a/TBF/UI/Bench/Uncertainties/UncertntDlgPressMeterTab.cs +++ b/TBF/UI/Bench/Uncertainties/UncertntDlgPressMeterTab.cs @@ -7,7 +7,7 @@ using System.Globalization; using System.Windows.Forms; using log4net; using Config.Entities; -using Results.Forms; +using Common.Forms; using TBF.Resources; using TBF.UI.Shared; diff --git a/TBF/UI/Bench/Uncertainties/UncertntDlgPressMeterTab.designer.cs b/TBF/UI/Bench/Uncertainties/UncertntDlgPressMeterTab.designer.cs index 16d4de950..5931ba9b3 100644 --- a/TBF/UI/Bench/Uncertainties/UncertntDlgPressMeterTab.designer.cs +++ b/TBF/UI/Bench/Uncertainties/UncertntDlgPressMeterTab.designer.cs @@ -34,7 +34,7 @@ namespace TBF.UI.Bench.Uncertainties this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.cmpntLabel = new System.Windows.Forms.Label(); this.cmpntNameLabel = new System.Windows.Forms.Label(); - this.listViewEx = new Results.Forms.ListViewEx(); + this.listViewEx = new Common.Forms.ListViewEx(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -116,7 +116,7 @@ namespace TBF.UI.Bench.Uncertainties private System.Windows.Forms.SplitContainer splitContainer1; private System.Windows.Forms.Label cmpntLabel; private System.Windows.Forms.Label cmpntNameLabel; - private Results.Forms.ListViewEx listViewEx; + private Common.Forms.ListViewEx listViewEx; } } diff --git a/TBF/UI/Bench/Uncertainties/UncertntDlgScaleTab.cs b/TBF/UI/Bench/Uncertainties/UncertntDlgScaleTab.cs index 247c6cff0..7594afdc7 100644 --- a/TBF/UI/Bench/Uncertainties/UncertntDlgScaleTab.cs +++ b/TBF/UI/Bench/Uncertainties/UncertntDlgScaleTab.cs @@ -7,7 +7,7 @@ using System.Globalization; using System.Windows.Forms; using log4net; using Config.Entities; -using Results.Forms; +using Common.Forms; using TBF.Resources; using TBF.UI.Shared; diff --git a/TBF/UI/Bench/Uncertainties/UncertntDlgScaleTab.designer.cs b/TBF/UI/Bench/Uncertainties/UncertntDlgScaleTab.designer.cs index a4050501e..fc694033e 100644 --- a/TBF/UI/Bench/Uncertainties/UncertntDlgScaleTab.designer.cs +++ b/TBF/UI/Bench/Uncertainties/UncertntDlgScaleTab.designer.cs @@ -32,7 +32,7 @@ namespace TBF.UI.Bench.Uncertainties private void InitializeComponent() { this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.listViewEx = new Results.Forms.ListViewEx(); + this.listViewEx = new Common.Forms.ListViewEx(); this.cmpntLabel = new System.Windows.Forms.Label(); this.cmpntNameLabel = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); @@ -114,7 +114,7 @@ namespace TBF.UI.Bench.Uncertainties #endregion private System.Windows.Forms.SplitContainer splitContainer1; - private Results.Forms.ListViewEx listViewEx; + private Common.Forms.ListViewEx listViewEx; private System.Windows.Forms.Label cmpntLabel; private System.Windows.Forms.Label cmpntNameLabel; } diff --git a/TBF/UI/Bench/Uncertainties/UncertntDlgTempMeterTab.cs b/TBF/UI/Bench/Uncertainties/UncertntDlgTempMeterTab.cs index e638f15b3..e15823a78 100644 --- a/TBF/UI/Bench/Uncertainties/UncertntDlgTempMeterTab.cs +++ b/TBF/UI/Bench/Uncertainties/UncertntDlgTempMeterTab.cs @@ -7,7 +7,7 @@ using System.Globalization; using System.Windows.Forms; using log4net; using Config.Entities; -using Results.Forms; +using Common.Forms; using TBF.Resources; using TBF.UI.Shared; diff --git a/TBF/UI/Bench/Uncertainties/UncertntDlgTempMeterTab.designer.cs b/TBF/UI/Bench/Uncertainties/UncertntDlgTempMeterTab.designer.cs index 681815042..592fa46ed 100644 --- a/TBF/UI/Bench/Uncertainties/UncertntDlgTempMeterTab.designer.cs +++ b/TBF/UI/Bench/Uncertainties/UncertntDlgTempMeterTab.designer.cs @@ -34,7 +34,7 @@ namespace TBF.UI.Bench.Uncertainties this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.cmpntLabel = new System.Windows.Forms.Label(); this.cmpntNameLabel = new System.Windows.Forms.Label(); - this.listViewEx = new Results.Forms.ListViewEx(); + this.listViewEx = new Common.Forms.ListViewEx(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -116,7 +116,7 @@ namespace TBF.UI.Bench.Uncertainties private System.Windows.Forms.SplitContainer splitContainer1; private System.Windows.Forms.Label cmpntLabel; private System.Windows.Forms.Label cmpntNameLabel; - private Results.Forms.ListViewEx listViewEx; + private Common.Forms.ListViewEx listViewEx; } } diff --git a/TBF/UI/Calendar/CalendarTabPageCtrl.designer.cs b/TBF/UI/Calendar/CalendarTabPageCtrl.designer.cs index 6432f8b40..2bf811502 100644 --- a/TBF/UI/Calendar/CalendarTabPageCtrl.designer.cs +++ b/TBF/UI/Calendar/CalendarTabPageCtrl.designer.cs @@ -37,7 +37,7 @@ namespace TBF.UI.Calendar this.calendarCtrl1 = new TBF.UI.Calendar.CalendarCtrl(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.newEventButton = new System.Windows.Forms.Button(); - this.calendarEventsListViewEx = new Common.UIControls.ListViewEx(); + this.calendarEventsListViewEx = new Common.Forms.ListViewEx(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -152,6 +152,6 @@ namespace TBF.UI.Calendar private CalendarCtrl calendarCtrl1; private System.Windows.Forms.Button newEventButton; private System.Windows.Forms.SplitContainer splitContainer2; - private Common.UIControls.ListViewEx calendarEventsListViewEx; + private Common.Forms.ListViewEx calendarEventsListViewEx; } } diff --git a/TBF/UI/EventLogs/EventLogsTabPageCtrl.cs b/TBF/UI/EventLogs/EventLogsTabPageCtrl.cs index be1127d9f..3ab2b1eb8 100644 --- a/TBF/UI/EventLogs/EventLogsTabPageCtrl.cs +++ b/TBF/UI/EventLogs/EventLogsTabPageCtrl.cs @@ -5,7 +5,8 @@ using System; using System.Collections.Generic; using System.Windows.Forms; -using Common.UIControls; +using Common; +using Common.Forms; using Events.Entities; using TBF.Resources; using TBF.UiBridge; @@ -25,7 +26,7 @@ namespace TBF.UI.EventLogs Count } - SortOrder sortOrder = SortOrder.Ascending; + MySortOrder sortOrder = MySortOrder.Ascending; int sortColumn = -1; /// 0-based index of column to be used for sorting @@ -80,13 +81,13 @@ namespace TBF.UI.EventLogs { if (e.Column == sortColumn) { - sortOrder = (sortOrder == SortOrder.Ascending) ? SortOrder.Descending : SortOrder.Ascending; + sortOrder = (sortOrder == MySortOrder.Ascending) ? MySortOrder.Descending : MySortOrder.Ascending; } else { /// Clicked on another column header => set sortOrder to SortOrder.Ascending sortColumn = e.Column; - sortOrder = SortOrder.Ascending; + sortOrder = MySortOrder.Ascending; } switch ((Column)sortColumn) diff --git a/TBF/UI/EventLogs/EventLogsTabPageCtrl.designer.cs b/TBF/UI/EventLogs/EventLogsTabPageCtrl.designer.cs index 0c80d6eb5..22562ebc6 100644 --- a/TBF/UI/EventLogs/EventLogsTabPageCtrl.designer.cs +++ b/TBF/UI/EventLogs/EventLogsTabPageCtrl.designer.cs @@ -32,7 +32,7 @@ namespace TBF.UI.EventLogs private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EventLogsTabPageCtrl)); - this.eventsListView = new Common.UIControls.ListViewEx(); + this.eventsListView = new Common.Forms.ListViewEx(); this.SuspendLayout(); // // eventsListView @@ -60,6 +60,6 @@ namespace TBF.UI.EventLogs #endregion - private Common.UIControls.ListViewEx eventsListView; + private Common.Forms.ListViewEx eventsListView; } } diff --git a/TBF/UI/Procedures/ProcedureDlg.Designer.cs b/TBF/UI/Procedures/ProcedureDlg.Designer.cs index fa427287f..f8602a057 100644 --- a/TBF/UI/Procedures/ProcedureDlg.Designer.cs +++ b/TBF/UI/Procedures/ProcedureDlg.Designer.cs @@ -101,11 +101,11 @@ namespace TBF.UI.Procedures this.metrology2TabPage = new System.Windows.Forms.TabPage(); this.processTabPage = new System.Windows.Forms.TabPage(); this.parametersTabPage = new System.Windows.Forms.TabPage(); - this.historyListViewEx = new Results.Forms.ListViewEx(); - this.metrology1ListViewEx = new Results.Forms.ListViewEx(); - this.metrology2ListViewEx = new Results.Forms.ListViewEx(); - this.processListViewEx = new Results.Forms.ListViewEx(); - this.parametersListViewEx = new Results.Forms.ListViewEx(); + this.historyListViewEx = new Common.Forms.ListViewEx(); + this.metrology1ListViewEx = new Common.Forms.ListViewEx(); + this.metrology2ListViewEx = new Common.Forms.ListViewEx(); + this.processListViewEx = new Common.Forms.ListViewEx(); + this.parametersListViewEx = new Common.Forms.ListViewEx(); this.sharedButtons = new TBF.UI.Shared.SharedButtons(); ((System.ComponentModel.ISupportInitialize)(this.mainSplitContainer)).BeginInit(); this.mainSplitContainer.Panel1.SuspendLayout(); @@ -708,13 +708,13 @@ namespace TBF.UI.Procedures private System.Windows.Forms.SplitContainer mainSplitContainer; private System.Windows.Forms.TabControl tabControl; private System.Windows.Forms.TabPage historyTabPage; - private Results.Forms.ListViewEx historyListViewEx; + private Common.Forms.ListViewEx historyListViewEx; private System.Windows.Forms.TabPage metrology1TabPage; - private Results.Forms.ListViewEx metrology1ListViewEx; + private Common.Forms.ListViewEx metrology1ListViewEx; private System.Windows.Forms.TabPage metrology2TabPage; - private Results.Forms.ListViewEx metrology2ListViewEx; + private Common.Forms.ListViewEx metrology2ListViewEx; private System.Windows.Forms.TabPage processTabPage; - private Results.Forms.ListViewEx processListViewEx; + private Common.Forms.ListViewEx processListViewEx; private TBF.UI.Shared.SharedButtons sharedButtons; private System.Windows.Forms.TabPage generalTabPage; private System.Windows.Forms.ComboBox fileWriter1ComboBox; @@ -746,7 +746,7 @@ namespace TBF.UI.Procedures private System.Windows.Forms.RadioButton metersKindRadioButton2; private System.Windows.Forms.RadioButton metersKindRadioButton1; private System.Windows.Forms.TabPage parametersTabPage; - private Results.Forms.ListViewEx parametersListViewEx; + private Common.Forms.ListViewEx parametersListViewEx; private System.Windows.Forms.ComboBox fileWriter2ComboBox; private System.Windows.Forms.ComboBox fileWriter3ComboBox; private System.Windows.Forms.ComboBox printer2ComboBox; diff --git a/TBF/UI/Procedures/ProcedureDlg.cs b/TBF/UI/Procedures/ProcedureDlg.cs index c9b46e648..55397e7e0 100644 --- a/TBF/UI/Procedures/ProcedureDlg.cs +++ b/TBF/UI/Procedures/ProcedureDlg.cs @@ -10,7 +10,7 @@ using log4net; using Common; using Config; using Config.Entities; -using Results.Forms; +using Common.Forms; using TBF.Rig.Generic; using TBF.Rig.GenericDevices; using TBF.Resources; diff --git a/TBF/UI/Procedures/ProcedureParamsCtrl.Designer.cs b/TBF/UI/Procedures/ProcedureParamsCtrl.Designer.cs index 9de1ab336..9e1026e84 100644 --- a/TBF/UI/Procedures/ProcedureParamsCtrl.Designer.cs +++ b/TBF/UI/Procedures/ProcedureParamsCtrl.Designer.cs @@ -31,7 +31,7 @@ namespace TBF.UI.Procedures /// private void InitializeComponent() { - this.listViewEx = new Results.Forms.ListViewEx(); + this.listViewEx = new Common.Forms.ListViewEx(); this.SuspendLayout(); // // listViewEx @@ -60,6 +60,6 @@ namespace TBF.UI.Procedures #endregion - private Results.Forms.ListViewEx listViewEx; + private Common.Forms.ListViewEx listViewEx; } } diff --git a/TBF/UI/Procedures/ProcedureParamsCtrl.cs b/TBF/UI/Procedures/ProcedureParamsCtrl.cs index aa9fd1e87..7a34d2506 100644 --- a/TBF/UI/Procedures/ProcedureParamsCtrl.cs +++ b/TBF/UI/Procedures/ProcedureParamsCtrl.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.Windows.Forms; using Config.Entities; -using Results.Forms; +using Common.Forms; using TBF.Rig.Generic; using TBF.Resources; diff --git a/TBF/UI/Procedures/ProcedureParamsMixedCtrl.Designer.cs b/TBF/UI/Procedures/ProcedureParamsMixedCtrl.Designer.cs index 9831647c9..18583a946 100644 --- a/TBF/UI/Procedures/ProcedureParamsMixedCtrl.Designer.cs +++ b/TBF/UI/Procedures/ProcedureParamsMixedCtrl.Designer.cs @@ -31,7 +31,7 @@ namespace TBF.UI.Procedures /// private void InitializeComponent() { - this.listViewEx = new Results.Forms.ListViewEx(); + this.listViewEx = new Common.Forms.ListViewEx(); this.SuspendLayout(); // // listViewEx @@ -60,6 +60,6 @@ namespace TBF.UI.Procedures #endregion - private Results.Forms.ListViewEx listViewEx; + private Common.Forms.ListViewEx listViewEx; } } diff --git a/TBF/UI/Procedures/ProcedureParamsMixedCtrl.cs b/TBF/UI/Procedures/ProcedureParamsMixedCtrl.cs index 7c85c80af..77b0c9f6b 100644 --- a/TBF/UI/Procedures/ProcedureParamsMixedCtrl.cs +++ b/TBF/UI/Procedures/ProcedureParamsMixedCtrl.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.Windows.Forms; using Config.Entities; -using Results.Forms; +using Common.Forms; using TBF.Rig.Generic; using TBF.Resources; diff --git a/TBF/UI/Procedures/ProceduresCtrl.Designer.cs b/TBF/UI/Procedures/ProceduresCtrl.Designer.cs index 4b8e499d9..e4b90a639 100644 --- a/TBF/UI/Procedures/ProceduresCtrl.Designer.cs +++ b/TBF/UI/Procedures/ProceduresCtrl.Designer.cs @@ -37,7 +37,7 @@ this.mclassComboBox = new System.Windows.Forms.ComboBox(); this.q3ComboBox = new System.Windows.Forms.ComboBox(); this.dnComboBox = new System.Windows.Forms.ComboBox(); - this.listViewEx = new Results.Forms.ListViewEx(); + this.listViewEx = new Common.Forms.ListViewEx(); ((System.ComponentModel.ISupportInitialize)(this.filtersSplitContainer)).BeginInit(); this.filtersSplitContainer.Panel1.SuspendLayout(); this.filtersSplitContainer.Panel2.SuspendLayout(); @@ -190,6 +190,6 @@ private System.Windows.Forms.ComboBox mclassComboBox; private System.Windows.Forms.ComboBox q3ComboBox; private System.Windows.Forms.ComboBox dnComboBox; - private Results.Forms.ListViewEx listViewEx; + private Common.Forms.ListViewEx listViewEx; } } diff --git a/TBF/UI/Procedures/ProceduresDlg.cs b/TBF/UI/Procedures/ProceduresDlg.cs index 9c03bb1e0..5ec472974 100644 --- a/TBF/UI/Procedures/ProceduresDlg.cs +++ b/TBF/UI/Procedures/ProceduresDlg.cs @@ -5,6 +5,7 @@ using System; using System.Windows.Forms; using log4net; using Common; +using Common.Forms; using TBF.Resources; using TBF.UI.Shared; @@ -190,7 +191,7 @@ namespace TBF.UI.Procedures /// public void SelectedIndexChanged(ListView sender, bool isFilterAny) { - Results.Forms.ListViewEx listViewEx = sender as Results.Forms.ListViewEx; + var listViewEx = sender as ListViewEx; if (listViewEx.SelectedItems.Count != 1) { /// No item selected diff --git a/TBF/UI/Procedures/TestParamsCtrl.Designer.cs b/TBF/UI/Procedures/TestParamsCtrl.Designer.cs index 409336bce..95ee638c8 100644 --- a/TBF/UI/Procedures/TestParamsCtrl.Designer.cs +++ b/TBF/UI/Procedures/TestParamsCtrl.Designer.cs @@ -31,7 +31,7 @@ namespace TBF.UI.Procedures /// private void InitializeComponent() { - this.listViewEx = new Results.Forms.ListViewEx(); + this.listViewEx = new Common.Forms.ListViewEx(); this.SuspendLayout(); // // listViewEx @@ -60,6 +60,6 @@ namespace TBF.UI.Procedures #endregion - private Results.Forms.ListViewEx listViewEx; + private Common.Forms.ListViewEx listViewEx; } } diff --git a/TBF/UI/Procedures/TestParamsCtrl.cs b/TBF/UI/Procedures/TestParamsCtrl.cs index 15176223d..4db404ffa 100644 --- a/TBF/UI/Procedures/TestParamsCtrl.cs +++ b/TBF/UI/Procedures/TestParamsCtrl.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Windows.Forms; using Common; using Config.Entities; -using Results.Forms; +using Common.Forms; using TBF.Rig.Generic; using TBF.Resources; diff --git a/TBF/UI/Procedures/TestWizard/OracleWZTypSelection.Designer.cs b/TBF/UI/Procedures/TestWizard/OracleWZTypSelection.Designer.cs index 4724cc343..309ac0168 100644 --- a/TBF/UI/Procedures/TestWizard/OracleWZTypSelection.Designer.cs +++ b/TBF/UI/Procedures/TestWizard/OracleWZTypSelection.Designer.cs @@ -55,7 +55,7 @@ namespace TBF.UI.Procedures.TestWizard this.idWZTypTextBox = new System.Windows.Forms.TextBox(); this.materialCodeRadioButton = new System.Windows.Forms.RadioButton(); this.idWZTypRadioButton = new System.Windows.Forms.RadioButton(); - this.listViewEx = new TracingDB.Forms.ListViewEx(); + this.listViewEx = new Common.Forms.ListViewEx(); this.cancelButton = new System.Windows.Forms.Button(); this.nextButton = new System.Windows.Forms.Button(); this.backButton = new System.Windows.Forms.Button(); @@ -340,8 +340,8 @@ namespace TBF.UI.Procedures.TestWizard this.listViewEx.TabIndex = 0; this.listViewEx.UseCompatibleStateImageBehavior = false; this.listViewEx.View = System.Windows.Forms.View.Details; - this.listViewEx.SubItemClicked += new TracingDB.Forms.SubItemEventHandler(this.listViewEx_SubItemClicked); - this.listViewEx.SubItemEndEditing += new TracingDB.Forms.SubItemEndEditingEventHandler(this.listViewEx_SubItemEndEditing); + this.listViewEx.SubItemClicked += new Common.Forms.SubItemEventHandler(this.listViewEx_SubItemClicked); + this.listViewEx.SubItemEndEditing += new Common.Forms.SubItemEndEditingEventHandler(this.listViewEx_SubItemEndEditing); // // cancelButton // @@ -411,7 +411,7 @@ namespace TBF.UI.Procedures.TestWizard private System.Windows.Forms.RadioButton materialCodeRadioButton; private System.Windows.Forms.RadioButton idWZTypRadioButton; private System.Windows.Forms.Button searchButton; - private TracingDB.Forms.ListViewEx listViewEx; + private Common.Forms.ListViewEx listViewEx; private System.Windows.Forms.Label remarkLabel; private System.Windows.Forms.TextBox wzTypTextBox; private System.Windows.Forms.Label wzTypLabel; diff --git a/TBF/UI/Procedures/TestWizard/OracleWZTypSelection.cs b/TBF/UI/Procedures/TestWizard/OracleWZTypSelection.cs index e359f9741..d42fec4a0 100644 --- a/TBF/UI/Procedures/TestWizard/OracleWZTypSelection.cs +++ b/TBF/UI/Procedures/TestWizard/OracleWZTypSelection.cs @@ -12,6 +12,7 @@ using Oracle.ManagedDataAccess.Client; using Oracle.DataAccess.Client; #endif using Common; +using Common.Forms; using Config.Entities; using Results.Output; using TBF.Rig.GenericDevices; @@ -302,7 +303,7 @@ namespace TBF.UI.Procedures.TestWizard } } - private void listViewEx_SubItemClicked(object sender, TracingDB.Forms.SubItemEventArgs e) + private void listViewEx_SubItemClicked(object sender, SubItemEventArgs e) { if (e.SubItem == listViewEx.Columns.Count - 2) { @@ -316,7 +317,7 @@ namespace TBF.UI.Procedures.TestWizard } } - private void listViewEx_SubItemEndEditing(object sender, TracingDB.Forms.SubItemEndEditingEventArgs e) + private void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) { if (e.SubItem == listViewEx.Columns.Count - 2) { diff --git a/TBF/UI/ResultsMI/ResultsTabPageCtrl.cs b/TBF/UI/ResultsMI/ResultsTabPageCtrl.cs index 014ad8ae7..bea1b8c7d 100644 --- a/TBF/UI/ResultsMI/ResultsTabPageCtrl.cs +++ b/TBF/UI/ResultsMI/ResultsTabPageCtrl.cs @@ -8,6 +8,7 @@ using System.Windows.Forms; using log4net; using NHibernate; using Common; +using Common.Forms; using Results; using Results.Forms; using Results.Entities; diff --git a/TBF/UI/Shared/BaseWithListViewEx.cs b/TBF/UI/Shared/BaseWithListViewEx.cs index c720c434b..4da03b478 100644 --- a/TBF/UI/Shared/BaseWithListViewEx.cs +++ b/TBF/UI/Shared/BaseWithListViewEx.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.Windows.Forms; using Config.Entities; -using Results.Forms; +using Common.Forms; namespace TBF.UI.Shared { diff --git a/TracingDB/Forms/ListViewEx.cs b/TracingDB/Forms/ListViewEx.cs deleted file mode 100644 index 82b09546d..000000000 --- a/TracingDB/Forms/ListViewEx.cs +++ /dev/null @@ -1,466 +0,0 @@ -/// -/// Copyright (c) 2016 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 TracingDB.Forms -{ - /// - /// 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 - - - public SortOrder SortOrder = SortOrder.None; - public int SortColumn = -1; - - /// - /// Required designer variable. - /// - private System.ComponentModel.Container components = null; - - public event SubItemEventHandler SubItemClicked; - 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)); - } - } - - #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); - } - - - /// - /// 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); - - if (_editSubItem >= 0 && _editSubItem < _editItem.SubItems.Count) - { - _editItem.SubItems[_editSubItem].Text = e.DisplayText; - } - - if (_editingControl != null) - { - _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/TracingDB/Forms/ListViewEx.resx b/TracingDB/Forms/ListViewEx.resx deleted file mode 100644 index 7e323966c..000000000 --- a/TracingDB/Forms/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/TracingDB/Forms/ListViewExtensions.cs b/TracingDB/Forms/ListViewExtensions.cs deleted file mode 100644 index 375f10633..000000000 --- a/TracingDB/Forms/ListViewExtensions.cs +++ /dev/null @@ -1,104 +0,0 @@ -using System; -using System.ComponentModel; -using System.Runtime.InteropServices; -using System.Windows.Forms; - -namespace TracingDB.Forms -{ - [EditorBrowsable(EditorBrowsableState.Never)] - public static class ListViewExtensions - { - [StructLayout(LayoutKind.Sequential)] - public struct HDITEM - { - public Mask mask; - public int cxy; - [MarshalAs(UnmanagedType.LPTStr)] - public string pszText; - public IntPtr hbm; - public int cchTextMax; - public Format fmt; - public IntPtr lParam; - // _WIN32_IE >= 0x0300 - public int iImage; - public int iOrder; - // _WIN32_IE >= 0x0500 - public uint type; - public IntPtr pvFilter; - // _WIN32_WINNT >= 0x0600 - public uint state; - - [Flags] - public enum Mask - { - Format = 0x4, // HDI_FORMAT - }; - - [Flags] - public enum Format - { - SortDown = 0x200, // HDF_SORTDOWN - SortUp = 0x400, // HDF_SORTUP - }; - }; - - public const int LVM_FIRST = 0x1000; - public const int LVM_GETHEADER = LVM_FIRST + 31; - - public const int HDM_FIRST = 0x1200; - public const int HDM_GETITEM = HDM_FIRST + 11; - public const int HDM_SETITEM = HDM_FIRST + 12; - - [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)] - public static extern IntPtr SendMessage(IntPtr hWnd, UInt32 msg, IntPtr wParam, IntPtr lParam); - - [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)] - public static extern IntPtr SendMessage(IntPtr hWnd, UInt32 msg, IntPtr wParam, ref HDITEM lParam); - - public static void SetSortIcon(this ListViewEx listViewControl, int columnIndex, SortOrder order) - { - IntPtr columnHeader = SendMessage(listViewControl.Handle, LVM_GETHEADER, IntPtr.Zero, IntPtr.Zero); - for (int columnNumber = 0; columnNumber <= listViewControl.Columns.Count - 1; columnNumber++) - { - var columnPtr = new IntPtr(columnNumber); - var item = new HDITEM - { - mask = HDITEM.Mask.Format - }; - - if (SendMessage(columnHeader, HDM_GETITEM, columnPtr, ref item) == IntPtr.Zero) - { - throw new Win32Exception(); - } - - if (order != SortOrder.None && columnNumber == columnIndex) - { - switch (order) - { - case SortOrder.Ascending: - item.fmt &= ~HDITEM.Format.SortDown; - item.fmt |= HDITEM.Format.SortUp; - break; - - case SortOrder.Descending: - item.fmt &= ~HDITEM.Format.SortUp; - item.fmt |= HDITEM.Format.SortDown; - break; - - default: - break; - } - } - else - { - item.fmt &= ~HDITEM.Format.SortDown & ~HDITEM.Format.SortUp; - } - - if (SendMessage(columnHeader, HDM_SETITEM, columnPtr, ref item) == IntPtr.Zero) - { - throw new Win32Exception(); - } - } - } - } -} diff --git a/TracingDB/Forms/LviIntColumnComparer.cs b/TracingDB/Forms/LviIntColumnComparer.cs deleted file mode 100644 index 219a2c910..000000000 --- a/TracingDB/Forms/LviIntColumnComparer.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Collections; -using System.Windows.Forms; - -namespace TracingDB.Forms -{ - public class LviIntColumnComparer : IComparer - { - int column; - SortOrder order; - - public LviIntColumnComparer() - { - column = 0; - order = SortOrder.Ascending; - } - - public LviIntColumnComparer(int column, SortOrder order) - { - this.column = column; - this.order = order; - } - - public int Compare(object x, object y) - { - int valX = int.Parse(((ListViewItem)x).SubItems[column].Text); - int valY = int.Parse(((ListViewItem)y).SubItems[column].Text); - return (order == SortOrder.Descending) ? (valY - valX) : (valX - valY); - } - } -} diff --git a/TracingDB/Forms/LviTextColumnComparer.cs b/TracingDB/Forms/LviTextColumnComparer.cs deleted file mode 100644 index d0dd7518c..000000000 --- a/TracingDB/Forms/LviTextColumnComparer.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Collections; -using System.Windows.Forms; - -namespace TracingDB.Forms -{ - public class LviTextColumnComparer : IComparer - { - private int column; - SortOrder order; - - public LviTextColumnComparer() - { - column = 0; - order = SortOrder.Ascending; - } - - public LviTextColumnComparer(int column, SortOrder order) - { - this.column = column; - this.order = order; - } - - public int Compare(object x, object y) - { - string txtX = ((ListViewItem)x).SubItems[column].Text; - string txtY = ((ListViewItem)y).SubItems[column].Text; - return (order == SortOrder.Descending) ? String.Compare(txtY, txtX) : String.Compare(txtX, txtY); - } - } -} diff --git a/TracingDB/Forms/ResultsConfigDlg.cs b/TracingDB/Forms/ResultsConfigDlg.cs index 4ae0bfb38..65329fc45 100644 --- a/TracingDB/Forms/ResultsConfigDlg.cs +++ b/TracingDB/Forms/ResultsConfigDlg.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.Windows.Forms; using log4net; +using Common.Forms; using TracingDB.Entities; using TracingDB.Resources; diff --git a/TracingDB/Forms/ResultsConfigDlg.designer.cs b/TracingDB/Forms/ResultsConfigDlg.designer.cs index 8e80e3ff3..a0820b926 100644 --- a/TracingDB/Forms/ResultsConfigDlg.designer.cs +++ b/TracingDB/Forms/ResultsConfigDlg.designer.cs @@ -39,7 +39,7 @@ namespace TracingDB.Forms this.removeAllButton = new System.Windows.Forms.Button(); this.removeButton = new System.Windows.Forms.Button(); this.addButton = new System.Windows.Forms.Button(); - this.selectedResultsListViewEx = new TracingDB.Forms.ListViewEx(); + this.selectedResultsListViewEx = new Common.Forms.ListViewEx(); this.upButton = new System.Windows.Forms.Button(); this.downButton = new System.Windows.Forms.Button(); this.SuspendLayout(); @@ -133,8 +133,8 @@ namespace TracingDB.Forms this.selectedResultsListViewEx.TabIndex = 47; this.selectedResultsListViewEx.UseCompatibleStateImageBehavior = false; this.selectedResultsListViewEx.View = System.Windows.Forms.View.Details; - this.selectedResultsListViewEx.SubItemClicked += new TracingDB.Forms.SubItemEventHandler(this.selectedResultsListViewEx_SubItemClicked); - this.selectedResultsListViewEx.SubItemEndEditing += new TracingDB.Forms.SubItemEndEditingEventHandler(this.selectedResultsListViewEx_SubItemEndEditing); + this.selectedResultsListViewEx.SubItemClicked += new Common.Forms.SubItemEventHandler(this.selectedResultsListViewEx_SubItemClicked); + this.selectedResultsListViewEx.SubItemEndEditing += new Common.Forms.SubItemEndEditingEventHandler(this.selectedResultsListViewEx_SubItemEndEditing); // // upButton // @@ -194,7 +194,7 @@ namespace TracingDB.Forms private System.Windows.Forms.Button removeAllButton; private System.Windows.Forms.Button removeButton; private System.Windows.Forms.Button addButton; - private ListViewEx selectedResultsListViewEx; + private Common.Forms.ListViewEx selectedResultsListViewEx; private System.Windows.Forms.Button upButton; private System.Windows.Forms.Button downButton; } diff --git a/TracingDB/TracingDB.csproj b/TracingDB/TracingDB.csproj index 9a4b0f642..251a85576 100644 --- a/TracingDB/TracingDB.csproj +++ b/TracingDB/TracingDB.csproj @@ -66,12 +66,6 @@ - - Component - - - - Form @@ -117,9 +111,6 @@ - - ListViewEx.cs - ModelessForm.cs @@ -140,6 +131,12 @@ + + + {c8939821-ba5c-4988-a3d0-bf53b74865c7} + Common + +