michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

There is only one ListViewEx in Results.Forms now.

Browse Source
This commit is contained in:
Milan Hanajik 2016-08-19 10:43:48 +02:00
parent f696d20060
commit 50194001d9
30 changed files with 138 additions and 672 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Results/Forms/ListViewEx.cs
View File

@ -1,5 +1,5 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
/// Copyright (c) 2013-2016 Sensus Metering Systems
///
using System;
using System.Collections;

4
TestBenchFramework/ComponentsManagerDlg.Designer.cs generated
View File

@ -33,7 +33,7 @@ namespace TBF
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ComponentsManagerDlg));
this.splitContainer = new System.Windows.Forms.SplitContainer();
this.listViewEx = new TBF.UiControls.ListViewEx();
this.listViewEx = new Results.Forms.ListViewEx();
this.sharedButtons = new TBF.UiControls.SharedButtons();
((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
this.splitContainer.Panel1.SuspendLayout();
@ -91,7 +91,7 @@ namespace TBF
#endregion
private TBF.UiControls.ListViewEx listViewEx;
private Results.Forms.ListViewEx listViewEx;
private System.Windows.Forms.SplitContainer splitContainer;
private UiControls.SharedButtons sharedButtons;
}

8
TestBenchFramework/ComponentsManagerDlg.cs
View File

@ -102,8 +102,8 @@ namespace TBF
for (LogLevel level = 0; level < LogLevel.Count; level++) logCB.Items.Add(level.ToString());
splitContainer.Panel1.Controls.Add(logCB);
listViewEx.SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked);
listViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
listViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked);
listViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
sharedButtons.DisableButtons(UiControls.SharedButtons.Buttons.Remove | UiControls.SharedButtons.Buttons.Edit);
@ -115,7 +115,7 @@ namespace TBF
RedrawAll();
}
void listViewEx_SubItemClicked(object sender, SubItemEventArgs e)
void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e)
{
if (unlocked && e.SubItem == (int)Column.DebugMode)
{
@ -127,7 +127,7 @@ namespace TBF
}
}
void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e)
void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e)
{
Component cmpnt = (Component)e.Item.Tag;

2
TestBenchFramework/PathsDlg.cs
View File

@ -200,7 +200,7 @@ namespace TBF
/// <param name="listViewEx"></param>
void SelectedIndexChanged(object sender, EventArgs e)
{
ListViewEx listViewEx = sender as ListViewEx;
Results.Forms.ListViewEx listViewEx = sender as Results.Forms.ListViewEx;
if (listViewEx.SelectedItems.Count != 1)
{
/// No item selected

20
TestBenchFramework/ProcedureDlg.Designer.cs generated
View File

@ -70,15 +70,15 @@ namespace TBF
this.procNameTextBox = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
this.historyTabPage = new System.Windows.Forms.TabPage();
this.historyListViewEx = new TBF.UiControls.ListViewEx();
this.historyListViewEx = new Results.Forms.ListViewEx();
this.metrology1TabPage = new System.Windows.Forms.TabPage();
this.metrology1ListViewEx = new TBF.UiControls.ListViewEx();
this.metrology1ListViewEx = new Results.Forms.ListViewEx();
this.metrology2TabPage = new System.Windows.Forms.TabPage();
this.metrology2ListViewEx = new TBF.UiControls.ListViewEx();
this.metrology2ListViewEx = new Results.Forms.ListViewEx();
this.processTabPage = new System.Windows.Forms.TabPage();
this.processListViewEx = new TBF.UiControls.ListViewEx();
this.processListViewEx = new Results.Forms.ListViewEx();
this.parametersTabPage = new System.Windows.Forms.TabPage();
this.parametersListViewEx = new TBF.UiControls.ListViewEx();
this.parametersListViewEx = new Results.Forms.ListViewEx();
this.sharedButtons = new TBF.UiControls.SharedButtons();
this.metersKindRadioButton3 = new System.Windows.Forms.RadioButton();
((System.ComponentModel.ISupportInitialize)(this.mainSplitContainer)).BeginInit();
@ -478,13 +478,13 @@ namespace TBF
private System.Windows.Forms.SplitContainer mainSplitContainer;
private System.Windows.Forms.TabControl tabControl;
private System.Windows.Forms.TabPage historyTabPage;
private UiControls.ListViewEx historyListViewEx;
private Results.Forms.ListViewEx historyListViewEx;
private System.Windows.Forms.TabPage metrology1TabPage;
private UiControls.ListViewEx metrology1ListViewEx;
private Results.Forms.ListViewEx metrology1ListViewEx;
private System.Windows.Forms.TabPage metrology2TabPage;
private UiControls.ListViewEx metrology2ListViewEx;
private Results.Forms.ListViewEx metrology2ListViewEx;
private System.Windows.Forms.TabPage processTabPage;
private UiControls.ListViewEx processListViewEx;
private Results.Forms.ListViewEx processListViewEx;
private UiControls.SharedButtons sharedButtons;
private System.Windows.Forms.TabPage generalTabPage;
private System.Windows.Forms.ComboBox fileWriter1ComboBox;
@ -516,7 +516,7 @@ namespace TBF
private System.Windows.Forms.RadioButton metersKindRadioButton2;
private System.Windows.Forms.RadioButton metersKindRadioButton1;
private System.Windows.Forms.TabPage parametersTabPage;
private UiControls.ListViewEx parametersListViewEx;
private Results.Forms.ListViewEx parametersListViewEx;
private System.Windows.Forms.TextBox protocolTitleTextBox;
private System.Windows.Forms.Label protocolTitleLabel;
private System.Windows.Forms.ComboBox fileWriter2ComboBox;

60
TestBenchFramework/ProcedureDlg.cs
View File

@ -71,21 +71,21 @@ namespace TBF
sharedButtons.DownClicked += downButton_Click;
/// ListViewEx-es configuration
metrology1ListViewEx.SubItemClicked += new SubItemEventHandler(metrology1ListViewEx_SubItemClicked);
metrology1ListViewEx.SubItemRightClicked += new SubItemEventHandler(metrology1ListViewEx_SubItemRightClicked);
metrology1ListViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(metrology1ListViewEx_SubItemEndEditing);
metrology1ListViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(metrology1ListViewEx_SubItemClicked);
metrology1ListViewEx.SubItemRightClicked += new Results.Forms.SubItemEventHandler(metrology1ListViewEx_SubItemRightClicked);
metrology1ListViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(metrology1ListViewEx_SubItemEndEditing);
metrology2ListViewEx.SubItemClicked += new SubItemEventHandler(metrology2ListViewEx_SubItemClicked);
metrology2ListViewEx.SubItemRightClicked += new SubItemEventHandler(metrology2ListViewEx_SubItemRightClicked);
metrology2ListViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(metrology2ListViewEx_SubItemEndEditing);
metrology2ListViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(metrology2ListViewEx_SubItemClicked);
metrology2ListViewEx.SubItemRightClicked += new Results.Forms.SubItemEventHandler(metrology2ListViewEx_SubItemRightClicked);
metrology2ListViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(metrology2ListViewEx_SubItemEndEditing);
processListViewEx.SubItemClicked += new SubItemEventHandler(processListViewEx_SubItemClicked);
processListViewEx.SubItemRightClicked += new SubItemEventHandler(processListViewEx_SubItemRightClicked);
processListViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(processListViewEx_SubItemEndEditing);
processListViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(processListViewEx_SubItemClicked);
processListViewEx.SubItemRightClicked += new Results.Forms.SubItemEventHandler(processListViewEx_SubItemRightClicked);
processListViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(processListViewEx_SubItemEndEditing);
parametersListViewEx.SubItemClicked += new SubItemEventHandler(parametersListViewEx_SubItemClicked);
parametersListViewEx.SubItemRightClicked += new SubItemEventHandler(parametersListViewEx_SubItemRightClicked);
parametersListViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(parametersListViewEx_SubItemEndEditing);
parametersListViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(parametersListViewEx_SubItemClicked);
parametersListViewEx.SubItemRightClicked += new Results.Forms.SubItemEventHandler(parametersListViewEx_SubItemRightClicked);
parametersListViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(parametersListViewEx_SubItemEndEditing);
}
public ProcedureDlg(Config.Entities.Procedure procedure)
@ -1108,7 +1108,7 @@ namespace TBF
}
}
private void metrology1ListViewEx_SubItemClicked(object sender, SubItemEventArgs e)
private void metrology1ListViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e)
{
if (unlocked && (e.SubItem < (int)MtrlgyClmn.MtrlgyClmnCount))
{
@ -1116,7 +1116,7 @@ namespace TBF
}
}
void metrology1ListViewEx_SubItemRightClicked(object sender, SubItemEventArgs e)
void metrology1ListViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e)
{
if (!unlocked || e.SubItem >= (int)MtrlgyClmn.MtrlgyClmnCount) return;
@ -1142,7 +1142,7 @@ namespace TBF
}
}
private void metrology1ListViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e)
private void metrology1ListViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e)
{
int dummy;
if (e.SubItem == (int)MtrlgyClmn.Part)
@ -1230,7 +1230,7 @@ namespace TBF
}
}
private void metrology2ListViewEx_SubItemClicked(object sender, SubItemEventArgs e)
private void metrology2ListViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e)
{
if (!unlocked ||
e.SubItem == (int)Mtrlgy2Clmn.Qfrom ||
@ -1243,7 +1243,7 @@ namespace TBF
metrology2ListViewEx.StartEditing(metrology2Editors[e.SubItem], e.Item, e.SubItem);
}
void metrology2ListViewEx_SubItemRightClicked(object sender, SubItemEventArgs e)
void metrology2ListViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e)
{
if (!unlocked ||
e.SubItem == (int)Mtrlgy2Clmn.Qfrom ||
@ -1275,7 +1275,7 @@ namespace TBF
}
}
private void metrology2ListViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e)
private void metrology2ListViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e)
{
int dummy;
if (e.SubItem == (int)Mtrlgy2Clmn.Part)
@ -1300,7 +1300,7 @@ namespace TBF
}
}
private void processListViewEx_SubItemClicked(object sender, SubItemEventArgs e)
private void processListViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e)
{
if (!unlocked ||
e.SubItem == (int)ProcessClmn.Qfrom ||
@ -1313,7 +1313,7 @@ namespace TBF
processListViewEx.StartEditing(processEditors[e.SubItem], e.Item, e.SubItem);
}
void processListViewEx_SubItemRightClicked(object sender, SubItemEventArgs e)
void processListViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e)
{
if (!unlocked ||
e.SubItem == (int)ProcessClmn.Qfrom ||
@ -1345,7 +1345,7 @@ namespace TBF
}
}
private void processListViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e)
private void processListViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e)
{
int dummy;
if (e.SubItem == (int)ProcessClmn.Part)
@ -1371,7 +1371,7 @@ namespace TBF
}
}
private void parametersListViewEx_SubItemClicked(object sender, SubItemEventArgs e)
private void parametersListViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e)
{
if (!unlocked ||
e.SubItem == (int)ParametersClmn.Qfrom ||
@ -1384,7 +1384,7 @@ namespace TBF
parametersListViewEx.StartEditing(parametersEditors[e.SubItem], e.Item, e.SubItem);
}
void parametersListViewEx_SubItemRightClicked(object sender, SubItemEventArgs e)
void parametersListViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e)
{
if (!unlocked ||
e.SubItem == (int)ParametersClmn.Qfrom ||
@ -1416,7 +1416,7 @@ namespace TBF
}
}
private void parametersListViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e)
private void parametersListViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e)
{
int dummy;
if (e.SubItem == (int)ParametersClmn.Part)
@ -1494,7 +1494,7 @@ namespace TBF
transitionEndComboBox.Enabled = true;
notesTextBox.Enabled = true;
ListViewEx listViewEx;
Results.Forms.ListViewEx listViewEx;
switch (selectedTab)
{
@ -1609,7 +1609,7 @@ namespace TBF
private void addButton_Click(object sender, EventArgs e)
{
ListViewEx listViewEx;
Results.Forms.ListViewEx listViewEx;
switch (selectedTab)
{
@ -1731,7 +1731,7 @@ namespace TBF
private void removeButton_Click(object sender, EventArgs e)
{
ListViewEx listViewEx;
Results.Forms.ListViewEx listViewEx;
switch (selectedTab)
{
@ -1784,7 +1784,7 @@ namespace TBF
private void upButton_Click(object sender, EventArgs e)
{
ListViewEx listViewEx;
Results.Forms.ListViewEx listViewEx;
switch (selectedTab)
{
@ -1833,7 +1833,7 @@ namespace TBF
private void downButton_Click(object sender, EventArgs e)
{
ListViewEx listViewEx;
Results.Forms.ListViewEx listViewEx;
switch (selectedTab)
{
@ -1930,7 +1930,7 @@ namespace TBF
/// <param name="listViewEx"></param>
void SelectedIndexChanged(object sender, EventArgs e)
{
ListViewEx listViewEx = sender as ListViewEx;
Results.Forms.ListViewEx listViewEx = sender as Results.Forms.ListViewEx;
if (listViewEx.SelectedItems.Count != 1)
{
UpdateButtonStates(SharedButtons.SelectedItemPos.None);

2
TestBenchFramework/ProceduresDlg.cs
View File

@ -136,7 +136,7 @@ namespace TBF
/// <param name="listViewEx"></param>
void SelectedIndexChanged(object sender, EventArgs e)
{
ListViewEx listViewEx = sender as ListViewEx;
Results.Forms.ListViewEx listViewEx = sender as Results.Forms.ListViewEx;
if (listViewEx.SelectedItems.Count != 1)
{
/// No item selected

6
TestBenchFramework/TBF.csproj
View File

@ -1446,9 +1446,6 @@
<Compile Include="UiControls\PathsBenchCtrl.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="UiControls\ListViewEx.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="UiControls\PathsFeedingCtrl.cs">
<SubType>Component</SubType>
</Compile>
@ -1994,9 +1991,6 @@
<EmbeddedResource Include="UiControls\MetrologyDlgPressMeterTab.resx">
<DependentUpon>MetrologyDlgPressMeterTab.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UiControls\ListViewEx.resx">
<DependentUpon>ListViewEx.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UiControls\ProcedureParamsCtrl.resx">
<DependentUpon>ProcedureParamsCtrl.cs</DependentUpon>
</EmbeddedResource>

4
TestBenchFramework/TransitionsDlg.cs
View File

@ -170,7 +170,7 @@ namespace TBF
void RefreshAllTabs()
{
foreach (var ctrl in seqStepsCtrls) (ctrl as ListViewEx).Refresh();
foreach (var ctrl in seqStepsCtrls) (ctrl as Results.Forms.ListViewEx).Refresh();
}
private void Unlocked(object sender, EventArgs e)
@ -358,7 +358,7 @@ namespace TBF
/// <param name="listViewEx"></param>
void SelectedIndexChanged(object sender, EventArgs e)
{
ListViewEx listViewEx = sender as ListViewEx;
Results.Forms.ListViewEx listViewEx = sender as Results.Forms.ListViewEx;
if (listViewEx.SelectedItems.Count != 1)
{
UpdateButtonStates(SharedButtons.SelectedItemPos.None);

2
TestBenchFramework/UiControls/BaseWithListViewEx.cs
View File

@ -8,7 +8,7 @@ using Config.Entities;
namespace TBF.UiControls
{
public class BaseWithListViewEx<MyItem> : ListViewEx
public class BaseWithListViewEx<MyItem> : Results.Forms.ListViewEx
{
/// <summary>
/// List of items to be edited

486
TestBenchFramework/UiControls/ListViewEx.cs
View File

@ -1,486 +0,0 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
///
using System;
using System.Collections;
using System.ComponentModel;
using System.Drawing;
using System.Data;
using System.Windows.Forms;
using System.Runtime.InteropServices;
namespace TBF.UiControls
{
/// <summary>
/// Event Handler for SubItem events
/// </summary>
public delegate void SubItemEventHandler(object sender, SubItemEventArgs e);
/// <summary>
/// Event Handler for SubItemEndEditing events
/// </summary>
public delegate void SubItemEndEditingEventHandler(object sender, SubItemEndEditingEventArgs e);
/// <summary>
/// Inherited ListView to allow in-place editing of subitems
/// </summary>
public class ListViewEx : System.Windows.Forms.ListView
{
#region Interop structs, imports and constants
/// <summary>
/// MessageHeader for WM_NOTIFY
/// </summary>
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
/// <summary>
/// Required designer variable.
/// </summary>
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;
}
/// <summary>
/// Clean up any resources being used.
/// </summary>
protected override void Dispose( bool disposing )
{
if( disposing )
{
if( components != null )
components.Dispose();
}
base.Dispose( disposing );
}
#region Component Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
components = new System.ComponentModel.Container();
}
#endregion
private bool _doubleClickActivation = false;
/// <summary>
/// Is a double click required to start editing a cell?
/// </summary>
public bool DoubleClickActivation
{
get { return _doubleClickActivation; }
set { _doubleClickActivation = value; }
}
/// <summary>
/// Retrieve the order in which columns appear
/// </summary>
/// <returns>Current display order of column indices</returns>
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;
}
/// <summary>
/// Find ListViewItem and SubItem Index at position (x,y)
/// </summary>
/// <param name="x">relative to ListView</param>
/// <param name="y">relative to ListView</param>
/// <param name="item">Item at position (x,y)</param>
/// <returns>SubItem index</returns>
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<order.Length; i++)
{
ColumnHeader h = this.Columns[order[i]];
if (x < subItemX+h.Width)
{
return h.Index;
}
subItemX += h.Width;
}
}
return -1;
}
/// <summary>
/// Get bounds for a SubItem
/// </summary>
/// <param name="Item">Target ListViewItem</param>
/// <param name="SubItem">Target SubItem index</param>
/// <returns>Bounds of SubItem (relative to ListView)</returns>
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<order.Length; i++)
{
col = this.Columns[order[i]];
if (col.Index == SubItem)
break;
subItemX += col.Width;
}
subItemRect = new Rectangle(subItemX, lviBounds.Top, this.Columns[order[i]].Width, lviBounds.Height);
return subItemRect;
}
protected override void WndProc(ref Message msg)
{
switch (msg.Msg)
{
// Look for WM_VSCROLL,WM_HSCROLL or WM_SIZE messages.
case WM_VSCROLL:
case WM_HSCROLL:
case WM_SIZE:
EndEditing(false);
break;
case WM_NOTIFY:
// Look for WM_NOTIFY of events that might also change the
// editor's position/size: Column reordering or resizing
NMHDR h = (NMHDR)Marshal.PtrToStructure(msg.LParam, typeof(NMHDR));
if (h.code == HDN_BEGINDRAG ||
h.code == HDN_ITEMCHANGINGA ||
h.code == HDN_ITEMCHANGINGW)
EndEditing(false);
break;
}
base.WndProc(ref msg);
}
#region Initialize editing depending of DoubleClickActivation property
protected override void OnMouseUp(System.Windows.Forms.MouseEventArgs e)
{
base.OnMouseUp(e);
MouseEventArgs me = (MouseEventArgs)e;
if (me.Button == MouseButtons.Right)
{
/// Right mouse button click function
RightClickFunctionSubitemAt(new Point(e.X, e.Y));
}
else
{
/// Normal function (=edit item)
if (DoubleClickActivation)
{
return;
}
EditSubitemAt(new Point(e.X, e.Y));
}
}
protected override void OnDoubleClick(EventArgs e)
{
base.OnDoubleClick (e);
if (!DoubleClickActivation)
{
return;
}
Point pt = this.PointToClient(Cursor.Position);
EditSubitemAt(pt);
}
///<summary>
/// Fire SubItemClicked
///</summary>
///<param name="p">Point of click/doubleclick</param>
private void EditSubitemAt(Point p)
{
ListViewItem item;
int idx = GetSubItemAt(p.X, p.Y, out item);
if (idx >= 0)
{
OnSubItemClicked(new SubItemEventArgs(item, idx));
}
}
///<summary>
/// Fire SubItemRightClicked
///</summary>
///<param name="p">Point of click/doubleclick</param>
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);
}
/// <summary>
/// Begin in-place editing of given cell
/// </summary>
/// <param name="c">Control used as cell editor</param>
/// <param name="Item">ListViewItem to edit</param>
/// <param name="SubItem">SubItem index to edit</param>
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;
}
}
}
/// <summary>
/// Accept or discard current value of cell editor control
/// </summary>
/// <param name="AcceptChanges">Use the _editingControl's Text as new SubItem text or discard changes?</param>
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
}
/// <summary>
/// Event Args for SubItemClicked event
/// </summary>
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;
}
}
/// <summary>
/// Event Args for SubItemEndEditingClicked event
/// </summary>
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; }
}
}
}

