diff --git a/TBF/UI/Procedures/ProcedureDlg.Designer.cs b/TBF/UI/Procedures/ProcedureDlg.Designer.cs index abd5f2915..c95710e2b 100644 --- a/TBF/UI/Procedures/ProcedureDlg.Designer.cs +++ b/TBF/UI/Procedures/ProcedureDlg.Designer.cs @@ -35,6 +35,10 @@ namespace TBF.UI.Procedures this.mainSplitContainer = new System.Windows.Forms.SplitContainer(); this.tabControl = new System.Windows.Forms.TabControl(); this.generalTabPage = new System.Windows.Forms.TabPage(); + this.eventTrigger3ComboBox = new System.Windows.Forms.ComboBox(); + this.eventTrigger2ComboBox = new System.Windows.Forms.ComboBox(); + this.eventTrigger1ComboBox = new System.Windows.Forms.ComboBox(); + this.eventTriggersLabel = new System.Windows.Forms.Label(); this.testProfileTextBox = new System.Windows.Forms.TextBox(); this.testProfileLabel = new System.Windows.Forms.Label(); this.altProcPeriodTextBox = new System.Windows.Forms.TextBox(); @@ -88,10 +92,6 @@ namespace TBF.UI.Procedures this.parametersTabPage = new System.Windows.Forms.TabPage(); this.parametersListViewEx = new Results.Forms.ListViewEx(); this.sharedButtons = new TBF.UI.Shared.SharedButtons(); - this.eventTrigger2ComboBox = new System.Windows.Forms.ComboBox(); - this.eventTrigger1ComboBox = new System.Windows.Forms.ComboBox(); - this.eventTriggersLabel = new System.Windows.Forms.Label(); - this.eventTrigger3ComboBox = new System.Windows.Forms.ComboBox(); ((System.ComponentModel.ISupportInitialize)(this.mainSplitContainer)).BeginInit(); this.mainSplitContainer.Panel1.SuspendLayout(); this.mainSplitContainer.Panel2.SuspendLayout(); @@ -184,6 +184,29 @@ namespace TBF.UI.Procedures this.generalTabPage.Name = "generalTabPage"; this.generalTabPage.UseVisualStyleBackColor = true; // + // eventTrigger3ComboBox + // + this.eventTrigger3ComboBox.FormattingEnabled = true; + resources.ApplyResources(this.eventTrigger3ComboBox, "eventTrigger3ComboBox"); + this.eventTrigger3ComboBox.Name = "eventTrigger3ComboBox"; + // + // eventTrigger2ComboBox + // + this.eventTrigger2ComboBox.FormattingEnabled = true; + resources.ApplyResources(this.eventTrigger2ComboBox, "eventTrigger2ComboBox"); + this.eventTrigger2ComboBox.Name = "eventTrigger2ComboBox"; + // + // eventTrigger1ComboBox + // + this.eventTrigger1ComboBox.FormattingEnabled = true; + resources.ApplyResources(this.eventTrigger1ComboBox, "eventTrigger1ComboBox"); + this.eventTrigger1ComboBox.Name = "eventTrigger1ComboBox"; + // + // eventTriggersLabel + // + resources.ApplyResources(this.eventTriggersLabel, "eventTriggersLabel"); + this.eventTriggersLabel.Name = "eventTriggersLabel"; + // // testProfileTextBox // resources.ApplyResources(this.testProfileTextBox, "testProfileTextBox"); @@ -511,29 +534,6 @@ namespace TBF.UI.Procedures resources.ApplyResources(this.sharedButtons, "sharedButtons"); this.sharedButtons.Name = "sharedButtons"; // - // eventTrigger2ComboBox - // - this.eventTrigger2ComboBox.FormattingEnabled = true; - resources.ApplyResources(this.eventTrigger2ComboBox, "eventTrigger2ComboBox"); - this.eventTrigger2ComboBox.Name = "eventTrigger2ComboBox"; - // - // eventTrigger1ComboBox - // - this.eventTrigger1ComboBox.FormattingEnabled = true; - resources.ApplyResources(this.eventTrigger1ComboBox, "eventTrigger1ComboBox"); - this.eventTrigger1ComboBox.Name = "eventTrigger1ComboBox"; - // - // eventTriggersLabel - // - resources.ApplyResources(this.eventTriggersLabel, "eventTriggersLabel"); - this.eventTriggersLabel.Name = "eventTriggersLabel"; - // - // eventTrigger3ComboBox - // - this.eventTrigger3ComboBox.FormattingEnabled = true; - resources.ApplyResources(this.eventTrigger3ComboBox, "eventTrigger3ComboBox"); - this.eventTrigger3ComboBox.Name = "eventTrigger3ComboBox"; - // // ProcedureDlg // resources.ApplyResources(this, "$this"); diff --git a/TBF/UI/Procedures/ProcedureDlg.cs b/TBF/UI/Procedures/ProcedureDlg.cs index e73aa2603..19fd6d155 100644 --- a/TBF/UI/Procedures/ProcedureDlg.cs +++ b/TBF/UI/Procedures/ProcedureDlg.cs @@ -74,7 +74,8 @@ namespace TBF.UI.Procedures #if TURA_SPECIAL || TURA_IPERL || TURA_IPERL_NEW sharedButtons.OptionalButtons = SharedButtons.Buttons.Add | SharedButtons.Buttons.Remove | - SharedButtons.Buttons.Up | SharedButtons.Buttons.Down |SharedButtons.Buttons.Custom1; + SharedButtons.Buttons.Up | SharedButtons.Buttons.Down | + SharedButtons.Buttons.Copy | SharedButtons.Buttons.Custom1; sharedButtons.Custom1Caption = string.Format("Načítaj testy{0}iPerl z Oracle", Environment.NewLine); sharedButtons.Custom1Clicked += iPerlWizardButton_Click; #else @@ -88,6 +89,7 @@ namespace TBF.UI.Procedures sharedButtons.RemoveClicked += removeButton_Click; sharedButtons.UpClicked += upButton_Click; sharedButtons.DownClicked += downButton_Click; + sharedButtons.CopyClicked += copyButton_Click; /// ListViewEx-es configuration metrology1ListViewEx.SubItemClicked += new SubItemEventHandler(metrology1ListViewEx_SubItemClicked); @@ -2472,6 +2474,64 @@ namespace TBF.UI.Procedures listViewEx.Items[ix + 1].EnsureVisible(); } + private void copyButton_Click(object sender, EventArgs e) + { + ListViewEx listViewEx; + + switch (selectedTab) + { + case ProcedureTabs.Metrology1: + UpdateFromMetrology1Tab(); + listViewEx = metrology1ListViewEx; + break; + + case ProcedureTabs.Metrology2: + UpdateFromMetrology2Tab(); + listViewEx = metrology2ListViewEx; + break; + + case ProcedureTabs.Process: + UpdateFromProcessTab(); + listViewEx = processListViewEx; + break; + + case ProcedureTabs.Parameters: + UpdateFromParametersTab(); + listViewEx = parametersListViewEx; + break; + + default: return; + } + + /// Check the selected index validity + if (listViewEx.SelectedItems.Count != 1) return; + int ix = listViewEx.SelectedIndices[0]; + if (ix < 0 || ix >= listViewEx.Items.Count) return; + + Test selectedTest = LoadedProcedure.Tests[ix]; + + /// Add a copy of the selected test + Test newTest = selectedTest.Clone(); + newTest.ItemNr = listViewEx.Items.Count; + newTest.Name = selectedTest.Name + " copy"; + + LoadedProcedure.Tests.Add(newTest); + /// + AddToMetrology1Tab(newTest); + AddToMetrology2Tab(newTest); + AddToProcessTab(newTest); + AddToParametersTab(newTest); + foreach (var ctrl in testParamsCtrls) ctrl.AddOne(newTest); + + if (listViewEx != null) + { + listViewEx.Focus(); + listViewEx.SelectedItems.Clear(); + listViewEx.Items[listViewEx.Items.Count - 1].Selected = true; + listViewEx.Items[listViewEx.Items.Count - 1].EnsureVisible(); + } + } + #endregion private void metrology1ListViewEx_SelectedIndexChanged(object sender, EventArgs e) { SelectedIndexChanged(sender, e); } diff --git a/TBF/UI/Procedures/ProcedureDlg.resx b/TBF/UI/Procedures/ProcedureDlg.resx index 830a87b32..e91b08900 100644 --- a/TBF/UI/Procedures/ProcedureDlg.resx +++ b/TBF/UI/Procedures/ProcedureDlg.resx @@ -1363,7 +1363,7 @@ historyListViewEx - Results.Forms.ListViewEx, Results, Version=2.25.1440.0, Culture=neutral, PublicKeyToken=null + Results.Forms.ListViewEx, Results, Version=2.26.1458.0, Culture=neutral, PublicKeyToken=null historyTabPage @@ -1405,7 +1405,7 @@ 3, 3 - 917, 385 + 917, 417 0 @@ -1414,7 +1414,7 @@ metrology1ListViewEx - Results.Forms.ListViewEx, Results, Version=2.25.1440.0, Culture=neutral, PublicKeyToken=null + Results.Forms.ListViewEx, Results, Version=2.26.1458.0, Culture=neutral, PublicKeyToken=null metrology1TabPage @@ -1429,7 +1429,7 @@ 3, 3, 3, 3 - 923, 391 + 923, 423 2 @@ -1456,7 +1456,7 @@ 3, 3 - 917, 385 + 917, 417 0 @@ -1465,7 +1465,7 @@ metrology2ListViewEx - Results.Forms.ListViewEx, Results, Version=2.25.1440.0, Culture=neutral, PublicKeyToken=null + Results.Forms.ListViewEx, Results, Version=2.26.1458.0, Culture=neutral, PublicKeyToken=null metrology2TabPage @@ -1480,7 +1480,7 @@ 3, 3, 3, 3 - 923, 391 + 923, 423 3 @@ -1507,7 +1507,7 @@ 3, 3 - 917, 385 + 917, 417 0 @@ -1516,7 +1516,7 @@ processListViewEx - Results.Forms.ListViewEx, Results, Version=2.25.1440.0, Culture=neutral, PublicKeyToken=null + Results.Forms.ListViewEx, Results, Version=2.26.1458.0, Culture=neutral, PublicKeyToken=null processTabPage @@ -1531,7 +1531,7 @@ 3, 3, 3, 3 - 923, 391 + 923, 423 4 @@ -1558,7 +1558,7 @@ 0, 0 - 923, 391 + 923, 423 0 @@ -1567,7 +1567,7 @@ parametersListViewEx - Results.Forms.ListViewEx, Results, Version=2.25.1440.0, Culture=neutral, PublicKeyToken=null + Results.Forms.ListViewEx, Results, Version=2.26.1458.0, Culture=neutral, PublicKeyToken=null parametersTabPage @@ -1579,7 +1579,7 @@ 4, 34 - 923, 391 + 923, 423 5 @@ -1642,7 +1642,7 @@ -1, 0 - 100, 400 + 100, 461 0 @@ -1651,7 +1651,7 @@ sharedButtons - TBF.UI.Shared.SharedButtons, TBF, Version=2.25.1440.0, Culture=neutral, PublicKeyToken=null + TBF.UI.Shared.SharedButtons, TBF, Version=2.26.1537.0, Culture=neutral, PublicKeyToken=null mainSplitContainer.Panel2