42
TestBenchFramework/UiControls/ListViewEx.resx
View File

@ -1,42 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<root>
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="ResMimeType">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="Version">
<value>1.0.0.0</value>
</resheader>
<resheader name="Reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3102.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="Writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3102.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

4
TestBenchFramework/UiControls/MetrologyDlgBalanceTab.Designer.cs generated
View File

@ -57,7 +57,7 @@ namespace TBF.UiControls
this.measuredTextBox = new System.Windows.Forms.TextBox();
this.correctedLabel = new System.Windows.Forms.Label();
this.measuredLabel = new System.Windows.Forms.Label();
this.listViewEx = new TBF.UiControls.ListViewEx();
this.listViewEx = new Results.Forms.ListViewEx();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@ -369,7 +369,7 @@ namespace TBF.UiControls
private System.Windows.Forms.Label cmpntNameLabel;
private System.Windows.Forms.SplitContainer splitContainer1;
private ListViewEx listViewEx;
private Results.Forms.ListViewEx listViewEx;
private System.Windows.Forms.Label measuredLabel;
private System.Windows.Forms.GroupBox testGroupBox;
private System.Windows.Forms.TextBox correctedTextBox;

12
TestBenchFramework/UiControls/MetrologyDlgBalanceTab.cs
View File

@ -72,9 +72,9 @@ namespace TBF.UiControls
this.Controls.Add(measurementTextBox);
this.Controls.Add(correctionTextBox);
listViewEx.SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked);
listViewEx.SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked);
listViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
listViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked);
listViewEx.SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked);
listViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Nr, Width = 60 });
listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Mass_kg, Width = 100 });
@ -132,7 +132,7 @@ namespace TBF.UiControls
listViewEx.Items.Add(lvi);
}
void listViewEx_SubItemClicked(object sender, SubItemEventArgs e)
void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e)
{
if (unlocked && e.SubItem == 1)
{
@ -144,7 +144,7 @@ namespace TBF.UiControls
}
}
void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e)
void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e)
{
if (!unlocked || e.SubItem < 1 || e.SubItem > 2) return;
@ -172,7 +172,7 @@ namespace TBF.UiControls
}
}
void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e)
void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e)
{
if (ParseItem(e.Item, e.SubItem, e.DisplayText)) return;

4
TestBenchFramework/UiControls/MetrologyDlgFlowMeterTab.Designer.cs generated
View File

@ -38,7 +38,7 @@ namespace TBF.UiControls
this.correctedLabel = new System.Windows.Forms.Label();
this.measuredLabel = new System.Windows.Forms.Label();
this.cmpntNameLabel = new System.Windows.Forms.Label();
this.listViewEx = new TBF.UiControls.ListViewEx();
this.listViewEx = new Results.Forms.ListViewEx();
this.nameGroupBox = new System.Windows.Forms.GroupBox();
this.calibrationGroupBox = new System.Windows.Forms.GroupBox();
this.calibValidDateTextBox = new System.Windows.Forms.TextBox();
@ -250,7 +250,7 @@ namespace TBF.UiControls
private System.Windows.Forms.SplitContainer splitContainer1;
private System.Windows.Forms.Label cmpntNameLabel;
private ListViewEx listViewEx;
private Results.Forms.ListViewEx listViewEx;
private System.Windows.Forms.GroupBox testGroupBox;
private System.Windows.Forms.TextBox correctedTextBox;
private System.Windows.Forms.TextBox measuredTextBox;

12
TestBenchFramework/UiControls/MetrologyDlgFlowMeterTab.cs
View File

@ -75,9 +75,9 @@ namespace TBF.UiControls
this.Controls.Add(measurementTextBox);
this.Controls.Add(correctionTextBox);
listViewEx.SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked);
listViewEx.SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked);
listViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
listViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked);
listViewEx.SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked);
listViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Nr, Width = 60 });
listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Flow_m3h, Width = 100 });
@ -123,7 +123,7 @@ namespace TBF.UiControls
listViewEx.Items.Add(lvi);
}
void listViewEx_SubItemClicked(object sender, SubItemEventArgs e)
void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e)
{
if (unlocked && e.SubItem == 1)
{
@ -135,7 +135,7 @@ namespace TBF.UiControls
}
}
void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e)
void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e)
{
if (!unlocked || e.SubItem < 1 || e.SubItem > 2) return;
@ -163,7 +163,7 @@ namespace TBF.UiControls
}
}
void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e)
void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e)
{
if (ParseItem(e.Item, e.SubItem, e.DisplayText)) return;

4
TestBenchFramework/UiControls/MetrologyDlgPressMeterTab.Designer.cs generated
View File

@ -39,7 +39,7 @@ namespace TBF.UiControls
this.measuredLabel = new System.Windows.Forms.Label();
this.componentLabel = new System.Windows.Forms.Label();
this.cmpntNameLabel = new System.Windows.Forms.Label();
this.listViewEx = new TBF.UiControls.ListViewEx();
this.listViewEx = new Results.Forms.ListViewEx();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@ -172,7 +172,7 @@ namespace TBF.UiControls
private System.Windows.Forms.SplitContainer splitContainer1;
private System.Windows.Forms.Label componentLabel;
private System.Windows.Forms.Label cmpntNameLabel;
private ListViewEx listViewEx;
private Results.Forms.ListViewEx listViewEx;
private System.Windows.Forms.GroupBox testGroupBox;
private System.Windows.Forms.TextBox correctedTextBox;
private System.Windows.Forms.TextBox measuredTextBox;

12
TestBenchFramework/UiControls/MetrologyDlgPressMeterTab.cs
View File

@ -69,9 +69,9 @@ namespace TBF.UiControls
this.Controls.Add(measurementTextBox);
this.Controls.Add(correctionTextBox);
listViewEx.SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked);
listViewEx.SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked);
listViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
listViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked);
listViewEx.SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked);
listViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Nr, Width = 60 });
listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Pressure_bar, Width = 100 });
@ -96,7 +96,7 @@ namespace TBF.UiControls
listViewEx.Items.Add(lvi);
}
void listViewEx_SubItemClicked(object sender, SubItemEventArgs e)
void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e)
{
if (unlocked && e.SubItem == 1)
{
@ -108,7 +108,7 @@ namespace TBF.UiControls
}
}
void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e)
void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e)
{
if (!unlocked || e.SubItem < 1 || e.SubItem > 2) return;
@ -136,7 +136,7 @@ namespace TBF.UiControls
}
}
void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e)
void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e)
{
if (ParseItem(e.Item, e.SubItem, e.DisplayText)) return;

12
TestBenchFramework/UiControls/PathsBenchCtrl.cs
View File

@ -53,9 +53,9 @@ namespace TBF.UiControls
.CreateQuery("FROM BenchPath ORDER BY ItemNr")
.List<Config.Entities.BenchPath>();
SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked);
SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked);
SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked);
SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked);
SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
/// ListViewEx columns
TBF.LocalSettings ls = Program.LocalSettings;
@ -131,7 +131,7 @@ namespace TBF.UiControls
base.RedrawAll();
}
void listViewEx_SubItemClicked(object sender, SubItemEventArgs e)
void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e)
{
if (!Unlocked || e.SubItem >= editors.Length) return;
if ((e.Item.Tag is Config.Entities.IHasItemNr) &&
@ -143,7 +143,7 @@ namespace TBF.UiControls
StartEditing(editors[e.SubItem], e.Item, e.SubItem);
}
void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e)
void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e)
{
if (!Unlocked || e.SubItem >= editors.Length) return;
@ -169,7 +169,7 @@ namespace TBF.UiControls
}
}
void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e)
void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e)
{
if (e.SubItem >= fixedColumnsCount)
{

12
TestBenchFramework/UiControls/PathsFeedingCtrl.cs
View File

@ -50,9 +50,9 @@ namespace TBF.UiControls
.CreateQuery("FROM FeedingPath ORDER BY ItemNr")
.List<Config.Entities.FeedingPath>();
SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked);
SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked);
SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked);
SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked);
SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
/// ListViewEx columns
TBF.LocalSettings ls = Program.LocalSettings;
@ -103,7 +103,7 @@ namespace TBF.UiControls
base.RedrawAll();
}
void listViewEx_SubItemClicked(object sender, SubItemEventArgs e)
void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e)
{
if (!Unlocked || e.SubItem >= editors.Length) return;
if ((e.Item.Tag is IHasItemNr) &&
@ -115,7 +115,7 @@ namespace TBF.UiControls
StartEditing(editors[e.SubItem], e.Item, e.SubItem);
}
void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e)
void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e)
{
if (!Unlocked || e.SubItem >= editors.Length) return;
@ -141,7 +141,7 @@ namespace TBF.UiControls
}
}
void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e)
void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e)
{
if (e.SubItem >= fixedColumnsCount)
{

12
TestBenchFramework/UiControls/PathsHeatMetersCtrl.cs
View File

@ -57,9 +57,9 @@ namespace TBF.UiControls
.CreateQuery("FROM HeatMetersPath ORDER BY ItemNr")
.List<Config.Entities.HeatMetersPath>();
SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked);
SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked);
SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked);
SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked);
SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
IList<ITempMeter> tempMeters = new List<ITempMeter>();
foreach (var cmpnt in parent.TbfComponents)
@ -116,7 +116,7 @@ namespace TBF.UiControls
#endif
}
void listViewEx_SubItemClicked(object sender, SubItemEventArgs e)
void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e)
{
if (!Unlocked || e.SubItem >= editors.Length) return;
if ((e.Item.Tag is Config.Entities.IHasItemNr) &&
@ -128,7 +128,7 @@ namespace TBF.UiControls
StartEditing(editors[e.SubItem], e.Item, e.SubItem);
}
void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e)
void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e)
{
if (!Unlocked || e.SubItem >= editors.Length) return;
@ -154,7 +154,7 @@ namespace TBF.UiControls
}
}
void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e)
void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e)
{
if (e.SubItem >= (int)Column.TWarmFrom && e.SubItem <= (int)Column.TColdTo)
{

12
TestBenchFramework/UiControls/PathsMetersCtrl.cs
View File

@ -44,9 +44,9 @@ namespace TBF.UiControls
.CreateQuery("FROM MetersPath ORDER BY ItemNr")
.List<Config.Entities.MetersPath>();
SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked);
SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked);
SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked);
SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked);
SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
IList<IRegisterReader> readers = new List<IRegisterReader>();
foreach (var cmpnt in parent.TbfComponents)
@ -85,13 +85,13 @@ namespace TBF.UiControls
base.RedrawAll();
}
void listViewEx_SubItemClicked(object sender, SubItemEventArgs e)
void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e)
{
if (!Unlocked || e.SubItem >= editors.Length) return;
StartEditing(editors[e.SubItem], e.Item, e.SubItem);
}
void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e)
void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e)
{
if (!Unlocked || e.SubItem >= editors.Length) return;
@ -117,7 +117,7 @@ namespace TBF.UiControls
}
}
void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e)
void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e)
{
}

12
TestBenchFramework/UiControls/PathsOutputCtrl.cs
View File

@ -57,9 +57,9 @@ namespace TBF.UiControls
.CreateQuery("FROM OutputPath ORDER BY ItemNr")
.List<Config.Entities.OutputPath>();
SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked);
SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked);
SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked);
SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked);
SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
/// ListViewEx columns
TBF.LocalSettings ls = Program.LocalSettings;
@ -145,7 +145,7 @@ namespace TBF.UiControls
base.RedrawAll();
}
void listViewEx_SubItemClicked(object sender, SubItemEventArgs e)
void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e)
{
if (!Unlocked || e.SubItem >= editors.Length) return;
if ((e.Item.Tag is IHasItemNr) &&
@ -157,7 +157,7 @@ namespace TBF.UiControls
StartEditing(editors[e.SubItem], e.Item, e.SubItem);
}
void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e)
void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e)
{
if (!Unlocked || e.SubItem >= editors.Length) return;
@ -183,7 +183,7 @@ namespace TBF.UiControls
}
}
void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e)
void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e)
{
if (e.SubItem >= fixedColumnsCount)
{

4
TestBenchFramework/UiControls/ProcedureParamsCtrl.Designer.cs generated
View File

@ -31,7 +31,7 @@ namespace TBF.UiControls
/// </summary>
private void InitializeComponent()
{
this.listViewEx = new TBF.UiControls.ListViewEx();
this.listViewEx = new Results.Forms.ListViewEx();
this.SuspendLayout();
//
// listViewEx
@ -60,6 +60,6 @@ namespace TBF.UiControls
#endregion
private ListViewEx listViewEx;
private Results.Forms.ListViewEx listViewEx;
}
}

12
TestBenchFramework/UiControls/ProcedureParamsCtrl.cs
View File

@ -95,20 +95,20 @@ namespace TBF.UiControls
}
}
listViewEx.SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked);
listViewEx.SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked);
listViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
listViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked);
listViewEx.SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked);
listViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
RedrawAll();
}
private void listViewEx_SubItemClicked(object sender, SubItemEventArgs e)
private void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e)
{
if (!unlocked || e.Item.Tag == null || e.SubItem < nrFixedColumns || e.SubItem >= nrFixedColumns + editors.Length) return;
listViewEx.StartEditing(editors[e.SubItem - nrFixedColumns], e.Item, e.SubItem);
}
void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e)
void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e)
{
if (!unlocked || e.Item.Tag == null || e.SubItem < nrFixedColumns || e.SubItem >= nrFixedColumns + editors.Length) return;
@ -141,7 +141,7 @@ namespace TBF.UiControls
}
}
private void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e)
private void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e)
{
string message;
if ((e.Item.Tag as IParamsProvider).ValidateParam(e.SubItem - nrFixedColumns, e.DisplayText, out message))

8
TestBenchFramework/UiControls/ProceduresCtrl.cs
View File

@ -47,8 +47,8 @@ namespace TBF.UiControls
this.parent = parent;
this.parentControl = parentControl;
SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked);
SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked);
SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
/// ListViewEx columns
TBF.LocalSettings ls = Program.LocalSettings;
@ -82,11 +82,11 @@ namespace TBF.UiControls
base.RedrawAll();
}
void listViewEx_SubItemClicked(object sender, SubItemEventArgs e)
void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e)
{
}
void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e)
void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e)
{
}

4
TestBenchFramework/UiControls/TestParamsCtrl.Designer.cs generated
View File

@ -31,7 +31,7 @@ namespace TBF.UiControls
/// </summary>
private void InitializeComponent()
{
this.listViewEx = new TBF.UiControls.ListViewEx();
this.listViewEx = new Results.Forms.ListViewEx();
this.SuspendLayout();
//
// listViewEx
@ -60,6 +60,6 @@ namespace TBF.UiControls
#endregion
private ListViewEx listViewEx;
private Results.Forms.ListViewEx listViewEx;
}
}

12
TestBenchFramework/UiControls/TestParamsCtrl.cs
View File

@ -99,14 +99,14 @@ namespace TBF.UiControls
}
}
listViewEx.SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked);
listViewEx.SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked);
listViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
listViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked);
listViewEx.SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked);
listViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
RedrawAll();
}
private void listViewEx_SubItemClicked(object sender, SubItemEventArgs e)
private void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e)
{
int itemNr = showTestsColumn ? (e.SubItem - 1) : e.SubItem;
if (!unlocked || e.Item.Tag == null || itemNr >= editors.Length || itemNr < 0) return;
@ -114,7 +114,7 @@ namespace TBF.UiControls
listViewEx.StartEditing(editors[itemNr], e.Item, e.SubItem);
}
void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e)
void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e)
{
int itemNr = showTestsColumn ? (e.SubItem - 1) : e.SubItem;
if (!unlocked || e.Item.Tag == null || itemNr >= editors.Length || itemNr < 0) return;
@ -147,7 +147,7 @@ namespace TBF.UiControls
}
}
private void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e)
private void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e)
{
string message;
int itemNr = showTestsColumn ? (e.SubItem - 1) : e.SubItem;

12
TestBenchFramework/UiControls/TransitionStepsCtrl.cs
View File

@ -51,9 +51,9 @@ namespace TBF.UiControls
Name = sequence.Name;
MyItems = sequence.TransitionSteps;
SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked);
SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked);
SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked);
SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked);
SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
vCount = 0;
fmPumpCount = 0;
@ -163,13 +163,13 @@ namespace TBF.UiControls
base.RedrawAll();
}
void listViewEx_SubItemClicked(object sender, SubItemEventArgs e)
void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e)
{
if (!Unlocked || e.SubItem >= editors.Length) return;
StartEditing(editors[e.SubItem], e.Item, e.SubItem);
}
void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e)
void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e)
{
if (!Unlocked || e.SubItem >= editors.Length) return;
@ -195,7 +195,7 @@ namespace TBF.UiControls
}
}
void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e)
void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e)
{
if (e.SubItem == (int)Column.Duration)
{

12
TestBenchFramework/UiControls/VirtualBenchStepsCtrl.cs
View File

@ -49,9 +49,9 @@ namespace TBF.UiControls
Name = sequence.Name;
MyItems = sequence.VirtualBenchSteps;
SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked);
SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked);
SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked);
SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked);
SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
vCount = 0;
fmPumpCount = 0;
@ -131,13 +131,13 @@ namespace TBF.UiControls
base.RedrawAll();
}
void listViewEx_SubItemClicked(object sender, SubItemEventArgs e)
void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e)
{
if (!Unlocked || e.SubItem >= editors.Length) return;
StartEditing(editors[e.SubItem], e.Item, e.SubItem);
}
void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e)
void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e)
{
if (!Unlocked || e.SubItem >= editors.Length) return;
@ -163,7 +163,7 @@ namespace TBF.UiControls
}
}
void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e)
void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e)
{
if (e.SubItem == (int)Column.Duration)
{