From 2953e977ef6c4c75f572a9b45b685f066d08c73e Mon Sep 17 00:00:00 2001 From: John Jenko Date: Thu, 10 Jul 2025 10:47:06 -0400 Subject: [PATCH 01/25] C2025-038 Code cleanup to prevent multiple events from being assigned to the same method. --- PROMS/DropDownPanel/Controls/DropDownPanel.cs | 4 ++++ PROMS/DropDownPanel/Forms/DropDownForm.cs | 2 ++ PROMS/DropDownPanel/Helper/DropDownWindowHelper.cs | 1 + PROMS/VEPROMS User Interface/DlgPrintProcedure.cs | 1 + .../VEPROMS User Interface/dlgApproveProcedure.cs | 6 ++++++ PROMS/VEPROMS User Interface/dlgManageSecurity.cs | 1 + PROMS/VEPROMS User Interface/frmPDFStatusForm.cs | 1 + PROMS/VEPROMS User Interface/frmVEPROMS.cs | 11 ++++++++++- PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs | 2 ++ PROMS/VEPROMS.CSLA.Library/VEObjects/VETreeNode.cs | 14 ++++++++++++++ PROMS/Volian.Controls.Library/AnnotationSearch.cs | 1 + .../DisplayApplicability.cs | 3 +++ PROMS/Volian.Controls.Library/DisplayRO.cs | 2 ++ PROMS/Volian.Controls.Library/DisplayReports.cs | 4 ++++ PROMS/Volian.Controls.Library/DisplaySearch.cs | 4 ++++ PROMS/Volian.Controls.Library/DisplayTabControl.cs | 4 ++++ PROMS/Volian.Controls.Library/DisplayTransition.cs | 2 ++ PROMS/Volian.Controls.Library/EditItem.cs | 9 +++++++++ 18 files changed, 71 insertions(+), 1 deletion(-) diff --git a/PROMS/DropDownPanel/Controls/DropDownPanel.cs b/PROMS/DropDownPanel/Controls/DropDownPanel.cs index 78f5d816..49646260 100644 --- a/PROMS/DropDownPanel/Controls/DropDownPanel.cs +++ b/PROMS/DropDownPanel/Controls/DropDownPanel.cs @@ -28,7 +28,9 @@ namespace AT.STO.UI.Win _dropDownHelper = new DropDownWindowHelper(); + _dropDownHelper.DropDownClosed -= new DropDownClosedEventHandler(DropDownHelper_DropDownClosed); _dropDownHelper.DropDownClosed += new DropDownClosedEventHandler(DropDownHelper_DropDownClosed); + _dropDownHelper.DropDownCancel -= new DropDownCancelEventHandler(DropDownHelper_DropDownCancel); _dropDownHelper.DropDownCancel += new DropDownCancelEventHandler(DropDownHelper_DropDownCancel); combo.DisplayMember = "Text"; @@ -82,7 +84,9 @@ namespace AT.STO.UI.Win DropDownForm dropDown = new DropDownForm(_dropDownControl); + dropDown.FinishEditing -= new DropDownValueChangedEventHandler(DropDown_FinishEditing); dropDown.FinishEditing += new DropDownValueChangedEventHandler(DropDown_FinishEditing); + dropDown.ValueChanged -= new DropDownValueChangedEventHandler(DropDown_ValueChanged); dropDown.ValueChanged += new DropDownValueChangedEventHandler(DropDown_ValueChanged); combo.DroppedDown = false; diff --git a/PROMS/DropDownPanel/Forms/DropDownForm.cs b/PROMS/DropDownPanel/Forms/DropDownForm.cs index 6e6a45db..c6923a15 100644 --- a/PROMS/DropDownPanel/Forms/DropDownForm.cs +++ b/PROMS/DropDownPanel/Forms/DropDownForm.cs @@ -49,7 +49,9 @@ namespace AT.STO.UI.Win { base.OnShown(e); + _control.FinishEditing -= new DropDownValueChangedEventHandler(Ctrl_FinishEditing); _control.FinishEditing += new DropDownValueChangedEventHandler(Ctrl_FinishEditing); + _control.ValueChanged -= new DropDownValueChangedEventHandler(Ctrl_ValueChanged); _control.ValueChanged += new DropDownValueChangedEventHandler(Ctrl_ValueChanged); } #endregion diff --git a/PROMS/DropDownPanel/Helper/DropDownWindowHelper.cs b/PROMS/DropDownPanel/Helper/DropDownWindowHelper.cs index 0d996e60..e3eb0308 100644 --- a/PROMS/DropDownPanel/Helper/DropDownWindowHelper.cs +++ b/PROMS/DropDownPanel/Helper/DropDownWindowHelper.cs @@ -39,6 +39,7 @@ namespace AT.STO.UI.Win public DropDownWindowHelper() { _filter = new DropDownMessageFilter(this); + _filter.DropDownCancel -= new DropDownCancelEventHandler(Popup_Cancel); _filter.DropDownCancel += new DropDownCancelEventHandler(Popup_Cancel); } #endregion diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs index f38f9188..15031b4a 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs @@ -393,6 +393,7 @@ namespace VEPROMS { SetupForProcedure(); _MyTimer = new Timer(); + _MyTimer.Tick -= new EventHandler(_MyTimer_Tick); _MyTimer.Tick += new EventHandler(_MyTimer_Tick); _MyTimer.Interval = 100; _MyTimer.Enabled = true; diff --git a/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs b/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs index 59420ece..e3e997b7 100644 --- a/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs +++ b/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs @@ -65,11 +65,13 @@ namespace VEPROMS MyFrmVEPROMS = myFrmVEPROMS;// Save frmVEPROMS for Import to shutoff SessionPing _MyApproval = new ApprovalInfo(myFrmVEPROMS);// Save frmVEPROMS for Import to shutoff SessionPing ApplicabilityIndex = myDocVersion.DocVersionConfig.SelectedSlave; + this.ConsistencyPrintRequest -= new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest); this.ConsistencyPrintRequest += new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest); _MyDocVersion = myDocVersion; _MyDocVersion.ResetProcedures(); // B2021-035: Pasted, modified number and deleted procedures not refreshed so missing from list InitializeComponent(); FlexGridAddEvents(); + _MyApproval.StatusUpdated -= new ApprovalStatusChangeEvent(_MyApproval_StatusUpdated); _MyApproval.StatusUpdated += new ApprovalStatusChangeEvent(_MyApproval_StatusUpdated); SetupComboBoxes(); foreach (ProcedureInfo pi in myDocVersion.Procedures) @@ -101,6 +103,7 @@ namespace VEPROMS //fgProcs.SetupEditor += new C1.Win.C1FlexGrid.RowColEventHandler(fgProcs_SetupEditor); //fgProcs.StartEdit += new C1.Win.C1FlexGrid.RowColEventHandler(fgProcs_StartEdit); //fgProcs.ValidateEdit += new C1.Win.C1FlexGrid.ValidateEditEventHandler(fgProcs_ValidateEdit); + fgProcs.ComboCloseUp -= new C1.Win.C1FlexGrid.RowColEventHandler(fgProcs_ComboCloseUp); fgProcs.ComboCloseUp += new C1.Win.C1FlexGrid.RowColEventHandler(fgProcs_ComboCloseUp); //fgProcs.MouseDown += new MouseEventHandler(fgProcs_MouseDown); //fgProcs.MouseUp += new MouseEventHandler(fgProcs_MouseUp); @@ -275,6 +278,7 @@ namespace VEPROMS { MyFrmVEPROMS = myFrmVEPROMS;// Save frmVEPROMS for Import to shutoff SessionPing _MyApproval = new ApprovalInfo(myFrmVEPROMS);// Save frmVEPROMS for Import to shutoff SessionPing + this.ConsistencyPrintRequest -= new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest); this.ConsistencyPrintRequest += new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest); _MyDocVersion = myDocVersion; _MyDocVersion.ResetProcedures(); // B2021-035: Pasted, modified number and deleted procedures not refreshed so missing from list @@ -295,6 +299,7 @@ namespace VEPROMS { MyFrmVEPROMS = myFrmVEPROMS;// Save frmVEPROMS for Import to shutoff SessionPing _MyApproval = new ApprovalInfo(myFrmVEPROMS);// Save frmVEPROMS for Import to shutoff SessionPing + this.ConsistencyPrintRequest -= new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest); this.ConsistencyPrintRequest += new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest); _MyDocVersion = myProcedure.MyDocVersion; _MyDocVersion.ResetProcedures(); // B2021-035: Pasted, modified number and deleted procedures not refreshed so missing from list @@ -450,6 +455,7 @@ namespace VEPROMS int checkedCount = clbMore.CheckedItems.Count; string oldLabel = lblMore.Text; pbMore.Visible = true; + ItemInfoList.ConsistencyCheckUpdated -= new ItemInfoListCCEvent(ItemInfoList_ConsistencyCheckUpdated); ItemInfoList.ConsistencyCheckUpdated += new ItemInfoListCCEvent(ItemInfoList_ConsistencyCheckUpdated); List myProcs = new List(); // B2018-136 use the list of procedures that have checkboxes and are checked (right panel) instead of the list to be approved (left panel) diff --git a/PROMS/VEPROMS User Interface/dlgManageSecurity.cs b/PROMS/VEPROMS User Interface/dlgManageSecurity.cs index 54f2bf58..defb3a4d 100644 --- a/PROMS/VEPROMS User Interface/dlgManageSecurity.cs +++ b/PROMS/VEPROMS User Interface/dlgManageSecurity.cs @@ -40,6 +40,7 @@ namespace VEPROMS rb.Parent = pnlGroups; rb.Dock = DockStyle.Top; rb.Tag = gi; + rb.CheckedChanged -= new EventHandler(rb_CheckedChanged); rb.CheckedChanged += new EventHandler(rb_CheckedChanged); pnlGroups.Controls.Add(rb); rb.BringToFront(); diff --git a/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs b/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs index a2088150..9b024af5 100644 --- a/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs +++ b/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs @@ -254,6 +254,7 @@ namespace VEPROMS if (CancelStop) btnCancel.Visible = true; Application.DoEvents(); + MyPromsPrinter.StatusChanged -= new PromsPrinterStatusEvent(pp_StatusChanged); MyPromsPrinter.StatusChanged += new PromsPrinterStatusEvent(pp_StatusChanged); MyPromsPrinter.DocReplace = DocReplace; // used when approve generates an export with unlinked ROs and Transitions diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 840dbd6e..6d7aafa8 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -3601,9 +3601,13 @@ namespace VEPROMS if (tn == null) return; _ExpandingTree = true; + tn.LoadingChildrenDone -= new VETreeNodeEvent(tn_LoadingChildrenDone); tn.LoadingChildrenDone += new VETreeNodeEvent(tn_LoadingChildrenDone); + tn.LoadingChildrenMax -= new VETreeNodeEvent(tn_LoadingChildrenMax); tn.LoadingChildrenMax += new VETreeNodeEvent(tn_LoadingChildrenMax); + tn.LoadingChildrenValue -= new VETreeNodeEvent(tn_LoadingChildrenValue); tn.LoadingChildrenValue += new VETreeNodeEvent(tn_LoadingChildrenValue); + tn.LoadingChildrenSQL -= new VETreeNodeEvent(tn_LoadingChildrenSQL); tn.LoadingChildrenSQL += new VETreeNodeEvent(tn_LoadingChildrenSQL); tn.LoadChildren(true); } @@ -4324,7 +4328,11 @@ namespace VEPROMS _LastStepRTB.EditModeChanged -= new StepRTBEvent(_LastStepRTB_EditModeChanged); _LastStepRTB = args != null && args.MyEditItem != null ? args.MyEditItem.MyStepRTB : null; - if (_LastStepRTB != null) _LastStepRTB.EditModeChanged += new StepRTBEvent(_LastStepRTB_EditModeChanged); + if (_LastStepRTB != null) + { + _LastStepRTB.EditModeChanged -= new StepRTBEvent(_LastStepRTB_EditModeChanged); + _LastStepRTB.EditModeChanged += new StepRTBEvent(_LastStepRTB_EditModeChanged); + } lblEditView.Text = " "; if (args == null) @@ -4459,6 +4467,7 @@ namespace VEPROMS displayHistory.MyEditItem = args.MyEditItem; lblEditView.Text = args.MyEditItem.MyStepPanel.VwMode == E_ViewMode.Edit ? "Edit" : "View"; + _CurrentItem.Deleted -= new ItemInfoEvent(_CurrentItem_Deleted); _CurrentItem.Deleted += new ItemInfoEvent(_CurrentItem_Deleted); dlgFindReplace.MyEditItem = args.MyEditItem; SpellChecker.MyEditItem = args.MyEditItem; diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index b0649cc6..2ddb1b73 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -8325,6 +8325,7 @@ namespace VEPROMS.CSLA.Library if (_ProcedureConfig == null) { _ProcedureConfig = new ProcedureConfig(this); + this.MyContent.Changed -= new ContentInfoEvent(MyContent_Changed); this.MyContent.Changed += new ContentInfoEvent(MyContent_Changed); } return _ProcedureConfig; @@ -8334,6 +8335,7 @@ namespace VEPROMS.CSLA.Library void MyContent_Changed(object sender) { + this.MyContent.Changed -= new ContentInfoEvent(MyContent_Changed); this.MyContent.Changed += new ContentInfoEvent(MyContent_Changed); } #endregion diff --git a/PROMS/VEPROMS.CSLA.Library/VEObjects/VETreeNode.cs b/PROMS/VEPROMS.CSLA.Library/VEObjects/VETreeNode.cs index d29e4595..4ae00cc6 100644 --- a/PROMS/VEPROMS.CSLA.Library/VEObjects/VETreeNode.cs +++ b/PROMS/VEPROMS.CSLA.Library/VEObjects/VETreeNode.cs @@ -386,12 +386,19 @@ namespace VEPROMS.CSLA.Library ItemInfo myItemInfo = o as ItemInfo; if (myItemInfo != null) { + myItemInfo.Deleted -= new ItemInfoEvent(myItemInfo_Deleted); myItemInfo.Deleted += new ItemInfoEvent(myItemInfo_Deleted); + myItemInfo.ChildrenDeleted -= new ItemInfoEvent(myItemInfo_ChildrenDeleted); myItemInfo.ChildrenDeleted += new ItemInfoEvent(myItemInfo_ChildrenDeleted); + myItemInfo.MyContent.Changed -= new ContentInfoEvent(NodeText_Changed); myItemInfo.MyContent.Changed += new ContentInfoEvent(NodeText_Changed); + myItemInfo.OrdinalChanged -= new ItemInfoEvent(NodeText_Changed); myItemInfo.OrdinalChanged += new ItemInfoEvent(NodeText_Changed); + myItemInfo.NewSiblingAfter -= new ItemInfoInsertEvent(myItemInfo_NewSiblingAfter); myItemInfo.NewSiblingAfter += new ItemInfoInsertEvent(myItemInfo_NewSiblingAfter); + myItemInfo.NewSiblingBefore -= new ItemInfoInsertEvent(myItemInfo_NewSiblingBefore); myItemInfo.NewSiblingBefore += new ItemInfoInsertEvent(myItemInfo_NewSiblingBefore); + myItemInfo.NewChild -= new ItemInfoInsertEvent(myItemInfo_NewChild); myItemInfo.NewChild += new ItemInfoInsertEvent(myItemInfo_NewChild); } } @@ -429,12 +436,19 @@ namespace VEPROMS.CSLA.Library ItemInfo myItemInfo = o as ItemInfo; if (myItemInfo != null) { + myItemInfo.Deleted -= new ItemInfoEvent(myItemInfo_Deleted); myItemInfo.Deleted += new ItemInfoEvent(myItemInfo_Deleted); + myItemInfo.ChildrenDeleted -= new ItemInfoEvent(myItemInfo_ChildrenDeleted); myItemInfo.ChildrenDeleted += new ItemInfoEvent(myItemInfo_ChildrenDeleted); + myItemInfo.MyContent.Changed -= new ContentInfoEvent(NodeText_Changed); myItemInfo.MyContent.Changed += new ContentInfoEvent(NodeText_Changed); + myItemInfo.OrdinalChanged -= new ItemInfoEvent(NodeText_Changed); myItemInfo.OrdinalChanged += new ItemInfoEvent(NodeText_Changed); + myItemInfo.NewSiblingAfter -= new ItemInfoInsertEvent(myItemInfo_NewSiblingAfter); myItemInfo.NewSiblingAfter += new ItemInfoInsertEvent(myItemInfo_NewSiblingAfter); + myItemInfo.NewSiblingBefore -= new ItemInfoInsertEvent(myItemInfo_NewSiblingBefore); myItemInfo.NewSiblingBefore += new ItemInfoInsertEvent(myItemInfo_NewSiblingBefore); + myItemInfo.NewChild -= new ItemInfoInsertEvent(myItemInfo_NewChild); myItemInfo.NewChild += new ItemInfoInsertEvent(myItemInfo_NewChild); } } diff --git a/PROMS/Volian.Controls.Library/AnnotationSearch.cs b/PROMS/Volian.Controls.Library/AnnotationSearch.cs index 68f3acec..19218a76 100644 --- a/PROMS/Volian.Controls.Library/AnnotationSearch.cs +++ b/PROMS/Volian.Controls.Library/AnnotationSearch.cs @@ -69,6 +69,7 @@ namespace Volian.Controls.Library _AnnotationDetails = annotationDetails; cbAnnoType.DisplayMember = "Name"; cbAnnoType.DataSource = AnnotationTypeInfoList.Get(); + lbResults.MouseMove -= new MouseEventHandler(lbResults_MouseMove); lbResults.MouseMove += new MouseEventHandler(lbResults_MouseMove); _TabControl = tc; } diff --git a/PROMS/Volian.Controls.Library/DisplayApplicability.cs b/PROMS/Volian.Controls.Library/DisplayApplicability.cs index 51947f06..a5869b64 100644 --- a/PROMS/Volian.Controls.Library/DisplayApplicability.cs +++ b/PROMS/Volian.Controls.Library/DisplayApplicability.cs @@ -354,7 +354,10 @@ namespace Volian.Controls.Library private void WireCheckboxes() { foreach (CheckBox cb in MyCheckBoxes.Values) + { + cb.CheckedChanged -= new EventHandler(cb_CheckedChanged); cb.CheckedChanged += new EventHandler(cb_CheckedChanged); + } } private void UnwireCheckboxes(bool reset) { diff --git a/PROMS/Volian.Controls.Library/DisplayRO.cs b/PROMS/Volian.Controls.Library/DisplayRO.cs index b5acdb7d..b82e6f3c 100644 --- a/PROMS/Volian.Controls.Library/DisplayRO.cs +++ b/PROMS/Volian.Controls.Library/DisplayRO.cs @@ -211,7 +211,9 @@ namespace Volian.Controls.Library } _myRTB = value; + MyRTB.LinkChanged -= new StepRTBLinkEvent(MyRTB_LinkChanged); MyRTB.LinkChanged += new StepRTBLinkEvent(MyRTB_LinkChanged); + MyRTB.SelectionChanged -= new EventHandler(MyRTB_SelectionChanged); MyRTB.SelectionChanged += new EventHandler(MyRTB_SelectionChanged); if (string.IsNullOrEmpty(MyRTB.MyLinkText)) diff --git a/PROMS/Volian.Controls.Library/DisplayReports.cs b/PROMS/Volian.Controls.Library/DisplayReports.cs index a32a2d43..a347edda 100644 --- a/PROMS/Volian.Controls.Library/DisplayReports.cs +++ b/PROMS/Volian.Controls.Library/DisplayReports.cs @@ -161,8 +161,11 @@ namespace Volian.Controls.Library if (_MyROFSTLookup == null) return; + advTreeRO.BeforeExpand -= new AdvTreeNodeCancelEventHandler(advTreeRO_BeforeExpand); advTreeRO.BeforeExpand += new AdvTreeNodeCancelEventHandler(advTreeRO_BeforeExpand); + advTreeRO.AfterExpand -= new AdvTreeNodeEventHandler(advTreeRO_AfterExpandorCollapse); advTreeRO.AfterExpand += new AdvTreeNodeEventHandler(advTreeRO_AfterExpandorCollapse); + advTreeRO.AfterCollapse -= new AdvTreeNodeEventHandler(advTreeRO_AfterExpandorCollapse); advTreeRO.AfterCollapse += new AdvTreeNodeEventHandler(advTreeRO_AfterExpandorCollapse); topnode = new DevComponents.AdvTree.Node(); @@ -250,6 +253,7 @@ namespace Volian.Controls.Library topnode.Tag = fi; } + advTreeProcSets.BeforeExpand -= new DevComponents.AdvTree.AdvTreeNodeCancelEventHandler(advTreeProcSets_BeforeExpand); advTreeProcSets.BeforeExpand += new DevComponents.AdvTree.AdvTreeNodeCancelEventHandler(advTreeProcSets_BeforeExpand); // position to the procedure set in the tree if we have a procedure open diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.cs b/PROMS/Volian.Controls.Library/DisplaySearch.cs index 0ddb5b59..dbca6c18 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.cs @@ -468,7 +468,9 @@ namespace Volian.Controls.Library lastLastFormatID = fv.FormatID; } } + cbxTranVersion.SelectedIndexChanged -= new EventHandler(cbxTranVersion_SelectedIndexChanged); cbxTranVersion.SelectedIndexChanged += new EventHandler(cbxTranVersion_SelectedIndexChanged); + cbxTranFormat.SelectedIndexChanged -= new EventHandler(cbxTranFormat_SelectedIndexChanged); cbxTranFormat.SelectedIndexChanged += new EventHandler(cbxTranFormat_SelectedIndexChanged); } this.Cursor = Cursors.Default; @@ -892,6 +894,7 @@ namespace Volian.Controls.Library topnode.DataKey = fi.FolderID; } + advTreeProcSets.BeforeExpand -= new DevComponents.AdvTree.AdvTreeNodeCancelEventHandler(advTreeProcSets_BeforeExpand); advTreeProcSets.BeforeExpand += new DevComponents.AdvTree.AdvTreeNodeCancelEventHandler(advTreeProcSets_BeforeExpand); // position to the procedure set in the tree if we have a procedure open @@ -986,6 +989,7 @@ namespace Volian.Controls.Library annoTypes.Add(new AnnotationTypeSearch(ati.Name, ati.TypeID.ToString())); cbxAnnoTypes.DisplayMember = "Name"; cbxAnnoTypes.DataSource = annoTypes; + lbSrchResults.MouseMove -= new MouseEventHandler(lbSrchResults_MouseMove); lbSrchResults.MouseMove += new MouseEventHandler(lbSrchResults_MouseMove); _TabControl = tc; } diff --git a/PROMS/Volian.Controls.Library/DisplayTabControl.cs b/PROMS/Volian.Controls.Library/DisplayTabControl.cs index 4d6dbda8..c516993f 100644 --- a/PROMS/Volian.Controls.Library/DisplayTabControl.cs +++ b/PROMS/Volian.Controls.Library/DisplayTabControl.cs @@ -378,7 +378,10 @@ namespace Volian.Controls.Library { _MyStepRTB = _MyEditItem.MyStepRTB; if (_MyStepRTB != null) + { + _MyStepRTB.Disposed -= new EventHandler(_MyStepRTB_Disposed); _MyStepRTB.Disposed += new EventHandler(_MyStepRTB_Disposed); + } } else _MyStepRTB = null; @@ -469,6 +472,7 @@ namespace Volian.Controls.Library myBar.DockTabControl.CloseButtonPosition = DevComponents.DotNetBar.eTabCloseButtonPosition.Right; myBar.DockTabControl.Width = ClientRectangle.Width; } + myBar.DockTabClosing -= new DockTabClosingEventHandler(myBar_DockTabClosing); myBar.DockTabClosing += new DockTabClosingEventHandler(myBar_DockTabClosing); if (!myBar.Visible) myBar.Visible = true; diff --git a/PROMS/Volian.Controls.Library/DisplayTransition.cs b/PROMS/Volian.Controls.Library/DisplayTransition.cs index bab8747c..5134ecbb 100644 --- a/PROMS/Volian.Controls.Library/DisplayTransition.cs +++ b/PROMS/Volian.Controls.Library/DisplayTransition.cs @@ -566,6 +566,7 @@ namespace Volian.Controls.Library startitm = startitm.GetNext(); } if (!setsel2) tvTran.SelectedNode = tvTran.Nodes[0]; + tvTran.BeforeExpand -= new TreeViewCancelEventHandler(tvTran_BeforeExpand); tvTran.BeforeExpand += new TreeViewCancelEventHandler(tvTran_BeforeExpand); // bug fix. TreeView needs the next two lines to properly display the bottom node. jsj 01/08/2010 tvTran.ItemHeight++; @@ -599,6 +600,7 @@ namespace Volian.Controls.Library startitm = startitm.GetNext(); } if (!setsel) tvTran.SelectedNode = tvTran.Nodes[0]; + tvTran.BeforeExpand -= new TreeViewCancelEventHandler(tvTran_BeforeExpand); tvTran.BeforeExpand += new TreeViewCancelEventHandler(tvTran_BeforeExpand); // bug fix. TreeView needs the next two lines to properly display the bottom node. jsj 01/08/2010 tvTran.ItemHeight++; diff --git a/PROMS/Volian.Controls.Library/EditItem.cs b/PROMS/Volian.Controls.Library/EditItem.cs index e5b2677d..8181c1c1 100644 --- a/PROMS/Volian.Controls.Library/EditItem.cs +++ b/PROMS/Volian.Controls.Library/EditItem.cs @@ -214,10 +214,14 @@ namespace Volian.Controls.Library UserCheckOffChar = (char)co.UIMark; } // Deal with changes in content data + value.MyContent.Changed -= new ContentInfoEvent(MyContent_Changed); value.MyContent.Changed += new ContentInfoEvent(MyContent_Changed); + value.MyProcedure.MyContent.Changed -= new ContentInfoEvent(MyContent_Changed); value.MyProcedure.MyContent.Changed += new ContentInfoEvent(MyContent_Changed); // Deal with change in item data + value.Changed -= new ItemInfoEvent(value_Changed); value.Changed += new ItemInfoEvent(value_Changed); + value.OrdinalChanged -= new ItemInfoEvent(value_OrdinalChanged); value.OrdinalChanged += new ItemInfoEvent(value_OrdinalChanged); // do something like this to draw circle around step numbers - note got NULL reference error on NSP data //if (value.FormatStepData != null && value.FormatStepData.TabData.IdentPrint.Contains("C0")) Circle = true; @@ -3997,9 +4001,13 @@ namespace Volian.Controls.Library if (!itemInfo.IsStep) // C2025-036 reduce un-needed processing - this will prevent duplicat calls that generate step tabs when loading a procedure SetupHeader(itemInfo); SetupAlarmTableView(itemInfo); // C2021-018 display alarm point table information in the step editor (if the format flag is set) + this.Paint -= new PaintEventHandler(EditItem_Paint); this.Paint += new PaintEventHandler(EditItem_Paint); + this.BackColorChanged -= new EventHandler(EditItem_BackColorChanged); this.BackColorChanged += new EventHandler(EditItem_BackColorChanged); + this.Move -= new EventHandler(EditItem_Move); this.Move += new EventHandler(EditItem_Move); + this.Resize -= new EventHandler(EditItem_Resize); this.Resize += new EventHandler(EditItem_Resize); if (itemInfo != null) { @@ -4050,6 +4058,7 @@ namespace Volian.Controls.Library SeqLevel = myParentEditItem.SeqLevel + ((myChildRelation == ChildRelation.After || myChildRelation == ChildRelation.Before) && itemInfo.IsSequential ? 1 : 0); //// TIMING: DisplayItem.TimeIt("CSLARTB seqLevel"); MyItemInfo = itemInfo; + MyItemInfo.MyConfig.PropertyChanged -= new PropertyChangedEventHandler(MyConfig_PropertyChanged); MyItemInfo.MyConfig.PropertyChanged += new PropertyChangedEventHandler(MyConfig_PropertyChanged); } //// TIMING: DisplayItem.TimeIt("CSLARTB MyItem"); From e08b5cde69f63265bc56a64917fc169cfbebbc86 Mon Sep 17 00:00:00 2001 From: Paul Larsen Date: Fri, 11 Jul 2025 16:08:14 -0400 Subject: [PATCH 02/25] C2025-027-AnnotationsTypeSelect --- .../DlgAnnotationsSelect.cs | 178 ++ .../DlgAnnotationsSelect.resx | 120 + PROMS/VEPROMS User Interface/PROMSFixes.Sql | 124 +- .../VEPROMS User Interface/VEPROMS_UI.csproj | 11 + .../dlgAnnotationsSelect.Designer.cs | 190 ++ .../frmSysOptions.Designer.cs | 2574 +++++++++-------- PROMS/VEPROMS User Interface/frmSysOptions.cs | 21 +- .../frmVEPROMS.Designer.cs | 9 +- PROMS/VEPROMS User Interface/frmVEPROMS.cs | 33 +- .../Generated/AnnotationAuditInfoList.cs | 2 +- .../Generated/AnnotationAuditInfoList_bak.cs | 226 ++ .../Minimal/AnnotationstypeSections.cs | 463 +++ .../VEPROMS.CSLA.Library.csproj | 1 + .../AnnotationDetails.cs | 9 +- PROMS/Volian.Controls.Library/vlnTreeView.cs | 29 +- 15 files changed, 2717 insertions(+), 1273 deletions(-) create mode 100644 PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs create mode 100644 PROMS/VEPROMS User Interface/DlgAnnotationsSelect.resx create mode 100644 PROMS/VEPROMS User Interface/dlgAnnotationsSelect.Designer.cs create mode 100644 PROMS/VEPROMS.CSLA.Library/Generated/AnnotationAuditInfoList_bak.cs create mode 100644 PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSections.cs diff --git a/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs b/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs new file mode 100644 index 00000000..3dadbffd --- /dev/null +++ b/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs @@ -0,0 +1,178 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using VEPROMS.CSLA.Library; + +namespace VEPROMS +{ + // C2025-027 Annotation Type Filtering + public partial class DlgAnnotationsSelect : Form + { + int AnnotationTypeID; + string AnnotationNameStr = ""; + + public DlgAnnotationsSelect() + { + InitializeComponent(); + } + + public DlgAnnotationsSelect(string userid) + { + InitializeComponent(); + //MyItemID = pi.ItemID; + UserID = userid; + } + + private int _MyItemID; + public int MyItemID + { + get { return _MyItemID; } + set { _MyItemID = value; } + } + + private string _UserID; + public string UserID + { + get { return _UserID; } + set { _UserID = value; } + } + + private void btnSelect_Click(object sender, EventArgs e) + { + MoveSelectedItems(lstUnselected, lstSelected); + } + + // Move selected items to lstUnselected. + private void btnDeselect_Click(object sender, EventArgs e) + { + MoveSelectedItems(lstSelected, lstUnselected); + } + + // Move selected items from one ListBox to another. + private void MoveSelectedItems(ListBox lstFrom, ListBox lstTo) + { + while (lstFrom.SelectedItems.Count > 0) + { + lstSelected.DisplayMember = "NameStr"; + lstSelected.ValueMember = "TypeID"; + + AnnotataionItem item = (AnnotataionItem)lstFrom.SelectedItems[0]; + lstTo.Items.Add(new AnnotataionItem(item.NameStr, item.TypeID)); + lstFrom.Items.Remove(item); + } + SetButtonsEditable(); + } + + // Move all items to lstSelected. + private void btnSelectAll_Click(object sender, EventArgs e) + { + MoveAllItems(lstUnselected, lstSelected); + } + + // Move all items to lstUnselected. + private void btnDeselectAll_Click(object sender, EventArgs e) + { + MoveAllItems(lstSelected, lstUnselected); + } + + // Move all items from one ListBox to another. + private void MoveAllItems(ListBox lstFrom, ListBox lstTo) + { + lstTo.Items.AddRange(lstFrom.Items); + lstFrom.Items.Clear(); + SetButtonsEditable(); + } + + // Enable and disable buttons. + private void lst_SelectedIndexChanged(object sender, EventArgs e) + { + SetButtonsEditable(); + } + // Save selected list to DB. + private void btnUpdate_Click(object sender, EventArgs e) + { + int dltFlg = 1; + + foreach (AnnotataionItem item in lstSelected.Items.OfType()) + { + lstSelected.DisplayMember = "NameStr"; + lstSelected.ValueMember = "TypeID"; + + AnnotationTypeID = item.TypeID; + AnnotationNameStr = item.NameStr; + + VEPROMS.CSLA.Library.AnnotationstypeSelections.Update(UserID, AnnotationTypeID, dltFlg, AnnotationNameStr); + dltFlg = 0; + } + } + public class AnnotataionItem + { + private string _NameStr; + private int _TypeID; + + public AnnotataionItem(string NameStr, int TypeID) + { + this._NameStr = NameStr; + this._TypeID = TypeID; + } + public string NameStr + { + get + { + return _NameStr; + } + } + public int TypeID + { + get + { + return _TypeID; + } + } + } + + // Enable and disable buttons. + private void SetButtonsEditable() + { + btnSelect.Enabled = (lstUnselected.SelectedItems.Count > 0); + btnSelectAll.Enabled = (lstUnselected.Items.Count > 0); + btnDeselect.Enabled = (lstSelected.SelectedItems.Count > 0); + btnDeselectAll.Enabled = (lstSelected.Items.Count > 0); + } + + private void DlgAnnotationsSelect_Load(object sender, EventArgs e) + { + lstUnselected.DisplayMember = "NameStr"; + lstUnselected.ValueMember = "TypeID"; + SetButtonsEditable(); + DataTable AnnoType = AnnotationstypeSelections.GetAnnoTypes(UserID); + foreach (DataRow dr in AnnoType.Rows) + { + lstUnselected.Items.Add(new AnnotataionItem(dr["Name"].ToString(), (int)dr["TypeID"])); + } + + lstSelected.DisplayMember = "NameStr"; + lstSelected.ValueMember = "TypeID"; + DataTable lstSelectedTbl = VEPROMS.CSLA.Library.AnnotationstypeSelections.Retrieve(UserID); + if (lstSelectedTbl.Rows.Count > 0) + { + foreach (DataRow lstSelectedRow in lstSelectedTbl.Rows) + { + lstSelected.Items.Add(new AnnotataionItem(lstSelectedRow["Name"].ToString(), (int)lstSelectedRow["TypeID"])); + } + } + } + + private void btnCancel_Click_1(object sender, EventArgs e) + { + this.Close(); + } + } +} + diff --git a/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.resx b/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/PROMS/VEPROMS User Interface/PROMSFixes.Sql b/PROMS/VEPROMS User Interface/PROMSFixes.Sql index d97734f5..0beebdf6 100644 --- a/PROMS/VEPROMS User Interface/PROMSFixes.Sql +++ b/PROMS/VEPROMS User Interface/PROMSFixes.Sql @@ -24035,6 +24035,7 @@ Begin -- Rofst Tables End Go + IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vesp_UpdateEPFormat]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1) DROP PROCEDURE [vesp_UpdateEPFormat]; GO @@ -24075,6 +24076,125 @@ ELSE GO +-- C2025-027 Annotation Type Filtering +IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[getAnnotationSelectListTypes]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1) + DROP PROCEDURE [getAnnotationSelectListTypes]; +GO + +SET ANSI_NULLS ON +GO +SET QUOTED_IDENTIFIER ON +GO + +-- ============================================= +-- Author: Paul Larsen +-- Create date: 7/10/2025 +-- Description: Retrieve Annotation Types not added to Annotation type filtering by user. +-- ============================================= +CREATE PROCEDURE [dbo].[getAnnotationSelectListTypes] +( + @UserID varchar(50) +) +WITH EXECUTE AS OWNER +AS + SELECT + [TypeID], + [Name], + [Config], + [DTS], + [UserID], + [LastChanged], + (SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[TypeID]= [TypeID]) [AnnotationCount] + --[IsEPAnnotationType] + FROM [AnnotationTypes] --A + --JOIN AnnotationTypeSelections S ON S.TypeID = A.TypeID + WHERE TypeID NOT IN (SELECT TypeID FROM AnnotationTypeSelections WHERE UsrID = @UserID) --S.ItemID = @ItemID AND S.TypeID != A.TypeID + + RETURN + +GO + +-- C2025-027 Annotation Type Filtering +IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[getAnnotationstypeSelections]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1) + DROP PROCEDURE [getAnnotationstypeSelections]; +GO + +SET ANSI_NULLS ON +GO +SET QUOTED_IDENTIFIER ON +GO +-- ============================================= +-- Author: Paul Larsen +-- Create date: 07/10/2025 +-- Description: Retrieve Current Annotation Types +-- ============================================= + +CREATE PROC [dbo].[getAnnotationstypeSelections] +( + @UsrID varchar(50) +) +AS +BEGIN + IF((SELECT TypeID FROM AnnotationTypeSelections WHERE UsrID = @UsrID) > 0) + BEGIN + SELECT [ASTypeID] + ,[TypeID] + ,[UsrID] + ,[Name] + ,[Config] + ,[DTS] + ,[UserID] + ,[IsEPAnnotationType] + FROM [dbo].[AnnotationTypeSelections] + WHERE UsrID = @UsrID + END + ELSE + BEGIN + SELECT + [TypeID], + [Name], + [Config], + [DTS], + [UserID], + [LastChanged], + (SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[TypeID]=[AnnotationTypes].[TypeID]) [AnnotationCount], + [IsEPAnnotationType] + FROM [AnnotationTypes] + END +END +GO + +-- C2025-027 Annotation Type Filtering +IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[AnnotationTypeSelections]') AND type in (N'U')) +DROP TABLE [dbo].[AnnotationTypeSelections] +GO + +/****** Object: Table [dbo].[AnnotationTypeSelections] Script Date: 7/10/2025 2:38:23 PM ******/ +SET ANSI_NULLS ON +GO + +SET QUOTED_IDENTIFIER ON +GO + +-- ============================================= +-- Author: Paul Larsen +-- Create date: 07/10/2025 +-- Description: Store user Annotation selections for annotation filter. +-- ============================================= + +CREATE TABLE [dbo].[AnnotationTypeSelections]( + [ASTypeID] [int] IDENTITY(1,1) NOT NULL, + [TypeID] [int] NULL, + [UsrID] [varchar](50) NULL, + [Name] [nvarchar](100) NOT NULL, + [Config] [nvarchar](max) NULL, + [DTS] [datetime] NOT NULL, + [UserID] [nvarchar](100) NOT NULL, + [LastChanged] [timestamp] NOT NULL, + [IsEPAnnotationType] [bit] NOT NULL +) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] +GO + IF (@@Error = 0) PRINT 'Running vesp_UpdateEPFormat Succeeded' ELSE PRINT 'Running vesp_UpdateEPFormat Failed to Execute' GO @@ -24117,8 +24237,8 @@ BEGIN TRY -- Try Block DECLARE @RevDate varchar(255) DECLARE @RevDescription varchar(255) - set @RevDate = '6/20/2025 3:07 PM' - set @RevDescription = 'Annotation Support' + set @RevDate = '07/10/2025 2:30 PM' + set @RevDescription = 'C2025-027 Annotation Type Filtering' Select cast(@RevDate as datetime) RevDate, @RevDescription RevDescription PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription diff --git a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj index 856bf9c4..69f53336 100644 --- a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj +++ b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj @@ -152,6 +152,12 @@ AboutVEPROMS.cs + + Form + + + DlgAnnotationsSelect.cs + Form @@ -337,6 +343,11 @@ Designer AboutVEPROMS.cs + + DlgAnnotationsSelect.cs + ResXFileCodeGenerator + DlgAnnotationsSelect1.Designer.cs + dlgMSWordMessage.cs diff --git a/PROMS/VEPROMS User Interface/dlgAnnotationsSelect.Designer.cs b/PROMS/VEPROMS User Interface/dlgAnnotationsSelect.Designer.cs new file mode 100644 index 00000000..b3d06b00 --- /dev/null +++ b/PROMS/VEPROMS User Interface/dlgAnnotationsSelect.Designer.cs @@ -0,0 +1,190 @@ + +namespace VEPROMS +{ + partial class DlgAnnotationsSelect + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.lstUnselected = new System.Windows.Forms.ListBox(); + this.lstSelected = new System.Windows.Forms.ListBox(); + this.btnSelect = new System.Windows.Forms.Button(); + this.btnSelectAll = new System.Windows.Forms.Button(); + this.btnDeselectAll = new System.Windows.Forms.Button(); + this.btnDeselect = new System.Windows.Forms.Button(); + this.btnUpdate = new System.Windows.Forms.Button(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.btnCancel = new System.Windows.Forms.Button(); + this.tableLayoutPanel1.SuspendLayout(); + this.SuspendLayout(); + // + // lstUnselected + // + this.lstUnselected.Dock = System.Windows.Forms.DockStyle.Fill; + this.lstUnselected.FormattingEnabled = true; + this.lstUnselected.IntegralHeight = false; + this.lstUnselected.Location = new System.Drawing.Point(3, 3); + this.lstUnselected.Name = "lstUnselected"; + this.tableLayoutPanel1.SetRowSpan(this.lstUnselected, 4); + this.lstUnselected.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended; + this.lstUnselected.Size = new System.Drawing.Size(287, 394); + this.lstUnselected.TabIndex = 0; + this.lstUnselected.SelectedIndexChanged += new System.EventHandler(this.lst_SelectedIndexChanged); + // + // lstSelected + // + this.lstSelected.Dock = System.Windows.Forms.DockStyle.Fill; + this.lstSelected.FormattingEnabled = true; + this.lstSelected.IntegralHeight = false; + this.lstSelected.Location = new System.Drawing.Point(334, 3); + this.lstSelected.Name = "lstSelected"; + this.tableLayoutPanel1.SetRowSpan(this.lstSelected, 4); + this.lstSelected.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended; + this.lstSelected.Size = new System.Drawing.Size(288, 394); + this.lstSelected.TabIndex = 1; + this.lstSelected.SelectedIndexChanged += new System.EventHandler(this.lst_SelectedIndexChanged); + // + // btnSelect + // + this.btnSelect.Anchor = System.Windows.Forms.AnchorStyles.None; + this.btnSelect.Location = new System.Drawing.Point(298, 38); + this.btnSelect.Name = "btnSelect"; + this.btnSelect.Size = new System.Drawing.Size(28, 23); + this.btnSelect.TabIndex = 2; + this.btnSelect.Text = ">"; + this.btnSelect.UseVisualStyleBackColor = true; + this.btnSelect.Click += new System.EventHandler(this.btnSelect_Click); + // + // btnSelectAll + // + this.btnSelectAll.Anchor = System.Windows.Forms.AnchorStyles.None; + this.btnSelectAll.Location = new System.Drawing.Point(298, 138); + this.btnSelectAll.Name = "btnSelectAll"; + this.btnSelectAll.Size = new System.Drawing.Size(28, 23); + this.btnSelectAll.TabIndex = 3; + this.btnSelectAll.Text = ">>"; + this.btnSelectAll.UseVisualStyleBackColor = true; + this.btnSelectAll.Click += new System.EventHandler(this.btnSelectAll_Click); + // + // btnDeselectAll + // + this.btnDeselectAll.Anchor = System.Windows.Forms.AnchorStyles.None; + this.btnDeselectAll.Location = new System.Drawing.Point(298, 238); + this.btnDeselectAll.Name = "btnDeselectAll"; + this.btnDeselectAll.Size = new System.Drawing.Size(28, 23); + this.btnDeselectAll.TabIndex = 5; + this.btnDeselectAll.Text = "<<"; + this.btnDeselectAll.UseVisualStyleBackColor = true; + this.btnDeselectAll.Click += new System.EventHandler(this.btnDeselectAll_Click); + // + // btnDeselect + // + this.btnDeselect.Anchor = System.Windows.Forms.AnchorStyles.None; + this.btnDeselect.Location = new System.Drawing.Point(298, 338); + this.btnDeselect.Name = "btnDeselect"; + this.btnDeselect.Size = new System.Drawing.Size(28, 23); + this.btnDeselect.TabIndex = 4; + this.btnDeselect.Text = "<"; + this.btnDeselect.UseVisualStyleBackColor = true; + this.btnDeselect.Click += new System.EventHandler(this.btnDeselect_Click); + // + // btnUpdate + // + this.btnUpdate.Anchor = System.Windows.Forms.AnchorStyles.None; + this.btnUpdate.Location = new System.Drawing.Point(536, 422); + this.btnUpdate.Name = "btnUpdate"; + this.btnUpdate.Size = new System.Drawing.Size(100, 35); + this.btnUpdate.TabIndex = 8; + this.btnUpdate.Text = "Update"; + this.btnUpdate.UseVisualStyleBackColor = true; + this.btnUpdate.Click += new System.EventHandler(this.btnUpdate_Click); + // + // tableLayoutPanel1 + // + this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.tableLayoutPanel1.ColumnCount = 3; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 38F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.lstUnselected, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.lstSelected, 2, 0); + this.tableLayoutPanel1.Controls.Add(this.btnDeselect, 1, 3); + this.tableLayoutPanel1.Controls.Add(this.btnDeselectAll, 1, 2); + this.tableLayoutPanel1.Controls.Add(this.btnSelect, 1, 0); + this.tableLayoutPanel1.Controls.Add(this.btnSelectAll, 1, 1); + this.tableLayoutPanel1.Location = new System.Drawing.Point(12, 12); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 4; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(625, 400); + this.tableLayoutPanel1.TabIndex = 6; + // + // btnCancel + // + this.btnCancel.Location = new System.Drawing.Point(411, 422); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.Size = new System.Drawing.Size(100, 35); + this.btnCancel.TabIndex = 9; + this.btnCancel.Text = "Close"; + this.btnCancel.UseVisualStyleBackColor = true; + this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click_1); + // + // DlgAnnotationsSelect + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(653, 466); + this.Controls.Add(this.btnCancel); + this.Controls.Add(this.tableLayoutPanel1); + this.Controls.Add(this.btnUpdate); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Name = "DlgAnnotationsSelect"; + this.Text = "Select Annotation Types"; + this.Load += new System.EventHandler(this.DlgAnnotationsSelect_Load); + this.tableLayoutPanel1.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + private System.Windows.Forms.ListBox lstUnselected; + private System.Windows.Forms.ListBox lstSelected; + private System.Windows.Forms.Button btnSelect; + private System.Windows.Forms.Button btnSelectAll; + private System.Windows.Forms.Button btnDeselectAll; + private System.Windows.Forms.Button btnDeselect; + private System.Windows.Forms.Button btnUpdate; + + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; + private System.Windows.Forms.Button btnCancel; + + } +} \ No newline at end of file diff --git a/PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs b/PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs index d86ed122..bbb2e6cc 100644 --- a/PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs @@ -28,1267 +28,1324 @@ namespace VEPROMS /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmSysOptions)); - this.btnCancel = new DevComponents.DotNetBar.ButtonX(); - this.btnOK = new DevComponents.DotNetBar.ButtonX(); - this.gpSystemColor = new DevComponents.DotNetBar.Controls.GroupPanel(); - this.cbRibonBlack = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.cbRibonSilver = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.cbRibonBlue = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.panButtons = new DevComponents.DotNetBar.PanelEx(); - this.btnIntrFaceStngs = new DevComponents.DotNetBar.ButtonX(); - this.btnStartMsg = new DevComponents.DotNetBar.ButtonX(); - this.btnGeneral = new DevComponents.DotNetBar.ButtonX(); - this.tcSysOpts = new DevComponents.DotNetBar.TabControl(); - this.tabControlPanel3 = new DevComponents.DotNetBar.TabControlPanel(); - this.gpOpenTabs = new DevComponents.DotNetBar.Controls.GroupPanel(); - this.cbOTRemember = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.cbOTAutoOpen = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.gpShwRplWords = new DevComponents.DotNetBar.Controls.GroupPanel(); - this.cbShwRplWrdsColor = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.gpVisioPath = new DevComponents.DotNetBar.Controls.GroupPanel(); - this.txbxVisioPath = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.gpSeparateWindows = new DevComponents.DotNetBar.Controls.GroupPanel(); - this.cbSeparateWindows = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.gpEnhancedDocs = new DevComponents.DotNetBar.Controls.GroupPanel(); - this.cbEnhancedDocumentSync = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.gpPasteSettings = new DevComponents.DotNetBar.Controls.GroupPanel(); - this.cbPastePlainText = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.cbPasteNoReturns = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.gpTreeView = new DevComponents.DotNetBar.Controls.GroupPanel(); - this.cbTVExpand = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.gpStepTypeToolTip = new DevComponents.DotNetBar.Controls.GroupPanel(); - this.cbStepTypeToolTip = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.gpAnnotationSettings = new DevComponents.DotNetBar.Controls.GroupPanel(); - this.cbAnnotationPopup = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.gpTransRangeColor = new DevComponents.DotNetBar.Controls.GroupPanel(); - this.colorPickerButton1 = new DevComponents.DotNetBar.ColorPickerButton(); - this.gpPropPageStyle = new DevComponents.DotNetBar.Controls.GroupPanel(); - this.cbPropGrid = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.cbTabbedIntrFace = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.cbButtonIntrFace = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.tiIntrFaceStngs = new DevComponents.DotNetBar.TabItem(this.components); - this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel(); - this.tiGeneral = new DevComponents.DotNetBar.TabItem(this.components); - this.tabControlPanel2 = new DevComponents.DotNetBar.TabControlPanel(); - this.tiStUpMsg = new DevComponents.DotNetBar.TabItem(this.components); - this.cbUCFLForSetOnly = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.cbUCFLUseAll = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.cbUCFLOnlyImport = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.cbUCFLNotUsed = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.cbUCFIgnore = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.btnReset = new DevComponents.DotNetBar.ButtonX(); - this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip(); - this.cbMSWordPrompt = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.gpMSWordSum = new DevComponents.DotNetBar.Controls.GroupPanel(); - this.gpSystemColor.SuspendLayout(); - this.panButtons.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.tcSysOpts)).BeginInit(); - this.tcSysOpts.SuspendLayout(); - this.tabControlPanel3.SuspendLayout(); - this.gpOpenTabs.SuspendLayout(); - this.gpShwRplWords.SuspendLayout(); - this.gpVisioPath.SuspendLayout(); - this.gpSeparateWindows.SuspendLayout(); - this.gpEnhancedDocs.SuspendLayout(); - this.gpPasteSettings.SuspendLayout(); - this.gpTreeView.SuspendLayout(); - this.gpStepTypeToolTip.SuspendLayout(); - this.gpAnnotationSettings.SuspendLayout(); - this.gpTransRangeColor.SuspendLayout(); - this.gpPropPageStyle.SuspendLayout(); - this.gpMSWordSum.SuspendLayout(); - this.SuspendLayout(); - // - // btnCancel - // - this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.Location = new System.Drawing.Point(616, 591); - this.btnCancel.Margin = new System.Windows.Forms.Padding(2); - this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(56, 19); - this.btnCancel.TabIndex = 0; - this.btnCancel.Text = "Cancel"; - this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); - // - // btnOK - // - this.btnOK.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnOK.Location = new System.Drawing.Point(542, 591); - this.btnOK.Margin = new System.Windows.Forms.Padding(2); - this.btnOK.Name = "btnOK"; - this.btnOK.Size = new System.Drawing.Size(56, 19); - this.btnOK.TabIndex = 1; - this.btnOK.Text = "OK"; - this.btnOK.Click += new System.EventHandler(this.btnOK_Click); - // - // gpSystemColor - // - this.gpSystemColor.BackColor = System.Drawing.Color.Transparent; - this.gpSystemColor.CanvasColor = System.Drawing.Color.Transparent; - this.gpSystemColor.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.gpSystemColor.Controls.Add(this.cbRibonBlack); - this.gpSystemColor.Controls.Add(this.cbRibonSilver); - this.gpSystemColor.Controls.Add(this.cbRibonBlue); - this.gpSystemColor.DisabledBackColor = System.Drawing.Color.Empty; - this.gpSystemColor.Location = new System.Drawing.Point(39, 13); - this.gpSystemColor.Margin = new System.Windows.Forms.Padding(2); - this.gpSystemColor.Name = "gpSystemColor"; - this.gpSystemColor.Size = new System.Drawing.Size(82, 97); - // - // - // - this.gpSystemColor.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.gpSystemColor.Style.BackColorGradientAngle = 90; - this.gpSystemColor.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.gpSystemColor.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpSystemColor.Style.BorderBottomWidth = 1; - this.gpSystemColor.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.gpSystemColor.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpSystemColor.Style.BorderLeftWidth = 1; - this.gpSystemColor.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpSystemColor.Style.BorderRightWidth = 1; - this.gpSystemColor.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpSystemColor.Style.BorderTopWidth = 1; - this.gpSystemColor.Style.CornerDiameter = 4; - this.gpSystemColor.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.gpSystemColor.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; - this.gpSystemColor.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.gpSystemColor.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; - // - // - // - this.gpSystemColor.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gpSystemColor.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gpSystemColor.TabIndex = 1; - this.gpSystemColor.Text = "System Color"; - // - // cbRibonBlack - // - this.cbRibonBlack.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.cbRibonBlack.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbRibonBlack.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; - this.cbRibonBlack.Location = new System.Drawing.Point(7, 54); - this.cbRibonBlack.Margin = new System.Windows.Forms.Padding(2); - this.cbRibonBlack.Name = "cbRibonBlack"; - this.cbRibonBlack.Size = new System.Drawing.Size(67, 19); - this.cbRibonBlack.TabIndex = 2; - this.cbRibonBlack.Text = "Black"; - this.cbRibonBlack.CheckedChanged += new System.EventHandler(this.cbRibonBlack_CheckedChanged); - // - // cbRibonSilver - // - this.cbRibonSilver.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.cbRibonSilver.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbRibonSilver.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; - this.cbRibonSilver.Location = new System.Drawing.Point(7, 30); - this.cbRibonSilver.Margin = new System.Windows.Forms.Padding(2); - this.cbRibonSilver.Name = "cbRibonSilver"; - this.cbRibonSilver.Size = new System.Drawing.Size(67, 19); - this.cbRibonSilver.TabIndex = 1; - this.cbRibonSilver.Text = "Silver"; - this.cbRibonSilver.CheckedChanged += new System.EventHandler(this.cbRibonSilver_CheckedChanged); - // - // cbRibonBlue - // - this.cbRibonBlue.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.cbRibonBlue.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbRibonBlue.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; - this.cbRibonBlue.Location = new System.Drawing.Point(7, 6); - this.cbRibonBlue.Margin = new System.Windows.Forms.Padding(2); - this.cbRibonBlue.Name = "cbRibonBlue"; - this.cbRibonBlue.Size = new System.Drawing.Size(67, 19); - this.cbRibonBlue.TabIndex = 0; - this.cbRibonBlue.Text = "Blue"; - this.cbRibonBlue.CheckedChanged += new System.EventHandler(this.cbRibonBlue_CheckedChanged); - // - // panButtons - // - this.panButtons.CanvasColor = System.Drawing.SystemColors.Control; - this.panButtons.Controls.Add(this.btnIntrFaceStngs); - this.panButtons.Controls.Add(this.btnStartMsg); - this.panButtons.Controls.Add(this.btnGeneral); - this.panButtons.DisabledBackColor = System.Drawing.Color.Empty; - this.panButtons.Location = new System.Drawing.Point(14, 14); - this.panButtons.Margin = new System.Windows.Forms.Padding(2); - this.panButtons.Name = "panButtons"; - this.panButtons.Size = new System.Drawing.Size(168, 460); - this.panButtons.Style.Alignment = System.Drawing.StringAlignment.Center; - this.panButtons.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.panButtons.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.panButtons.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.panButtons.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.panButtons.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.panButtons.Style.GradientAngle = 90; - this.panButtons.TabIndex = 2; - this.panButtons.Text = "panelEx1"; - this.panButtons.ThemeAware = true; - this.panButtons.Visible = false; - // - // btnIntrFaceStngs - // - this.btnIntrFaceStngs.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnIntrFaceStngs.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnIntrFaceStngs.Dock = System.Windows.Forms.DockStyle.Top; - this.btnIntrFaceStngs.Location = new System.Drawing.Point(0, 38); - this.btnIntrFaceStngs.Margin = new System.Windows.Forms.Padding(2); - this.btnIntrFaceStngs.Name = "btnIntrFaceStngs"; - this.btnIntrFaceStngs.Size = new System.Drawing.Size(168, 19); - this.btnIntrFaceStngs.TabIndex = 2; - this.btnIntrFaceStngs.Text = "My Interface Settings"; - this.btnIntrFaceStngs.Click += new System.EventHandler(this.btnIntrFaceStngs_Click); - // - // btnStartMsg - // - this.btnStartMsg.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnStartMsg.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnStartMsg.Dock = System.Windows.Forms.DockStyle.Top; - this.btnStartMsg.Location = new System.Drawing.Point(0, 19); - this.btnStartMsg.Margin = new System.Windows.Forms.Padding(2); - this.btnStartMsg.Name = "btnStartMsg"; - this.btnStartMsg.Size = new System.Drawing.Size(168, 19); - this.btnStartMsg.TabIndex = 1; - this.btnStartMsg.Text = "Startup Message"; - this.btnStartMsg.Visible = false; - this.btnStartMsg.Click += new System.EventHandler(this.btnStartMsg_Click); - // - // btnGeneral - // - this.btnGeneral.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnGeneral.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnGeneral.Dock = System.Windows.Forms.DockStyle.Top; - this.btnGeneral.Location = new System.Drawing.Point(0, 0); - this.btnGeneral.Margin = new System.Windows.Forms.Padding(2); - this.btnGeneral.Name = "btnGeneral"; - this.btnGeneral.Size = new System.Drawing.Size(168, 19); - this.btnGeneral.TabIndex = 0; - this.btnGeneral.Text = "General"; - this.btnGeneral.Visible = false; - this.btnGeneral.Click += new System.EventHandler(this.btnGeneral_Click); - // - // tcSysOpts - // - this.tcSysOpts.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(217)))), ((int)(((byte)(247))))); - this.tcSysOpts.CanReorderTabs = true; - this.tcSysOpts.Controls.Add(this.tabControlPanel3); - this.tcSysOpts.Controls.Add(this.tabControlPanel1); - this.tcSysOpts.Controls.Add(this.tabControlPanel2); - this.tcSysOpts.Location = new System.Drawing.Point(27, 17); - this.tcSysOpts.Margin = new System.Windows.Forms.Padding(2); - this.tcSysOpts.Name = "tcSysOpts"; - this.tcSysOpts.SelectedTabFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold); - this.tcSysOpts.SelectedTabIndex = 2; - this.tcSysOpts.Size = new System.Drawing.Size(645, 555); - this.tcSysOpts.TabIndex = 3; - this.tcSysOpts.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox; - this.tcSysOpts.Tabs.Add(this.tiGeneral); - this.tcSysOpts.Tabs.Add(this.tiStUpMsg); - this.tcSysOpts.Tabs.Add(this.tiIntrFaceStngs); - this.tcSysOpts.TabsVisible = false; - this.tcSysOpts.Text = "tabControl1"; - this.tcSysOpts.ThemeAware = true; - // - // tabControlPanel3 - // - this.tabControlPanel3.Controls.Add(this.gpMSWordSum); - this.tabControlPanel3.Controls.Add(this.gpOpenTabs); - this.tabControlPanel3.Controls.Add(this.gpShwRplWords); - this.tabControlPanel3.Controls.Add(this.gpVisioPath); - this.tabControlPanel3.Controls.Add(this.gpSeparateWindows); - this.tabControlPanel3.Controls.Add(this.gpEnhancedDocs); - this.tabControlPanel3.Controls.Add(this.gpPasteSettings); - this.tabControlPanel3.Controls.Add(this.gpTreeView); - this.tabControlPanel3.Controls.Add(this.gpStepTypeToolTip); - this.tabControlPanel3.Controls.Add(this.gpAnnotationSettings); - this.tabControlPanel3.Controls.Add(this.gpTransRangeColor); - this.tabControlPanel3.Controls.Add(this.gpPropPageStyle); - this.tabControlPanel3.Controls.Add(this.gpSystemColor); - this.tabControlPanel3.DisabledBackColor = System.Drawing.Color.Empty; - this.tabControlPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControlPanel3.Location = new System.Drawing.Point(0, 27); - this.tabControlPanel3.Margin = new System.Windows.Forms.Padding(2); - this.tabControlPanel3.Name = "tabControlPanel3"; - this.tabControlPanel3.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel3.Size = new System.Drawing.Size(645, 528); - this.tabControlPanel3.Style.BackColor1.Color = System.Drawing.SystemColors.Control; - this.tabControlPanel3.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.tabControlPanel3.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmSysOptions)); + this.btnCancel = new DevComponents.DotNetBar.ButtonX(); + this.btnOK = new DevComponents.DotNetBar.ButtonX(); + this.gpSystemColor = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.cbRibonBlack = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.cbRibonSilver = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.cbRibonBlue = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.panButtons = new DevComponents.DotNetBar.PanelEx(); + this.btnIntrFaceStngs = new DevComponents.DotNetBar.ButtonX(); + this.btnStartMsg = new DevComponents.DotNetBar.ButtonX(); + this.btnGeneral = new DevComponents.DotNetBar.ButtonX(); + this.tcSysOpts = new DevComponents.DotNetBar.TabControl(); + this.tabControlPanel3 = new DevComponents.DotNetBar.TabControlPanel(); + this.gpMSWordSum = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.cbMSWordPrompt = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.gpOpenTabs = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.cbOTRemember = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.cbOTAutoOpen = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.gpShwRplWords = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.cbShwRplWrdsColor = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.gpAnnoTypeFilter = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.gpVisioPath = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.txbxVisioPath = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.gpSeparateWindows = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.cbSeparateWindows = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.gpEnhancedDocs = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.cbEnhancedDocumentSync = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.gpPasteSettings = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.cbPastePlainText = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.cbPasteNoReturns = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.gpTreeView = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.cbTVExpand = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.gpStepTypeToolTip = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.cbStepTypeToolTip = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.gpAnnotationSettings = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.cbAnnotationPopup = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.gpTransRangeColor = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.colorPickerButton1 = new DevComponents.DotNetBar.ColorPickerButton(); + this.gpPropPageStyle = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.cbPropGrid = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.cbTabbedIntrFace = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.cbButtonIntrFace = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.tiIntrFaceStngs = new DevComponents.DotNetBar.TabItem(this.components); + this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel(); + this.tiGeneral = new DevComponents.DotNetBar.TabItem(this.components); + this.tabControlPanel2 = new DevComponents.DotNetBar.TabControlPanel(); + this.tiStUpMsg = new DevComponents.DotNetBar.TabItem(this.components); + this.cbUCFLForSetOnly = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.cbUCFLUseAll = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.cbUCFLOnlyImport = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.cbUCFLNotUsed = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.cbUCFIgnore = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.btnReset = new DevComponents.DotNetBar.ButtonX(); + this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip(); + this.cbShwAnnoFilter = new DevComponents.DotNetBar.ButtonX(); + this.gpSystemColor.SuspendLayout(); + this.panButtons.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.tcSysOpts)).BeginInit(); + this.tcSysOpts.SuspendLayout(); + this.tabControlPanel3.SuspendLayout(); + this.gpMSWordSum.SuspendLayout(); + this.gpOpenTabs.SuspendLayout(); + this.gpShwRplWords.SuspendLayout(); + this.gpAnnoTypeFilter.SuspendLayout(); + this.gpVisioPath.SuspendLayout(); + this.gpSeparateWindows.SuspendLayout(); + this.gpEnhancedDocs.SuspendLayout(); + this.gpPasteSettings.SuspendLayout(); + this.gpTreeView.SuspendLayout(); + this.gpStepTypeToolTip.SuspendLayout(); + this.gpAnnotationSettings.SuspendLayout(); + this.gpTransRangeColor.SuspendLayout(); + this.gpPropPageStyle.SuspendLayout(); + this.SuspendLayout(); + // + // btnCancel + // + this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.btnCancel.Location = new System.Drawing.Point(616, 591); + this.btnCancel.Margin = new System.Windows.Forms.Padding(2); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.Size = new System.Drawing.Size(56, 19); + this.btnCancel.TabIndex = 0; + this.btnCancel.Text = "Cancel"; + this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); + // + // btnOK + // + this.btnOK.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnOK.Location = new System.Drawing.Point(542, 591); + this.btnOK.Margin = new System.Windows.Forms.Padding(2); + this.btnOK.Name = "btnOK"; + this.btnOK.Size = new System.Drawing.Size(56, 19); + this.btnOK.TabIndex = 1; + this.btnOK.Text = "OK"; + this.btnOK.Click += new System.EventHandler(this.btnOK_Click); + // + // gpSystemColor + // + this.gpSystemColor.BackColor = System.Drawing.Color.Transparent; + this.gpSystemColor.CanvasColor = System.Drawing.Color.Transparent; + this.gpSystemColor.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.gpSystemColor.Controls.Add(this.cbRibonBlack); + this.gpSystemColor.Controls.Add(this.cbRibonSilver); + this.gpSystemColor.Controls.Add(this.cbRibonBlue); + this.gpSystemColor.DisabledBackColor = System.Drawing.Color.Empty; + this.gpSystemColor.Location = new System.Drawing.Point(39, 13); + this.gpSystemColor.Margin = new System.Windows.Forms.Padding(2); + this.gpSystemColor.Name = "gpSystemColor"; + this.gpSystemColor.Size = new System.Drawing.Size(82, 97); + // + // + // + this.gpSystemColor.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.gpSystemColor.Style.BackColorGradientAngle = 90; + this.gpSystemColor.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.gpSystemColor.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpSystemColor.Style.BorderBottomWidth = 1; + this.gpSystemColor.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.gpSystemColor.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpSystemColor.Style.BorderLeftWidth = 1; + this.gpSystemColor.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpSystemColor.Style.BorderRightWidth = 1; + this.gpSystemColor.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpSystemColor.Style.BorderTopWidth = 1; + this.gpSystemColor.Style.CornerDiameter = 4; + this.gpSystemColor.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.gpSystemColor.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; + this.gpSystemColor.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.gpSystemColor.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; + // + // + // + this.gpSystemColor.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.gpSystemColor.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gpSystemColor.TabIndex = 1; + this.gpSystemColor.Text = "System Color"; + // + // cbRibonBlack + // + this.cbRibonBlack.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.cbRibonBlack.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbRibonBlack.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; + this.cbRibonBlack.Location = new System.Drawing.Point(7, 54); + this.cbRibonBlack.Margin = new System.Windows.Forms.Padding(2); + this.cbRibonBlack.Name = "cbRibonBlack"; + this.cbRibonBlack.Size = new System.Drawing.Size(67, 19); + this.cbRibonBlack.TabIndex = 2; + this.cbRibonBlack.Text = "Black"; + this.cbRibonBlack.CheckedChanged += new System.EventHandler(this.cbRibonBlack_CheckedChanged); + // + // cbRibonSilver + // + this.cbRibonSilver.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.cbRibonSilver.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbRibonSilver.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; + this.cbRibonSilver.Location = new System.Drawing.Point(7, 30); + this.cbRibonSilver.Margin = new System.Windows.Forms.Padding(2); + this.cbRibonSilver.Name = "cbRibonSilver"; + this.cbRibonSilver.Size = new System.Drawing.Size(67, 19); + this.cbRibonSilver.TabIndex = 1; + this.cbRibonSilver.Text = "Silver"; + this.cbRibonSilver.CheckedChanged += new System.EventHandler(this.cbRibonSilver_CheckedChanged); + // + // cbRibonBlue + // + this.cbRibonBlue.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.cbRibonBlue.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbRibonBlue.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; + this.cbRibonBlue.Location = new System.Drawing.Point(7, 6); + this.cbRibonBlue.Margin = new System.Windows.Forms.Padding(2); + this.cbRibonBlue.Name = "cbRibonBlue"; + this.cbRibonBlue.Size = new System.Drawing.Size(67, 19); + this.cbRibonBlue.TabIndex = 0; + this.cbRibonBlue.Text = "Blue"; + this.cbRibonBlue.CheckedChanged += new System.EventHandler(this.cbRibonBlue_CheckedChanged); + // + // panButtons + // + this.panButtons.CanvasColor = System.Drawing.SystemColors.Control; + this.panButtons.Controls.Add(this.btnIntrFaceStngs); + this.panButtons.Controls.Add(this.btnStartMsg); + this.panButtons.Controls.Add(this.btnGeneral); + this.panButtons.DisabledBackColor = System.Drawing.Color.Empty; + this.panButtons.Location = new System.Drawing.Point(14, 14); + this.panButtons.Margin = new System.Windows.Forms.Padding(2); + this.panButtons.Name = "panButtons"; + this.panButtons.Size = new System.Drawing.Size(168, 460); + this.panButtons.Style.Alignment = System.Drawing.StringAlignment.Center; + this.panButtons.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.panButtons.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.panButtons.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.panButtons.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.panButtons.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.panButtons.Style.GradientAngle = 90; + this.panButtons.TabIndex = 2; + this.panButtons.Text = "panelEx1"; + this.panButtons.ThemeAware = true; + this.panButtons.Visible = false; + // + // btnIntrFaceStngs + // + this.btnIntrFaceStngs.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnIntrFaceStngs.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnIntrFaceStngs.Dock = System.Windows.Forms.DockStyle.Top; + this.btnIntrFaceStngs.Location = new System.Drawing.Point(0, 38); + this.btnIntrFaceStngs.Margin = new System.Windows.Forms.Padding(2); + this.btnIntrFaceStngs.Name = "btnIntrFaceStngs"; + this.btnIntrFaceStngs.Size = new System.Drawing.Size(168, 19); + this.btnIntrFaceStngs.TabIndex = 2; + this.btnIntrFaceStngs.Text = "My Interface Settings"; + this.btnIntrFaceStngs.Click += new System.EventHandler(this.btnIntrFaceStngs_Click); + // + // btnStartMsg + // + this.btnStartMsg.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnStartMsg.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnStartMsg.Dock = System.Windows.Forms.DockStyle.Top; + this.btnStartMsg.Location = new System.Drawing.Point(0, 19); + this.btnStartMsg.Margin = new System.Windows.Forms.Padding(2); + this.btnStartMsg.Name = "btnStartMsg"; + this.btnStartMsg.Size = new System.Drawing.Size(168, 19); + this.btnStartMsg.TabIndex = 1; + this.btnStartMsg.Text = "Startup Message"; + this.btnStartMsg.Visible = false; + this.btnStartMsg.Click += new System.EventHandler(this.btnStartMsg_Click); + // + // btnGeneral + // + this.btnGeneral.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnGeneral.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnGeneral.Dock = System.Windows.Forms.DockStyle.Top; + this.btnGeneral.Location = new System.Drawing.Point(0, 0); + this.btnGeneral.Margin = new System.Windows.Forms.Padding(2); + this.btnGeneral.Name = "btnGeneral"; + this.btnGeneral.Size = new System.Drawing.Size(168, 19); + this.btnGeneral.TabIndex = 0; + this.btnGeneral.Text = "General"; + this.btnGeneral.Visible = false; + this.btnGeneral.Click += new System.EventHandler(this.btnGeneral_Click); + // + // tcSysOpts + // + this.tcSysOpts.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(217)))), ((int)(((byte)(247))))); + this.tcSysOpts.CanReorderTabs = true; + this.tcSysOpts.Controls.Add(this.tabControlPanel3); + this.tcSysOpts.Controls.Add(this.tabControlPanel2); + this.tcSysOpts.Controls.Add(this.tabControlPanel1); + this.tcSysOpts.Location = new System.Drawing.Point(27, 17); + this.tcSysOpts.Margin = new System.Windows.Forms.Padding(2); + this.tcSysOpts.Name = "tcSysOpts"; + this.tcSysOpts.SelectedTabFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold); + this.tcSysOpts.SelectedTabIndex = 2; + this.tcSysOpts.Size = new System.Drawing.Size(645, 555); + this.tcSysOpts.TabIndex = 3; + this.tcSysOpts.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox; + this.tcSysOpts.Tabs.Add(this.tiGeneral); + this.tcSysOpts.Tabs.Add(this.tiStUpMsg); + this.tcSysOpts.Tabs.Add(this.tiIntrFaceStngs); + this.tcSysOpts.TabsVisible = false; + this.tcSysOpts.Text = "tabControl1"; + this.tcSysOpts.ThemeAware = true; + // + // tabControlPanel3 + // + this.tabControlPanel3.Controls.Add(this.gpMSWordSum); + this.tabControlPanel3.Controls.Add(this.gpOpenTabs); + this.tabControlPanel3.Controls.Add(this.gpShwRplWords); + this.tabControlPanel3.Controls.Add(this.gpAnnoTypeFilter); + this.tabControlPanel3.Controls.Add(this.gpVisioPath); + this.tabControlPanel3.Controls.Add(this.gpSeparateWindows); + this.tabControlPanel3.Controls.Add(this.gpEnhancedDocs); + this.tabControlPanel3.Controls.Add(this.gpPasteSettings); + this.tabControlPanel3.Controls.Add(this.gpTreeView); + this.tabControlPanel3.Controls.Add(this.gpStepTypeToolTip); + this.tabControlPanel3.Controls.Add(this.gpAnnotationSettings); + this.tabControlPanel3.Controls.Add(this.gpTransRangeColor); + this.tabControlPanel3.Controls.Add(this.gpPropPageStyle); + this.tabControlPanel3.Controls.Add(this.gpSystemColor); + this.tabControlPanel3.DisabledBackColor = System.Drawing.Color.Empty; + this.tabControlPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabControlPanel3.Location = new System.Drawing.Point(0, 27); + this.tabControlPanel3.Margin = new System.Windows.Forms.Padding(2); + this.tabControlPanel3.Name = "tabControlPanel3"; + this.tabControlPanel3.Padding = new System.Windows.Forms.Padding(1); + this.tabControlPanel3.Size = new System.Drawing.Size(645, 528); + this.tabControlPanel3.Style.BackColor1.Color = System.Drawing.SystemColors.Control; + this.tabControlPanel3.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.tabControlPanel3.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) | DevComponents.DotNetBar.eBorderSide.Bottom))); - this.tabControlPanel3.Style.GradientAngle = 90; - this.tabControlPanel3.TabIndex = 3; - this.tabControlPanel3.TabItem = this.tiIntrFaceStngs; - this.tabControlPanel3.ThemeAware = true; - // - // gpOpenTabs - // - this.gpOpenTabs.BackColor = System.Drawing.Color.Transparent; - this.gpOpenTabs.CanvasColor = System.Drawing.SystemColors.Control; - this.gpOpenTabs.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.gpOpenTabs.Controls.Add(this.cbOTRemember); - this.gpOpenTabs.Controls.Add(this.cbOTAutoOpen); - this.gpOpenTabs.DisabledBackColor = System.Drawing.Color.Empty; - this.gpOpenTabs.Location = new System.Drawing.Point(462, 252); - this.gpOpenTabs.Margin = new System.Windows.Forms.Padding(2); - this.gpOpenTabs.Name = "gpOpenTabs"; - this.gpOpenTabs.Size = new System.Drawing.Size(139, 81); - // - // - // - this.gpOpenTabs.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.gpOpenTabs.Style.BackColorGradientAngle = 90; - this.gpOpenTabs.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.gpOpenTabs.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpOpenTabs.Style.BorderBottomWidth = 1; - this.gpOpenTabs.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.gpOpenTabs.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpOpenTabs.Style.BorderLeftWidth = 1; - this.gpOpenTabs.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpOpenTabs.Style.BorderRightWidth = 1; - this.gpOpenTabs.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpOpenTabs.Style.BorderTopWidth = 1; - this.gpOpenTabs.Style.CornerDiameter = 4; - this.gpOpenTabs.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.gpOpenTabs.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; - this.gpOpenTabs.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.gpOpenTabs.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; - // - // - // - this.gpOpenTabs.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gpOpenTabs.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gpOpenTabs.TabIndex = 13; - this.gpOpenTabs.Text = "Open Tabs"; - // - // cbOTRemember - // - // - // - // - this.cbOTRemember.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbOTRemember.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbOTRemember.Location = new System.Drawing.Point(8, 5); - this.cbOTRemember.Margin = new System.Windows.Forms.Padding(2); - this.cbOTRemember.Name = "cbOTRemember"; - this.cbOTRemember.Size = new System.Drawing.Size(119, 19); - this.cbOTRemember.TabIndex = 9; - this.cbOTRemember.Text = "Remember Setting"; - this.cbOTRemember.CheckedChanged += new System.EventHandler(this.cbOTRemember_CheckedChanged); - // - // cbOTAutoOpen - // - // - // - // - this.cbOTAutoOpen.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbOTAutoOpen.Enabled = false; - this.cbOTAutoOpen.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbOTAutoOpen.Location = new System.Drawing.Point(8, 28); - this.cbOTAutoOpen.Margin = new System.Windows.Forms.Padding(2); - this.cbOTAutoOpen.Name = "cbOTAutoOpen"; - this.cbOTAutoOpen.Size = new System.Drawing.Size(92, 19); - this.cbOTAutoOpen.TabIndex = 10; - this.cbOTAutoOpen.Text = "Auto Open"; - this.cbOTAutoOpen.Visible = false; - // - // gpShwRplWords - // - this.gpShwRplWords.BackColor = System.Drawing.Color.Transparent; - this.gpShwRplWords.CanvasColor = System.Drawing.SystemColors.Control; - this.gpShwRplWords.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.gpShwRplWords.Controls.Add(this.cbShwRplWrdsColor); - this.gpShwRplWords.DisabledBackColor = System.Drawing.Color.Empty; - this.gpShwRplWords.Location = new System.Drawing.Point(462, 165); - this.gpShwRplWords.Margin = new System.Windows.Forms.Padding(2); - this.gpShwRplWords.Name = "gpShwRplWords"; - this.gpShwRplWords.Size = new System.Drawing.Size(139, 72); - // - // - // - this.gpShwRplWords.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.gpShwRplWords.Style.BackColorGradientAngle = 90; - this.gpShwRplWords.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.gpShwRplWords.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpShwRplWords.Style.BorderBottomWidth = 1; - this.gpShwRplWords.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.gpShwRplWords.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpShwRplWords.Style.BorderLeftWidth = 1; - this.gpShwRplWords.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpShwRplWords.Style.BorderRightWidth = 1; - this.gpShwRplWords.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpShwRplWords.Style.BorderTopWidth = 1; - this.gpShwRplWords.Style.CornerDiameter = 4; - this.gpShwRplWords.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.gpShwRplWords.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; - this.gpShwRplWords.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.gpShwRplWords.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; - // - // - // - this.gpShwRplWords.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gpShwRplWords.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gpShwRplWords.TabIndex = 13; - this.gpShwRplWords.Text = "Replace Words"; - // - // cbShwRplWrdsColor - // - // - // - // - this.cbShwRplWrdsColor.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbShwRplWrdsColor.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbShwRplWrdsColor.Location = new System.Drawing.Point(8, 5); - this.cbShwRplWrdsColor.Margin = new System.Windows.Forms.Padding(2); - this.cbShwRplWrdsColor.Name = "cbShwRplWrdsColor"; - this.cbShwRplWrdsColor.Size = new System.Drawing.Size(119, 19); - this.cbShwRplWrdsColor.TabIndex = 9; - this.cbShwRplWrdsColor.Text = "Color Replace Words"; - this.cbShwRplWrdsColor.CheckedChanged += new System.EventHandler(this.cbShwRplWrdsColor_CheckedChanged); - // - // gpVisioPath - // - this.gpVisioPath.BackColor = System.Drawing.Color.Transparent; - this.gpVisioPath.CanvasColor = System.Drawing.SystemColors.Control; - this.gpVisioPath.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.gpVisioPath.Controls.Add(this.txbxVisioPath); - this.gpVisioPath.DisabledBackColor = System.Drawing.Color.Empty; - this.gpVisioPath.Location = new System.Drawing.Point(25, 432); - this.gpVisioPath.Margin = new System.Windows.Forms.Padding(2); - this.gpVisioPath.Name = "gpVisioPath"; - this.gpVisioPath.Size = new System.Drawing.Size(285, 69); - // - // - // - this.gpVisioPath.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.gpVisioPath.Style.BackColorGradientAngle = 90; - this.gpVisioPath.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.gpVisioPath.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpVisioPath.Style.BorderBottomWidth = 1; - this.gpVisioPath.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.gpVisioPath.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpVisioPath.Style.BorderLeftWidth = 1; - this.gpVisioPath.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpVisioPath.Style.BorderRightWidth = 1; - this.gpVisioPath.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpVisioPath.Style.BorderTopWidth = 1; - this.gpVisioPath.Style.CornerDiameter = 4; - this.gpVisioPath.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.gpVisioPath.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; - this.gpVisioPath.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.gpVisioPath.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; - // - // - // - this.gpVisioPath.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gpVisioPath.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gpVisioPath.TabIndex = 11; - this.gpVisioPath.Text = "Visio Path"; - // - // txbxVisioPath - // - // - // - // - this.txbxVisioPath.Border.Class = "TextBoxBorder"; - this.txbxVisioPath.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.txbxVisioPath.Location = new System.Drawing.Point(8, 13); - this.txbxVisioPath.Name = "txbxVisioPath"; - this.txbxVisioPath.PreventEnterBeep = true; - this.txbxVisioPath.ScrollBars = System.Windows.Forms.ScrollBars.Horizontal; - this.txbxVisioPath.ShortcutsEnabled = false; - this.txbxVisioPath.Size = new System.Drawing.Size(263, 20); - this.superTooltip1.SetSuperTooltip(this.txbxVisioPath, new DevComponents.DotNetBar.SuperTooltipInfo("Visio Path", "", "PROMS wil use this specified path to open Visio for use with inserting the Equati" + + this.tabControlPanel3.Style.GradientAngle = 90; + this.tabControlPanel3.TabIndex = 3; + this.tabControlPanel3.TabItem = this.tiIntrFaceStngs; + this.tabControlPanel3.ThemeAware = true; + // + // gpMSWordSum + // + this.gpMSWordSum.BackColor = System.Drawing.Color.Transparent; + this.gpMSWordSum.CanvasColor = System.Drawing.SystemColors.Control; + this.gpMSWordSum.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.gpMSWordSum.Controls.Add(this.cbMSWordPrompt); + this.gpMSWordSum.DisabledBackColor = System.Drawing.Color.Empty; + this.gpMSWordSum.Location = new System.Drawing.Point(25, 347); + this.gpMSWordSum.Margin = new System.Windows.Forms.Padding(2); + this.gpMSWordSum.Name = "gpMSWordSum"; + this.gpMSWordSum.Size = new System.Drawing.Size(119, 81); + // + // + // + this.gpMSWordSum.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.gpMSWordSum.Style.BackColorGradientAngle = 90; + this.gpMSWordSum.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.gpMSWordSum.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpMSWordSum.Style.BorderBottomWidth = 1; + this.gpMSWordSum.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.gpMSWordSum.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpMSWordSum.Style.BorderLeftWidth = 1; + this.gpMSWordSum.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpMSWordSum.Style.BorderRightWidth = 1; + this.gpMSWordSum.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpMSWordSum.Style.BorderTopWidth = 1; + this.gpMSWordSum.Style.CornerDiameter = 4; + this.gpMSWordSum.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.gpMSWordSum.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; + this.gpMSWordSum.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.gpMSWordSum.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; + // + // + // + this.gpMSWordSum.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.gpMSWordSum.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gpMSWordSum.TabIndex = 14; + this.gpMSWordSum.Text = "Opening in MS Word"; + // + // cbMSWordPrompt + // + // + // + // + this.cbMSWordPrompt.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbMSWordPrompt.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbMSWordPrompt.Location = new System.Drawing.Point(8, 5); + this.cbMSWordPrompt.Margin = new System.Windows.Forms.Padding(2); + this.cbMSWordPrompt.Name = "cbMSWordPrompt"; + this.cbMSWordPrompt.Size = new System.Drawing.Size(92, 44); + this.cbMSWordPrompt.TabIndex = 9; + this.cbMSWordPrompt.Text = "Show Prompt For Summaries"; + // + // gpOpenTabs + // + this.gpOpenTabs.BackColor = System.Drawing.Color.Transparent; + this.gpOpenTabs.CanvasColor = System.Drawing.SystemColors.Control; + this.gpOpenTabs.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.gpOpenTabs.Controls.Add(this.cbOTRemember); + this.gpOpenTabs.Controls.Add(this.cbOTAutoOpen); + this.gpOpenTabs.DisabledBackColor = System.Drawing.Color.Empty; + this.gpOpenTabs.Location = new System.Drawing.Point(462, 252); + this.gpOpenTabs.Margin = new System.Windows.Forms.Padding(2); + this.gpOpenTabs.Name = "gpOpenTabs"; + this.gpOpenTabs.Size = new System.Drawing.Size(139, 81); + // + // + // + this.gpOpenTabs.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.gpOpenTabs.Style.BackColorGradientAngle = 90; + this.gpOpenTabs.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.gpOpenTabs.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpOpenTabs.Style.BorderBottomWidth = 1; + this.gpOpenTabs.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.gpOpenTabs.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpOpenTabs.Style.BorderLeftWidth = 1; + this.gpOpenTabs.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpOpenTabs.Style.BorderRightWidth = 1; + this.gpOpenTabs.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpOpenTabs.Style.BorderTopWidth = 1; + this.gpOpenTabs.Style.CornerDiameter = 4; + this.gpOpenTabs.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.gpOpenTabs.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; + this.gpOpenTabs.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.gpOpenTabs.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; + // + // + // + this.gpOpenTabs.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.gpOpenTabs.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gpOpenTabs.TabIndex = 13; + this.gpOpenTabs.Text = "Open Tabs"; + // + // cbOTRemember + // + // + // + // + this.cbOTRemember.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbOTRemember.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbOTRemember.Location = new System.Drawing.Point(8, 5); + this.cbOTRemember.Margin = new System.Windows.Forms.Padding(2); + this.cbOTRemember.Name = "cbOTRemember"; + this.cbOTRemember.Size = new System.Drawing.Size(119, 19); + this.cbOTRemember.TabIndex = 9; + this.cbOTRemember.Text = "Remember Setting"; + this.cbOTRemember.CheckedChanged += new System.EventHandler(this.cbOTRemember_CheckedChanged); + // + // cbOTAutoOpen + // + // + // + // + this.cbOTAutoOpen.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbOTAutoOpen.Enabled = false; + this.cbOTAutoOpen.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbOTAutoOpen.Location = new System.Drawing.Point(8, 28); + this.cbOTAutoOpen.Margin = new System.Windows.Forms.Padding(2); + this.cbOTAutoOpen.Name = "cbOTAutoOpen"; + this.cbOTAutoOpen.Size = new System.Drawing.Size(92, 19); + this.cbOTAutoOpen.TabIndex = 10; + this.cbOTAutoOpen.Text = "Auto Open"; + this.cbOTAutoOpen.Visible = false; + // + // gpShwRplWords + // + this.gpShwRplWords.BackColor = System.Drawing.Color.Transparent; + this.gpShwRplWords.CanvasColor = System.Drawing.SystemColors.Control; + this.gpShwRplWords.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.gpShwRplWords.Controls.Add(this.cbShwRplWrdsColor); + this.gpShwRplWords.DisabledBackColor = System.Drawing.Color.Empty; + this.gpShwRplWords.Location = new System.Drawing.Point(462, 165); + this.gpShwRplWords.Margin = new System.Windows.Forms.Padding(2); + this.gpShwRplWords.Name = "gpShwRplWords"; + this.gpShwRplWords.Size = new System.Drawing.Size(139, 72); + // + // + // + this.gpShwRplWords.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.gpShwRplWords.Style.BackColorGradientAngle = 90; + this.gpShwRplWords.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.gpShwRplWords.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpShwRplWords.Style.BorderBottomWidth = 1; + this.gpShwRplWords.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.gpShwRplWords.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpShwRplWords.Style.BorderLeftWidth = 1; + this.gpShwRplWords.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpShwRplWords.Style.BorderRightWidth = 1; + this.gpShwRplWords.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpShwRplWords.Style.BorderTopWidth = 1; + this.gpShwRplWords.Style.CornerDiameter = 4; + this.gpShwRplWords.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.gpShwRplWords.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; + this.gpShwRplWords.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.gpShwRplWords.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; + // + // + // + this.gpShwRplWords.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.gpShwRplWords.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gpShwRplWords.TabIndex = 13; + this.gpShwRplWords.Text = "Replace Words"; + // + // cbShwRplWrdsColor + // + // + // + // + this.cbShwRplWrdsColor.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbShwRplWrdsColor.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbShwRplWrdsColor.Location = new System.Drawing.Point(8, 5); + this.cbShwRplWrdsColor.Margin = new System.Windows.Forms.Padding(2); + this.cbShwRplWrdsColor.Name = "cbShwRplWrdsColor"; + this.cbShwRplWrdsColor.Size = new System.Drawing.Size(119, 19); + this.cbShwRplWrdsColor.TabIndex = 9; + this.cbShwRplWrdsColor.Text = "Color Replace Words"; + this.cbShwRplWrdsColor.CheckedChanged += new System.EventHandler(this.cbShwRplWrdsColor_CheckedChanged); + // + // gpAnnoTypeFilter + // + this.gpAnnoTypeFilter.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.gpAnnoTypeFilter.Controls.Add(this.cbShwAnnoFilter); + this.gpAnnoTypeFilter.DisabledBackColor = System.Drawing.Color.Empty; + this.gpAnnoTypeFilter.Location = new System.Drawing.Point(324, 12); + this.gpAnnoTypeFilter.Margin = new System.Windows.Forms.Padding(2); + this.gpAnnoTypeFilter.Name = "gpAnnoTypeFilter"; + this.gpAnnoTypeFilter.Size = new System.Drawing.Size(150, 72); + // + // + // + this.gpAnnoTypeFilter.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.gpAnnoTypeFilter.Style.BackColorGradientAngle = 90; + this.gpAnnoTypeFilter.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.gpAnnoTypeFilter.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpAnnoTypeFilter.Style.BorderBottomWidth = 1; + this.gpAnnoTypeFilter.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.gpAnnoTypeFilter.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpAnnoTypeFilter.Style.BorderLeftWidth = 1; + this.gpAnnoTypeFilter.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpAnnoTypeFilter.Style.BorderRightWidth = 1; + this.gpAnnoTypeFilter.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpAnnoTypeFilter.Style.BorderTopWidth = 1; + this.gpAnnoTypeFilter.Style.CornerDiameter = 4; + this.gpAnnoTypeFilter.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.gpAnnoTypeFilter.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; + this.gpAnnoTypeFilter.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.gpAnnoTypeFilter.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; + // + // + // + this.gpAnnoTypeFilter.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.gpAnnoTypeFilter.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gpAnnoTypeFilter.TabIndex = 13; + this.gpAnnoTypeFilter.Text = "Select Annotation Types"; + // + // gpVisioPath + // + this.gpVisioPath.BackColor = System.Drawing.Color.Transparent; + this.gpVisioPath.CanvasColor = System.Drawing.SystemColors.Control; + this.gpVisioPath.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.gpVisioPath.Controls.Add(this.txbxVisioPath); + this.gpVisioPath.DisabledBackColor = System.Drawing.Color.Empty; + this.gpVisioPath.Location = new System.Drawing.Point(25, 432); + this.gpVisioPath.Margin = new System.Windows.Forms.Padding(2); + this.gpVisioPath.Name = "gpVisioPath"; + this.gpVisioPath.Size = new System.Drawing.Size(285, 69); + // + // + // + this.gpVisioPath.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.gpVisioPath.Style.BackColorGradientAngle = 90; + this.gpVisioPath.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.gpVisioPath.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpVisioPath.Style.BorderBottomWidth = 1; + this.gpVisioPath.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.gpVisioPath.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpVisioPath.Style.BorderLeftWidth = 1; + this.gpVisioPath.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpVisioPath.Style.BorderRightWidth = 1; + this.gpVisioPath.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpVisioPath.Style.BorderTopWidth = 1; + this.gpVisioPath.Style.CornerDiameter = 4; + this.gpVisioPath.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.gpVisioPath.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; + this.gpVisioPath.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.gpVisioPath.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; + // + // + // + this.gpVisioPath.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.gpVisioPath.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gpVisioPath.TabIndex = 11; + this.gpVisioPath.Text = "Visio Path"; + // + // txbxVisioPath + // + // + // + // + this.txbxVisioPath.Border.Class = "TextBoxBorder"; + this.txbxVisioPath.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.txbxVisioPath.Location = new System.Drawing.Point(8, 13); + this.txbxVisioPath.Name = "txbxVisioPath"; + this.txbxVisioPath.PreventEnterBeep = true; + this.txbxVisioPath.ScrollBars = System.Windows.Forms.ScrollBars.Horizontal; + this.txbxVisioPath.ShortcutsEnabled = false; + this.txbxVisioPath.Size = new System.Drawing.Size(263, 20); + this.superTooltip1.SetSuperTooltip(this.txbxVisioPath, new DevComponents.DotNetBar.SuperTooltipInfo("Visio Path", "", "PROMS wil use this specified path to open Visio for use with inserting the Equati" + "on sub step type.\r\n\r\nIf this is blank, then PROMS will look in the registry for " + "the path to Visio.\r\n\r\n", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, false, new System.Drawing.Size(300, 115))); - this.txbxVisioPath.TabIndex = 0; - this.txbxVisioPath.WordWrap = false; - this.txbxVisioPath.Leave += new System.EventHandler(this.txbxVisioPath_Leave_1); - // - // gpSeparateWindows - // - this.gpSeparateWindows.BackColor = System.Drawing.Color.Transparent; - this.gpSeparateWindows.CanvasColor = System.Drawing.SystemColors.Control; - this.gpSeparateWindows.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.gpSeparateWindows.Controls.Add(this.cbSeparateWindows); - this.gpSeparateWindows.DisabledBackColor = System.Drawing.Color.Empty; - this.gpSeparateWindows.Location = new System.Drawing.Point(313, 252); - this.gpSeparateWindows.Margin = new System.Windows.Forms.Padding(2); - this.gpSeparateWindows.Name = "gpSeparateWindows"; - this.gpSeparateWindows.Size = new System.Drawing.Size(127, 81); - // - // - // - this.gpSeparateWindows.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.gpSeparateWindows.Style.BackColorGradientAngle = 90; - this.gpSeparateWindows.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.gpSeparateWindows.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpSeparateWindows.Style.BorderBottomWidth = 1; - this.gpSeparateWindows.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.gpSeparateWindows.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpSeparateWindows.Style.BorderLeftWidth = 1; - this.gpSeparateWindows.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpSeparateWindows.Style.BorderRightWidth = 1; - this.gpSeparateWindows.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpSeparateWindows.Style.BorderTopWidth = 1; - this.gpSeparateWindows.Style.CornerDiameter = 4; - this.gpSeparateWindows.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.gpSeparateWindows.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; - this.gpSeparateWindows.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.gpSeparateWindows.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; - // - // - // - this.gpSeparateWindows.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gpSeparateWindows.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gpSeparateWindows.TabIndex = 10; - this.gpSeparateWindows.Text = "Separate Windows"; - // - // cbSeparateWindows - // - // - // - // - this.cbSeparateWindows.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbSeparateWindows.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbSeparateWindows.Location = new System.Drawing.Point(8, 8); - this.cbSeparateWindows.Margin = new System.Windows.Forms.Padding(2); - this.cbSeparateWindows.Name = "cbSeparateWindows"; - this.cbSeparateWindows.Size = new System.Drawing.Size(107, 19); - this.cbSeparateWindows.TabIndex = 9; - this.cbSeparateWindows.Text = "By Procedure Set"; - this.cbSeparateWindows.CheckedChanged += new System.EventHandler(this.cbSeparateWindows_CheckedChanged); - // - // gpEnhancedDocs - // - this.gpEnhancedDocs.BackColor = System.Drawing.Color.Transparent; - this.gpEnhancedDocs.CanvasColor = System.Drawing.SystemColors.Control; - this.gpEnhancedDocs.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.gpEnhancedDocs.Controls.Add(this.cbEnhancedDocumentSync); - this.gpEnhancedDocs.DisabledBackColor = System.Drawing.Color.Empty; - this.gpEnhancedDocs.Location = new System.Drawing.Point(167, 252); - this.gpEnhancedDocs.Margin = new System.Windows.Forms.Padding(2); - this.gpEnhancedDocs.Name = "gpEnhancedDocs"; - this.gpEnhancedDocs.Size = new System.Drawing.Size(127, 81); - // - // - // - this.gpEnhancedDocs.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.gpEnhancedDocs.Style.BackColorGradientAngle = 90; - this.gpEnhancedDocs.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.gpEnhancedDocs.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpEnhancedDocs.Style.BorderBottomWidth = 1; - this.gpEnhancedDocs.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.gpEnhancedDocs.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpEnhancedDocs.Style.BorderLeftWidth = 1; - this.gpEnhancedDocs.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpEnhancedDocs.Style.BorderRightWidth = 1; - this.gpEnhancedDocs.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpEnhancedDocs.Style.BorderTopWidth = 1; - this.gpEnhancedDocs.Style.CornerDiameter = 4; - this.gpEnhancedDocs.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.gpEnhancedDocs.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; - this.gpEnhancedDocs.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.gpEnhancedDocs.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; - // - // - // - this.gpEnhancedDocs.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gpEnhancedDocs.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gpEnhancedDocs.TabIndex = 9; - this.gpEnhancedDocs.Text = "Enhanced Documents"; - // - // cbEnhancedDocumentSync - // - // - // - // - this.cbEnhancedDocumentSync.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbEnhancedDocumentSync.Checked = true; - this.cbEnhancedDocumentSync.CheckState = System.Windows.Forms.CheckState.Checked; - this.cbEnhancedDocumentSync.CheckValue = "Y"; - this.cbEnhancedDocumentSync.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbEnhancedDocumentSync.Location = new System.Drawing.Point(8, 8); - this.cbEnhancedDocumentSync.Margin = new System.Windows.Forms.Padding(2); - this.cbEnhancedDocumentSync.Name = "cbEnhancedDocumentSync"; - this.cbEnhancedDocumentSync.Size = new System.Drawing.Size(99, 19); - this.cbEnhancedDocumentSync.TabIndex = 9; - this.cbEnhancedDocumentSync.Text = "Sync Navigation"; - // - // gpPasteSettings - // - this.gpPasteSettings.BackColor = System.Drawing.Color.Transparent; - this.gpPasteSettings.CanvasColor = System.Drawing.SystemColors.Control; - this.gpPasteSettings.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.gpPasteSettings.Controls.Add(this.cbPastePlainText); - this.gpPasteSettings.Controls.Add(this.cbPasteNoReturns); - this.gpPasteSettings.DisabledBackColor = System.Drawing.Color.Empty; - this.gpPasteSettings.Location = new System.Drawing.Point(25, 252); - this.gpPasteSettings.Margin = new System.Windows.Forms.Padding(2); - this.gpPasteSettings.Name = "gpPasteSettings"; - this.gpPasteSettings.Size = new System.Drawing.Size(119, 81); - // - // - // - this.gpPasteSettings.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.gpPasteSettings.Style.BackColorGradientAngle = 90; - this.gpPasteSettings.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.gpPasteSettings.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpPasteSettings.Style.BorderBottomWidth = 1; - this.gpPasteSettings.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.gpPasteSettings.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpPasteSettings.Style.BorderLeftWidth = 1; - this.gpPasteSettings.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpPasteSettings.Style.BorderRightWidth = 1; - this.gpPasteSettings.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpPasteSettings.Style.BorderTopWidth = 1; - this.gpPasteSettings.Style.CornerDiameter = 4; - this.gpPasteSettings.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.gpPasteSettings.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; - this.gpPasteSettings.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.gpPasteSettings.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; - // - // - // - this.gpPasteSettings.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gpPasteSettings.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gpPasteSettings.TabIndex = 8; - this.gpPasteSettings.Text = "Paste Settings"; - // - // cbPastePlainText - // - // - // - // - this.cbPastePlainText.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbPastePlainText.Checked = true; - this.cbPastePlainText.CheckState = System.Windows.Forms.CheckState.Checked; - this.cbPastePlainText.CheckValue = "Y"; - this.cbPastePlainText.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbPastePlainText.Location = new System.Drawing.Point(8, 8); - this.cbPastePlainText.Margin = new System.Windows.Forms.Padding(2); - this.cbPastePlainText.Name = "cbPastePlainText"; - this.cbPastePlainText.Size = new System.Drawing.Size(92, 19); - this.cbPastePlainText.TabIndex = 9; - this.cbPastePlainText.Text = "Plain Text"; - this.cbPastePlainText.CheckedChanged += new System.EventHandler(this.cbPastePlainText_CheckedChanged); - // - // cbPasteNoReturns - // - // - // - // - this.cbPasteNoReturns.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbPasteNoReturns.Checked = true; - this.cbPasteNoReturns.CheckState = System.Windows.Forms.CheckState.Checked; - this.cbPasteNoReturns.CheckValue = "Y"; - this.cbPasteNoReturns.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbPasteNoReturns.Location = new System.Drawing.Point(8, 28); - this.cbPasteNoReturns.Margin = new System.Windows.Forms.Padding(2); - this.cbPasteNoReturns.Name = "cbPasteNoReturns"; - this.cbPasteNoReturns.Size = new System.Drawing.Size(92, 19); - this.cbPasteNoReturns.TabIndex = 10; - this.cbPasteNoReturns.Text = "No Returns"; - this.cbPasteNoReturns.CheckedChanged += new System.EventHandler(this.cbPasteNoReturns_CheckedChanged); - // - // gpTreeView - // - this.gpTreeView.BackColor = System.Drawing.Color.Transparent; - this.gpTreeView.CanvasColor = System.Drawing.SystemColors.Control; - this.gpTreeView.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.gpTreeView.Controls.Add(this.cbTVExpand); - this.gpTreeView.DisabledBackColor = System.Drawing.Color.Empty; - this.gpTreeView.Location = new System.Drawing.Point(312, 165); - this.gpTreeView.Margin = new System.Windows.Forms.Padding(2); - this.gpTreeView.Name = "gpTreeView"; - this.gpTreeView.Size = new System.Drawing.Size(119, 72); - // - // - // - this.gpTreeView.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.gpTreeView.Style.BackColorGradientAngle = 90; - this.gpTreeView.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.gpTreeView.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpTreeView.Style.BorderBottomWidth = 1; - this.gpTreeView.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.gpTreeView.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpTreeView.Style.BorderLeftWidth = 1; - this.gpTreeView.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpTreeView.Style.BorderRightWidth = 1; - this.gpTreeView.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpTreeView.Style.BorderTopWidth = 1; - this.gpTreeView.Style.CornerDiameter = 4; - this.gpTreeView.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.gpTreeView.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; - this.gpTreeView.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.gpTreeView.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; - // - // - // - this.gpTreeView.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gpTreeView.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gpTreeView.TabIndex = 6; - this.gpTreeView.Text = "Tree View"; - // - // cbTVExpand - // - // - // - // - this.cbTVExpand.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbTVExpand.Checked = true; - this.cbTVExpand.CheckState = System.Windows.Forms.CheckState.Checked; - this.cbTVExpand.CheckValue = "Y"; - this.cbTVExpand.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbTVExpand.Location = new System.Drawing.Point(8, 13); - this.cbTVExpand.Margin = new System.Windows.Forms.Padding(2); - this.cbTVExpand.Name = "cbTVExpand"; - this.cbTVExpand.Size = new System.Drawing.Size(92, 19); - this.superTooltip1.SetSuperTooltip(this.cbTVExpand, new DevComponents.DotNetBar.SuperTooltipInfo("Remember Last", "", "When checked, PROMS will remember the last procedure you had seleced from the tre" + + this.txbxVisioPath.TabIndex = 0; + this.txbxVisioPath.WordWrap = false; + this.txbxVisioPath.Leave += new System.EventHandler(this.txbxVisioPath_Leave_1); + // + // gpSeparateWindows + // + this.gpSeparateWindows.BackColor = System.Drawing.Color.Transparent; + this.gpSeparateWindows.CanvasColor = System.Drawing.SystemColors.Control; + this.gpSeparateWindows.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.gpSeparateWindows.Controls.Add(this.cbSeparateWindows); + this.gpSeparateWindows.DisabledBackColor = System.Drawing.Color.Empty; + this.gpSeparateWindows.Location = new System.Drawing.Point(313, 252); + this.gpSeparateWindows.Margin = new System.Windows.Forms.Padding(2); + this.gpSeparateWindows.Name = "gpSeparateWindows"; + this.gpSeparateWindows.Size = new System.Drawing.Size(127, 81); + // + // + // + this.gpSeparateWindows.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.gpSeparateWindows.Style.BackColorGradientAngle = 90; + this.gpSeparateWindows.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.gpSeparateWindows.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpSeparateWindows.Style.BorderBottomWidth = 1; + this.gpSeparateWindows.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.gpSeparateWindows.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpSeparateWindows.Style.BorderLeftWidth = 1; + this.gpSeparateWindows.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpSeparateWindows.Style.BorderRightWidth = 1; + this.gpSeparateWindows.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpSeparateWindows.Style.BorderTopWidth = 1; + this.gpSeparateWindows.Style.CornerDiameter = 4; + this.gpSeparateWindows.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.gpSeparateWindows.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; + this.gpSeparateWindows.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.gpSeparateWindows.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; + // + // + // + this.gpSeparateWindows.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.gpSeparateWindows.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gpSeparateWindows.TabIndex = 10; + this.gpSeparateWindows.Text = "Separate Windows"; + // + // cbSeparateWindows + // + // + // + // + this.cbSeparateWindows.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbSeparateWindows.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbSeparateWindows.Location = new System.Drawing.Point(8, 8); + this.cbSeparateWindows.Margin = new System.Windows.Forms.Padding(2); + this.cbSeparateWindows.Name = "cbSeparateWindows"; + this.cbSeparateWindows.Size = new System.Drawing.Size(107, 19); + this.cbSeparateWindows.TabIndex = 9; + this.cbSeparateWindows.Text = "By Procedure Set"; + this.cbSeparateWindows.CheckedChanged += new System.EventHandler(this.cbSeparateWindows_CheckedChanged); + // + // gpEnhancedDocs + // + this.gpEnhancedDocs.BackColor = System.Drawing.Color.Transparent; + this.gpEnhancedDocs.CanvasColor = System.Drawing.SystemColors.Control; + this.gpEnhancedDocs.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.gpEnhancedDocs.Controls.Add(this.cbEnhancedDocumentSync); + this.gpEnhancedDocs.DisabledBackColor = System.Drawing.Color.Empty; + this.gpEnhancedDocs.Location = new System.Drawing.Point(167, 252); + this.gpEnhancedDocs.Margin = new System.Windows.Forms.Padding(2); + this.gpEnhancedDocs.Name = "gpEnhancedDocs"; + this.gpEnhancedDocs.Size = new System.Drawing.Size(127, 81); + // + // + // + this.gpEnhancedDocs.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.gpEnhancedDocs.Style.BackColorGradientAngle = 90; + this.gpEnhancedDocs.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.gpEnhancedDocs.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpEnhancedDocs.Style.BorderBottomWidth = 1; + this.gpEnhancedDocs.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.gpEnhancedDocs.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpEnhancedDocs.Style.BorderLeftWidth = 1; + this.gpEnhancedDocs.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpEnhancedDocs.Style.BorderRightWidth = 1; + this.gpEnhancedDocs.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpEnhancedDocs.Style.BorderTopWidth = 1; + this.gpEnhancedDocs.Style.CornerDiameter = 4; + this.gpEnhancedDocs.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.gpEnhancedDocs.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; + this.gpEnhancedDocs.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.gpEnhancedDocs.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; + // + // + // + this.gpEnhancedDocs.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.gpEnhancedDocs.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gpEnhancedDocs.TabIndex = 9; + this.gpEnhancedDocs.Text = "Enhanced Documents"; + // + // cbEnhancedDocumentSync + // + // + // + // + this.cbEnhancedDocumentSync.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbEnhancedDocumentSync.Checked = true; + this.cbEnhancedDocumentSync.CheckState = System.Windows.Forms.CheckState.Checked; + this.cbEnhancedDocumentSync.CheckValue = "Y"; + this.cbEnhancedDocumentSync.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbEnhancedDocumentSync.Location = new System.Drawing.Point(8, 8); + this.cbEnhancedDocumentSync.Margin = new System.Windows.Forms.Padding(2); + this.cbEnhancedDocumentSync.Name = "cbEnhancedDocumentSync"; + this.cbEnhancedDocumentSync.Size = new System.Drawing.Size(99, 19); + this.cbEnhancedDocumentSync.TabIndex = 9; + this.cbEnhancedDocumentSync.Text = "Sync Navigation"; + // + // gpPasteSettings + // + this.gpPasteSettings.BackColor = System.Drawing.Color.Transparent; + this.gpPasteSettings.CanvasColor = System.Drawing.SystemColors.Control; + this.gpPasteSettings.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.gpPasteSettings.Controls.Add(this.cbPastePlainText); + this.gpPasteSettings.Controls.Add(this.cbPasteNoReturns); + this.gpPasteSettings.DisabledBackColor = System.Drawing.Color.Empty; + this.gpPasteSettings.Location = new System.Drawing.Point(25, 252); + this.gpPasteSettings.Margin = new System.Windows.Forms.Padding(2); + this.gpPasteSettings.Name = "gpPasteSettings"; + this.gpPasteSettings.Size = new System.Drawing.Size(119, 81); + // + // + // + this.gpPasteSettings.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.gpPasteSettings.Style.BackColorGradientAngle = 90; + this.gpPasteSettings.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.gpPasteSettings.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpPasteSettings.Style.BorderBottomWidth = 1; + this.gpPasteSettings.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.gpPasteSettings.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpPasteSettings.Style.BorderLeftWidth = 1; + this.gpPasteSettings.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpPasteSettings.Style.BorderRightWidth = 1; + this.gpPasteSettings.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpPasteSettings.Style.BorderTopWidth = 1; + this.gpPasteSettings.Style.CornerDiameter = 4; + this.gpPasteSettings.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.gpPasteSettings.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; + this.gpPasteSettings.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.gpPasteSettings.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; + // + // + // + this.gpPasteSettings.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.gpPasteSettings.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gpPasteSettings.TabIndex = 8; + this.gpPasteSettings.Text = "Paste Settings"; + // + // cbPastePlainText + // + // + // + // + this.cbPastePlainText.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbPastePlainText.Checked = true; + this.cbPastePlainText.CheckState = System.Windows.Forms.CheckState.Checked; + this.cbPastePlainText.CheckValue = "Y"; + this.cbPastePlainText.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbPastePlainText.Location = new System.Drawing.Point(8, 8); + this.cbPastePlainText.Margin = new System.Windows.Forms.Padding(2); + this.cbPastePlainText.Name = "cbPastePlainText"; + this.cbPastePlainText.Size = new System.Drawing.Size(92, 19); + this.cbPastePlainText.TabIndex = 9; + this.cbPastePlainText.Text = "Plain Text"; + this.cbPastePlainText.CheckedChanged += new System.EventHandler(this.cbPastePlainText_CheckedChanged); + // + // cbPasteNoReturns + // + // + // + // + this.cbPasteNoReturns.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbPasteNoReturns.Checked = true; + this.cbPasteNoReturns.CheckState = System.Windows.Forms.CheckState.Checked; + this.cbPasteNoReturns.CheckValue = "Y"; + this.cbPasteNoReturns.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbPasteNoReturns.Location = new System.Drawing.Point(8, 28); + this.cbPasteNoReturns.Margin = new System.Windows.Forms.Padding(2); + this.cbPasteNoReturns.Name = "cbPasteNoReturns"; + this.cbPasteNoReturns.Size = new System.Drawing.Size(92, 19); + this.cbPasteNoReturns.TabIndex = 10; + this.cbPasteNoReturns.Text = "No Returns"; + this.cbPasteNoReturns.CheckedChanged += new System.EventHandler(this.cbPasteNoReturns_CheckedChanged); + // + // gpTreeView + // + this.gpTreeView.BackColor = System.Drawing.Color.Transparent; + this.gpTreeView.CanvasColor = System.Drawing.SystemColors.Control; + this.gpTreeView.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.gpTreeView.Controls.Add(this.cbTVExpand); + this.gpTreeView.DisabledBackColor = System.Drawing.Color.Empty; + this.gpTreeView.Location = new System.Drawing.Point(312, 165); + this.gpTreeView.Margin = new System.Windows.Forms.Padding(2); + this.gpTreeView.Name = "gpTreeView"; + this.gpTreeView.Size = new System.Drawing.Size(119, 72); + // + // + // + this.gpTreeView.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.gpTreeView.Style.BackColorGradientAngle = 90; + this.gpTreeView.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.gpTreeView.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpTreeView.Style.BorderBottomWidth = 1; + this.gpTreeView.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.gpTreeView.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpTreeView.Style.BorderLeftWidth = 1; + this.gpTreeView.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpTreeView.Style.BorderRightWidth = 1; + this.gpTreeView.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpTreeView.Style.BorderTopWidth = 1; + this.gpTreeView.Style.CornerDiameter = 4; + this.gpTreeView.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.gpTreeView.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; + this.gpTreeView.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.gpTreeView.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; + // + // + // + this.gpTreeView.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.gpTreeView.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gpTreeView.TabIndex = 6; + this.gpTreeView.Text = "Tree View"; + // + // cbTVExpand + // + // + // + // + this.cbTVExpand.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbTVExpand.Checked = true; + this.cbTVExpand.CheckState = System.Windows.Forms.CheckState.Checked; + this.cbTVExpand.CheckValue = "Y"; + this.cbTVExpand.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbTVExpand.Location = new System.Drawing.Point(8, 13); + this.cbTVExpand.Margin = new System.Windows.Forms.Padding(2); + this.cbTVExpand.Name = "cbTVExpand"; + this.cbTVExpand.Size = new System.Drawing.Size(92, 19); + this.superTooltip1.SetSuperTooltip(this.cbTVExpand, new DevComponents.DotNetBar.SuperTooltipInfo("Remember Last", "", "When checked, PROMS will remember the last procedure you had seleced from the tre" + "e and expand the tree to that location the next time PROMS is started.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 130))); - this.cbTVExpand.TabIndex = 7; - this.cbTVExpand.Text = "Remember Last"; - this.cbTVExpand.CheckedChanged += new System.EventHandler(this.cbTVExpand_CheckedChanged); - // - // gpStepTypeToolTip - // - this.gpStepTypeToolTip.BackColor = System.Drawing.Color.Transparent; - this.gpStepTypeToolTip.CanvasColor = System.Drawing.SystemColors.Control; - this.gpStepTypeToolTip.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.gpStepTypeToolTip.Controls.Add(this.cbStepTypeToolTip); - this.gpStepTypeToolTip.DisabledBackColor = System.Drawing.Color.Empty; - this.gpStepTypeToolTip.Location = new System.Drawing.Point(167, 165); - this.gpStepTypeToolTip.Margin = new System.Windows.Forms.Padding(2); - this.gpStepTypeToolTip.Name = "gpStepTypeToolTip"; - this.gpStepTypeToolTip.Size = new System.Drawing.Size(119, 72); - // - // - // - this.gpStepTypeToolTip.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.gpStepTypeToolTip.Style.BackColorGradientAngle = 90; - this.gpStepTypeToolTip.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.gpStepTypeToolTip.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpStepTypeToolTip.Style.BorderBottomWidth = 1; - this.gpStepTypeToolTip.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.gpStepTypeToolTip.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpStepTypeToolTip.Style.BorderLeftWidth = 1; - this.gpStepTypeToolTip.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpStepTypeToolTip.Style.BorderRightWidth = 1; - this.gpStepTypeToolTip.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpStepTypeToolTip.Style.BorderTopWidth = 1; - this.gpStepTypeToolTip.Style.CornerDiameter = 4; - this.gpStepTypeToolTip.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.gpStepTypeToolTip.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; - this.gpStepTypeToolTip.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.gpStepTypeToolTip.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; - // - // - // - this.gpStepTypeToolTip.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gpStepTypeToolTip.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gpStepTypeToolTip.TabIndex = 5; - this.gpStepTypeToolTip.Text = "Step Type Tool Tip"; - // - // cbStepTypeToolTip - // - // - // - // - this.cbStepTypeToolTip.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbStepTypeToolTip.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbStepTypeToolTip.Location = new System.Drawing.Point(8, 13); - this.cbStepTypeToolTip.Margin = new System.Windows.Forms.Padding(2); - this.cbStepTypeToolTip.Name = "cbStepTypeToolTip"; - this.cbStepTypeToolTip.Size = new System.Drawing.Size(92, 19); - this.cbStepTypeToolTip.TabIndex = 7; - this.cbStepTypeToolTip.Text = "Show Tool Tip"; - this.cbStepTypeToolTip.CheckedChanged += new System.EventHandler(this.cbStepTypeToolTip_CheckedChanged); - // - // gpAnnotationSettings - // - this.gpAnnotationSettings.BackColor = System.Drawing.Color.Transparent; - this.gpAnnotationSettings.CanvasColor = System.Drawing.SystemColors.Control; - this.gpAnnotationSettings.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.gpAnnotationSettings.Controls.Add(this.cbAnnotationPopup); - this.gpAnnotationSettings.DisabledBackColor = System.Drawing.Color.Empty; - this.gpAnnotationSettings.Location = new System.Drawing.Point(25, 165); - this.gpAnnotationSettings.Margin = new System.Windows.Forms.Padding(2); - this.gpAnnotationSettings.Name = "gpAnnotationSettings"; - this.gpAnnotationSettings.Size = new System.Drawing.Size(119, 72); - // - // - // - this.gpAnnotationSettings.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.gpAnnotationSettings.Style.BackColorGradientAngle = 90; - this.gpAnnotationSettings.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.gpAnnotationSettings.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpAnnotationSettings.Style.BorderBottomWidth = 1; - this.gpAnnotationSettings.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.gpAnnotationSettings.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpAnnotationSettings.Style.BorderLeftWidth = 1; - this.gpAnnotationSettings.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpAnnotationSettings.Style.BorderRightWidth = 1; - this.gpAnnotationSettings.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpAnnotationSettings.Style.BorderTopWidth = 1; - this.gpAnnotationSettings.Style.CornerDiameter = 4; - this.gpAnnotationSettings.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.gpAnnotationSettings.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; - this.gpAnnotationSettings.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.gpAnnotationSettings.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; - // - // - // - this.gpAnnotationSettings.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gpAnnotationSettings.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gpAnnotationSettings.TabIndex = 4; - this.gpAnnotationSettings.Text = "Annotation Settings"; - // - // cbAnnotationPopup - // - // - // - // - this.cbAnnotationPopup.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbAnnotationPopup.Checked = true; - this.cbAnnotationPopup.CheckState = System.Windows.Forms.CheckState.Checked; - this.cbAnnotationPopup.CheckValue = "Y"; - this.cbAnnotationPopup.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbAnnotationPopup.Location = new System.Drawing.Point(8, 13); - this.cbAnnotationPopup.Margin = new System.Windows.Forms.Padding(2); - this.cbAnnotationPopup.Name = "cbAnnotationPopup"; - this.cbAnnotationPopup.Size = new System.Drawing.Size(92, 19); - this.cbAnnotationPopup.TabIndex = 7; - this.cbAnnotationPopup.Text = "Auto Popup"; - this.cbAnnotationPopup.CheckedChanged += new System.EventHandler(this.cbAnnotationPopup_CheckedChanged); - // - // gpTransRangeColor - // - this.gpTransRangeColor.BackColor = System.Drawing.Color.Transparent; - this.gpTransRangeColor.CanvasColor = System.Drawing.SystemColors.Control; - this.gpTransRangeColor.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.gpTransRangeColor.Controls.Add(this.colorPickerButton1); - this.gpTransRangeColor.DisabledBackColor = System.Drawing.Color.Empty; - this.gpTransRangeColor.Location = new System.Drawing.Point(488, 13); - this.gpTransRangeColor.Name = "gpTransRangeColor"; - this.gpTransRangeColor.Size = new System.Drawing.Size(146, 62); - // - // - // - this.gpTransRangeColor.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.gpTransRangeColor.Style.BackColorGradientAngle = 90; - this.gpTransRangeColor.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.gpTransRangeColor.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpTransRangeColor.Style.BorderBottomWidth = 1; - this.gpTransRangeColor.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.gpTransRangeColor.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpTransRangeColor.Style.BorderLeftWidth = 1; - this.gpTransRangeColor.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpTransRangeColor.Style.BorderRightWidth = 1; - this.gpTransRangeColor.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpTransRangeColor.Style.BorderTopWidth = 1; - this.gpTransRangeColor.Style.CornerDiameter = 4; - this.gpTransRangeColor.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.gpTransRangeColor.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; - this.gpTransRangeColor.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.gpTransRangeColor.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; - // - // - // - this.gpTransRangeColor.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gpTransRangeColor.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gpTransRangeColor.TabIndex = 3; - this.gpTransRangeColor.Text = "Transition Range Color"; - this.gpTransRangeColor.Visible = false; - // - // colorPickerButton1 - // - this.colorPickerButton1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.colorPickerButton1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.colorPickerButton1.Image = ((System.Drawing.Image)(resources.GetObject("colorPickerButton1.Image"))); - this.colorPickerButton1.Location = new System.Drawing.Point(7, 12); - this.colorPickerButton1.Name = "colorPickerButton1"; - this.colorPickerButton1.SelectedColorImageRectangle = new System.Drawing.Rectangle(2, 2, 12, 12); - this.colorPickerButton1.Size = new System.Drawing.Size(103, 23); - this.colorPickerButton1.TabIndex = 0; - this.colorPickerButton1.SelectedColorChanged += new System.EventHandler(this.colorPickerButton1_SelectedColorChanged); - // - // gpPropPageStyle - // - this.gpPropPageStyle.BackColor = System.Drawing.Color.Transparent; - this.gpPropPageStyle.CanvasColor = System.Drawing.SystemColors.Control; - this.gpPropPageStyle.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.gpPropPageStyle.Controls.Add(this.cbPropGrid); - this.gpPropPageStyle.Controls.Add(this.cbTabbedIntrFace); - this.gpPropPageStyle.Controls.Add(this.cbButtonIntrFace); - this.gpPropPageStyle.DisabledBackColor = System.Drawing.Color.Empty; - this.gpPropPageStyle.Location = new System.Drawing.Point(155, 12); - this.gpPropPageStyle.Margin = new System.Windows.Forms.Padding(2); - this.gpPropPageStyle.Name = "gpPropPageStyle"; - this.gpPropPageStyle.Size = new System.Drawing.Size(127, 107); - // - // - // - this.gpPropPageStyle.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.gpPropPageStyle.Style.BackColorGradientAngle = 90; - this.gpPropPageStyle.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.gpPropPageStyle.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpPropPageStyle.Style.BorderBottomWidth = 1; - this.gpPropPageStyle.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.gpPropPageStyle.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpPropPageStyle.Style.BorderLeftWidth = 1; - this.gpPropPageStyle.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpPropPageStyle.Style.BorderRightWidth = 1; - this.gpPropPageStyle.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpPropPageStyle.Style.BorderTopWidth = 1; - this.gpPropPageStyle.Style.CornerDiameter = 4; - this.gpPropPageStyle.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.gpPropPageStyle.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; - this.gpPropPageStyle.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.gpPropPageStyle.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; - // - // - // - this.gpPropPageStyle.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gpPropPageStyle.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gpPropPageStyle.TabIndex = 2; - this.gpPropPageStyle.Text = "Property Page Style"; - // - // cbPropGrid - // - // - // - // - this.cbPropGrid.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbPropGrid.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; - this.cbPropGrid.Location = new System.Drawing.Point(8, 59); - this.cbPropGrid.Margin = new System.Windows.Forms.Padding(2); - this.cbPropGrid.Name = "cbPropGrid"; - this.cbPropGrid.Size = new System.Drawing.Size(97, 20); - this.cbPropGrid.TabIndex = 2; - this.cbPropGrid.Text = "Property Grid"; - this.cbPropGrid.Visible = false; - // - // cbTabbedIntrFace - // - // - // - // - this.cbTabbedIntrFace.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbTabbedIntrFace.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; - this.cbTabbedIntrFace.Location = new System.Drawing.Point(8, 34); - this.cbTabbedIntrFace.Margin = new System.Windows.Forms.Padding(2); - this.cbTabbedIntrFace.Name = "cbTabbedIntrFace"; - this.cbTabbedIntrFace.Size = new System.Drawing.Size(111, 20); - this.cbTabbedIntrFace.TabIndex = 1; - this.cbTabbedIntrFace.Text = "Tabbed Interface"; - // - // cbButtonIntrFace - // - // - // - // - this.cbButtonIntrFace.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbButtonIntrFace.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; - this.cbButtonIntrFace.Location = new System.Drawing.Point(8, 10); - this.cbButtonIntrFace.Margin = new System.Windows.Forms.Padding(2); - this.cbButtonIntrFace.Name = "cbButtonIntrFace"; - this.cbButtonIntrFace.Size = new System.Drawing.Size(97, 20); - this.cbButtonIntrFace.TabIndex = 0; - this.cbButtonIntrFace.Text = "Button Interface"; - // - // tiIntrFaceStngs - // - this.tiIntrFaceStngs.AttachedControl = this.tabControlPanel3; - this.tiIntrFaceStngs.Name = "tiIntrFaceStngs"; - this.tiIntrFaceStngs.Text = "My Interface Settings"; - // - // tabControlPanel1 - // - this.tabControlPanel1.DisabledBackColor = System.Drawing.Color.Empty; - this.tabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControlPanel1.Location = new System.Drawing.Point(0, 27); - this.tabControlPanel1.Margin = new System.Windows.Forms.Padding(2); - this.tabControlPanel1.Name = "tabControlPanel1"; - this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel1.Size = new System.Drawing.Size(645, 430); - this.tabControlPanel1.Style.BackColor1.Color = System.Drawing.SystemColors.Control; - this.tabControlPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.tabControlPanel1.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) + this.cbTVExpand.TabIndex = 7; + this.cbTVExpand.Text = "Remember Last"; + this.cbTVExpand.CheckedChanged += new System.EventHandler(this.cbTVExpand_CheckedChanged); + // + // gpStepTypeToolTip + // + this.gpStepTypeToolTip.BackColor = System.Drawing.Color.Transparent; + this.gpStepTypeToolTip.CanvasColor = System.Drawing.SystemColors.Control; + this.gpStepTypeToolTip.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.gpStepTypeToolTip.Controls.Add(this.cbStepTypeToolTip); + this.gpStepTypeToolTip.DisabledBackColor = System.Drawing.Color.Empty; + this.gpStepTypeToolTip.Location = new System.Drawing.Point(167, 165); + this.gpStepTypeToolTip.Margin = new System.Windows.Forms.Padding(2); + this.gpStepTypeToolTip.Name = "gpStepTypeToolTip"; + this.gpStepTypeToolTip.Size = new System.Drawing.Size(119, 72); + // + // + // + this.gpStepTypeToolTip.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.gpStepTypeToolTip.Style.BackColorGradientAngle = 90; + this.gpStepTypeToolTip.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.gpStepTypeToolTip.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpStepTypeToolTip.Style.BorderBottomWidth = 1; + this.gpStepTypeToolTip.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.gpStepTypeToolTip.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpStepTypeToolTip.Style.BorderLeftWidth = 1; + this.gpStepTypeToolTip.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpStepTypeToolTip.Style.BorderRightWidth = 1; + this.gpStepTypeToolTip.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpStepTypeToolTip.Style.BorderTopWidth = 1; + this.gpStepTypeToolTip.Style.CornerDiameter = 4; + this.gpStepTypeToolTip.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.gpStepTypeToolTip.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; + this.gpStepTypeToolTip.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.gpStepTypeToolTip.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; + // + // + // + this.gpStepTypeToolTip.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.gpStepTypeToolTip.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gpStepTypeToolTip.TabIndex = 5; + this.gpStepTypeToolTip.Text = "Step Type Tool Tip"; + // + // cbStepTypeToolTip + // + // + // + // + this.cbStepTypeToolTip.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbStepTypeToolTip.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbStepTypeToolTip.Location = new System.Drawing.Point(8, 13); + this.cbStepTypeToolTip.Margin = new System.Windows.Forms.Padding(2); + this.cbStepTypeToolTip.Name = "cbStepTypeToolTip"; + this.cbStepTypeToolTip.Size = new System.Drawing.Size(92, 19); + this.cbStepTypeToolTip.TabIndex = 7; + this.cbStepTypeToolTip.Text = "Show Tool Tip"; + this.cbStepTypeToolTip.CheckedChanged += new System.EventHandler(this.cbStepTypeToolTip_CheckedChanged); + // + // gpAnnotationSettings + // + this.gpAnnotationSettings.BackColor = System.Drawing.Color.Transparent; + this.gpAnnotationSettings.CanvasColor = System.Drawing.SystemColors.Control; + this.gpAnnotationSettings.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.gpAnnotationSettings.Controls.Add(this.cbAnnotationPopup); + this.gpAnnotationSettings.DisabledBackColor = System.Drawing.Color.Empty; + this.gpAnnotationSettings.Location = new System.Drawing.Point(25, 165); + this.gpAnnotationSettings.Margin = new System.Windows.Forms.Padding(2); + this.gpAnnotationSettings.Name = "gpAnnotationSettings"; + this.gpAnnotationSettings.Size = new System.Drawing.Size(119, 72); + // + // + // + this.gpAnnotationSettings.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.gpAnnotationSettings.Style.BackColorGradientAngle = 90; + this.gpAnnotationSettings.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.gpAnnotationSettings.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpAnnotationSettings.Style.BorderBottomWidth = 1; + this.gpAnnotationSettings.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.gpAnnotationSettings.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpAnnotationSettings.Style.BorderLeftWidth = 1; + this.gpAnnotationSettings.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpAnnotationSettings.Style.BorderRightWidth = 1; + this.gpAnnotationSettings.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpAnnotationSettings.Style.BorderTopWidth = 1; + this.gpAnnotationSettings.Style.CornerDiameter = 4; + this.gpAnnotationSettings.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.gpAnnotationSettings.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; + this.gpAnnotationSettings.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.gpAnnotationSettings.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; + // + // + // + this.gpAnnotationSettings.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.gpAnnotationSettings.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gpAnnotationSettings.TabIndex = 4; + this.gpAnnotationSettings.Text = "Annotation Settings"; + // + // cbAnnotationPopup + // + // + // + // + this.cbAnnotationPopup.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbAnnotationPopup.Checked = true; + this.cbAnnotationPopup.CheckState = System.Windows.Forms.CheckState.Checked; + this.cbAnnotationPopup.CheckValue = "Y"; + this.cbAnnotationPopup.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbAnnotationPopup.Location = new System.Drawing.Point(8, 13); + this.cbAnnotationPopup.Margin = new System.Windows.Forms.Padding(2); + this.cbAnnotationPopup.Name = "cbAnnotationPopup"; + this.cbAnnotationPopup.Size = new System.Drawing.Size(92, 19); + this.cbAnnotationPopup.TabIndex = 7; + this.cbAnnotationPopup.Text = "Auto Popup"; + this.cbAnnotationPopup.CheckedChanged += new System.EventHandler(this.cbAnnotationPopup_CheckedChanged); + // + // gpTransRangeColor + // + this.gpTransRangeColor.BackColor = System.Drawing.Color.Transparent; + this.gpTransRangeColor.CanvasColor = System.Drawing.SystemColors.Control; + this.gpTransRangeColor.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.gpTransRangeColor.Controls.Add(this.colorPickerButton1); + this.gpTransRangeColor.DisabledBackColor = System.Drawing.Color.Empty; + this.gpTransRangeColor.Location = new System.Drawing.Point(488, 13); + this.gpTransRangeColor.Name = "gpTransRangeColor"; + this.gpTransRangeColor.Size = new System.Drawing.Size(146, 62); + // + // + // + this.gpTransRangeColor.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.gpTransRangeColor.Style.BackColorGradientAngle = 90; + this.gpTransRangeColor.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.gpTransRangeColor.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpTransRangeColor.Style.BorderBottomWidth = 1; + this.gpTransRangeColor.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.gpTransRangeColor.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpTransRangeColor.Style.BorderLeftWidth = 1; + this.gpTransRangeColor.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpTransRangeColor.Style.BorderRightWidth = 1; + this.gpTransRangeColor.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpTransRangeColor.Style.BorderTopWidth = 1; + this.gpTransRangeColor.Style.CornerDiameter = 4; + this.gpTransRangeColor.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.gpTransRangeColor.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; + this.gpTransRangeColor.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.gpTransRangeColor.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; + // + // + // + this.gpTransRangeColor.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.gpTransRangeColor.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gpTransRangeColor.TabIndex = 3; + this.gpTransRangeColor.Text = "Transition Range Color"; + this.gpTransRangeColor.Visible = false; + // + // colorPickerButton1 + // + this.colorPickerButton1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.colorPickerButton1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.colorPickerButton1.Image = ((System.Drawing.Image)(resources.GetObject("colorPickerButton1.Image"))); + this.colorPickerButton1.Location = new System.Drawing.Point(7, 12); + this.colorPickerButton1.Name = "colorPickerButton1"; + this.colorPickerButton1.SelectedColorImageRectangle = new System.Drawing.Rectangle(2, 2, 12, 12); + this.colorPickerButton1.Size = new System.Drawing.Size(103, 23); + this.colorPickerButton1.TabIndex = 0; + this.colorPickerButton1.SelectedColorChanged += new System.EventHandler(this.colorPickerButton1_SelectedColorChanged); + // + // gpPropPageStyle + // + this.gpPropPageStyle.BackColor = System.Drawing.Color.Transparent; + this.gpPropPageStyle.CanvasColor = System.Drawing.SystemColors.Control; + this.gpPropPageStyle.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.gpPropPageStyle.Controls.Add(this.cbPropGrid); + this.gpPropPageStyle.Controls.Add(this.cbTabbedIntrFace); + this.gpPropPageStyle.Controls.Add(this.cbButtonIntrFace); + this.gpPropPageStyle.DisabledBackColor = System.Drawing.Color.Empty; + this.gpPropPageStyle.Location = new System.Drawing.Point(155, 12); + this.gpPropPageStyle.Margin = new System.Windows.Forms.Padding(2); + this.gpPropPageStyle.Name = "gpPropPageStyle"; + this.gpPropPageStyle.Size = new System.Drawing.Size(127, 107); + // + // + // + this.gpPropPageStyle.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.gpPropPageStyle.Style.BackColorGradientAngle = 90; + this.gpPropPageStyle.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.gpPropPageStyle.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpPropPageStyle.Style.BorderBottomWidth = 1; + this.gpPropPageStyle.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.gpPropPageStyle.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpPropPageStyle.Style.BorderLeftWidth = 1; + this.gpPropPageStyle.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpPropPageStyle.Style.BorderRightWidth = 1; + this.gpPropPageStyle.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpPropPageStyle.Style.BorderTopWidth = 1; + this.gpPropPageStyle.Style.CornerDiameter = 4; + this.gpPropPageStyle.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.gpPropPageStyle.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; + this.gpPropPageStyle.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.gpPropPageStyle.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; + // + // + // + this.gpPropPageStyle.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.gpPropPageStyle.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gpPropPageStyle.TabIndex = 2; + this.gpPropPageStyle.Text = "Property Page Style"; + // + // cbPropGrid + // + // + // + // + this.cbPropGrid.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbPropGrid.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; + this.cbPropGrid.Location = new System.Drawing.Point(8, 59); + this.cbPropGrid.Margin = new System.Windows.Forms.Padding(2); + this.cbPropGrid.Name = "cbPropGrid"; + this.cbPropGrid.Size = new System.Drawing.Size(97, 20); + this.cbPropGrid.TabIndex = 2; + this.cbPropGrid.Text = "Property Grid"; + this.cbPropGrid.Visible = false; + // + // cbTabbedIntrFace + // + // + // + // + this.cbTabbedIntrFace.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbTabbedIntrFace.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; + this.cbTabbedIntrFace.Location = new System.Drawing.Point(8, 34); + this.cbTabbedIntrFace.Margin = new System.Windows.Forms.Padding(2); + this.cbTabbedIntrFace.Name = "cbTabbedIntrFace"; + this.cbTabbedIntrFace.Size = new System.Drawing.Size(111, 20); + this.cbTabbedIntrFace.TabIndex = 1; + this.cbTabbedIntrFace.Text = "Tabbed Interface"; + // + // cbButtonIntrFace + // + // + // + // + this.cbButtonIntrFace.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbButtonIntrFace.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; + this.cbButtonIntrFace.Location = new System.Drawing.Point(8, 10); + this.cbButtonIntrFace.Margin = new System.Windows.Forms.Padding(2); + this.cbButtonIntrFace.Name = "cbButtonIntrFace"; + this.cbButtonIntrFace.Size = new System.Drawing.Size(97, 20); + this.cbButtonIntrFace.TabIndex = 0; + this.cbButtonIntrFace.Text = "Button Interface"; + // + // tiIntrFaceStngs + // + this.tiIntrFaceStngs.AttachedControl = this.tabControlPanel3; + this.tiIntrFaceStngs.Name = "tiIntrFaceStngs"; + this.tiIntrFaceStngs.Text = "My Interface Settings"; + // + // tabControlPanel1 + // + this.tabControlPanel1.DisabledBackColor = System.Drawing.Color.Empty; + this.tabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabControlPanel1.Location = new System.Drawing.Point(0, 27); + this.tabControlPanel1.Margin = new System.Windows.Forms.Padding(2); + this.tabControlPanel1.Name = "tabControlPanel1"; + this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1); + this.tabControlPanel1.Size = new System.Drawing.Size(645, 528); + this.tabControlPanel1.Style.BackColor1.Color = System.Drawing.SystemColors.Control; + this.tabControlPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.tabControlPanel1.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) | DevComponents.DotNetBar.eBorderSide.Bottom))); - this.tabControlPanel1.Style.GradientAngle = 90; - this.tabControlPanel1.TabIndex = 1; - this.tabControlPanel1.TabItem = this.tiGeneral; - this.tabControlPanel1.ThemeAware = true; - // - // tiGeneral - // - this.tiGeneral.AttachedControl = this.tabControlPanel1; - this.tiGeneral.Name = "tiGeneral"; - this.tiGeneral.Text = "General"; - this.tiGeneral.Visible = false; - // - // tabControlPanel2 - // - this.tabControlPanel2.DisabledBackColor = System.Drawing.Color.Empty; - this.tabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControlPanel2.Location = new System.Drawing.Point(0, 27); - this.tabControlPanel2.Margin = new System.Windows.Forms.Padding(2); - this.tabControlPanel2.Name = "tabControlPanel2"; - this.tabControlPanel2.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel2.Size = new System.Drawing.Size(645, 528); - this.tabControlPanel2.Style.BackColor1.Color = System.Drawing.SystemColors.Control; - this.tabControlPanel2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.tabControlPanel2.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) + this.tabControlPanel1.Style.GradientAngle = 90; + this.tabControlPanel1.TabIndex = 1; + this.tabControlPanel1.TabItem = this.tiGeneral; + this.tabControlPanel1.ThemeAware = true; + // + // tiGeneral + // + this.tiGeneral.AttachedControl = this.tabControlPanel1; + this.tiGeneral.Name = "tiGeneral"; + this.tiGeneral.Text = "General"; + this.tiGeneral.Visible = false; + // + // tabControlPanel2 + // + this.tabControlPanel2.DisabledBackColor = System.Drawing.Color.Empty; + this.tabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabControlPanel2.Location = new System.Drawing.Point(0, 27); + this.tabControlPanel2.Margin = new System.Windows.Forms.Padding(2); + this.tabControlPanel2.Name = "tabControlPanel2"; + this.tabControlPanel2.Padding = new System.Windows.Forms.Padding(1); + this.tabControlPanel2.Size = new System.Drawing.Size(645, 528); + this.tabControlPanel2.Style.BackColor1.Color = System.Drawing.SystemColors.Control; + this.tabControlPanel2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.tabControlPanel2.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) | DevComponents.DotNetBar.eBorderSide.Bottom))); - this.tabControlPanel2.Style.GradientAngle = 90; - this.tabControlPanel2.TabIndex = 2; - this.tabControlPanel2.TabItem = this.tiStUpMsg; - this.tabControlPanel2.ThemeAware = true; - // - // tiStUpMsg - // - this.tiStUpMsg.AttachedControl = this.tabControlPanel2; - this.tiStUpMsg.Name = "tiStUpMsg"; - this.tiStUpMsg.Text = "Startup Message"; - this.tiStUpMsg.Visible = false; - // - // cbUCFLForSetOnly - // - this.cbUCFLForSetOnly.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.cbUCFLForSetOnly.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbUCFLForSetOnly.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; - this.cbUCFLForSetOnly.Location = new System.Drawing.Point(2, 89); - this.cbUCFLForSetOnly.Margin = new System.Windows.Forms.Padding(2); - this.cbUCFLForSetOnly.Name = "cbUCFLForSetOnly"; - this.cbUCFLForSetOnly.Size = new System.Drawing.Size(105, 19); - this.cbUCFLForSetOnly.TabIndex = 5; - this.cbUCFLForSetOnly.Text = "Load For Set Only"; - this.cbUCFLForSetOnly.CheckedChanged += new System.EventHandler(this.cbUCFLForSetOnly_CheckedChanged); - // - // cbUCFLUseAll - // - this.cbUCFLUseAll.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.cbUCFLUseAll.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbUCFLUseAll.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; - this.cbUCFLUseAll.Location = new System.Drawing.Point(2, 67); - this.cbUCFLUseAll.Margin = new System.Windows.Forms.Padding(2); - this.cbUCFLUseAll.Name = "cbUCFLUseAll"; - this.cbUCFLUseAll.Size = new System.Drawing.Size(105, 19); - this.cbUCFLUseAll.TabIndex = 4; - this.cbUCFLUseAll.Text = "Load Use All"; - this.cbUCFLUseAll.CheckedChanged += new System.EventHandler(this.cbUCFLUseAll_CheckedChanged); - // - // cbUCFLOnlyImport - // - this.cbUCFLOnlyImport.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.cbUCFLOnlyImport.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbUCFLOnlyImport.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; - this.cbUCFLOnlyImport.Location = new System.Drawing.Point(2, 46); - this.cbUCFLOnlyImport.Margin = new System.Windows.Forms.Padding(2); - this.cbUCFLOnlyImport.Name = "cbUCFLOnlyImport"; - this.cbUCFLOnlyImport.Size = new System.Drawing.Size(105, 19); - this.cbUCFLOnlyImport.TabIndex = 3; - this.cbUCFLOnlyImport.Text = "Load Only Imported"; - this.cbUCFLOnlyImport.CheckedChanged += new System.EventHandler(this.cbUCFLOnlyImport_CheckedChanged); - // - // cbUCFLNotUsed - // - this.cbUCFLNotUsed.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.cbUCFLNotUsed.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbUCFLNotUsed.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; - this.cbUCFLNotUsed.Location = new System.Drawing.Point(2, 24); - this.cbUCFLNotUsed.Margin = new System.Windows.Forms.Padding(2); - this.cbUCFLNotUsed.Name = "cbUCFLNotUsed"; - this.cbUCFLNotUsed.Size = new System.Drawing.Size(88, 19); - this.cbUCFLNotUsed.TabIndex = 2; - this.cbUCFLNotUsed.Text = "Load Not Used"; - this.cbUCFLNotUsed.CheckedChanged += new System.EventHandler(this.cbUCFLNotUsed_CheckedChanged); - // - // cbUCFIgnore - // - this.cbUCFIgnore.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.cbUCFIgnore.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbUCFIgnore.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; - this.cbUCFIgnore.Location = new System.Drawing.Point(2, 2); - this.cbUCFIgnore.Margin = new System.Windows.Forms.Padding(2); - this.cbUCFIgnore.Name = "cbUCFIgnore"; - this.cbUCFIgnore.Size = new System.Drawing.Size(67, 19); - this.cbUCFIgnore.TabIndex = 1; - this.cbUCFIgnore.Text = "Ignore"; - this.cbUCFIgnore.CheckedChanged += new System.EventHandler(this.cbUCFIgnore_CheckedChanged); - // - // btnReset - // - this.btnReset.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnReset.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnReset.Location = new System.Drawing.Point(194, 591); - this.btnReset.Margin = new System.Windows.Forms.Padding(2); - this.btnReset.Name = "btnReset"; - this.btnReset.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.btnReset.Size = new System.Drawing.Size(79, 19); - this.superTooltip1.SetSuperTooltip(this.btnReset, new DevComponents.DotNetBar.SuperTooltipInfo("Default Settings", "", "This will reset saved user settings back to the Proms system default.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(140, 95))); - this.btnReset.TabIndex = 3; - this.btnReset.Text = "Default Settings"; - this.btnReset.Click += new System.EventHandler(this.btnReset_Click); - // - // superTooltip1 - // - this.superTooltip1.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray); - this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; - // - // cbMSWordPrompt - // - // - // - // - this.cbMSWordPrompt.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbMSWordPrompt.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbMSWordPrompt.Location = new System.Drawing.Point(8, 5); - this.cbMSWordPrompt.Margin = new System.Windows.Forms.Padding(2); - this.cbMSWordPrompt.Name = "cbMSWordPrompt"; - this.cbMSWordPrompt.Size = new System.Drawing.Size(92, 44); - this.cbMSWordPrompt.TabIndex = 9; - this.cbMSWordPrompt.Text = "Show Prompt For Summaries"; - // - // gpMSWordSum - // - this.gpMSWordSum.BackColor = System.Drawing.Color.Transparent; - this.gpMSWordSum.CanvasColor = System.Drawing.SystemColors.Control; - this.gpMSWordSum.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.gpMSWordSum.Controls.Add(this.cbMSWordPrompt); - this.gpMSWordSum.DisabledBackColor = System.Drawing.Color.Empty; - this.gpMSWordSum.Location = new System.Drawing.Point(25, 347); - this.gpMSWordSum.Margin = new System.Windows.Forms.Padding(2); - this.gpMSWordSum.Name = "gpMSWordSum"; - this.gpMSWordSum.Size = new System.Drawing.Size(119, 81); - // - // - // - this.gpMSWordSum.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.gpMSWordSum.Style.BackColorGradientAngle = 90; - this.gpMSWordSum.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.gpMSWordSum.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpMSWordSum.Style.BorderBottomWidth = 1; - this.gpMSWordSum.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.gpMSWordSum.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpMSWordSum.Style.BorderLeftWidth = 1; - this.gpMSWordSum.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpMSWordSum.Style.BorderRightWidth = 1; - this.gpMSWordSum.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpMSWordSum.Style.BorderTopWidth = 1; - this.gpMSWordSum.Style.CornerDiameter = 4; - this.gpMSWordSum.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.gpMSWordSum.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; - this.gpMSWordSum.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.gpMSWordSum.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; - // - // - // - this.gpMSWordSum.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gpMSWordSum.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gpMSWordSum.TabIndex = 14; - this.gpMSWordSum.Text = "Opening in MS Word"; - // - // frmSysOptions - // - this.AcceptButton = this.btnOK; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.CancelButton = this.btnCancel; - this.ClientSize = new System.Drawing.Size(699, 620); - this.ControlBox = false; - this.Controls.Add(this.btnReset); - this.Controls.Add(this.tcSysOpts); - this.Controls.Add(this.panButtons); - this.Controls.Add(this.btnOK); - this.Controls.Add(this.btnCancel); - this.DoubleBuffered = true; - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Margin = new System.Windows.Forms.Padding(2); - this.Name = "frmSysOptions"; - this.Text = "Proms System Options"; - this.Load += new System.EventHandler(this.frmSysOptions_Load); - this.gpSystemColor.ResumeLayout(false); - this.panButtons.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.tcSysOpts)).EndInit(); - this.tcSysOpts.ResumeLayout(false); - this.tabControlPanel3.ResumeLayout(false); - this.gpOpenTabs.ResumeLayout(false); - this.gpShwRplWords.ResumeLayout(false); - this.gpVisioPath.ResumeLayout(false); - this.gpSeparateWindows.ResumeLayout(false); - this.gpEnhancedDocs.ResumeLayout(false); - this.gpPasteSettings.ResumeLayout(false); - this.gpTreeView.ResumeLayout(false); - this.gpStepTypeToolTip.ResumeLayout(false); - this.gpAnnotationSettings.ResumeLayout(false); - this.gpTransRangeColor.ResumeLayout(false); - this.gpPropPageStyle.ResumeLayout(false); - this.gpMSWordSum.ResumeLayout(false); - this.ResumeLayout(false); + this.tabControlPanel2.Style.GradientAngle = 90; + this.tabControlPanel2.TabIndex = 2; + this.tabControlPanel2.TabItem = this.tiStUpMsg; + this.tabControlPanel2.ThemeAware = true; + // + // tiStUpMsg + // + this.tiStUpMsg.AttachedControl = this.tabControlPanel2; + this.tiStUpMsg.Name = "tiStUpMsg"; + this.tiStUpMsg.Text = "Startup Message"; + this.tiStUpMsg.Visible = false; + // + // cbUCFLForSetOnly + // + this.cbUCFLForSetOnly.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.cbUCFLForSetOnly.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbUCFLForSetOnly.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; + this.cbUCFLForSetOnly.Location = new System.Drawing.Point(2, 89); + this.cbUCFLForSetOnly.Margin = new System.Windows.Forms.Padding(2); + this.cbUCFLForSetOnly.Name = "cbUCFLForSetOnly"; + this.cbUCFLForSetOnly.Size = new System.Drawing.Size(105, 19); + this.cbUCFLForSetOnly.TabIndex = 5; + this.cbUCFLForSetOnly.Text = "Load For Set Only"; + this.cbUCFLForSetOnly.CheckedChanged += new System.EventHandler(this.cbUCFLForSetOnly_CheckedChanged); + // + // cbUCFLUseAll + // + this.cbUCFLUseAll.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.cbUCFLUseAll.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbUCFLUseAll.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; + this.cbUCFLUseAll.Location = new System.Drawing.Point(2, 67); + this.cbUCFLUseAll.Margin = new System.Windows.Forms.Padding(2); + this.cbUCFLUseAll.Name = "cbUCFLUseAll"; + this.cbUCFLUseAll.Size = new System.Drawing.Size(105, 19); + this.cbUCFLUseAll.TabIndex = 4; + this.cbUCFLUseAll.Text = "Load Use All"; + this.cbUCFLUseAll.CheckedChanged += new System.EventHandler(this.cbUCFLUseAll_CheckedChanged); + // + // cbUCFLOnlyImport + // + this.cbUCFLOnlyImport.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.cbUCFLOnlyImport.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbUCFLOnlyImport.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; + this.cbUCFLOnlyImport.Location = new System.Drawing.Point(2, 46); + this.cbUCFLOnlyImport.Margin = new System.Windows.Forms.Padding(2); + this.cbUCFLOnlyImport.Name = "cbUCFLOnlyImport"; + this.cbUCFLOnlyImport.Size = new System.Drawing.Size(105, 19); + this.cbUCFLOnlyImport.TabIndex = 3; + this.cbUCFLOnlyImport.Text = "Load Only Imported"; + this.cbUCFLOnlyImport.CheckedChanged += new System.EventHandler(this.cbUCFLOnlyImport_CheckedChanged); + // + // cbUCFLNotUsed + // + this.cbUCFLNotUsed.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.cbUCFLNotUsed.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbUCFLNotUsed.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; + this.cbUCFLNotUsed.Location = new System.Drawing.Point(2, 24); + this.cbUCFLNotUsed.Margin = new System.Windows.Forms.Padding(2); + this.cbUCFLNotUsed.Name = "cbUCFLNotUsed"; + this.cbUCFLNotUsed.Size = new System.Drawing.Size(88, 19); + this.cbUCFLNotUsed.TabIndex = 2; + this.cbUCFLNotUsed.Text = "Load Not Used"; + this.cbUCFLNotUsed.CheckedChanged += new System.EventHandler(this.cbUCFLNotUsed_CheckedChanged); + // + // cbUCFIgnore + // + this.cbUCFIgnore.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.cbUCFIgnore.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbUCFIgnore.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; + this.cbUCFIgnore.Location = new System.Drawing.Point(2, 2); + this.cbUCFIgnore.Margin = new System.Windows.Forms.Padding(2); + this.cbUCFIgnore.Name = "cbUCFIgnore"; + this.cbUCFIgnore.Size = new System.Drawing.Size(67, 19); + this.cbUCFIgnore.TabIndex = 1; + this.cbUCFIgnore.Text = "Ignore"; + this.cbUCFIgnore.CheckedChanged += new System.EventHandler(this.cbUCFIgnore_CheckedChanged); + // + // btnReset + // + this.btnReset.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnReset.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnReset.Location = new System.Drawing.Point(194, 591); + this.btnReset.Margin = new System.Windows.Forms.Padding(2); + this.btnReset.Name = "btnReset"; + this.btnReset.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.btnReset.Size = new System.Drawing.Size(79, 19); + this.superTooltip1.SetSuperTooltip(this.btnReset, new DevComponents.DotNetBar.SuperTooltipInfo("Default Settings", "", "This will reset saved user settings back to the Proms system default.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(140, 95))); + this.btnReset.TabIndex = 3; + this.btnReset.Text = "Default Settings"; + this.btnReset.Click += new System.EventHandler(this.btnReset_Click); + // + // superTooltip1 + // + this.superTooltip1.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray); + this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; + // + // cbShwAnnoFilter + // + this.cbShwAnnoFilter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.cbShwAnnoFilter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.cbShwAnnoFilter.Location = new System.Drawing.Point(25, 13); + this.cbShwAnnoFilter.Name = "cbShwAnnoFilter"; + this.cbShwAnnoFilter.Size = new System.Drawing.Size(91, 23); + this.cbShwAnnoFilter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.cbShwAnnoFilter.TabIndex = 0; + this.cbShwAnnoFilter.Text = "Select"; + this.cbShwAnnoFilter.Click += new System.EventHandler(this.buttonX1_Click); + // + // frmSysOptions + // + this.AcceptButton = this.btnOK; + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.btnCancel; + this.ClientSize = new System.Drawing.Size(699, 620); + this.ControlBox = false; + this.Controls.Add(this.btnReset); + this.Controls.Add(this.tcSysOpts); + this.Controls.Add(this.panButtons); + this.Controls.Add(this.btnOK); + this.Controls.Add(this.btnCancel); + this.DoubleBuffered = true; + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Margin = new System.Windows.Forms.Padding(2); + this.Name = "frmSysOptions"; + this.Text = "Proms System Options"; + this.Load += new System.EventHandler(this.frmSysOptions_Load); + this.gpSystemColor.ResumeLayout(false); + this.panButtons.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.tcSysOpts)).EndInit(); + this.tcSysOpts.ResumeLayout(false); + this.tabControlPanel3.ResumeLayout(false); + this.gpMSWordSum.ResumeLayout(false); + this.gpOpenTabs.ResumeLayout(false); + this.gpShwRplWords.ResumeLayout(false); + this.gpAnnoTypeFilter.ResumeLayout(false); + this.gpVisioPath.ResumeLayout(false); + this.gpSeparateWindows.ResumeLayout(false); + this.gpEnhancedDocs.ResumeLayout(false); + this.gpPasteSettings.ResumeLayout(false); + this.gpTreeView.ResumeLayout(false); + this.gpStepTypeToolTip.ResumeLayout(false); + this.gpAnnotationSettings.ResumeLayout(false); + this.gpTransRangeColor.ResumeLayout(false); + this.gpPropPageStyle.ResumeLayout(false); + this.ResumeLayout(false); } @@ -1342,11 +1399,14 @@ namespace VEPROMS private DevComponents.DotNetBar.Controls.CheckBoxX cbUCFLNotUsed; private DevComponents.DotNetBar.Controls.CheckBoxX cbUCFIgnore; private DevComponents.DotNetBar.Controls.GroupPanel gpOpenTabs; - private DevComponents.DotNetBar.Controls.GroupPanel gpShwRplWords; + private DevComponents.DotNetBar.Controls.GroupPanel gpShwRplWords; + private DevComponents.DotNetBar.Controls.GroupPanel gpAnnoTypeFilter; private DevComponents.DotNetBar.Controls.CheckBoxX cbOTRemember; private DevComponents.DotNetBar.Controls.CheckBoxX cbOTAutoOpen; private DevComponents.DotNetBar.Controls.CheckBoxX cbShwRplWrdsColor; + //private DevComponents.DotNetBar.ButtonItem cbShwAnnoFilter; private DevComponents.DotNetBar.Controls.GroupPanel gpMSWordSum; private DevComponents.DotNetBar.Controls.CheckBoxX cbMSWordPrompt; - } + private DevComponents.DotNetBar.ButtonX cbShwAnnoFilter; + } } diff --git a/PROMS/VEPROMS User Interface/frmSysOptions.cs b/PROMS/VEPROMS User Interface/frmSysOptions.cs index 2c9afd49..c3364284 100644 --- a/PROMS/VEPROMS User Interface/frmSysOptions.cs +++ b/PROMS/VEPROMS User Interface/frmSysOptions.cs @@ -365,5 +365,24 @@ namespace VEPROMS Properties.Settings.Default.cbShwRplWrdsColor = cbShwRplWrdsColor.Checked; // update setting value Properties.Settings.Default.Save(); // save settings } - } + private void cbShwAnnoFilter_Click(object sender, EventArgs e) + { + + //OnSelectAnnotations(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0)); + + //Settings.Default.cbShwAnnoFilter = cbShwAnnoFilter.Checked; + //VlnSettings.cbShwAnnoFilter = cbShwAnnoFilter.Checked; + //Properties.Settings.Default.cbShwAnnoFilter = cbShwAnnoFilter.Checked; // update setting value + //Properties.Settings.Default.Save(); // save settings + } + + private void buttonX1_Click(object sender, EventArgs e) + { + frmVEPROMS.tv_SelectAnnotations(); + } + //private void OnSelectAnnotations(object sender, vlnTreeEventArgs args) + //{ + // if (SelectAnnotations != null) SelectAnnotations(sender, args); + //} + } } \ No newline at end of file diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs index 030f4070..18e3b2bf 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs @@ -723,9 +723,8 @@ namespace VEPROMS this.epAnnotations.Expanded = false; this.epAnnotations.ExpandedBounds = new System.Drawing.Rectangle(4, 544, 1187, 202); this.epAnnotations.ExpandOnTitleClick = true; - this.epAnnotations.Location = new System.Drawing.Point(5, 547); - this.epAnnotations.Name = "epAnnotations"; - this.epAnnotations.Size = new System.Drawing.Size(1185, 26); + this.epAnnotations.Location = new System.Drawing.Point(5, 324); + this.epAnnotations.Size = new System.Drawing.Size(1185, 249); this.epAnnotations.Style.Alignment = System.Drawing.StringAlignment.Center; this.epAnnotations.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.epAnnotations.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -765,7 +764,7 @@ namespace VEPROMS this.ctrlAnnotationDetails.MyUserInfo = null; this.ctrlAnnotationDetails.Name = "ctrlAnnotationDetails"; this.ctrlAnnotationDetails.ProcItem = null; - this.ctrlAnnotationDetails.Size = new System.Drawing.Size(1185, 0); + this.ctrlAnnotationDetails.Size = new System.Drawing.Size(1185, 223); this.ctrlAnnotationDetails.TabIndex = 15; // // btnAnnoDetailsPushPin @@ -799,7 +798,7 @@ namespace VEPROMS this.epProcedures.ExpandOnTitleClick = true; this.epProcedures.Location = new System.Drawing.Point(5, 57); this.epProcedures.Name = "epProcedures"; - this.epProcedures.Size = new System.Drawing.Size(326, 490); + this.epProcedures.Size = new System.Drawing.Size(326, 267); this.epProcedures.Style.Alignment = System.Drawing.StringAlignment.Center; this.epProcedures.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.epProcedures.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 840dbd6e..8e0178e9 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -543,7 +543,7 @@ namespace VEPROMS tv.RefreshCheckedOutProcedures += new vlnTreeViewEvent(tv_RefreshCheckedOutProcedures); tv.ProcedureCheckedOutTo += new vlnTreeViewEvent(tv_ProcedureCheckedOutTo); tv.ViewPDF += new vlnTreeViewPdfEvent(tv_ViewPDF); - + //tv.SelectAnnotations += new (tv_SelectAnnotations); displayApplicability.ApplicabilityViewModeChanged += new DisplayApplicability.DisplayApplicabilityEvent(displayApplicability_ApplicabilityViewModeChanged); tv.ExportImportProcedureSets += new vlnTreeViewEvent(tv_ExportImportProcedureSets); @@ -1296,7 +1296,38 @@ namespace VEPROMS pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0; } + //void tv_SelectAnnotations(object sender, vlnTreeEventArgs args) + //{ + // ProcedureInfo pi = (args.Node as VETreeNode).VEObject as ProcedureInfo; + // if (pi == null) return; + // tc.SaveCurrentEditItem(pi); + + // //pi.MyDocVersion.DocVersionConfig.SelectedSlave = args.UnitIndex; + + // DlgAnnotationsSelect sannoDlg = new DlgAnnotationsSelect(pi, MyUserInfo.UserID); + // //sannoDlg.SelectedSlave = args.UnitIndex; + // //sannoDlg.MySessionInfo = MySessionInfo; + // sannoDlg.ShowDialog(this); // RHM 20120925 - Center dialog over PROMS window + + // //pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0; + //} + public static void tv_SelectAnnotations() + { + //ProcedureInfo pi = (args.Node as VETreeNode).VEObject as ProcedureInfo; + //if (pi == null) return; + + //tc.SaveCurrentEditItem(pi); + + //pi.MyDocVersion.DocVersionConfig.SelectedSlave = args.UnitIndex; + + DlgAnnotationsSelect sannoDlg = new DlgAnnotationsSelect(VlnSettings.UserID); + //sannoDlg.SelectedSlave = args.UnitIndex; + //sannoDlg.MySessionInfo = MySessionInfo; + sannoDlg.ShowDialog(); // RHM 20120925 - Center dialog over PROMS window + + //pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0; + } void tv_CreateTimeCriticalActionSummary(object sender, vlnTreeEventArgs args) { DialogResult dr = System.Windows.Forms.DialogResult.Yes; diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationAuditInfoList.cs b/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationAuditInfoList.cs index a804a4fe..f444303b 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationAuditInfoList.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationAuditInfoList.cs @@ -206,7 +206,7 @@ namespace VEPROMS.CSLA.Library public partial class AnnotationAuditInfoListPropertyDescriptor : vlnListPropertyDescriptor { private AnnotationAuditInfo Item { get { return (AnnotationAuditInfo)_Item; } } - public AnnotationAuditInfoListPropertyDescriptor(AnnotationAuditInfoList collection, int index) : base(collection, index) { ;} + public AnnotationAuditInfoListPropertyDescriptor(AnnotationAuditInfoList collection, int index) : base(collection, index) {; } } #endregion #region Converter diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationAuditInfoList_bak.cs b/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationAuditInfoList_bak.cs new file mode 100644 index 00000000..a804a4fe --- /dev/null +++ b/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationAuditInfoList_bak.cs @@ -0,0 +1,226 @@ +// ======================================================================== +// Copyright 2007 - Volian Enterprises, Inc. All rights reserved. +// Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE +// ------------------------------------------------------------------------ +// $Workfile: $ $Revision: $ +// $Author: $ $Date: $ +// +// $History: $ +// ======================================================================== + +using System; +using System.Data; +using System.Data.SqlClient; +using Csla; +using Csla.Data; +using System.Configuration; +using System.IO; +using System.ComponentModel; +using System.Collections.Generic; +namespace VEPROMS.CSLA.Library +{ + /// + /// AnnotationAuditInfoList Generated by MyGeneration using the CSLA Object Mapping template + /// + [Serializable()] + [TypeConverter(typeof(AnnotationAuditInfoListConverter))] + public partial class AnnotationAuditInfoList : ReadOnlyListBase, ICustomTypeDescriptor, IDisposable + { + #region Log4Net + private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); + #endregion + #region Business Methods + internal new IList Items + { get { return base.Items; } } + public void AddEvents() + { + foreach (AnnotationAuditInfo tmp in this) + { + tmp.Changed += new AnnotationAuditInfoEvent(tmp_Changed); + } + } + void tmp_Changed(object sender) + { + for (int i = 0; i < Count; i++) + { + if (base[i] == sender) + this.OnListChanged(new ListChangedEventArgs(ListChangedType.ItemChanged, i)); + } + } + private bool _Disposed = false; + private static int _CountCreated = 0; + private static int _CountDisposed = 0; + private static int _CountFinalized = 0; + private static int IncrementCountCreated + { get { return ++_CountCreated; } } + private int _CountWhenCreated = IncrementCountCreated; + public static int CountCreated + { get { return _CountCreated; } } + public static int CountNotDisposed + { get { return _CountCreated - _CountDisposed; } } + public static int CountNotFinalized + { get { return _CountCreated - _CountFinalized; } } + ~AnnotationAuditInfoList() + { + _CountFinalized++; + } + public void Dispose() + { + if (_Disposed) return; + _CountDisposed++; + _Disposed = true; + foreach (AnnotationAuditInfo tmp in this) + { + tmp.Changed -= new AnnotationAuditInfoEvent(tmp_Changed); + } + } + #endregion + #region Factory Methods + public static AnnotationAuditInfoList _AnnotationAuditInfoList = null; + /// + /// Return a list of all AnnotationAuditInfo. + /// + public static AnnotationAuditInfoList Get() + { + try + { + if (_AnnotationAuditInfoList != null) + return _AnnotationAuditInfoList; + AnnotationAuditInfoList tmp = DataPortal.Fetch(); + AnnotationAuditInfo.AddList(tmp); + tmp.AddEvents(); + _AnnotationAuditInfoList = tmp; + return tmp; + } + catch (Exception ex) + { + throw new DbCslaException("Error on AnnotationAuditInfoList.Get", ex); + } + } + /// + /// Reset the list of all AnnotationAuditInfo. + /// + public static void Reset() + { + _AnnotationAuditInfoList = null; + } + // CSLATODO: Add alternative gets - + //public static AnnotationAuditInfoList Get() + //{ + // try + // { + // return DataPortal.Fetch(new FilteredCriteria()); + // } + // catch (Exception ex) + // { + // throw new DbCslaException("Error on AnnotationAuditInfoList.Get", ex); + // } + //} + private AnnotationAuditInfoList() + { /* require use of factory methods */ } + #endregion + #region Data Access Portal + private void DataPortal_Fetch() + { + this.RaiseListChangedEvents = false; + if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] AnnotationAuditInfoList.DataPortal_Fetch", GetHashCode()); + try + { + using (SqlConnection cn = Database.VEPROMS_SqlConnection) + { + using (SqlCommand cm = cn.CreateCommand()) + { + cm.CommandType = CommandType.StoredProcedure; + cm.CommandText = "getAnnotationAudits"; + cm.CommandTimeout = Database.DefaultTimeout; + using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader())) + { + IsReadOnly = false; + while (dr.Read()) this.Add(new AnnotationAuditInfo(dr)); + IsReadOnly = true; + } + } + } + } + catch (Exception ex) + { + if (_MyLog.IsErrorEnabled) _MyLog.Error("AnnotationAuditInfoList.DataPortal_Fetch", ex); + throw new DbCslaException("AnnotationAuditInfoList.DataPortal_Fetch", ex); + } + this.RaiseListChangedEvents = true; + } + #endregion + #region ICustomTypeDescriptor impl + public String GetClassName() + { return TypeDescriptor.GetClassName(this, true); } + public AttributeCollection GetAttributes() + { return TypeDescriptor.GetAttributes(this, true); } + public String GetComponentName() + { return TypeDescriptor.GetComponentName(this, true); } + public TypeConverter GetConverter() + { return TypeDescriptor.GetConverter(this, true); } + public EventDescriptor GetDefaultEvent() + { return TypeDescriptor.GetDefaultEvent(this, true); } + public PropertyDescriptor GetDefaultProperty() + { return TypeDescriptor.GetDefaultProperty(this, true); } + public object GetEditor(Type editorBaseType) + { return TypeDescriptor.GetEditor(this, editorBaseType, true); } + public EventDescriptorCollection GetEvents(Attribute[] attributes) + { return TypeDescriptor.GetEvents(this, attributes, true); } + public EventDescriptorCollection GetEvents() + { return TypeDescriptor.GetEvents(this, true); } + public object GetPropertyOwner(PropertyDescriptor pd) + { return this; } + /// + /// Called to get the properties of this type. Returns properties with certain + /// attributes. this restriction is not implemented here. + /// + /// + /// + public PropertyDescriptorCollection GetProperties(Attribute[] attributes) + { return GetProperties(); } + /// + /// Called to get the properties of this type. + /// + /// + public PropertyDescriptorCollection GetProperties() + { + // Create a collection object to hold property descriptors + PropertyDescriptorCollection pds = new PropertyDescriptorCollection(null); + // Iterate the list + for (int i = 0; i < this.Items.Count; i++) + { + // Create a property descriptor for the item and add to the property descriptor collection + AnnotationAuditInfoListPropertyDescriptor pd = new AnnotationAuditInfoListPropertyDescriptor(this, i); + pds.Add(pd); + } + // return the property descriptor collection + return pds; + } + #endregion + } // Class + #region Property Descriptor + /// + /// Summary description for CollectionPropertyDescriptor. + /// + public partial class AnnotationAuditInfoListPropertyDescriptor : vlnListPropertyDescriptor + { + private AnnotationAuditInfo Item { get { return (AnnotationAuditInfo)_Item; } } + public AnnotationAuditInfoListPropertyDescriptor(AnnotationAuditInfoList collection, int index) : base(collection, index) { ;} + } + #endregion + #region Converter + internal class AnnotationAuditInfoListConverter : ExpandableObjectConverter + { + public override object ConvertTo(ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value, Type destType) + { + if (destType == typeof(string) && value is AnnotationAuditInfoList) + { + // Return department and department role separated by comma. + return ((AnnotationAuditInfoList)value).Items.Count.ToString() + " AnnotationAudits"; + } + return base.ConvertTo(context, culture, value, destType); + } + } + #endregion +} // Namespace diff --git a/PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSections.cs b/PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSections.cs new file mode 100644 index 00000000..7df44168 --- /dev/null +++ b/PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSections.cs @@ -0,0 +1,463 @@ +using System; +using System.Collections.Generic; +using System.Collections; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Data; +using System.Data.SqlClient; +using System.Text.RegularExpressions; +using Csla; +using Csla.Data; +using System.Configuration; +using System.IO; +using System.ComponentModel; + + +//namespace VEPROMS.CSLA.Library; + +// C2025-027 this new file is used to support (data retrival) for selecting Annotation types to display on the Annotation screen. + +namespace VEPROMS.CSLA.Library +{ + public class AnnotationstypeSelections + { + public static DataTable Get(string UserID, int ItemID) + { + using (SqlConnection cn = Database.VEPROMS_SqlConnection) + { + using (SqlCommand cm = cn.CreateCommand()) + { + try + { + cm.CommandType = CommandType.StoredProcedure; + cm.CommandText = "getAnnotationstypeSelections"; + cm.CommandTimeout = Database.DefaultTimeout; + cm.Parameters.AddWithValue("@UsrID", UserID); + SqlDataAdapter da = new SqlDataAdapter(cm); + SqlDataReader reader = cm.ExecuteReader(); + DataTable dt = new DataTable(); + dt.Load(reader); + // if the user has not created a annotation sub-set list saved to AnnotationTypeSelections table. + if (dt.Rows.Count < 1) + { + //dt.Rows.Add(DataPortal.Fetch()); + //DataPortal.Fetch(); + DataRow row; + int rowflg = 0; + foreach (AnnotationTypeInfo annosel in DataPortal.Fetch()) + { + // C2025-027 need to use a datatable instead of AnnotationTypeInfoList so the global search Annotations will not be effected by the Annotation select list selections + if (rowflg == 0) + { + row = dt.NewRow(); + dt.Rows.Add(row); + rowflg = 1; + } + else + { + row = dt.NewRow(); + row["TypeID"] = annosel.TypeID; + row["ItemID"] = ItemID; + row["Name"] = annosel.Name; + row["Config"] = annosel.Config; + row["DTS"] = annosel.DTS; + row["UserID"] = annosel.UserID; + row["IsEPAnnotationType"] = annosel.IsEPAnnotationType; + dt.Rows.Add(row); + } + + //row = dt.NewRow(); + //row["TypeID"] = annosel.TypeID; + //row["ItemID"] = ItemID; + //row["Name"] = annosel.Name; + //row["Config"] = annosel.Config; + //row["DTS"] = annosel.DTS; + //row["UserID"] = annosel.UserID; + //row["IsEPAnnotationType"] = annosel.IsEPAnnotationType; + + //dt.Rows.Add(row); + + //dt.Rows.Add(0,annosel.TypeID, ItemID, annosel.Name, annosel.Config, annosel.DTS, annosel.UserID, 0x0000000000000000, annosel.IsEPAnnotationType); + }; + } + return dt; + + } + catch (Exception ex) + { + //B2025-004 + //if it fails loading previously open tabs, simply treat it as if no tabs were open + //instead of crashing + return new DataTable(); + } + + } + } + } + public static DataTable Retrieve(string UserID) + { + using (SqlConnection cn = Database.VEPROMS_SqlConnection) + { + using (SqlCommand cm = cn.CreateCommand()) + { + try + { + cm.CommandType = CommandType.StoredProcedure; + cm.CommandText = "getAnnotationstypeSelections"; + cm.CommandTimeout = Database.DefaultTimeout; + cm.Parameters.AddWithValue("@UsrID", UserID); + SqlDataAdapter da = new SqlDataAdapter(cm); + SqlDataReader reader = cm.ExecuteReader(); + DataTable dt = new DataTable(); + dt.Load(reader); + + return dt; + + } + catch (Exception ex) + { + //B2025-004 + //if it fails loading previously open tabs, simply treat it as if no tabs were open + //instead of crashing + return new DataTable(); + } + + } + } + } + public static DataTable GetAnnoTypes(string UserID) + { + using (SqlConnection cn = Database.VEPROMS_SqlConnection) + { + using (SqlCommand cm = cn.CreateCommand()) + { + try + { + cm.CommandType = CommandType.StoredProcedure; + cm.CommandText = "getAnnotationSelectListTypes"; + cm.CommandTimeout = Database.DefaultTimeout; + SqlDataAdapter da = new SqlDataAdapter(cm); + cm.Parameters.AddWithValue("@UserID", UserID); + SqlDataReader reader = cm.ExecuteReader(); + DataTable dt = new DataTable(); + dt.Load(reader); + + return dt; + + } + catch (Exception ex) + { + //B2025-004 + //if it fails loading previously open tabs, simply treat it as if no tabs were open + //instead of crashing + return new DataTable(); + } + + } + } + } + public static void Update(string UserID, int TypeID, int dltFlg, string Name = "") + { + using (SqlConnection cn = Database.VEPROMS_SqlConnection) + { + using (SqlCommand cm = cn.CreateCommand()) + { + try + { + cm.CommandType = CommandType.StoredProcedure; + cm.CommandText = "UpdateAnnotationstypeSelections"; + cm.CommandTimeout = Database.DefaultTimeout; + cm.Parameters.AddWithValue("@UserID", UserID); + cm.Parameters.AddWithValue("@TypeID", TypeID); + cm.Parameters.AddWithValue("@dltFlg", dltFlg); + cm.Parameters.AddWithValue("@Name", Name); + + cm.ExecuteNonQuery(); + } + catch (Exception ex) + { + + } + } + } + } + + public static AnnotationTypeInfoList AnnotationSelectByItem(int itemID) + { + try + { + //if (_AnnotationTypeInfoList != null) + // return _AnnotationTypeInfoList; + AnnotationTypeInfoList tmp = (AnnotationTypeInfoList)DataPortal.Fetch(new AnnotationSelectByItemIDCriteria(itemID)); + if (tmp.Count < 1) + { + tmp = DataPortal.Fetch(); + } + AnnotationTypeInfo.AddList(tmp); + tmp.AddEvents(); + return tmp; + + } + catch (Exception ex) + { + throw new DbCslaException("Error on AnnotationTypeInfoList.Get", ex); + } + } + private int _TypeID; + [System.ComponentModel.DataObjectField(true, true)] + public int TypeID + { + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)] + get + { + return _TypeID; + } + } + private int _ItemID; + [System.ComponentModel.DataObjectField(true, true)] + public int ItemID + { + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)] + get + { + return _ItemID; + } + } + private string _Name = string.Empty; + public string Name + { + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)] + get + { + return _Name; + } + } + private string _Config = string.Empty; + public string Config + { + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)] + get + { + return _Config; + } + } + private DateTime _DTS = new DateTime(); + public DateTime DTS + { + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)] + get + { + return _DTS; + } + } + private string _UserID = string.Empty; + public string UserID + { + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)] + get + { + return _UserID; + } + } + private int _AnnotationTypeAnnotationCount = 0; + public int AnnotationTypeAnnotationCount + { + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)] + get + { + return _AnnotationTypeAnnotationCount; + } + } + //C2025-023 - Electronic Procedures - Modifications to PROMS + // Is Annotation Type an EP Annotation? + private bool _IsEPAnnotationType = false; + public bool IsEPAnnotationType + { + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)] + get + { + return _IsEPAnnotationType; + } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)] + set + { + if (_IsEPAnnotationType != value) + { + _IsEPAnnotationType = value; + //PropertyHasChanged(); + } + } + } + + #region Log4Net + private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); + #endregion + private string _ErrorMessage = string.Empty; + public string ErrorMessage + { + get { return _ErrorMessage; } + } + [Serializable()] + protected class retrieveAnnotSelections + { + private int _itemID; + public int itemID { get { return _itemID; } } + + public retrieveAnnotSelections(int itemID) + { + _itemID = itemID; + } + } + [Serializable()] + public class retrieveAnnotSelectionsList + { + private int _TypeID; + public int TypeID + { + get { return _TypeID; } + set { _TypeID = value; } + } + private int _ItemID; + public int ItemID + { + get { return _ItemID; } + set { _ItemID = value; } + } + private string _Name; + public string Name + { + get { return _Name; } + set { _Name = value; } + } + private string _Config; + public string Config + { + get { return _Config; } + set { _Config = value; } + } + private DateTime _DTS; + public DateTime DTS + { + get { return _DTS; } + set { _DTS = value; } + } + private string _UserID; + public string UserID + { + get { return _UserID; } + set { _UserID = value; } + } + private bool _IsEPAnnotationType; + public bool IsEPAnnotationType + { + get { return _IsEPAnnotationType; } + set { _IsEPAnnotationType = value; } + } + private string _ErrorMessage = string.Empty; + public string ErrorMessage + { + get { return _ErrorMessage; } + } + } + + private void DataPortal_Fetch(retrieveAnnotSelections criteria) + { + try + { + using (SqlConnection cn = Database.VEPROMS_SqlConnection) + { + using (SqlCommand cm = cn.CreateCommand()) + { + cm.CommandType = CommandType.StoredProcedure; + cm.CommandText = "getAnnotationstypeSelections"; + cm.CommandTimeout = Database.DefaultTimeout; + cm.Parameters.AddWithValue("@itemID", criteria.itemID); + using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader())) + { + if (!dr.Read()) + { + _ErrorMessage = "No Record Found"; + return; + } + ReadData(dr); + } + } + } + } + catch (Exception ex) + { + if (_MyLog.IsErrorEnabled) _MyLog.Error("retrieveAnnotSelectionsList.DataPortal_Fetch", ex); + throw new DbCslaException("retrieveAnnotSelectionsList.DataPortal_Fetch", ex); + } + //this.RaiseListChangedEvents = true; + } + [Serializable()] + protected class AnnotationSelectByItemIDCriteria + { + private int _itemID; + public int ItemID + { get { return _itemID; } } + + public AnnotationSelectByItemIDCriteria(int itemID) + { + _itemID = itemID; + } + } + private void DataPortal_Fetch(AnnotationSelectByItemIDCriteria criteria) + { + //this.RaiseListChangedEvents = false; + if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] AnnotationTypeInfoList.DataPortal_Fetch", GetHashCode()); + try + { + using (SqlConnection cn = Database.VEPROMS_SqlConnection) + { + using (SqlCommand cm = cn.CreateCommand()) + { + cm.CommandType = CommandType.StoredProcedure; + cm.CommandText = "getAnnotationTypes2"; + cm.Parameters.AddWithValue("@itemID", criteria.ItemID); + cm.CommandTimeout = Database.DefaultTimeout; + using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader())) + { + //IsReadOnly = false; + //while (dr.Read()) this.Add(new AnnotationTypeInfo(dr)); + //IsReadOnly = true; + } + } + } + } + catch (Exception ex) + { + if (_MyLog.IsErrorEnabled) _MyLog.Error("AnnotationTypeInfoList.DataPortal_Fetch", ex); + throw new DbCslaException("AnnotationTypeInfoList.DataPortal_Fetch", ex); + } + //this.RaiseListChangedEvents = true; + } + + private void ReadData(SafeDataReader dr) + { + if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] retrieveAnnotSelectionsList.ReadData", GetHashCode()); + try + { + _TypeID = dr.GetInt32("TypeID"); + _ItemID = dr.GetInt32("ItemID"); + _Name = dr.GetString("Name"); + _Config = dr.GetString("Config"); + _DTS = dr.GetDateTime("DTS"); + _UserID = dr.GetString("UserID"); + _AnnotationTypeAnnotationCount = dr.GetInt32("AnnotationCount"); + if (dr.GetSchemaTable().Rows.OfType().Any(row => row["ColumnName"].ToString() == "IsEPAnnotationType")) + _IsEPAnnotationType = (bool)dr.GetValue("IsEPAnnotationType"); + } + catch (Exception ex) + { + if (_MyLog.IsErrorEnabled) _MyLog.Error("retrieveAnnotSelectionsList.ReadData", ex); + _ErrorMessage = ex.Message; + throw new DbCslaException("retrieveAnnotSelectionsList.ReadData", ex); + } + } + + } +} + diff --git a/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj b/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj index 3af1e207..27379637 100644 --- a/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj +++ b/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj @@ -387,6 +387,7 @@ + diff --git a/PROMS/Volian.Controls.Library/AnnotationDetails.cs b/PROMS/Volian.Controls.Library/AnnotationDetails.cs index d001d92e..2506f1a1 100644 --- a/PROMS/Volian.Controls.Library/AnnotationDetails.cs +++ b/PROMS/Volian.Controls.Library/AnnotationDetails.cs @@ -120,7 +120,14 @@ namespace Volian.Controls.Library if (CurrentItem.MyDocVersion.DocVersionAssociationCount > 0) _ROPath = CurrentItem.MyDocVersion.DocVersionAssociations[0].MyROFst.MyRODb.FolderPath; ProcItem = CurrentItem.MyProcedure; - } + // C2025-027 + //cbGridAnnoType.DataSource = VEPROMS.CSLA.Library.AnnotationstypeSelections.Get(ProcItem.ItemID); + cbGridAnnoType.DataSource = VEPROMS.CSLA.Library.AnnotationstypeSelections.Get(MyUserInfo.UserID, ProcItem.ItemID); + cbGridAnnoType.WatermarkText = "Select Annotation Type"; + + + + } public AnnotationInfo FirstExeAnnotation(ItemInfo ii) { if (ii == null) return null; diff --git a/PROMS/Volian.Controls.Library/vlnTreeView.cs b/PROMS/Volian.Controls.Library/vlnTreeView.cs index bdd75d47..212fafdf 100644 --- a/PROMS/Volian.Controls.Library/vlnTreeView.cs +++ b/PROMS/Volian.Controls.Library/vlnTreeView.cs @@ -573,11 +573,12 @@ namespace Volian.Controls.Library { if (ProcedureCheckedOutTo != null) ProcedureCheckedOutTo(sender, args); } - - - - - + // C2025-027 + public event vlnTreeViewEvent SelectAnnotations; + private void OnSelectAnnotations(object sender, vlnTreeEventArgs args) + { + if (SelectAnnotations != null) SelectAnnotations(sender, args); + } public event vlnTreeViewEvent ExportImportProcedureSets; private void OnExportImportProcedureSets(object sender, vlnTreeEventArgs args) { @@ -871,6 +872,8 @@ namespace Volian.Controls.Library MenuItem miqp = new MenuItem("Quick Print"); //MenuItem mips = new MenuItem("Print Section"); MenuItem mia = new MenuItem("Approve"); + MenuItem misa = new MenuItem("Select Annotations"); //C2025-027 + int k = 0; foreach (string s in pri.MyDocVersion.UnitNames) { @@ -895,12 +898,16 @@ namespace Volian.Controls.Library MenuItem mtc = mitcas.MenuItems.Add(s, new EventHandler(miMultiUnit_Click)); mtc.Enabled = procAppl; mtc.Tag = k; + MenuItem msa = misa.MenuItems.Add(s, new EventHandler(miMultiUnit_Click)); + msa.Enabled = procAppl; + msa.Tag = k; } cm.MenuItems.Add(micas); cm.MenuItems.Add(mitcas); cm.MenuItems.Add(mip); cm.MenuItems.Add(miqp); //cm.MenuItems.Add(mips); + cm.MenuItems.Add(misa); AddShowChangeBarsAfterMenuItem(cm.MenuItems, pri); cm.MenuItems.Add(mia); AddApprovedRevisionsMultiUnit(cm.MenuItems, pri); @@ -916,6 +923,7 @@ namespace Volian.Controls.Library AddShowChangeBarsAfterMenuItem(cm.MenuItems, pri); cm.MenuItems.Add("Approve", new EventHandler(mi_Click)); //_MyLog.WarnFormat("Context Menu 1 before - {0}", GC.GetTotalMemory(true)); + cm.MenuItems.Add("Select Annotations", new EventHandler(mi_Click)); //C2025-027 AddApprovedRevisions(cm.MenuItems, pri); //_MyLog.WarnFormat("Context Menu 1 after - {0}", GC.GetTotalMemory(true)); } @@ -928,6 +936,7 @@ namespace Volian.Controls.Library { MenuItem mip = new MenuItem("Print"); MenuItem miqp = new MenuItem("Quick Print"); + MenuItem misa = new MenuItem("Select Annotations"); //C2025-027 int k = 0; foreach (string s in pri.MyDocVersion.UnitNames) { @@ -936,15 +945,19 @@ namespace Volian.Controls.Library mp.Tag = k; MenuItem mqp = miqp.MenuItems.Add(s, new EventHandler(miMultiUnit_Click)); mqp.Tag = k; + MenuItem msa = misa.MenuItems.Add(s, new EventHandler(miMultiUnit_Click)); + msa.Tag = k; } cm.MenuItems.Add(mip); cm.MenuItems.Add(miqp); + cm.MenuItems.Add(misa); AddApprovedRevisionsMultiUnit(cm.MenuItems, pri); } else { cm.MenuItems.Add("Print", new EventHandler(mi_Click)); cm.MenuItems.Add("Quick Print", new EventHandler(mi_Click)); + cm.MenuItems.Add("Select Annotations", new EventHandler(mi_Click)); //C2025-027 AddApprovedRevisions(cm.MenuItems, pri); } } @@ -1936,6 +1949,9 @@ namespace Volian.Controls.Library case "Create Time Critical Action Summary": OnCreateTimeCriticalActionSummary(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0, mi.Text, (int)mi.Tag)); break; + case "Select Annotations": // C2025-027 + OnSelectAnnotations(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0)); + break; default: if (mip.Text.StartsWith("Showing Change Bars Starting")) OnSelectDateToStartChangeBars(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0)); @@ -2241,6 +2257,9 @@ namespace Volian.Controls.Library FlexibleMessageBox.Show("You have copied a document that is NOT linked to an Enhanced Document.\n\n" + "You cannot paste a Non-Enhanced Procedure into an Enhanced Procedure Set.", "Cannot Paste Here"); break; + case "Select Annotations": // C2025-027 + OnSelectAnnotations(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0)); + break; //case "Check Out Procedure Set": // CheckOutDocVersion(SelectedNode as VETreeNode); // break; From 139f7bbd0aa883670e9888b07ea87fa7760b0760 Mon Sep 17 00:00:00 2001 From: John Jenko Date: Tue, 15 Jul 2025 15:25:52 -0400 Subject: [PATCH 03/25] F2025-017 Created a new cover page type for Wolf Creek Single Column format. --- PROMS/Formats/fmtall/WCN1all.xml | Bin 95018 -> 99634 bytes PROMS/Formats/genmacall/wcn1.svg | Bin 13398 -> 13910 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/PROMS/Formats/fmtall/WCN1all.xml b/PROMS/Formats/fmtall/WCN1all.xml index b5a3891b94bec4e1b6ebf4cb127e9a4548eb8398..d9b5f92a9f3ff0d070db1eb4cddadff9adad28c7 100644 GIT binary patch delta 520 zcmZ4WjCE5NTf-K{UzXDt8ClpB7{GA)e_2N5$@|W#O}>}FHaSRGXtL9zbCW&h2u=Pn zrDt;1Jb}sAw(w1k5ayYlq|0bAdEI#zuw;sO4YK59qwRW=k6Z}BDtBnJ%;Xyv8^Cf$ z-nF6Wlbft^xddY24pcK2ZIYQTpuxxnv^M@qI#wlzHfv3uaqvoY8i<$uc*K(B Date: Tue, 15 Jul 2025 23:14:26 -0400 Subject: [PATCH 04/25] C2025-027-AnnotationsTypeSelect --- PROMS/VEPROMS User Interface/PROMSFixes.Sql | 52 +++- .../frmVEPROMS.Designer.cs | 2 +- PROMS/VEPROMS User Interface/frmVEPROMS.cs | 27 --- .../Generated/AnnotationAuditInfoList.cs | 2 +- .../Generated/AnnotationAuditInfoList_bak.cs | 226 ------------------ .../Minimal/AnnotationstypeSections.cs | 112 +-------- .../AnnotationDetails.cs | 16 +- 7 files changed, 66 insertions(+), 371 deletions(-) delete mode 100644 PROMS/VEPROMS.CSLA.Library/Generated/AnnotationAuditInfoList_bak.cs diff --git a/PROMS/VEPROMS User Interface/PROMSFixes.Sql b/PROMS/VEPROMS User Interface/PROMSFixes.Sql index 0beebdf6..cc155fbe 100644 --- a/PROMS/VEPROMS User Interface/PROMSFixes.Sql +++ b/PROMS/VEPROMS User Interface/PROMSFixes.Sql @@ -24135,7 +24135,7 @@ CREATE PROC [dbo].[getAnnotationstypeSelections] ) AS BEGIN - IF((SELECT TypeID FROM AnnotationTypeSelections WHERE UsrID = @UsrID) > 0) + IF((SELECT count(TypeID) FROM AnnotationTypeSelections WHERE UsrID = @UsrID) > 0) BEGIN SELECT [ASTypeID] ,[TypeID] @@ -24164,6 +24164,56 @@ BEGIN END GO +-- C2025-027 Annotation Type Filtering +IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[getAnnotationstypeFiltered]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1) + DROP PROCEDURE [getAnnotationstypeFiltered]; +GO +SET ANSI_NULLS ON +GO + +SET QUOTED_IDENTIFIER ON +GO + +-- ============================================= +-- Author: Paul Larsen +-- Create date: 07/10/2025 +-- Description: Retrieve Current Annotation Types +-- ============================================= + +CREATE PROC [dbo].[getAnnotationstypeFiltered] +( + @UsrID varchar(50) +) +AS +BEGIN + IF((SELECT count(TypeID) FROM AnnotationTypeSelections WHERE UsrID = @UsrID) > 0) + BEGIN + SELECT [ASTypeID] + ,[TypeID] + ,[UsrID] + ,[Name] + ,[Config] + ,[DTS] + ,[UserID] + ,[IsEPAnnotationType] + FROM [dbo].[AnnotationTypeSelections] + WHERE UsrID = @UsrID + END + ELSE + BEGIN + SELECT + [TypeID], + [Name], + [Config], + [DTS], + [UserID], + [LastChanged], + (SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[TypeID]=[AnnotationTypes].[TypeID]) [AnnotationCount], + [IsEPAnnotationType] + FROM [AnnotationTypes] + END +END + -- C2025-027 Annotation Type Filtering IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[AnnotationTypeSelections]') AND type in (N'U')) DROP TABLE [dbo].[AnnotationTypeSelections] diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs index 18e3b2bf..285d5aaf 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs @@ -1663,7 +1663,7 @@ namespace VEPROMS private DevComponents.DotNetBar.QatCustomizeItem qatCustomizeItem1; private DevComponents.DotNetBar.Bar bottomBar; private DevComponents.DotNetBar.ProgressBarItem bottomProgBar; - private DevComponents.DotNetBar.ExpandablePanel epAnnotations; + public DevComponents.DotNetBar.ExpandablePanel epAnnotations; private DevComponents.DotNetBar.ExpandablePanel epProcedures; private DevComponents.DotNetBar.ExpandablePanel infoPanel; private Volian.Controls.Library.vlnTreeView tv; diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 8e0178e9..206f99d1 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -1296,37 +1296,10 @@ namespace VEPROMS pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0; } - //void tv_SelectAnnotations(object sender, vlnTreeEventArgs args) - //{ - // ProcedureInfo pi = (args.Node as VETreeNode).VEObject as ProcedureInfo; - // if (pi == null) return; - - // tc.SaveCurrentEditItem(pi); - - // //pi.MyDocVersion.DocVersionConfig.SelectedSlave = args.UnitIndex; - - // DlgAnnotationsSelect sannoDlg = new DlgAnnotationsSelect(pi, MyUserInfo.UserID); - // //sannoDlg.SelectedSlave = args.UnitIndex; - // //sannoDlg.MySessionInfo = MySessionInfo; - // sannoDlg.ShowDialog(this); // RHM 20120925 - Center dialog over PROMS window - - // //pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0; - //} public static void tv_SelectAnnotations() { - //ProcedureInfo pi = (args.Node as VETreeNode).VEObject as ProcedureInfo; - //if (pi == null) return; - - //tc.SaveCurrentEditItem(pi); - - //pi.MyDocVersion.DocVersionConfig.SelectedSlave = args.UnitIndex; - DlgAnnotationsSelect sannoDlg = new DlgAnnotationsSelect(VlnSettings.UserID); - //sannoDlg.SelectedSlave = args.UnitIndex; - //sannoDlg.MySessionInfo = MySessionInfo; sannoDlg.ShowDialog(); // RHM 20120925 - Center dialog over PROMS window - - //pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0; } void tv_CreateTimeCriticalActionSummary(object sender, vlnTreeEventArgs args) { diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationAuditInfoList.cs b/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationAuditInfoList.cs index f444303b..a804a4fe 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationAuditInfoList.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationAuditInfoList.cs @@ -206,7 +206,7 @@ namespace VEPROMS.CSLA.Library public partial class AnnotationAuditInfoListPropertyDescriptor : vlnListPropertyDescriptor { private AnnotationAuditInfo Item { get { return (AnnotationAuditInfo)_Item; } } - public AnnotationAuditInfoListPropertyDescriptor(AnnotationAuditInfoList collection, int index) : base(collection, index) {; } + public AnnotationAuditInfoListPropertyDescriptor(AnnotationAuditInfoList collection, int index) : base(collection, index) { ;} } #endregion #region Converter diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationAuditInfoList_bak.cs b/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationAuditInfoList_bak.cs deleted file mode 100644 index a804a4fe..00000000 --- a/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationAuditInfoList_bak.cs +++ /dev/null @@ -1,226 +0,0 @@ -// ======================================================================== -// Copyright 2007 - Volian Enterprises, Inc. All rights reserved. -// Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE -// ------------------------------------------------------------------------ -// $Workfile: $ $Revision: $ -// $Author: $ $Date: $ -// -// $History: $ -// ======================================================================== - -using System; -using System.Data; -using System.Data.SqlClient; -using Csla; -using Csla.Data; -using System.Configuration; -using System.IO; -using System.ComponentModel; -using System.Collections.Generic; -namespace VEPROMS.CSLA.Library -{ - /// - /// AnnotationAuditInfoList Generated by MyGeneration using the CSLA Object Mapping template - /// - [Serializable()] - [TypeConverter(typeof(AnnotationAuditInfoListConverter))] - public partial class AnnotationAuditInfoList : ReadOnlyListBase, ICustomTypeDescriptor, IDisposable - { - #region Log4Net - private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); - #endregion - #region Business Methods - internal new IList Items - { get { return base.Items; } } - public void AddEvents() - { - foreach (AnnotationAuditInfo tmp in this) - { - tmp.Changed += new AnnotationAuditInfoEvent(tmp_Changed); - } - } - void tmp_Changed(object sender) - { - for (int i = 0; i < Count; i++) - { - if (base[i] == sender) - this.OnListChanged(new ListChangedEventArgs(ListChangedType.ItemChanged, i)); - } - } - private bool _Disposed = false; - private static int _CountCreated = 0; - private static int _CountDisposed = 0; - private static int _CountFinalized = 0; - private static int IncrementCountCreated - { get { return ++_CountCreated; } } - private int _CountWhenCreated = IncrementCountCreated; - public static int CountCreated - { get { return _CountCreated; } } - public static int CountNotDisposed - { get { return _CountCreated - _CountDisposed; } } - public static int CountNotFinalized - { get { return _CountCreated - _CountFinalized; } } - ~AnnotationAuditInfoList() - { - _CountFinalized++; - } - public void Dispose() - { - if (_Disposed) return; - _CountDisposed++; - _Disposed = true; - foreach (AnnotationAuditInfo tmp in this) - { - tmp.Changed -= new AnnotationAuditInfoEvent(tmp_Changed); - } - } - #endregion - #region Factory Methods - public static AnnotationAuditInfoList _AnnotationAuditInfoList = null; - /// - /// Return a list of all AnnotationAuditInfo. - /// - public static AnnotationAuditInfoList Get() - { - try - { - if (_AnnotationAuditInfoList != null) - return _AnnotationAuditInfoList; - AnnotationAuditInfoList tmp = DataPortal.Fetch(); - AnnotationAuditInfo.AddList(tmp); - tmp.AddEvents(); - _AnnotationAuditInfoList = tmp; - return tmp; - } - catch (Exception ex) - { - throw new DbCslaException("Error on AnnotationAuditInfoList.Get", ex); - } - } - /// - /// Reset the list of all AnnotationAuditInfo. - /// - public static void Reset() - { - _AnnotationAuditInfoList = null; - } - // CSLATODO: Add alternative gets - - //public static AnnotationAuditInfoList Get() - //{ - // try - // { - // return DataPortal.Fetch(new FilteredCriteria()); - // } - // catch (Exception ex) - // { - // throw new DbCslaException("Error on AnnotationAuditInfoList.Get", ex); - // } - //} - private AnnotationAuditInfoList() - { /* require use of factory methods */ } - #endregion - #region Data Access Portal - private void DataPortal_Fetch() - { - this.RaiseListChangedEvents = false; - if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] AnnotationAuditInfoList.DataPortal_Fetch", GetHashCode()); - try - { - using (SqlConnection cn = Database.VEPROMS_SqlConnection) - { - using (SqlCommand cm = cn.CreateCommand()) - { - cm.CommandType = CommandType.StoredProcedure; - cm.CommandText = "getAnnotationAudits"; - cm.CommandTimeout = Database.DefaultTimeout; - using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader())) - { - IsReadOnly = false; - while (dr.Read()) this.Add(new AnnotationAuditInfo(dr)); - IsReadOnly = true; - } - } - } - } - catch (Exception ex) - { - if (_MyLog.IsErrorEnabled) _MyLog.Error("AnnotationAuditInfoList.DataPortal_Fetch", ex); - throw new DbCslaException("AnnotationAuditInfoList.DataPortal_Fetch", ex); - } - this.RaiseListChangedEvents = true; - } - #endregion - #region ICustomTypeDescriptor impl - public String GetClassName() - { return TypeDescriptor.GetClassName(this, true); } - public AttributeCollection GetAttributes() - { return TypeDescriptor.GetAttributes(this, true); } - public String GetComponentName() - { return TypeDescriptor.GetComponentName(this, true); } - public TypeConverter GetConverter() - { return TypeDescriptor.GetConverter(this, true); } - public EventDescriptor GetDefaultEvent() - { return TypeDescriptor.GetDefaultEvent(this, true); } - public PropertyDescriptor GetDefaultProperty() - { return TypeDescriptor.GetDefaultProperty(this, true); } - public object GetEditor(Type editorBaseType) - { return TypeDescriptor.GetEditor(this, editorBaseType, true); } - public EventDescriptorCollection GetEvents(Attribute[] attributes) - { return TypeDescriptor.GetEvents(this, attributes, true); } - public EventDescriptorCollection GetEvents() - { return TypeDescriptor.GetEvents(this, true); } - public object GetPropertyOwner(PropertyDescriptor pd) - { return this; } - /// - /// Called to get the properties of this type. Returns properties with certain - /// attributes. this restriction is not implemented here. - /// - /// - /// - public PropertyDescriptorCollection GetProperties(Attribute[] attributes) - { return GetProperties(); } - /// - /// Called to get the properties of this type. - /// - /// - public PropertyDescriptorCollection GetProperties() - { - // Create a collection object to hold property descriptors - PropertyDescriptorCollection pds = new PropertyDescriptorCollection(null); - // Iterate the list - for (int i = 0; i < this.Items.Count; i++) - { - // Create a property descriptor for the item and add to the property descriptor collection - AnnotationAuditInfoListPropertyDescriptor pd = new AnnotationAuditInfoListPropertyDescriptor(this, i); - pds.Add(pd); - } - // return the property descriptor collection - return pds; - } - #endregion - } // Class - #region Property Descriptor - /// - /// Summary description for CollectionPropertyDescriptor. - /// - public partial class AnnotationAuditInfoListPropertyDescriptor : vlnListPropertyDescriptor - { - private AnnotationAuditInfo Item { get { return (AnnotationAuditInfo)_Item; } } - public AnnotationAuditInfoListPropertyDescriptor(AnnotationAuditInfoList collection, int index) : base(collection, index) { ;} - } - #endregion - #region Converter - internal class AnnotationAuditInfoListConverter : ExpandableObjectConverter - { - public override object ConvertTo(ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value, Type destType) - { - if (destType == typeof(string) && value is AnnotationAuditInfoList) - { - // Return department and department role separated by comma. - return ((AnnotationAuditInfoList)value).Items.Count.ToString() + " AnnotationAudits"; - } - return base.ConvertTo(context, culture, value, destType); - } - } - #endregion -} // Namespace diff --git a/PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSections.cs b/PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSections.cs index 7df44168..d1186cea 100644 --- a/PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSections.cs +++ b/PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSections.cs @@ -16,13 +16,13 @@ using System.ComponentModel; //namespace VEPROMS.CSLA.Library; -// C2025-027 this new file is used to support (data retrival) for selecting Annotation types to display on the Annotation screen. +// C2025-027 this new file is used to support (data retrival) for selecting Annotation types to display on the Annotation screen. This is related to Annotation type filtering through V->Options. namespace VEPROMS.CSLA.Library { public class AnnotationstypeSelections { - public static DataTable Get(string UserID, int ItemID) + public static DataTable Get(string UserID) { using (SqlConnection cn = Database.VEPROMS_SqlConnection) { @@ -31,7 +31,7 @@ namespace VEPROMS.CSLA.Library try { cm.CommandType = CommandType.StoredProcedure; - cm.CommandText = "getAnnotationstypeSelections"; + cm.CommandText = "getAnnotationstypeFiltered"; cm.CommandTimeout = Database.DefaultTimeout; cm.Parameters.AddWithValue("@UsrID", UserID); SqlDataAdapter da = new SqlDataAdapter(cm); @@ -58,7 +58,6 @@ namespace VEPROMS.CSLA.Library { row = dt.NewRow(); row["TypeID"] = annosel.TypeID; - row["ItemID"] = ItemID; row["Name"] = annosel.Name; row["Config"] = annosel.Config; row["DTS"] = annosel.DTS; @@ -67,18 +66,7 @@ namespace VEPROMS.CSLA.Library dt.Rows.Add(row); } - //row = dt.NewRow(); - //row["TypeID"] = annosel.TypeID; - //row["ItemID"] = ItemID; - //row["Name"] = annosel.Name; - //row["Config"] = annosel.Config; - //row["DTS"] = annosel.DTS; - //row["UserID"] = annosel.UserID; - //row["IsEPAnnotationType"] = annosel.IsEPAnnotationType; - //dt.Rows.Add(row); - - //dt.Rows.Add(0,annosel.TypeID, ItemID, annosel.Name, annosel.Config, annosel.DTS, annosel.UserID, 0x0000000000000000, annosel.IsEPAnnotationType); }; } return dt; @@ -183,27 +171,7 @@ namespace VEPROMS.CSLA.Library } } - public static AnnotationTypeInfoList AnnotationSelectByItem(int itemID) - { - try - { - //if (_AnnotationTypeInfoList != null) - // return _AnnotationTypeInfoList; - AnnotationTypeInfoList tmp = (AnnotationTypeInfoList)DataPortal.Fetch(new AnnotationSelectByItemIDCriteria(itemID)); - if (tmp.Count < 1) - { - tmp = DataPortal.Fetch(); - } - AnnotationTypeInfo.AddList(tmp); - tmp.AddEvents(); - return tmp; - } - catch (Exception ex) - { - throw new DbCslaException("Error on AnnotationTypeInfoList.Get", ex); - } - } private int _TypeID; [System.ComponentModel.DataObjectField(true, true)] public int TypeID @@ -361,80 +329,6 @@ namespace VEPROMS.CSLA.Library } } - private void DataPortal_Fetch(retrieveAnnotSelections criteria) - { - try - { - using (SqlConnection cn = Database.VEPROMS_SqlConnection) - { - using (SqlCommand cm = cn.CreateCommand()) - { - cm.CommandType = CommandType.StoredProcedure; - cm.CommandText = "getAnnotationstypeSelections"; - cm.CommandTimeout = Database.DefaultTimeout; - cm.Parameters.AddWithValue("@itemID", criteria.itemID); - using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader())) - { - if (!dr.Read()) - { - _ErrorMessage = "No Record Found"; - return; - } - ReadData(dr); - } - } - } - } - catch (Exception ex) - { - if (_MyLog.IsErrorEnabled) _MyLog.Error("retrieveAnnotSelectionsList.DataPortal_Fetch", ex); - throw new DbCslaException("retrieveAnnotSelectionsList.DataPortal_Fetch", ex); - } - //this.RaiseListChangedEvents = true; - } - [Serializable()] - protected class AnnotationSelectByItemIDCriteria - { - private int _itemID; - public int ItemID - { get { return _itemID; } } - - public AnnotationSelectByItemIDCriteria(int itemID) - { - _itemID = itemID; - } - } - private void DataPortal_Fetch(AnnotationSelectByItemIDCriteria criteria) - { - //this.RaiseListChangedEvents = false; - if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] AnnotationTypeInfoList.DataPortal_Fetch", GetHashCode()); - try - { - using (SqlConnection cn = Database.VEPROMS_SqlConnection) - { - using (SqlCommand cm = cn.CreateCommand()) - { - cm.CommandType = CommandType.StoredProcedure; - cm.CommandText = "getAnnotationTypes2"; - cm.Parameters.AddWithValue("@itemID", criteria.ItemID); - cm.CommandTimeout = Database.DefaultTimeout; - using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader())) - { - //IsReadOnly = false; - //while (dr.Read()) this.Add(new AnnotationTypeInfo(dr)); - //IsReadOnly = true; - } - } - } - } - catch (Exception ex) - { - if (_MyLog.IsErrorEnabled) _MyLog.Error("AnnotationTypeInfoList.DataPortal_Fetch", ex); - throw new DbCslaException("AnnotationTypeInfoList.DataPortal_Fetch", ex); - } - //this.RaiseListChangedEvents = true; - } - private void ReadData(SafeDataReader dr) { if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] retrieveAnnotSelectionsList.ReadData", GetHashCode()); diff --git a/PROMS/Volian.Controls.Library/AnnotationDetails.cs b/PROMS/Volian.Controls.Library/AnnotationDetails.cs index 2506f1a1..bec98914 100644 --- a/PROMS/Volian.Controls.Library/AnnotationDetails.cs +++ b/PROMS/Volian.Controls.Library/AnnotationDetails.cs @@ -119,13 +119,11 @@ namespace Volian.Controls.Library if (CurrentItem.MyDocVersion != null) if (CurrentItem.MyDocVersion.DocVersionAssociationCount > 0) _ROPath = CurrentItem.MyDocVersion.DocVersionAssociations[0].MyROFst.MyRODb.FolderPath; - ProcItem = CurrentItem.MyProcedure; - // C2025-027 - //cbGridAnnoType.DataSource = VEPROMS.CSLA.Library.AnnotationstypeSelections.Get(ProcItem.ItemID); - cbGridAnnoType.DataSource = VEPROMS.CSLA.Library.AnnotationstypeSelections.Get(MyUserInfo.UserID, ProcItem.ItemID); - cbGridAnnoType.WatermarkText = "Select Annotation Type"; - + //ProcItem = CurrentItem.MyProcedure; + // C2025-027 Annotation Type Filtering + //cbGridAnnoType.WatermarkText = "Select Annotation Type"; + //cbGridAnnoType.DataSource = VEPROMS.CSLA.Library.AnnotationstypeSelections.Get(MyUserInfo.UserID); } public AnnotationInfo FirstExeAnnotation(ItemInfo ii) @@ -372,6 +370,12 @@ namespace Volian.Controls.Library cbGridAnnoType.DisplayMember = "Name"; cbGridAnnoType.ValueMember = "TypeId"; cbGridAnnoType.DataSource = AnnotationTypeInfoList.Get().Clone(); + + //ProcItem = CurrentItem.MyProcedure; + //C2025 - 027 Annotation Type Filtering + cbGridAnnoType.WatermarkText = "Select Annotation Type"; + cbGridAnnoType.DataSource = VEPROMS.CSLA.Library.AnnotationstypeSelections.Get(MyUserInfo.UserID); + // If there are no annotatons, then selected index is -1 (not defined), otherwise select the first. // This was done so that it could be saved if there was text entered but user moves to another steprtb without selecting save button // so that annotation gets saved. From c98299d916819beda3b60f902805106f49e76f9c Mon Sep 17 00:00:00 2001 From: Paul Larsen Date: Tue, 15 Jul 2025 23:32:31 -0400 Subject: [PATCH 05/25] C2025-027-AnnotationsTypeSelect --- PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs index 285d5aaf..18e3b2bf 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs @@ -1663,7 +1663,7 @@ namespace VEPROMS private DevComponents.DotNetBar.QatCustomizeItem qatCustomizeItem1; private DevComponents.DotNetBar.Bar bottomBar; private DevComponents.DotNetBar.ProgressBarItem bottomProgBar; - public DevComponents.DotNetBar.ExpandablePanel epAnnotations; + private DevComponents.DotNetBar.ExpandablePanel epAnnotations; private DevComponents.DotNetBar.ExpandablePanel epProcedures; private DevComponents.DotNetBar.ExpandablePanel infoPanel; private Volian.Controls.Library.vlnTreeView tv; From 7a0f56cad8800912576eb8692e191343eab50d5f Mon Sep 17 00:00:00 2001 From: Paul Larsen Date: Wed, 16 Jul 2025 15:03:32 -0400 Subject: [PATCH 06/25] C2025-027-AnnotationsTypeSelect --- .../DlgAnnotationsSelect.cs | 17 +- PROMS/VEPROMS User Interface/PROMSFixes.Sql | 29 ++- .../VEPROMS User Interface/VEPROMS_UI.csproj | 10 +- .../dlgAnnotationsSelect.Designer.cs | 41 ++-- .../frmSysOptions.Designer.cs | 3 +- PROMS/VEPROMS User Interface/frmSysOptions.cs | 17 +- PROMS/VEPROMS User Interface/frmVEPROMS.cs | 3 +- .../Minimal/AnnotationstypeSections.cs | 183 +----------------- .../AnnotationDetails.cs | 7 - 9 files changed, 58 insertions(+), 252 deletions(-) diff --git a/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs b/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs index 3dadbffd..5083cd84 100644 --- a/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs +++ b/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs @@ -12,20 +12,19 @@ using VEPROMS.CSLA.Library; namespace VEPROMS { // C2025-027 Annotation Type Filtering - public partial class DlgAnnotationsSelect : Form + public partial class dlgAnnotationsSelect : Form { - int AnnotationTypeID; - string AnnotationNameStr = ""; + //int AnnotationTypeID; + //string AnnotationNameStr = ""; - public DlgAnnotationsSelect() + public dlgAnnotationsSelect() { InitializeComponent(); } - public DlgAnnotationsSelect(string userid) + public dlgAnnotationsSelect(string userid) { InitializeComponent(); - //MyItemID = pi.ItemID; UserID = userid; } @@ -97,13 +96,13 @@ namespace VEPROMS // Save selected list to DB. private void btnUpdate_Click(object sender, EventArgs e) { + int AnnotationTypeID; + string AnnotationNameStr = ""; + // dltFlg flag is used to notify SQL SP to deleted all the entries for the user before entering the annotation type selections. int dltFlg = 1; foreach (AnnotataionItem item in lstSelected.Items.OfType()) { - lstSelected.DisplayMember = "NameStr"; - lstSelected.ValueMember = "TypeID"; - AnnotationTypeID = item.TypeID; AnnotationNameStr = item.NameStr; diff --git a/PROMS/VEPROMS User Interface/PROMSFixes.Sql b/PROMS/VEPROMS User Interface/PROMSFixes.Sql index cc155fbe..0dc8511a 100644 --- a/PROMS/VEPROMS User Interface/PROMSFixes.Sql +++ b/PROMS/VEPROMS User Interface/PROMSFixes.Sql @@ -24134,8 +24134,6 @@ CREATE PROC [dbo].[getAnnotationstypeSelections] @UsrID varchar(50) ) AS -BEGIN - IF((SELECT count(TypeID) FROM AnnotationTypeSelections WHERE UsrID = @UsrID) > 0) BEGIN SELECT [ASTypeID] ,[TypeID] @@ -24146,22 +24144,8 @@ BEGIN ,[UserID] ,[IsEPAnnotationType] FROM [dbo].[AnnotationTypeSelections] - WHERE UsrID = @UsrID + WHERE UsrID = @UsrID END - ELSE - BEGIN - SELECT - [TypeID], - [Name], - [Config], - [DTS], - [UserID], - [LastChanged], - (SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[TypeID]=[AnnotationTypes].[TypeID]) [AnnotationCount], - [IsEPAnnotationType] - FROM [AnnotationTypes] - END -END GO -- C2025-027 Annotation Type Filtering @@ -24244,6 +24228,17 @@ CREATE TABLE [dbo].[AnnotationTypeSelections]( [IsEPAnnotationType] [bit] NOT NULL ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] GO +CREATE NONCLUSTERED INDEX [idx_AnnotationTypeSelections_Usrid] ON [dbo].[AnnotationTypeSelections] +( + [UsrID] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY] +GO +CREATE NONCLUSTERED INDEX [idx_AnnotationTypeSelections_TypeID] ON [dbo].[AnnotationTypeSelections] +( + [TypeID] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY] +GO + IF (@@Error = 0) PRINT 'Running vesp_UpdateEPFormat Succeeded' ELSE PRINT 'Running vesp_UpdateEPFormat Failed to Execute' diff --git a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj index 69f53336..1a130536 100644 --- a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj +++ b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj @@ -152,11 +152,11 @@ AboutVEPROMS.cs - + Form - DlgAnnotationsSelect.cs + dlgAnnotationsSelect.cs Form @@ -343,10 +343,10 @@ Designer AboutVEPROMS.cs - - DlgAnnotationsSelect.cs + + dlgAnnotationsSelect.cs ResXFileCodeGenerator - DlgAnnotationsSelect1.Designer.cs + dlgAnnotationsSelect2.Designer.cs dlgMSWordMessage.cs diff --git a/PROMS/VEPROMS User Interface/dlgAnnotationsSelect.Designer.cs b/PROMS/VEPROMS User Interface/dlgAnnotationsSelect.Designer.cs index b3d06b00..21924cba 100644 --- a/PROMS/VEPROMS User Interface/dlgAnnotationsSelect.Designer.cs +++ b/PROMS/VEPROMS User Interface/dlgAnnotationsSelect.Designer.cs @@ -1,7 +1,7 @@  namespace VEPROMS { - partial class DlgAnnotationsSelect + partial class dlgAnnotationsSelect { /// /// Required designer variable. @@ -38,6 +38,7 @@ namespace VEPROMS this.btnUpdate = new System.Windows.Forms.Button(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.btnCancel = new System.Windows.Forms.Button(); + this.lblMessage = new System.Windows.Forms.Label(); this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // @@ -46,11 +47,12 @@ namespace VEPROMS this.lstUnselected.Dock = System.Windows.Forms.DockStyle.Fill; this.lstUnselected.FormattingEnabled = true; this.lstUnselected.IntegralHeight = false; + this.lstUnselected.ItemHeight = 20; this.lstUnselected.Location = new System.Drawing.Point(3, 3); this.lstUnselected.Name = "lstUnselected"; this.tableLayoutPanel1.SetRowSpan(this.lstUnselected, 4); this.lstUnselected.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended; - this.lstUnselected.Size = new System.Drawing.Size(287, 394); + this.lstUnselected.Size = new System.Drawing.Size(287, 359); this.lstUnselected.TabIndex = 0; this.lstUnselected.SelectedIndexChanged += new System.EventHandler(this.lst_SelectedIndexChanged); // @@ -59,18 +61,19 @@ namespace VEPROMS this.lstSelected.Dock = System.Windows.Forms.DockStyle.Fill; this.lstSelected.FormattingEnabled = true; this.lstSelected.IntegralHeight = false; + this.lstSelected.ItemHeight = 20; this.lstSelected.Location = new System.Drawing.Point(334, 3); this.lstSelected.Name = "lstSelected"; this.tableLayoutPanel1.SetRowSpan(this.lstSelected, 4); this.lstSelected.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended; - this.lstSelected.Size = new System.Drawing.Size(288, 394); + this.lstSelected.Size = new System.Drawing.Size(288, 359); this.lstSelected.TabIndex = 1; this.lstSelected.SelectedIndexChanged += new System.EventHandler(this.lst_SelectedIndexChanged); // // btnSelect // this.btnSelect.Anchor = System.Windows.Forms.AnchorStyles.None; - this.btnSelect.Location = new System.Drawing.Point(298, 38); + this.btnSelect.Location = new System.Drawing.Point(298, 34); this.btnSelect.Name = "btnSelect"; this.btnSelect.Size = new System.Drawing.Size(28, 23); this.btnSelect.TabIndex = 2; @@ -81,7 +84,7 @@ namespace VEPROMS // btnSelectAll // this.btnSelectAll.Anchor = System.Windows.Forms.AnchorStyles.None; - this.btnSelectAll.Location = new System.Drawing.Point(298, 138); + this.btnSelectAll.Location = new System.Drawing.Point(298, 125); this.btnSelectAll.Name = "btnSelectAll"; this.btnSelectAll.Size = new System.Drawing.Size(28, 23); this.btnSelectAll.TabIndex = 3; @@ -92,7 +95,7 @@ namespace VEPROMS // btnDeselectAll // this.btnDeselectAll.Anchor = System.Windows.Forms.AnchorStyles.None; - this.btnDeselectAll.Location = new System.Drawing.Point(298, 238); + this.btnDeselectAll.Location = new System.Drawing.Point(298, 216); this.btnDeselectAll.Name = "btnDeselectAll"; this.btnDeselectAll.Size = new System.Drawing.Size(28, 23); this.btnDeselectAll.TabIndex = 5; @@ -103,7 +106,7 @@ namespace VEPROMS // btnDeselect // this.btnDeselect.Anchor = System.Windows.Forms.AnchorStyles.None; - this.btnDeselect.Location = new System.Drawing.Point(298, 338); + this.btnDeselect.Location = new System.Drawing.Point(298, 307); this.btnDeselect.Name = "btnDeselect"; this.btnDeselect.Size = new System.Drawing.Size(28, 23); this.btnDeselect.TabIndex = 4; @@ -124,9 +127,9 @@ namespace VEPROMS // // tableLayoutPanel1 // - this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.tableLayoutPanel1.ColumnCount = 3; this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 38F)); @@ -137,14 +140,14 @@ namespace VEPROMS this.tableLayoutPanel1.Controls.Add(this.btnDeselectAll, 1, 2); this.tableLayoutPanel1.Controls.Add(this.btnSelect, 1, 0); this.tableLayoutPanel1.Controls.Add(this.btnSelectAll, 1, 1); - this.tableLayoutPanel1.Location = new System.Drawing.Point(12, 12); + this.tableLayoutPanel1.Location = new System.Drawing.Point(12, 51); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 4; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(625, 400); + this.tableLayoutPanel1.Size = new System.Drawing.Size(625, 365); this.tableLayoutPanel1.TabIndex = 6; // // btnCancel @@ -157,14 +160,25 @@ namespace VEPROMS this.btnCancel.UseVisualStyleBackColor = true; this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click_1); // + // lblMessage + // + this.lblMessage.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblMessage.Location = new System.Drawing.Point(50, 18); + this.lblMessage.Name = "lblMessage"; + this.lblMessage.Size = new System.Drawing.Size(317, 28); + this.lblMessage.TabIndex = 10; + this.lblMessage.Text = "Updates will appear when PROMS is restarted."; + // // DlgAnnotationsSelect // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(653, 466); this.Controls.Add(this.btnCancel); this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.btnUpdate); + this.Controls.Add(this.lblMessage); + this.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.Name = "DlgAnnotationsSelect"; this.Text = "Select Annotation Types"; @@ -185,6 +199,7 @@ namespace VEPROMS private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; private System.Windows.Forms.Button btnCancel; + private System.Windows.Forms.Label lblMessage; } } \ No newline at end of file diff --git a/PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs b/PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs index bbb2e6cc..aa101551 100644 --- a/PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs @@ -1306,7 +1306,7 @@ namespace VEPROMS this.cbShwAnnoFilter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.cbShwAnnoFilter.TabIndex = 0; this.cbShwAnnoFilter.Text = "Select"; - this.cbShwAnnoFilter.Click += new System.EventHandler(this.buttonX1_Click); + this.cbShwAnnoFilter.Click += new System.EventHandler(this.cbShwAnnoFilter_Click); // // frmSysOptions // @@ -1404,7 +1404,6 @@ namespace VEPROMS private DevComponents.DotNetBar.Controls.CheckBoxX cbOTRemember; private DevComponents.DotNetBar.Controls.CheckBoxX cbOTAutoOpen; private DevComponents.DotNetBar.Controls.CheckBoxX cbShwRplWrdsColor; - //private DevComponents.DotNetBar.ButtonItem cbShwAnnoFilter; private DevComponents.DotNetBar.Controls.GroupPanel gpMSWordSum; private DevComponents.DotNetBar.Controls.CheckBoxX cbMSWordPrompt; private DevComponents.DotNetBar.ButtonX cbShwAnnoFilter; diff --git a/PROMS/VEPROMS User Interface/frmSysOptions.cs b/PROMS/VEPROMS User Interface/frmSysOptions.cs index c3364284..19de065e 100644 --- a/PROMS/VEPROMS User Interface/frmSysOptions.cs +++ b/PROMS/VEPROMS User Interface/frmSysOptions.cs @@ -365,24 +365,11 @@ namespace VEPROMS Properties.Settings.Default.cbShwRplWrdsColor = cbShwRplWrdsColor.Checked; // update setting value Properties.Settings.Default.Save(); // save settings } + private void cbShwAnnoFilter_Click(object sender, EventArgs e) - { - - //OnSelectAnnotations(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0)); - - //Settings.Default.cbShwAnnoFilter = cbShwAnnoFilter.Checked; - //VlnSettings.cbShwAnnoFilter = cbShwAnnoFilter.Checked; - //Properties.Settings.Default.cbShwAnnoFilter = cbShwAnnoFilter.Checked; // update setting value - //Properties.Settings.Default.Save(); // save settings - } - - private void buttonX1_Click(object sender, EventArgs e) { frmVEPROMS.tv_SelectAnnotations(); } - //private void OnSelectAnnotations(object sender, vlnTreeEventArgs args) - //{ - // if (SelectAnnotations != null) SelectAnnotations(sender, args); - //} + } } \ No newline at end of file diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 206f99d1..0ac6013a 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -543,7 +543,6 @@ namespace VEPROMS tv.RefreshCheckedOutProcedures += new vlnTreeViewEvent(tv_RefreshCheckedOutProcedures); tv.ProcedureCheckedOutTo += new vlnTreeViewEvent(tv_ProcedureCheckedOutTo); tv.ViewPDF += new vlnTreeViewPdfEvent(tv_ViewPDF); - //tv.SelectAnnotations += new (tv_SelectAnnotations); displayApplicability.ApplicabilityViewModeChanged += new DisplayApplicability.DisplayApplicabilityEvent(displayApplicability_ApplicabilityViewModeChanged); tv.ExportImportProcedureSets += new vlnTreeViewEvent(tv_ExportImportProcedureSets); @@ -1298,7 +1297,7 @@ namespace VEPROMS } public static void tv_SelectAnnotations() { - DlgAnnotationsSelect sannoDlg = new DlgAnnotationsSelect(VlnSettings.UserID); + dlgAnnotationsSelect sannoDlg = new dlgAnnotationsSelect(VlnSettings.UserID); sannoDlg.ShowDialog(); // RHM 20120925 - Center dialog over PROMS window } void tv_CreateTimeCriticalActionSummary(object sender, vlnTreeEventArgs args) diff --git a/PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSections.cs b/PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSections.cs index d1186cea..9caba8a6 100644 --- a/PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSections.cs +++ b/PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSections.cs @@ -169,188 +169,7 @@ namespace VEPROMS.CSLA.Library } } } - } - - - private int _TypeID; - [System.ComponentModel.DataObjectField(true, true)] - public int TypeID - { - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)] - get - { - return _TypeID; - } - } - private int _ItemID; - [System.ComponentModel.DataObjectField(true, true)] - public int ItemID - { - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)] - get - { - return _ItemID; - } - } - private string _Name = string.Empty; - public string Name - { - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)] - get - { - return _Name; - } - } - private string _Config = string.Empty; - public string Config - { - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)] - get - { - return _Config; - } - } - private DateTime _DTS = new DateTime(); - public DateTime DTS - { - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)] - get - { - return _DTS; - } - } - private string _UserID = string.Empty; - public string UserID - { - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)] - get - { - return _UserID; - } - } - private int _AnnotationTypeAnnotationCount = 0; - public int AnnotationTypeAnnotationCount - { - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)] - get - { - return _AnnotationTypeAnnotationCount; - } - } - //C2025-023 - Electronic Procedures - Modifications to PROMS - // Is Annotation Type an EP Annotation? - private bool _IsEPAnnotationType = false; - public bool IsEPAnnotationType - { - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)] - get - { - return _IsEPAnnotationType; - } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)] - set - { - if (_IsEPAnnotationType != value) - { - _IsEPAnnotationType = value; - //PropertyHasChanged(); - } - } - } - - #region Log4Net - private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); - #endregion - private string _ErrorMessage = string.Empty; - public string ErrorMessage - { - get { return _ErrorMessage; } - } - [Serializable()] - protected class retrieveAnnotSelections - { - private int _itemID; - public int itemID { get { return _itemID; } } - - public retrieveAnnotSelections(int itemID) - { - _itemID = itemID; - } - } - [Serializable()] - public class retrieveAnnotSelectionsList - { - private int _TypeID; - public int TypeID - { - get { return _TypeID; } - set { _TypeID = value; } - } - private int _ItemID; - public int ItemID - { - get { return _ItemID; } - set { _ItemID = value; } - } - private string _Name; - public string Name - { - get { return _Name; } - set { _Name = value; } - } - private string _Config; - public string Config - { - get { return _Config; } - set { _Config = value; } - } - private DateTime _DTS; - public DateTime DTS - { - get { return _DTS; } - set { _DTS = value; } - } - private string _UserID; - public string UserID - { - get { return _UserID; } - set { _UserID = value; } - } - private bool _IsEPAnnotationType; - public bool IsEPAnnotationType - { - get { return _IsEPAnnotationType; } - set { _IsEPAnnotationType = value; } - } - private string _ErrorMessage = string.Empty; - public string ErrorMessage - { - get { return _ErrorMessage; } - } - } - - private void ReadData(SafeDataReader dr) - { - if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] retrieveAnnotSelectionsList.ReadData", GetHashCode()); - try - { - _TypeID = dr.GetInt32("TypeID"); - _ItemID = dr.GetInt32("ItemID"); - _Name = dr.GetString("Name"); - _Config = dr.GetString("Config"); - _DTS = dr.GetDateTime("DTS"); - _UserID = dr.GetString("UserID"); - _AnnotationTypeAnnotationCount = dr.GetInt32("AnnotationCount"); - if (dr.GetSchemaTable().Rows.OfType().Any(row => row["ColumnName"].ToString() == "IsEPAnnotationType")) - _IsEPAnnotationType = (bool)dr.GetValue("IsEPAnnotationType"); - } - catch (Exception ex) - { - if (_MyLog.IsErrorEnabled) _MyLog.Error("retrieveAnnotSelectionsList.ReadData", ex); - _ErrorMessage = ex.Message; - throw new DbCslaException("retrieveAnnotSelectionsList.ReadData", ex); - } - } + } } } diff --git a/PROMS/Volian.Controls.Library/AnnotationDetails.cs b/PROMS/Volian.Controls.Library/AnnotationDetails.cs index bec98914..27577b01 100644 --- a/PROMS/Volian.Controls.Library/AnnotationDetails.cs +++ b/PROMS/Volian.Controls.Library/AnnotationDetails.cs @@ -120,11 +120,6 @@ namespace Volian.Controls.Library if (CurrentItem.MyDocVersion.DocVersionAssociationCount > 0) _ROPath = CurrentItem.MyDocVersion.DocVersionAssociations[0].MyROFst.MyRODb.FolderPath; - //ProcItem = CurrentItem.MyProcedure; - // C2025-027 Annotation Type Filtering - //cbGridAnnoType.WatermarkText = "Select Annotation Type"; - //cbGridAnnoType.DataSource = VEPROMS.CSLA.Library.AnnotationstypeSelections.Get(MyUserInfo.UserID); - } public AnnotationInfo FirstExeAnnotation(ItemInfo ii) { @@ -369,9 +364,7 @@ namespace Volian.Controls.Library cbGridAnnoType.DisplayMember = "Name"; cbGridAnnoType.ValueMember = "TypeId"; - cbGridAnnoType.DataSource = AnnotationTypeInfoList.Get().Clone(); - //ProcItem = CurrentItem.MyProcedure; //C2025 - 027 Annotation Type Filtering cbGridAnnoType.WatermarkText = "Select Annotation Type"; cbGridAnnoType.DataSource = VEPROMS.CSLA.Library.AnnotationstypeSelections.Get(MyUserInfo.UserID); From 6f04d0bf07c73ea17f226c179e65bfcd2517e0d2 Mon Sep 17 00:00:00 2001 From: Paul Larsen Date: Tue, 22 Jul 2025 09:06:11 -0400 Subject: [PATCH 07/25] C2025-027-AnnotationsTypeSelect --- .../DlgAnnotationsSelect.cs | 31 ++- PROMS/VEPROMS User Interface/PROMSFixes.Sql | 180 ++++++++++++++---- .../Minimal/AnnotationstypeSections.cs | 27 ++- 3 files changed, 189 insertions(+), 49 deletions(-) diff --git a/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs b/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs index 5083cd84..cf77407b 100644 --- a/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs +++ b/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs @@ -101,14 +101,17 @@ namespace VEPROMS // dltFlg flag is used to notify SQL SP to deleted all the entries for the user before entering the annotation type selections. int dltFlg = 1; - foreach (AnnotataionItem item in lstSelected.Items.OfType()) - { - AnnotationTypeID = item.TypeID; - AnnotationNameStr = item.NameStr; + //foreach (AnnotataionItem item in lstSelected.Items.OfType()) + //{ + // AnnotationTypeID = item.TypeID; + // AnnotationNameStr = item.NameStr; + + DataTable dt2 = coverToTable(UserID); + + VEPROMS.CSLA.Library.AnnotationstypeSelections.Update2(dt2); + // dltFlg = 0; + //} - VEPROMS.CSLA.Library.AnnotationstypeSelections.Update(UserID, AnnotationTypeID, dltFlg, AnnotationNameStr); - dltFlg = 0; - } } public class AnnotataionItem { @@ -172,6 +175,20 @@ namespace VEPROMS { this.Close(); } + + private DataTable coverToTable(string userid) + { + DataTable dt = new DataTable(); + dt.Columns.Add("TypeID", typeof(Int32)); + dt.Columns.Add("NameStr", typeof(string)); + dt.Columns.Add("UserID", typeof(string)); + + foreach (AnnotataionItem item in lstSelected.Items.OfType()) + { + dt.Rows.Add(item.TypeID, item.NameStr, userid); + } + return dt; + } } } diff --git a/PROMS/VEPROMS User Interface/PROMSFixes.Sql b/PROMS/VEPROMS User Interface/PROMSFixes.Sql index 0dc8511a..60e92399 100644 --- a/PROMS/VEPROMS User Interface/PROMSFixes.Sql +++ b/PROMS/VEPROMS User Interface/PROMSFixes.Sql @@ -1,5 +1,3 @@ - - Set NoCount On; If (db_name() in('master','model','msdn','tempdb')) @@ -24076,16 +24074,72 @@ ELSE GO + + + + +-- C2025-027 Annotation Type Filtering +IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[AnnotationTypeSelections]') AND type in (N'U')) +DROP TABLE [dbo].[AnnotationTypeSelections] +GO + +/****** Object: Table [dbo].[AnnotationTypeSelections] Script Date: 7/10/2025 2:38:23 PM ******/ +SET ANSI_NULLS ON +GO + +SET QUOTED_IDENTIFIER ON +GO + +-- ============================================= +-- Author: Paul Larsen +-- Create date: 07/10/2025 +-- Description: Store user Annotation selections for annotation filter. +-- ============================================= + +CREATE TABLE [dbo].[AnnotationTypeSelections]( + [ASTypeID] [int] IDENTITY(1,1) NOT NULL, + [TypeID] [int] NULL, + [UsrID] [varchar](50) NULL, + [Name] [nvarchar](100) NULL, + [Config] [nvarchar](max) NULL, + [DTS] [datetime] NULL, + [UserID] [nvarchar](100) NULL, + [LastChanged] [timestamp] NULL, + [IsEPAnnotationType] [bit] NULL +) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] +GO + +--CREATE UNIQUE INDEX idx_AnnotationTypeSelections_Usrid +--ON AnnotationTypeSelections (TypeID, Name, UsrID); +--GO + +IF EXISTS (SELECT * FROM sys.indexes WHERE name='idx_AnnotationTypeSelections_UsrID' +AND object_id = OBJECT_ID('[dbo].[AnnotationTypeSelections]')) +begin +DROP INDEX [idx_AnnotationTypeSelections_UsrID] ON [dbo].[AnnotationTypeSelections]; +end + +CREATE NONCLUSTERED INDEX idx_AnnotationTypeSelections_UsrID + ON [dbo].[AnnotationTypeSelections] (UsrID) +INCLUDE (TypeID, Name) +GO + +--CREATE NONCLUSTERED INDEX [idx_AnnotationTypeSelections_Usrid] ON [dbo].[AnnotationTypeSelections] +--( +-- [UsrID] ASC +--)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY] +--GO +--CREATE NONCLUSTERED INDEX [idx_AnnotationTypeSelections_TypeID] ON [dbo].[AnnotationTypeSelections] +--( +-- [TypeID] ASC +--)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY] +--GO + -- C2025-027 Annotation Type Filtering IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[getAnnotationSelectListTypes]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1) DROP PROCEDURE [getAnnotationSelectListTypes]; GO -SET ANSI_NULLS ON -GO -SET QUOTED_IDENTIFIER ON -GO - -- ============================================= -- Author: Paul Larsen -- Create date: 7/10/2025 @@ -24104,13 +24158,10 @@ AS [DTS], [UserID], [LastChanged], - (SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[TypeID]= [TypeID]) [AnnotationCount] - --[IsEPAnnotationType] + (SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[TypeID]= [TypeID]) [AnnotationCount], + [IsEPAnnotationType] FROM [AnnotationTypes] --A - --JOIN AnnotationTypeSelections S ON S.TypeID = A.TypeID - WHERE TypeID NOT IN (SELECT TypeID FROM AnnotationTypeSelections WHERE UsrID = @UserID) --S.ItemID = @ItemID AND S.TypeID != A.TypeID - - RETURN + WHERE TypeID NOT IN (SELECT TypeID FROM AnnotationTypeSelections WHERE UsrID = @UserID) GO @@ -24154,7 +24205,6 @@ IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[getAnnotationsty GO SET ANSI_NULLS ON GO - SET QUOTED_IDENTIFIER ON GO @@ -24198,12 +24248,42 @@ BEGIN END END +GO -- C2025-027 Annotation Type Filtering -IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[AnnotationTypeSelections]') AND type in (N'U')) -DROP TABLE [dbo].[AnnotationTypeSelections] +--IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[TableValAnnotTypeSelections]') AND OBJECTPROPERTY(id,N'IsType') = 1) + +-- Type -- + +--IF NOT EXISTS (SELECT * FROM sys.types WHERE is_table_type = 1 AND name ='TableValAnnotTypeSelections') +-- DROP PROCEDURE [TableValAnnotTypeSelections]; +--GO + +--/****** Object: UserDefinedTableType [dbo].[TableValAnnotTypeSelections] Script Date: 7/21/2025 8:06:11 PM ******/ +--CREATE TYPE [dbo].[TableValAnnotTypeSelections] AS TABLE( +-- [TypeID] [int] NOT NULL, +-- [NameStr] [varchar](200) NULL, +-- [UserID] [varchar](50) NULL +--) +--GO + +-- C2025-027 Annotation Type Filtering +IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[UpdateAnnotationstypeSelections2]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1) + DROP PROCEDURE [UpdateAnnotationstypeSelections2]; + +-- Need to drop UpdateAnnotationstypeSelections2 SP first so script can drop and recreate the TableValAnnotTypeSelections table type + +IF EXISTS( SELECT * FROM INFORMATION_SCHEMA.DOMAINS WHERE Domain_Name = 'TableValAnnotTypeSelections' ) + DROP TYPE [dbo].[TableValAnnotTypeSelections] + +CREATE TYPE [dbo].[TableValAnnotTypeSelections] AS TABLE( + [TypeID] [int] NOT NULL, + [NameStr] [varchar](200) NULL, + [UserID] [varchar](50) NULL +) GO -/****** Object: Table [dbo].[AnnotationTypeSelections] Script Date: 7/10/2025 2:38:23 PM ******/ + +/****** Object: StoredProcedure [dbo].[UpdateAnnotationstypeSelections2] Script Date: 7/21/2025 8:51:42 PM ******/ SET ANSI_NULLS ON GO @@ -24212,33 +24292,51 @@ GO -- ============================================= -- Author: Paul Larsen --- Create date: 07/10/2025 --- Description: Store user Annotation selections for annotation filter. +-- Create date: 07/21/2025 +-- Description: Manage user choice annotation types -- ============================================= - -CREATE TABLE [dbo].[AnnotationTypeSelections]( - [ASTypeID] [int] IDENTITY(1,1) NOT NULL, - [TypeID] [int] NULL, - [UsrID] [varchar](50) NULL, - [Name] [nvarchar](100) NOT NULL, - [Config] [nvarchar](max) NULL, - [DTS] [datetime] NOT NULL, - [UserID] [nvarchar](100) NOT NULL, - [LastChanged] [timestamp] NOT NULL, - [IsEPAnnotationType] [bit] NOT NULL -) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] -GO -CREATE NONCLUSTERED INDEX [idx_AnnotationTypeSelections_Usrid] ON [dbo].[AnnotationTypeSelections] +CREATE PROC [dbo].[UpdateAnnotationstypeSelections2] ( - [UsrID] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY] -GO -CREATE NONCLUSTERED INDEX [idx_AnnotationTypeSelections_TypeID] ON [dbo].[AnnotationTypeSelections] -( - [TypeID] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY] -GO + @TempTable AS dbo.TableValAnnotTypeSelections READONLY +) +AS +BEGIN + --INSERT INTO CUSTOMER (CustomerId,CustomerName ,Isdeleted ) + --SELECT CustomerId, CustomerName, 0 AS Isdeleted FROM @TempTable + +MERGE AnnotationTypeSelections AS TARGET + USING @TempTable AS SOURCE + + /* 1. Performing the UPDATE operation */ + + /* If the P_ID is same, + check for change in P_NAME or P_PRICE */ + ON (TARGET.TypeID = SOURCE.TypeID) + WHEN MATCHED + AND TARGET.Name <> SOURCE.NameStr + + /* Update the records in TARGET */ + THEN UPDATE + SET TARGET.Name = SOURCE.NameStr, + TARGET.UsrID = SOURCE.UserID + + /* 2. Performing the INSERT operation */ + + /* When no records are matched with TARGET table + Then insert the records in the target table */ + WHEN NOT MATCHED BY TARGET + THEN INSERT (TypeID, Name, UsrID) + VALUES (SOURCE.TypeID, SOURCE.NameStr,SOURCE.UserID) + + /* 3. Performing the DELETE operation */ + + /* When no records are matched with SOURCE table + Then delete the records from the target table */ + WHEN NOT MATCHED BY SOURCE + THEN DELETE; +END +GO IF (@@Error = 0) PRINT 'Running vesp_UpdateEPFormat Succeeded' ELSE PRINT 'Running vesp_UpdateEPFormat Failed to Execute' diff --git a/PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSections.cs b/PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSections.cs index 9caba8a6..e120ccd9 100644 --- a/PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSections.cs +++ b/PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSections.cs @@ -169,7 +169,32 @@ namespace VEPROMS.CSLA.Library } } } - } + + } + public static void Update2(DataTable dt) + { + using (SqlConnection cn = Database.VEPROMS_SqlConnection) + { + using (SqlCommand cm = cn.CreateCommand()) + { + try + { + cm.CommandType = CommandType.StoredProcedure; + cm.CommandText = "UpdateAnnotationstypeSelections2"; + cm.CommandTimeout = Database.DefaultTimeout; + + //Pass table Valued parameter to Store Procedure + SqlParameter sqlParam = cm.Parameters.AddWithValue("@TempTable", dt); + sqlParam.SqlDbType = SqlDbType.Structured; + cm.ExecuteNonQuery(); + } + catch (Exception ex) + { + + } + } + } + } } } From 99445406fcb5541b182ab5f1c8c3dc015d2619db Mon Sep 17 00:00:00 2001 From: Paul Larsen Date: Fri, 25 Jul 2025 23:06:50 -0400 Subject: [PATCH 08/25] C2025-027-AnnotationsTypeSelect --- .../DlgAnnotationsSelect.cs | 24 +-- PROMS/VEPROMS User Interface/PROMSFixes.Sql | 142 ++++++------------ .../VEPROMS User Interface/VEPROMS_UI.csproj | 6 +- .../dlgAnnotationsSelect.Designer.cs | 60 +++++--- .../Minimal/AnnotationstypeSections.cs | 54 +++---- 5 files changed, 124 insertions(+), 162 deletions(-) diff --git a/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs b/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs index cf77407b..a13fa677 100644 --- a/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs +++ b/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs @@ -14,9 +14,6 @@ namespace VEPROMS // C2025-027 Annotation Type Filtering public partial class dlgAnnotationsSelect : Form { - //int AnnotationTypeID; - //string AnnotationNameStr = ""; - public dlgAnnotationsSelect() { InitializeComponent(); @@ -96,22 +93,8 @@ namespace VEPROMS // Save selected list to DB. private void btnUpdate_Click(object sender, EventArgs e) { - int AnnotationTypeID; - string AnnotationNameStr = ""; - // dltFlg flag is used to notify SQL SP to deleted all the entries for the user before entering the annotation type selections. - int dltFlg = 1; - - //foreach (AnnotataionItem item in lstSelected.Items.OfType()) - //{ - // AnnotationTypeID = item.TypeID; - // AnnotationNameStr = item.NameStr; - DataTable dt2 = coverToTable(UserID); - - VEPROMS.CSLA.Library.AnnotationstypeSelections.Update2(dt2); - // dltFlg = 0; - //} - + VEPROMS.CSLA.Library.AnnotationstypeSelections.Update(dt2); } public class AnnotataionItem { @@ -178,14 +161,17 @@ namespace VEPROMS private DataTable coverToTable(string userid) { + int RowID = 0; DataTable dt = new DataTable(); dt.Columns.Add("TypeID", typeof(Int32)); dt.Columns.Add("NameStr", typeof(string)); dt.Columns.Add("UserID", typeof(string)); + dt.Columns.Add("RowID", typeof(string)); foreach (AnnotataionItem item in lstSelected.Items.OfType()) { - dt.Rows.Add(item.TypeID, item.NameStr, userid); + ++RowID; + dt.Rows.Add(item.TypeID, item.NameStr, userid, RowID); } return dt; } diff --git a/PROMS/VEPROMS User Interface/PROMSFixes.Sql b/PROMS/VEPROMS User Interface/PROMSFixes.Sql index 60e92399..f5ded9fc 100644 --- a/PROMS/VEPROMS User Interface/PROMSFixes.Sql +++ b/PROMS/VEPROMS User Interface/PROMSFixes.Sql @@ -24104,15 +24104,10 @@ CREATE TABLE [dbo].[AnnotationTypeSelections]( [Config] [nvarchar](max) NULL, [DTS] [datetime] NULL, [UserID] [nvarchar](100) NULL, - [LastChanged] [timestamp] NULL, - [IsEPAnnotationType] [bit] NULL + [LastChanged] [timestamp] NULL ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] GO ---CREATE UNIQUE INDEX idx_AnnotationTypeSelections_Usrid ---ON AnnotationTypeSelections (TypeID, Name, UsrID); ---GO - IF EXISTS (SELECT * FROM sys.indexes WHERE name='idx_AnnotationTypeSelections_UsrID' AND object_id = OBJECT_ID('[dbo].[AnnotationTypeSelections]')) begin @@ -24124,17 +24119,6 @@ CREATE NONCLUSTERED INDEX idx_AnnotationTypeSelections_UsrID INCLUDE (TypeID, Name) GO ---CREATE NONCLUSTERED INDEX [idx_AnnotationTypeSelections_Usrid] ON [dbo].[AnnotationTypeSelections] ---( --- [UsrID] ASC ---)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY] ---GO ---CREATE NONCLUSTERED INDEX [idx_AnnotationTypeSelections_TypeID] ON [dbo].[AnnotationTypeSelections] ---( --- [TypeID] ASC ---)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY] ---GO - -- C2025-027 Annotation Type Filtering IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[getAnnotationSelectListTypes]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1) DROP PROCEDURE [getAnnotationSelectListTypes]; @@ -24161,8 +24145,7 @@ AS (SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[TypeID]= [TypeID]) [AnnotationCount], [IsEPAnnotationType] FROM [AnnotationTypes] --A - WHERE TypeID NOT IN (SELECT TypeID FROM AnnotationTypeSelections WHERE UsrID = @UserID) - + WHERE TypeID NOT IN (SELECT TypeID FROM AnnotationTypeSelections WHERE UsrID = @UserID) GO -- C2025-027 Annotation Type Filtering @@ -24187,26 +24170,23 @@ CREATE PROC [dbo].[getAnnotationstypeSelections] AS BEGIN SELECT [ASTypeID] - ,[TypeID] + ,ATS.[TypeID] ,[UsrID] - ,[Name] - ,[Config] - ,[DTS] - ,[UserID] - ,[IsEPAnnotationType] - FROM [dbo].[AnnotationTypeSelections] + ,AT.[Name] + ,AT.[Config] + ,ATS.[DTS] + ,AT.[UserID] + ,AT.[IsEPAnnotationType] + FROM [dbo].[AnnotationTypeSelections] ATS + INNER JOIN AnnotationTypes AT ON AT.TypeID = ATS.TypeID WHERE UsrID = @UsrID END -GO +GO -- C2025-027 Annotation Type Filtering IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[getAnnotationstypeFiltered]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1) DROP PROCEDURE [getAnnotationstypeFiltered]; GO -SET ANSI_NULLS ON -GO -SET QUOTED_IDENTIFIER ON -GO -- ============================================= -- Author: Paul Larsen @@ -24223,14 +24203,15 @@ BEGIN IF((SELECT count(TypeID) FROM AnnotationTypeSelections WHERE UsrID = @UsrID) > 0) BEGIN SELECT [ASTypeID] - ,[TypeID] + ,ATS.[TypeID] ,[UsrID] - ,[Name] - ,[Config] - ,[DTS] - ,[UserID] - ,[IsEPAnnotationType] - FROM [dbo].[AnnotationTypeSelections] + ,AT.[Name] + ,AT.[Config] + ,ATS.[DTS] + ,AT.[UserID] + ,AT.[IsEPAnnotationType] + FROM [dbo].[AnnotationTypeSelections] ATS + INNER JOIN AnnotationTypes AT ON AT.TypeID = ATS.TypeID WHERE UsrID = @UsrID END ELSE @@ -24249,28 +24230,12 @@ BEGIN END GO --- C2025-027 Annotation Type Filtering ---IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[TableValAnnotTypeSelections]') AND OBJECTPROPERTY(id,N'IsType') = 1) - --- Type -- - ---IF NOT EXISTS (SELECT * FROM sys.types WHERE is_table_type = 1 AND name ='TableValAnnotTypeSelections') --- DROP PROCEDURE [TableValAnnotTypeSelections]; ---GO - ---/****** Object: UserDefinedTableType [dbo].[TableValAnnotTypeSelections] Script Date: 7/21/2025 8:06:11 PM ******/ ---CREATE TYPE [dbo].[TableValAnnotTypeSelections] AS TABLE( --- [TypeID] [int] NOT NULL, --- [NameStr] [varchar](200) NULL, --- [UserID] [varchar](50) NULL ---) ---GO -- C2025-027 Annotation Type Filtering -IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[UpdateAnnotationstypeSelections2]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1) - DROP PROCEDURE [UpdateAnnotationstypeSelections2]; +IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[UpdateAnnotationstypeSelections]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1) + DROP PROCEDURE [UpdateAnnotationstypeSelections]; --- Need to drop UpdateAnnotationstypeSelections2 SP first so script can drop and recreate the TableValAnnotTypeSelections table type +-- Need to drop UpdateAnnotationstypeSelections SP first so script can drop and recreate the TableValAnnotTypeSelections table type IF EXISTS( SELECT * FROM INFORMATION_SCHEMA.DOMAINS WHERE Domain_Name = 'TableValAnnotTypeSelections' ) DROP TYPE [dbo].[TableValAnnotTypeSelections] @@ -24278,63 +24243,46 @@ IF EXISTS( SELECT * FROM INFORMATION_SCHEMA.DOMAINS WHERE Domain_Name = 'TableVa CREATE TYPE [dbo].[TableValAnnotTypeSelections] AS TABLE( [TypeID] [int] NOT NULL, [NameStr] [varchar](200) NULL, - [UserID] [varchar](50) NULL + [UserID] [varchar](50) NULL, + [RowID] [int] NOT NULL, + PRIMARY KEY CLUSTERED +( + [RowID] ASC +)WITH (IGNORE_DUP_KEY = OFF) ) GO - -/****** Object: StoredProcedure [dbo].[UpdateAnnotationstypeSelections2] Script Date: 7/21/2025 8:51:42 PM ******/ -SET ANSI_NULLS ON -GO - -SET QUOTED_IDENTIFIER ON -GO +/****** Object: StoredProcedure [dbo].[UpdateAnnotationstypeSelections] Script Date: 7/21/2025 8:51:42 PM ******/ -- ============================================= -- Author: Paul Larsen -- Create date: 07/21/2025 -- Description: Manage user choice annotation types -- ============================================= -CREATE PROC [dbo].[UpdateAnnotationstypeSelections2] +CREATE PROC [dbo].[UpdateAnnotationstypeSelections] ( @TempTable AS dbo.TableValAnnotTypeSelections READONLY ) AS BEGIN - --INSERT INTO CUSTOMER (CustomerId,CustomerName ,Isdeleted ) - --SELECT CustomerId, CustomerName, 0 AS Isdeleted FROM @TempTable + DECLARE @cnt integer = 0 + DECLARE @cnt2 integer = 0 + SET @cnt = (SELECT count(*) from @TempTable) + DECLARE @UserID VARCHAR(50) = (SELECT TOP 1 UserID FROM @TempTable) + DELETE FROM AnnotationTypeSelections WHERE usrID = @UserID; -MERGE AnnotationTypeSelections AS TARGET - USING @TempTable AS SOURCE + declare @i int + select @i = min(RowID) from @TempTable + declare @max int + select @max = max(RowID) from @TempTable - /* 1. Performing the UPDATE operation */ - - /* If the P_ID is same, - check for change in P_NAME or P_PRICE */ - ON (TARGET.TypeID = SOURCE.TypeID) - WHEN MATCHED - AND TARGET.Name <> SOURCE.NameStr - - /* Update the records in TARGET */ - THEN UPDATE - SET TARGET.Name = SOURCE.NameStr, - TARGET.UsrID = SOURCE.UserID - - /* 2. Performing the INSERT operation */ - - /* When no records are matched with TARGET table - Then insert the records in the target table */ - WHEN NOT MATCHED BY TARGET - THEN INSERT (TypeID, Name, UsrID) - VALUES (SOURCE.TypeID, SOURCE.NameStr,SOURCE.UserID) - - /* 3. Performing the DELETE operation */ - - /* When no records are matched with SOURCE table - Then delete the records from the target table */ - WHEN NOT MATCHED BY SOURCE - THEN DELETE; + WHILE @i <= @max + BEGIN + INSERT INTO AnnotationTypeSelections (TypeID, Name, Usrid) + select TypeID, NameStr, UserID from @TempTable where RowID = @i + set @i = @i + 1 + END END GO diff --git a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj index 1a130536..34aae1a6 100644 --- a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj +++ b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj @@ -158,6 +158,11 @@ dlgAnnotationsSelect.cs + + True + True + dlgAnnotationsSelect.resx + Form @@ -346,7 +351,6 @@ dlgAnnotationsSelect.cs ResXFileCodeGenerator - dlgAnnotationsSelect2.Designer.cs dlgMSWordMessage.cs diff --git a/PROMS/VEPROMS User Interface/dlgAnnotationsSelect.Designer.cs b/PROMS/VEPROMS User Interface/dlgAnnotationsSelect.Designer.cs index 21924cba..9e6eb162 100644 --- a/PROMS/VEPROMS User Interface/dlgAnnotationsSelect.Designer.cs +++ b/PROMS/VEPROMS User Interface/dlgAnnotationsSelect.Designer.cs @@ -39,6 +39,8 @@ namespace VEPROMS this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.btnCancel = new System.Windows.Forms.Button(); this.lblMessage = new System.Windows.Forms.Label(); + this.lblAvailableTypes = new System.Windows.Forms.Label(); + this.lblSelected = new System.Windows.Forms.Label(); this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // @@ -47,12 +49,12 @@ namespace VEPROMS this.lstUnselected.Dock = System.Windows.Forms.DockStyle.Fill; this.lstUnselected.FormattingEnabled = true; this.lstUnselected.IntegralHeight = false; - this.lstUnselected.ItemHeight = 20; + this.lstUnselected.ItemHeight = 16; this.lstUnselected.Location = new System.Drawing.Point(3, 3); this.lstUnselected.Name = "lstUnselected"; this.tableLayoutPanel1.SetRowSpan(this.lstUnselected, 4); this.lstUnselected.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended; - this.lstUnselected.Size = new System.Drawing.Size(287, 359); + this.lstUnselected.Size = new System.Drawing.Size(287, 347); this.lstUnselected.TabIndex = 0; this.lstUnselected.SelectedIndexChanged += new System.EventHandler(this.lst_SelectedIndexChanged); // @@ -61,19 +63,19 @@ namespace VEPROMS this.lstSelected.Dock = System.Windows.Forms.DockStyle.Fill; this.lstSelected.FormattingEnabled = true; this.lstSelected.IntegralHeight = false; - this.lstSelected.ItemHeight = 20; + this.lstSelected.ItemHeight = 16; this.lstSelected.Location = new System.Drawing.Point(334, 3); this.lstSelected.Name = "lstSelected"; this.tableLayoutPanel1.SetRowSpan(this.lstSelected, 4); this.lstSelected.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended; - this.lstSelected.Size = new System.Drawing.Size(288, 359); + this.lstSelected.Size = new System.Drawing.Size(288, 347); this.lstSelected.TabIndex = 1; this.lstSelected.SelectedIndexChanged += new System.EventHandler(this.lst_SelectedIndexChanged); // // btnSelect // this.btnSelect.Anchor = System.Windows.Forms.AnchorStyles.None; - this.btnSelect.Location = new System.Drawing.Point(298, 34); + this.btnSelect.Location = new System.Drawing.Point(298, 32); this.btnSelect.Name = "btnSelect"; this.btnSelect.Size = new System.Drawing.Size(28, 23); this.btnSelect.TabIndex = 2; @@ -84,9 +86,9 @@ namespace VEPROMS // btnSelectAll // this.btnSelectAll.Anchor = System.Windows.Forms.AnchorStyles.None; - this.btnSelectAll.Location = new System.Drawing.Point(298, 125); + this.btnSelectAll.Location = new System.Drawing.Point(296, 120); this.btnSelectAll.Name = "btnSelectAll"; - this.btnSelectAll.Size = new System.Drawing.Size(28, 23); + this.btnSelectAll.Size = new System.Drawing.Size(32, 23); this.btnSelectAll.TabIndex = 3; this.btnSelectAll.Text = ">>"; this.btnSelectAll.UseVisualStyleBackColor = true; @@ -95,9 +97,9 @@ namespace VEPROMS // btnDeselectAll // this.btnDeselectAll.Anchor = System.Windows.Forms.AnchorStyles.None; - this.btnDeselectAll.Location = new System.Drawing.Point(298, 216); + this.btnDeselectAll.Location = new System.Drawing.Point(297, 207); this.btnDeselectAll.Name = "btnDeselectAll"; - this.btnDeselectAll.Size = new System.Drawing.Size(28, 23); + this.btnDeselectAll.Size = new System.Drawing.Size(30, 26); this.btnDeselectAll.TabIndex = 5; this.btnDeselectAll.Text = "<<"; this.btnDeselectAll.UseVisualStyleBackColor = true; @@ -106,7 +108,7 @@ namespace VEPROMS // btnDeselect // this.btnDeselect.Anchor = System.Windows.Forms.AnchorStyles.None; - this.btnDeselect.Location = new System.Drawing.Point(298, 307); + this.btnDeselect.Location = new System.Drawing.Point(298, 297); this.btnDeselect.Name = "btnDeselect"; this.btnDeselect.Size = new System.Drawing.Size(28, 23); this.btnDeselect.TabIndex = 4; @@ -140,14 +142,14 @@ namespace VEPROMS this.tableLayoutPanel1.Controls.Add(this.btnDeselectAll, 1, 2); this.tableLayoutPanel1.Controls.Add(this.btnSelect, 1, 0); this.tableLayoutPanel1.Controls.Add(this.btnSelectAll, 1, 1); - this.tableLayoutPanel1.Location = new System.Drawing.Point(12, 51); + this.tableLayoutPanel1.Location = new System.Drawing.Point(12, 62); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 4; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(625, 365); + this.tableLayoutPanel1.Size = new System.Drawing.Size(625, 353); this.tableLayoutPanel1.TabIndex = 6; // // btnCancel @@ -163,28 +165,49 @@ namespace VEPROMS // lblMessage // this.lblMessage.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblMessage.Location = new System.Drawing.Point(50, 18); + this.lblMessage.Location = new System.Drawing.Point(43, 12); this.lblMessage.Name = "lblMessage"; - this.lblMessage.Size = new System.Drawing.Size(317, 28); + this.lblMessage.Size = new System.Drawing.Size(317, 16); this.lblMessage.TabIndex = 10; this.lblMessage.Text = "Updates will appear when PROMS is restarted."; // - // DlgAnnotationsSelect + // lblAvailableTypes // - this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); + this.lblAvailableTypes.AutoSize = true; + this.lblAvailableTypes.Location = new System.Drawing.Point(12, 43); + this.lblAvailableTypes.Name = "lblAvailableTypes"; + this.lblAvailableTypes.Size = new System.Drawing.Size(110, 16); + this.lblAvailableTypes.TabIndex = 11; + this.lblAvailableTypes.Text = "Types Available "; + // + // lblSelected + // + this.lblSelected.AutoSize = true; + this.lblSelected.Location = new System.Drawing.Point(343, 43); + this.lblSelected.Name = "lblSelected"; + this.lblSelected.Size = new System.Drawing.Size(104, 16); + this.lblSelected.TabIndex = 12; + this.lblSelected.Text = "Types Selected"; + // + // dlgAnnotationsSelect + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(653, 466); + this.Controls.Add(this.lblSelected); + this.Controls.Add(this.lblAvailableTypes); this.Controls.Add(this.btnCancel); this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.btnUpdate); this.Controls.Add(this.lblMessage); this.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; - this.Name = "DlgAnnotationsSelect"; + this.Name = "dlgAnnotationsSelect"; this.Text = "Select Annotation Types"; this.Load += new System.EventHandler(this.DlgAnnotationsSelect_Load); this.tableLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); + this.PerformLayout(); } @@ -200,6 +223,7 @@ namespace VEPROMS private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; private System.Windows.Forms.Button btnCancel; private System.Windows.Forms.Label lblMessage; - + private System.Windows.Forms.Label lblAvailableTypes; + private System.Windows.Forms.Label lblSelected; } } \ No newline at end of file diff --git a/PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSections.cs b/PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSections.cs index e120ccd9..338c6276 100644 --- a/PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSections.cs +++ b/PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSections.cs @@ -145,7 +145,33 @@ namespace VEPROMS.CSLA.Library } } } - public static void Update(string UserID, int TypeID, int dltFlg, string Name = "") + //public static void Update(string UserID, int TypeID, int dltFlg, string Name = "") + //{ + // using (SqlConnection cn = Database.VEPROMS_SqlConnection) + // { + // using (SqlCommand cm = cn.CreateCommand()) + // { + // try + // { + // cm.CommandType = CommandType.StoredProcedure; + // cm.CommandText = "UpdateAnnotationstypeSelections"; + // cm.CommandTimeout = Database.DefaultTimeout; + // cm.Parameters.AddWithValue("@UserID", UserID); + // cm.Parameters.AddWithValue("@TypeID", TypeID); + // cm.Parameters.AddWithValue("@dltFlg", dltFlg); + // cm.Parameters.AddWithValue("@Name", Name); + + // cm.ExecuteNonQuery(); + // } + // catch (Exception ex) + // { + + // } + // } + // } + + //} + public static void Update(DataTable dt) { using (SqlConnection cn = Database.VEPROMS_SqlConnection) { @@ -156,32 +182,6 @@ namespace VEPROMS.CSLA.Library cm.CommandType = CommandType.StoredProcedure; cm.CommandText = "UpdateAnnotationstypeSelections"; cm.CommandTimeout = Database.DefaultTimeout; - cm.Parameters.AddWithValue("@UserID", UserID); - cm.Parameters.AddWithValue("@TypeID", TypeID); - cm.Parameters.AddWithValue("@dltFlg", dltFlg); - cm.Parameters.AddWithValue("@Name", Name); - - cm.ExecuteNonQuery(); - } - catch (Exception ex) - { - - } - } - } - - } - public static void Update2(DataTable dt) - { - using (SqlConnection cn = Database.VEPROMS_SqlConnection) - { - using (SqlCommand cm = cn.CreateCommand()) - { - try - { - cm.CommandType = CommandType.StoredProcedure; - cm.CommandText = "UpdateAnnotationstypeSelections2"; - cm.CommandTimeout = Database.DefaultTimeout; //Pass table Valued parameter to Store Procedure SqlParameter sqlParam = cm.Parameters.AddWithValue("@TempTable", dt); From 4def73d7384ac2d52175ee5229e8a340b4bdd909 Mon Sep 17 00:00:00 2001 From: John Jenko Date: Mon, 28 Jul 2025 16:06:55 -0400 Subject: [PATCH 09/25] B2025-039 Needed to include the Blue color to the RTF color table for formats that use a proportional font. --- PROMS/Volian.Controls.Library/StepRTB.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PROMS/Volian.Controls.Library/StepRTB.cs b/PROMS/Volian.Controls.Library/StepRTB.cs index d922791f..dcd59514 100644 --- a/PROMS/Volian.Controls.Library/StepRTB.cs +++ b/PROMS/Volian.Controls.Library/StepRTB.cs @@ -1284,7 +1284,7 @@ namespace Volian.Controls.Library } selectedRtfSB.Append(@"{\rtf1\ansi\ansicpg1252\deff0\deflang1033{\fonttbl{\f0\fnil\fcharset2 " + myFont.FontFamily.Name + @";}"); //}\f0\fs" + this.Font.SizeInPoints * 2 + @" " + myDisplayTextElement.Text + @"}}"; if (!isFixed) - selectedRtfSB.Append(@"{\f1\fnil\fcharset0 " + Volian.Base.Library.vlnFont.ProportionalSymbolFont + @";}}{\colortbl ;\red255\green0\blue0;}"); // C2017-036 get best available proportional font for symbols + selectedRtfSB.Append(@"{\f1\fnil\fcharset0 " + Volian.Base.Library.vlnFont.ProportionalSymbolFont + @";}}{\colortbl ;\red255\green0\blue0;\red0\green0\blue255;}"); // C2017-036 get best available proportional font for symbols - B2025-039 add Blue for Colored Replace Words else selectedRtfSB.Append(@"{\f1\fnil\fcharset0 FreeMono;}}{\colortbl ;\red255\green0\blue0;\red0\green0\blue255;}"); // FreeMono is now used for the edit screen only. VESymbFix and Consolas are used for printing selectedRtfSB.Append("\r\n"); From d3888e3c3266a03daed20a7032a04faa37cdf698 Mon Sep 17 00:00:00 2001 From: Paul Larsen Date: Tue, 29 Jul 2025 09:20:58 -0400 Subject: [PATCH 10/25] C2025-027-AnnotationsTypeSelect --- .../DlgAnnotationsSelect.cs | 22 ++-- PROMS/VEPROMS User Interface/PROMSFixes.Sql | 103 +++++++++--------- .../Minimal/AnnotationstypeSections.cs | 51 ++------- 3 files changed, 69 insertions(+), 107 deletions(-) diff --git a/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs b/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs index a13fa677..1786e97c 100644 --- a/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs +++ b/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs @@ -93,8 +93,8 @@ namespace VEPROMS // Save selected list to DB. private void btnUpdate_Click(object sender, EventArgs e) { - DataTable dt2 = coverToTable(UserID); - VEPROMS.CSLA.Library.AnnotationstypeSelections.Update(dt2); + DataTable dt2 = coverToTable(); + VEPROMS.CSLA.Library.AnnotationstypeSelections.Update(dt2, UserID); } public class AnnotataionItem { @@ -145,12 +145,10 @@ namespace VEPROMS lstSelected.DisplayMember = "NameStr"; lstSelected.ValueMember = "TypeID"; DataTable lstSelectedTbl = VEPROMS.CSLA.Library.AnnotationstypeSelections.Retrieve(UserID); - if (lstSelectedTbl.Rows.Count > 0) + + foreach (DataRow lstSelectedRow in lstSelectedTbl.Rows) { - foreach (DataRow lstSelectedRow in lstSelectedTbl.Rows) - { - lstSelected.Items.Add(new AnnotataionItem(lstSelectedRow["Name"].ToString(), (int)lstSelectedRow["TypeID"])); - } + lstSelected.Items.Add(new AnnotataionItem(lstSelectedRow["Name"].ToString(), (int)lstSelectedRow["TypeID"])); } } @@ -159,19 +157,15 @@ namespace VEPROMS this.Close(); } - private DataTable coverToTable(string userid) + private DataTable coverToTable() { - int RowID = 0; DataTable dt = new DataTable(); dt.Columns.Add("TypeID", typeof(Int32)); - dt.Columns.Add("NameStr", typeof(string)); - dt.Columns.Add("UserID", typeof(string)); - dt.Columns.Add("RowID", typeof(string)); + foreach (AnnotataionItem item in lstSelected.Items.OfType()) { - ++RowID; - dt.Rows.Add(item.TypeID, item.NameStr, userid, RowID); + dt.Rows.Add(item.TypeID); } return dt; } diff --git a/PROMS/VEPROMS User Interface/PROMSFixes.Sql b/PROMS/VEPROMS User Interface/PROMSFixes.Sql index f5ded9fc..d16b68c8 100644 --- a/PROMS/VEPROMS User Interface/PROMSFixes.Sql +++ b/PROMS/VEPROMS User Interface/PROMSFixes.Sql @@ -24074,10 +24074,6 @@ ELSE GO - - - - -- C2025-027 Annotation Type Filtering IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[AnnotationTypeSelections]') AND type in (N'U')) DROP TABLE [dbo].[AnnotationTypeSelections] @@ -24095,28 +24091,36 @@ GO -- Create date: 07/10/2025 -- Description: Store user Annotation selections for annotation filter. -- ============================================= +IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[AnnotationTypeSelections]') AND type in (N'U')) +BEGIN -CREATE TABLE [dbo].[AnnotationTypeSelections]( - [ASTypeID] [int] IDENTITY(1,1) NOT NULL, - [TypeID] [int] NULL, - [UsrID] [varchar](50) NULL, - [Name] [nvarchar](100) NULL, - [Config] [nvarchar](max) NULL, - [DTS] [datetime] NULL, - [UserID] [nvarchar](100) NULL, - [LastChanged] [timestamp] NULL -) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] + CREATE TABLE [dbo].[AnnotationTypeSelections]( + [ASTypeID] [int] IDENTITY(1,1) NOT NULL, + [TypeID] [int] NULL, + [UserID] [varchar](50) NULL, + [LastChanged] [datetime] NULL, + CONSTRAINT [PK_AnnotationTypeSelections] PRIMARY KEY CLUSTERED + ([ASTypeID] ASC)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] + ) ON [PRIMARY] +END + +IF OBJECT_ID('DF_AnnotationTypeSelections_LastChanged', 'D') IS NULL + ALTER TABLE AnnotationTypeSelections ADD CONSTRAINT [DF_AnnotationTypeSelections_LastChanged] DEFAULT (getdate()) for [LastChanged]; GO -IF EXISTS (SELECT * FROM sys.indexes WHERE name='idx_AnnotationTypeSelections_UsrID' +IF EXISTS (SELECT * FROM sys.indexes WHERE name='idx_AnnotationTypeSelections_UserIDTypeID' AND object_id = OBJECT_ID('[dbo].[AnnotationTypeSelections]')) begin -DROP INDEX [idx_AnnotationTypeSelections_UsrID] ON [dbo].[AnnotationTypeSelections]; +DROP INDEX [idx_AnnotationTypeSelections_UserIDTypeID] ON [dbo].[AnnotationTypeSelections]; end -CREATE NONCLUSTERED INDEX idx_AnnotationTypeSelections_UsrID - ON [dbo].[AnnotationTypeSelections] (UsrID) -INCLUDE (TypeID, Name) +CREATE UNIQUE INDEX [idx_AnnotationTypeSelections_UserIDTypeID] ON [dbo].[AnnotationTypeSelections] +( +[UserID] ASC, +[TypeID] ASC +) +INCLUDE (ASTypeID) +WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY] GO -- C2025-027 Annotation Type Filtering @@ -24145,7 +24149,7 @@ AS (SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[TypeID]= [TypeID]) [AnnotationCount], [IsEPAnnotationType] FROM [AnnotationTypes] --A - WHERE TypeID NOT IN (SELECT TypeID FROM AnnotationTypeSelections WHERE UsrID = @UserID) + WHERE TypeID NOT IN (SELECT TypeID FROM AnnotationTypeSelections ATS WHERE ATS.UserID = @UserID) GO -- C2025-027 Annotation Type Filtering @@ -24171,18 +24175,19 @@ AS BEGIN SELECT [ASTypeID] ,ATS.[TypeID] - ,[UsrID] + ,ATS.[UserID] ,AT.[Name] ,AT.[Config] - ,ATS.[DTS] + ,ATS.[LastChanged] ,AT.[UserID] ,AT.[IsEPAnnotationType] FROM [dbo].[AnnotationTypeSelections] ATS INNER JOIN AnnotationTypes AT ON AT.TypeID = ATS.TypeID - WHERE UsrID = @UsrID + WHERE ATS.UserID = @UsrID END GO + -- C2025-027 Annotation Type Filtering IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[getAnnotationstypeFiltered]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1) DROP PROCEDURE [getAnnotationstypeFiltered]; @@ -24200,19 +24205,19 @@ CREATE PROC [dbo].[getAnnotationstypeFiltered] ) AS BEGIN - IF((SELECT count(TypeID) FROM AnnotationTypeSelections WHERE UsrID = @UsrID) > 0) + IF((SELECT count(TypeID) FROM AnnotationTypeSelections WHERE UserID = @UsrID) > 0) BEGIN SELECT [ASTypeID] ,ATS.[TypeID] - ,[UsrID] + ,ATS.[UserID] ,AT.[Name] ,AT.[Config] - ,ATS.[DTS] + ,ATS.[LastChanged] ,AT.[UserID] ,AT.[IsEPAnnotationType] FROM [dbo].[AnnotationTypeSelections] ATS INNER JOIN AnnotationTypes AT ON AT.TypeID = ATS.TypeID - WHERE UsrID = @UsrID + WHERE ATS.UserID = @UsrID END ELSE BEGIN @@ -24241,14 +24246,8 @@ IF EXISTS( SELECT * FROM INFORMATION_SCHEMA.DOMAINS WHERE Domain_Name = 'TableVa DROP TYPE [dbo].[TableValAnnotTypeSelections] CREATE TYPE [dbo].[TableValAnnotTypeSelections] AS TABLE( - [TypeID] [int] NOT NULL, - [NameStr] [varchar](200) NULL, - [UserID] [varchar](50) NULL, - [RowID] [int] NOT NULL, - PRIMARY KEY CLUSTERED -( - [RowID] ASC -)WITH (IGNORE_DUP_KEY = OFF) + [TypeID] [int] NOT NULL + ) GO @@ -24261,28 +24260,30 @@ GO -- ============================================= CREATE PROC [dbo].[UpdateAnnotationstypeSelections] ( - @TempTable AS dbo.TableValAnnotTypeSelections READONLY + @TempTable AS dbo.TableValAnnotTypeSelections READONLY, + @UserID [varchar](50) NULL ) AS BEGIN + + - DECLARE @cnt integer = 0 - DECLARE @cnt2 integer = 0 - SET @cnt = (SELECT count(*) from @TempTable) - DECLARE @UserID VARCHAR(50) = (SELECT TOP 1 UserID FROM @TempTable) - DELETE FROM AnnotationTypeSelections WHERE usrID = @UserID; + DELETE FROM AnnotationTypeSelections where UserID = @UserID + AND + TypeID not in + (Select TypeID From @TempTable tmp) - declare @i int - select @i = min(RowID) from @TempTable - declare @max int - select @max = max(RowID) from @TempTable + --this would insert all the ones that are in the uploaded table and not already in AnnotationTypeSelections + Insert INTO AnnotationTypeSelections (TypeID, UserID) + Select tmp.TypeID, @UserID + FROM + @TempTable tmp + LEFT OUTER JOIN + AnnotationTypeSelections ATS on ATS.TypeID = tmp.TypeID + AND ATS.UserID = @UserID + where + ATS.ASTypeID IS NULL - WHILE @i <= @max - BEGIN - INSERT INTO AnnotationTypeSelections (TypeID, Name, Usrid) - select TypeID, NameStr, UserID from @TempTable where RowID = @i - set @i = @i + 1 - END END GO diff --git a/PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSections.cs b/PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSections.cs index 338c6276..0ef12337 100644 --- a/PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSections.cs +++ b/PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSections.cs @@ -41,8 +41,6 @@ namespace VEPROMS.CSLA.Library // if the user has not created a annotation sub-set list saved to AnnotationTypeSelections table. if (dt.Rows.Count < 1) { - //dt.Rows.Add(DataPortal.Fetch()); - //DataPortal.Fetch(); DataRow row; int rowflg = 0; foreach (AnnotationTypeInfo annosel in DataPortal.Fetch()) @@ -145,53 +143,22 @@ namespace VEPROMS.CSLA.Library } } } - //public static void Update(string UserID, int TypeID, int dltFlg, string Name = "") - //{ - // using (SqlConnection cn = Database.VEPROMS_SqlConnection) - // { - // using (SqlCommand cm = cn.CreateCommand()) - // { - // try - // { - // cm.CommandType = CommandType.StoredProcedure; - // cm.CommandText = "UpdateAnnotationstypeSelections"; - // cm.CommandTimeout = Database.DefaultTimeout; - // cm.Parameters.AddWithValue("@UserID", UserID); - // cm.Parameters.AddWithValue("@TypeID", TypeID); - // cm.Parameters.AddWithValue("@dltFlg", dltFlg); - // cm.Parameters.AddWithValue("@Name", Name); - // cm.ExecuteNonQuery(); - // } - // catch (Exception ex) - // { - - // } - // } - // } - - //} - public static void Update(DataTable dt) + public static void Update(DataTable dt, string UserID) { using (SqlConnection cn = Database.VEPROMS_SqlConnection) { using (SqlCommand cm = cn.CreateCommand()) { - try - { - cm.CommandType = CommandType.StoredProcedure; - cm.CommandText = "UpdateAnnotationstypeSelections"; - cm.CommandTimeout = Database.DefaultTimeout; + cm.CommandType = CommandType.StoredProcedure; + cm.CommandText = "UpdateAnnotationstypeSelections"; + cm.CommandTimeout = Database.DefaultTimeout; - //Pass table Valued parameter to Store Procedure - SqlParameter sqlParam = cm.Parameters.AddWithValue("@TempTable", dt); - sqlParam.SqlDbType = SqlDbType.Structured; - cm.ExecuteNonQuery(); - } - catch (Exception ex) - { - - } + //Pass table Valued parameter to Store Procedure + SqlParameter sqlParam = cm.Parameters.AddWithValue("@TempTable", dt); + sqlParam.SqlDbType = SqlDbType.Structured; + cm.Parameters.AddWithValue("@UserID", UserID); + cm.ExecuteNonQuery(); } } } From d701935ddf17e42ad247bd848befab083ce6a18d Mon Sep 17 00:00:00 2001 From: mschill Date: Tue, 29 Jul 2025 09:21:51 -0400 Subject: [PATCH 11/25] DEV_Proj_File_Dependency_Update Visual Studio 2022 changed the default build order --- this will alow rebuild all in VS2022 --- PROMS/VEPROMS/VEPROMS.sln | 3 +++ 1 file changed, 3 insertions(+) diff --git a/PROMS/VEPROMS/VEPROMS.sln b/PROMS/VEPROMS/VEPROMS.sln index 09af4b2f..47cfa040 100644 --- a/PROMS/VEPROMS/VEPROMS.sln +++ b/PROMS/VEPROMS/VEPROMS.sln @@ -38,6 +38,9 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Baseline", "..\Baseline\Baseline.csproj", "{8B29E0DE-B6C9-4041-8817-319FDE3123C4}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RoAccessToSql", "..\RoAccessToSql\RoAccessToSql.csproj", "{1EC96BDA-01E7-4153-A95D-6A4A36FA278E}" + ProjectSection(ProjectDependencies) = postProject + {AEEE9FD1-6892-45E2-A67E-418C06D46FF9} = {AEEE9FD1-6892-45E2-A67E-418C06D46FF9} + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution From 09d3995e6c40703dfa1bd521d26899285a6ea983 Mon Sep 17 00:00:00 2001 From: mschill Date: Tue, 29 Jul 2025 15:12:51 -0400 Subject: [PATCH 12/25] C2025-044 Update PROMS Fixes to be SQL 2016 compatible --- PROMS/VEPROMS User Interface/PROMSFixes.Sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PROMS/VEPROMS User Interface/PROMSFixes.Sql b/PROMS/VEPROMS User Interface/PROMSFixes.Sql index d97734f5..6668fddf 100644 --- a/PROMS/VEPROMS User Interface/PROMSFixes.Sql +++ b/PROMS/VEPROMS User Interface/PROMSFixes.Sql @@ -24026,7 +24026,7 @@ Begin -- Rofst Tables CONSTRAINT [PK_EPFormats] PRIMARY KEY CLUSTERED ( [FormatID] ASC - )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY] + )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] IF (@@Error = 0) PRINT 'Table Creation: [EPFormats] Succeeded' From 1ebf67233bd86771b4780d0b49169a95887605b4 Mon Sep 17 00:00:00 2001 From: Paul Larsen Date: Tue, 29 Jul 2025 15:34:13 -0400 Subject: [PATCH 13/25] C2025-027-AnnotationsTypeSelect --- .../DlgAnnotationsSelect.cs | 1 + PROMS/VEPROMS User Interface/PROMSFixes.Sql | 9 ++++---- .../Minimal/AnnotationstypeSections.cs | 23 ++++++++++++------- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs b/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs index 1786e97c..3f4d87e3 100644 --- a/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs +++ b/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs @@ -95,6 +95,7 @@ namespace VEPROMS { DataTable dt2 = coverToTable(); VEPROMS.CSLA.Library.AnnotationstypeSelections.Update(dt2, UserID); + this.Close(); } public class AnnotataionItem { diff --git a/PROMS/VEPROMS User Interface/PROMSFixes.Sql b/PROMS/VEPROMS User Interface/PROMSFixes.Sql index d16b68c8..c882ef3c 100644 --- a/PROMS/VEPROMS User Interface/PROMSFixes.Sql +++ b/PROMS/VEPROMS User Interface/PROMSFixes.Sql @@ -24075,10 +24075,6 @@ ELSE GO -- C2025-027 Annotation Type Filtering -IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[AnnotationTypeSelections]') AND type in (N'U')) -DROP TABLE [dbo].[AnnotationTypeSelections] -GO - /****** Object: Table [dbo].[AnnotationTypeSelections] Script Date: 7/10/2025 2:38:23 PM ******/ SET ANSI_NULLS ON GO @@ -24149,7 +24145,10 @@ AS (SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[TypeID]= [TypeID]) [AnnotationCount], [IsEPAnnotationType] FROM [AnnotationTypes] --A - WHERE TypeID NOT IN (SELECT TypeID FROM AnnotationTypeSelections ATS WHERE ATS.UserID = @UserID) + LEFT OUTER JOIN AnnotationTypeSelections ON AnnotationTypeSelections.TypeID = AnnotationTypes.TypeID + WHERE AnnotationTypeSelections.UserID = @UserID + AND + AnnotationTypeSelections.ASTypeID IS NULL GO -- C2025-027 Annotation Type Filtering diff --git a/PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSections.cs b/PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSections.cs index 0ef12337..c3af558b 100644 --- a/PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSections.cs +++ b/PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSections.cs @@ -150,15 +150,22 @@ namespace VEPROMS.CSLA.Library { using (SqlCommand cm = cn.CreateCommand()) { - cm.CommandType = CommandType.StoredProcedure; - cm.CommandText = "UpdateAnnotationstypeSelections"; - cm.CommandTimeout = Database.DefaultTimeout; + try + { + cm.CommandType = CommandType.StoredProcedure; + cm.CommandText = "UpdateAnnotationstypeSelections"; + cm.CommandTimeout = Database.DefaultTimeout; - //Pass table Valued parameter to Store Procedure - SqlParameter sqlParam = cm.Parameters.AddWithValue("@TempTable", dt); - sqlParam.SqlDbType = SqlDbType.Structured; - cm.Parameters.AddWithValue("@UserID", UserID); - cm.ExecuteNonQuery(); + //Pass table Valued parameter to Store Procedure + SqlParameter sqlParam = cm.Parameters.AddWithValue("@TempTable", dt); + sqlParam.SqlDbType = SqlDbType.Structured; + cm.Parameters.AddWithValue("@UserID", UserID); + cm.ExecuteNonQuery(); + } + catch (Exception ex) + { + throw new DbCslaException("Error in UpdateAnnotationstypeSelections: update failed", ex); + } } } } From 655592186ba9586195acbcdfb93834bcbb35ed2d Mon Sep 17 00:00:00 2001 From: Paul Larsen Date: Tue, 29 Jul 2025 22:54:44 -0400 Subject: [PATCH 14/25] C2025-027-AnnotationsTypeSelect --- PROMS/VEPROMS User Interface/PROMSFixes.Sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PROMS/VEPROMS User Interface/PROMSFixes.Sql b/PROMS/VEPROMS User Interface/PROMSFixes.Sql index c882ef3c..41d0e283 100644 --- a/PROMS/VEPROMS User Interface/PROMSFixes.Sql +++ b/PROMS/VEPROMS User Interface/PROMSFixes.Sql @@ -24116,7 +24116,7 @@ CREATE UNIQUE INDEX [idx_AnnotationTypeSelections_UserIDTypeID] ON [dbo].[Annota [TypeID] ASC ) INCLUDE (ASTypeID) -WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY] +WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] GO -- C2025-027 Annotation Type Filtering From 449bb2522b565a1491df840dee8fcd40a857141f Mon Sep 17 00:00:00 2001 From: Paul Larsen Date: Wed, 30 Jul 2025 10:25:07 -0400 Subject: [PATCH 15/25] C2025-027-AnnotationsTypeSelect-2 --- PROMS/VEPROMS User Interface/PROMSFixes.Sql | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/PROMS/VEPROMS User Interface/PROMSFixes.Sql b/PROMS/VEPROMS User Interface/PROMSFixes.Sql index b1408657..3a210aeb 100644 --- a/PROMS/VEPROMS User Interface/PROMSFixes.Sql +++ b/PROMS/VEPROMS User Interface/PROMSFixes.Sql @@ -24136,19 +24136,19 @@ CREATE PROCEDURE [dbo].[getAnnotationSelectListTypes] WITH EXECUTE AS OWNER AS SELECT - [TypeID], - [Name], - [Config], + ATS.[TypeID], + AT.[Name], + AT.[Config], [DTS], - [UserID], - [LastChanged], + ATS.[UserID], + ATS.[LastChanged], (SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[TypeID]= [TypeID]) [AnnotationCount], [IsEPAnnotationType] - FROM [AnnotationTypes] --A - LEFT OUTER JOIN AnnotationTypeSelections ON AnnotationTypeSelections.TypeID = AnnotationTypes.TypeID - WHERE AnnotationTypeSelections.UserID = @UserID + FROM [AnnotationTypes] AT + LEFT OUTER JOIN AnnotationTypeSelections ATS ON ATS.TypeID = AT.TypeID + WHERE ATS.UserID = @UserID AND - AnnotationTypeSelections.ASTypeID IS NULL + ATS.ASTypeID IS NULL GO -- C2025-027 Annotation Type Filtering From e31e0b6680949897125f448edf5a96052c173a7e Mon Sep 17 00:00:00 2001 From: Paul Larsen Date: Wed, 30 Jul 2025 10:58:58 -0400 Subject: [PATCH 16/25] C2025-027-AnnotationsTypeSelect-2 --- PROMS/VEPROMS User Interface/PROMSFixes.Sql | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/PROMS/VEPROMS User Interface/PROMSFixes.Sql b/PROMS/VEPROMS User Interface/PROMSFixes.Sql index 3a210aeb..3ca37132 100644 --- a/PROMS/VEPROMS User Interface/PROMSFixes.Sql +++ b/PROMS/VEPROMS User Interface/PROMSFixes.Sql @@ -24136,19 +24136,16 @@ CREATE PROCEDURE [dbo].[getAnnotationSelectListTypes] WITH EXECUTE AS OWNER AS SELECT - ATS.[TypeID], - AT.[Name], - AT.[Config], + [TypeID], + [Name], + [Config], [DTS], - ATS.[UserID], - ATS.[LastChanged], + [UserID], + [LastChanged], (SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[TypeID]= [TypeID]) [AnnotationCount], [IsEPAnnotationType] - FROM [AnnotationTypes] AT - LEFT OUTER JOIN AnnotationTypeSelections ATS ON ATS.TypeID = AT.TypeID - WHERE ATS.UserID = @UserID - AND - ATS.ASTypeID IS NULL + FROM [AnnotationTypes] --A + WHERE TypeID NOT IN (SELECT TypeID FROM AnnotationTypeSelections WHERE UserID = @UserID) GO -- C2025-027 Annotation Type Filtering From 009243b0912625be6c400645db26e85d5cc01ada Mon Sep 17 00:00:00 2001 From: Paul Larsen Date: Wed, 30 Jul 2025 11:18:33 -0400 Subject: [PATCH 17/25] C2025-027-AnnotationsTypeSelect-2 --- PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs index 18e3b2bf..e2f0b575 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs @@ -721,10 +721,11 @@ namespace VEPROMS this.epAnnotations.Dock = System.Windows.Forms.DockStyle.Bottom; this.epAnnotations.Enabled = false; this.epAnnotations.Expanded = false; - this.epAnnotations.ExpandedBounds = new System.Drawing.Rectangle(4, 544, 1187, 202); + this.epAnnotations.ExpandedBounds = new System.Drawing.Rectangle(5, 371, 1185, 202); this.epAnnotations.ExpandOnTitleClick = true; - this.epAnnotations.Location = new System.Drawing.Point(5, 324); - this.epAnnotations.Size = new System.Drawing.Size(1185, 249); + this.epAnnotations.Location = new System.Drawing.Point(5, 547); + this.epAnnotations.Name = "epAnnotations"; + this.epAnnotations.Size = new System.Drawing.Size(1185, 26); this.epAnnotations.Style.Alignment = System.Drawing.StringAlignment.Center; this.epAnnotations.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.epAnnotations.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -760,11 +761,11 @@ namespace VEPROMS this.ctrlAnnotationDetails.Dock = System.Windows.Forms.DockStyle.Fill; this.ctrlAnnotationDetails.Enabled = false; this.ctrlAnnotationDetails.Location = new System.Drawing.Point(0, 26); - this.ctrlAnnotationDetails.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ctrlAnnotationDetails.Margin = new System.Windows.Forms.Padding(2); this.ctrlAnnotationDetails.MyUserInfo = null; this.ctrlAnnotationDetails.Name = "ctrlAnnotationDetails"; this.ctrlAnnotationDetails.ProcItem = null; - this.ctrlAnnotationDetails.Size = new System.Drawing.Size(1185, 223); + this.ctrlAnnotationDetails.Size = new System.Drawing.Size(1185, 0); this.ctrlAnnotationDetails.TabIndex = 15; // // btnAnnoDetailsPushPin @@ -798,7 +799,7 @@ namespace VEPROMS this.epProcedures.ExpandOnTitleClick = true; this.epProcedures.Location = new System.Drawing.Point(5, 57); this.epProcedures.Name = "epProcedures"; - this.epProcedures.Size = new System.Drawing.Size(326, 267); + this.epProcedures.Size = new System.Drawing.Size(326, 490); this.epProcedures.Style.Alignment = System.Drawing.StringAlignment.Center; this.epProcedures.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.epProcedures.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; From 25bfbeb8d6d2cc951d82f3f8636223c050710a8d Mon Sep 17 00:00:00 2001 From: Paul Larsen Date: Wed, 30 Jul 2025 23:05:11 -0400 Subject: [PATCH 18/25] C2025-027-AnnotationsTypeSelect-3 --- .../DlgAnnotationsSelect.cs | 1 - .../dlgAnnotationsSelect.Designer.cs | 4 +- .../frmSysOptions.Designer.cs | 38 +++++++++---------- PROMS/Volian.Controls.Library/vlnTreeView.cs | 23 ----------- 4 files changed, 21 insertions(+), 45 deletions(-) diff --git a/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs b/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs index 3f4d87e3..1786e97c 100644 --- a/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs +++ b/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs @@ -95,7 +95,6 @@ namespace VEPROMS { DataTable dt2 = coverToTable(); VEPROMS.CSLA.Library.AnnotationstypeSelections.Update(dt2, UserID); - this.Close(); } public class AnnotataionItem { diff --git a/PROMS/VEPROMS User Interface/dlgAnnotationsSelect.Designer.cs b/PROMS/VEPROMS User Interface/dlgAnnotationsSelect.Designer.cs index 9e6eb162..22a5f7c5 100644 --- a/PROMS/VEPROMS User Interface/dlgAnnotationsSelect.Designer.cs +++ b/PROMS/VEPROMS User Interface/dlgAnnotationsSelect.Designer.cs @@ -123,7 +123,7 @@ namespace VEPROMS this.btnUpdate.Name = "btnUpdate"; this.btnUpdate.Size = new System.Drawing.Size(100, 35); this.btnUpdate.TabIndex = 8; - this.btnUpdate.Text = "Update"; + this.btnUpdate.Text = "Save"; this.btnUpdate.UseVisualStyleBackColor = true; this.btnUpdate.Click += new System.EventHandler(this.btnUpdate_Click); // @@ -158,7 +158,7 @@ namespace VEPROMS this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(100, 35); this.btnCancel.TabIndex = 9; - this.btnCancel.Text = "Close"; + this.btnCancel.Text = "Cancel"; this.btnCancel.UseVisualStyleBackColor = true; this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click_1); // diff --git a/PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs b/PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs index aa101551..51e952ec 100644 --- a/PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs @@ -30,7 +30,7 @@ namespace VEPROMS { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmSysOptions)); - this.btnCancel = new DevComponents.DotNetBar.ButtonX(); + //this.btnCancel = new DevComponents.DotNetBar.ButtonX(); this.btnOK = new DevComponents.DotNetBar.ButtonX(); this.gpSystemColor = new DevComponents.DotNetBar.Controls.GroupPanel(); this.cbRibonBlack = new DevComponents.DotNetBar.Controls.CheckBoxX(); @@ -103,23 +103,23 @@ namespace VEPROMS this.gpTransRangeColor.SuspendLayout(); this.gpPropPageStyle.SuspendLayout(); this.SuspendLayout(); - // - // btnCancel - // - this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.Location = new System.Drawing.Point(616, 591); - this.btnCancel.Margin = new System.Windows.Forms.Padding(2); - this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(56, 19); - this.btnCancel.TabIndex = 0; - this.btnCancel.Text = "Cancel"; - this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); + //// + //// btnCancel + //// + //this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + //this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + //this.btnCancel.Location = new System.Drawing.Point(616, 591); + //this.btnCancel.Margin = new System.Windows.Forms.Padding(2); + //this.btnCancel.Name = "btnCancel"; + //this.btnCancel.Size = new System.Drawing.Size(56, 19); + //this.btnCancel.TabIndex = 0; + //this.btnCancel.Text = "Cancel"; + //this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); // // btnOK // this.btnOK.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnOK.Location = new System.Drawing.Point(542, 591); + this.btnOK.Location = new System.Drawing.Point(616, 591); this.btnOK.Margin = new System.Windows.Forms.Padding(2); this.btnOK.Name = "btnOK"; this.btnOK.Size = new System.Drawing.Size(56, 19); @@ -562,7 +562,7 @@ namespace VEPROMS // this.gpAnnoTypeFilter.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.gpAnnoTypeFilter.TabIndex = 13; - this.gpAnnoTypeFilter.Text = "Select Annotation Types"; + this.gpAnnoTypeFilter.Text = "Filter Annotation Types"; // // gpVisioPath // @@ -1305,7 +1305,7 @@ namespace VEPROMS this.cbShwAnnoFilter.Size = new System.Drawing.Size(91, 23); this.cbShwAnnoFilter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.cbShwAnnoFilter.TabIndex = 0; - this.cbShwAnnoFilter.Text = "Select"; + this.cbShwAnnoFilter.Text = "Open"; this.cbShwAnnoFilter.Click += new System.EventHandler(this.cbShwAnnoFilter_Click); // // frmSysOptions @@ -1313,14 +1313,14 @@ namespace VEPROMS this.AcceptButton = this.btnOK; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.CancelButton = this.btnCancel; + //this.CancelButton = this.btnCancel; this.ClientSize = new System.Drawing.Size(699, 620); this.ControlBox = false; this.Controls.Add(this.btnReset); this.Controls.Add(this.tcSysOpts); this.Controls.Add(this.panButtons); this.Controls.Add(this.btnOK); - this.Controls.Add(this.btnCancel); + //this.Controls.Add(this.btnCancel); this.DoubleBuffered = true; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Margin = new System.Windows.Forms.Padding(2); @@ -1352,7 +1352,7 @@ namespace VEPROMS #endregion - private DevComponents.DotNetBar.ButtonX btnCancel; + //private DevComponents.DotNetBar.ButtonX btnCancel; private DevComponents.DotNetBar.ButtonX btnOK; private DevComponents.DotNetBar.Controls.GroupPanel gpSystemColor; private DevComponents.DotNetBar.Controls.CheckBoxX cbRibonBlack; diff --git a/PROMS/Volian.Controls.Library/vlnTreeView.cs b/PROMS/Volian.Controls.Library/vlnTreeView.cs index 212fafdf..82dc5a98 100644 --- a/PROMS/Volian.Controls.Library/vlnTreeView.cs +++ b/PROMS/Volian.Controls.Library/vlnTreeView.cs @@ -573,12 +573,6 @@ namespace Volian.Controls.Library { if (ProcedureCheckedOutTo != null) ProcedureCheckedOutTo(sender, args); } - // C2025-027 - public event vlnTreeViewEvent SelectAnnotations; - private void OnSelectAnnotations(object sender, vlnTreeEventArgs args) - { - if (SelectAnnotations != null) SelectAnnotations(sender, args); - } public event vlnTreeViewEvent ExportImportProcedureSets; private void OnExportImportProcedureSets(object sender, vlnTreeEventArgs args) { @@ -872,7 +866,6 @@ namespace Volian.Controls.Library MenuItem miqp = new MenuItem("Quick Print"); //MenuItem mips = new MenuItem("Print Section"); MenuItem mia = new MenuItem("Approve"); - MenuItem misa = new MenuItem("Select Annotations"); //C2025-027 int k = 0; foreach (string s in pri.MyDocVersion.UnitNames) @@ -898,16 +891,12 @@ namespace Volian.Controls.Library MenuItem mtc = mitcas.MenuItems.Add(s, new EventHandler(miMultiUnit_Click)); mtc.Enabled = procAppl; mtc.Tag = k; - MenuItem msa = misa.MenuItems.Add(s, new EventHandler(miMultiUnit_Click)); - msa.Enabled = procAppl; - msa.Tag = k; } cm.MenuItems.Add(micas); cm.MenuItems.Add(mitcas); cm.MenuItems.Add(mip); cm.MenuItems.Add(miqp); //cm.MenuItems.Add(mips); - cm.MenuItems.Add(misa); AddShowChangeBarsAfterMenuItem(cm.MenuItems, pri); cm.MenuItems.Add(mia); AddApprovedRevisionsMultiUnit(cm.MenuItems, pri); @@ -923,7 +912,6 @@ namespace Volian.Controls.Library AddShowChangeBarsAfterMenuItem(cm.MenuItems, pri); cm.MenuItems.Add("Approve", new EventHandler(mi_Click)); //_MyLog.WarnFormat("Context Menu 1 before - {0}", GC.GetTotalMemory(true)); - cm.MenuItems.Add("Select Annotations", new EventHandler(mi_Click)); //C2025-027 AddApprovedRevisions(cm.MenuItems, pri); //_MyLog.WarnFormat("Context Menu 1 after - {0}", GC.GetTotalMemory(true)); } @@ -936,7 +924,6 @@ namespace Volian.Controls.Library { MenuItem mip = new MenuItem("Print"); MenuItem miqp = new MenuItem("Quick Print"); - MenuItem misa = new MenuItem("Select Annotations"); //C2025-027 int k = 0; foreach (string s in pri.MyDocVersion.UnitNames) { @@ -945,19 +932,15 @@ namespace Volian.Controls.Library mp.Tag = k; MenuItem mqp = miqp.MenuItems.Add(s, new EventHandler(miMultiUnit_Click)); mqp.Tag = k; - MenuItem msa = misa.MenuItems.Add(s, new EventHandler(miMultiUnit_Click)); - msa.Tag = k; } cm.MenuItems.Add(mip); cm.MenuItems.Add(miqp); - cm.MenuItems.Add(misa); AddApprovedRevisionsMultiUnit(cm.MenuItems, pri); } else { cm.MenuItems.Add("Print", new EventHandler(mi_Click)); cm.MenuItems.Add("Quick Print", new EventHandler(mi_Click)); - cm.MenuItems.Add("Select Annotations", new EventHandler(mi_Click)); //C2025-027 AddApprovedRevisions(cm.MenuItems, pri); } } @@ -1949,9 +1932,6 @@ namespace Volian.Controls.Library case "Create Time Critical Action Summary": OnCreateTimeCriticalActionSummary(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0, mi.Text, (int)mi.Tag)); break; - case "Select Annotations": // C2025-027 - OnSelectAnnotations(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0)); - break; default: if (mip.Text.StartsWith("Showing Change Bars Starting")) OnSelectDateToStartChangeBars(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0)); @@ -2257,9 +2237,6 @@ namespace Volian.Controls.Library FlexibleMessageBox.Show("You have copied a document that is NOT linked to an Enhanced Document.\n\n" + "You cannot paste a Non-Enhanced Procedure into an Enhanced Procedure Set.", "Cannot Paste Here"); break; - case "Select Annotations": // C2025-027 - OnSelectAnnotations(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0)); - break; //case "Check Out Procedure Set": // CheckOutDocVersion(SelectedNode as VETreeNode); // break; From 81a23305ba097069d30b357e82db9709ac7243b5 Mon Sep 17 00:00:00 2001 From: mschill Date: Thu, 31 Jul 2025 10:48:39 -0400 Subject: [PATCH 19/25] SQL optimization to used AnnotationTypeSelections Index --- PROMS/VEPROMS User Interface/PROMSFixes.Sql | 26 +++++++++++---------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/PROMS/VEPROMS User Interface/PROMSFixes.Sql b/PROMS/VEPROMS User Interface/PROMSFixes.Sql index 3ca37132..2ea74f82 100644 --- a/PROMS/VEPROMS User Interface/PROMSFixes.Sql +++ b/PROMS/VEPROMS User Interface/PROMSFixes.Sql @@ -24136,16 +24136,18 @@ CREATE PROCEDURE [dbo].[getAnnotationSelectListTypes] WITH EXECUTE AS OWNER AS SELECT - [TypeID], - [Name], - [Config], - [DTS], - [UserID], - [LastChanged], - (SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[TypeID]= [TypeID]) [AnnotationCount], - [IsEPAnnotationType] - FROM [AnnotationTypes] --A - WHERE TypeID NOT IN (SELECT TypeID FROM AnnotationTypeSelections WHERE UserID = @UserID) + AT.[TypeID], + AT.[Name], + AT.[Config], + AT.[DTS], + AT.[UserID], + AT.[LastChanged], + (SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[TypeID]= AT.[TypeID]) [AnnotationCount], + AT.[IsEPAnnotationType] + FROM [AnnotationTypes] AT + LEFT OUTER JOIN AnnotationTypeSelections ATS + ON ATS.TypeID = AT.TypeID AND ATS.UserID = @UserID + WHERE ATS.ASTypeID IS NULL GO -- C2025-027 Annotation Type Filtering @@ -24325,8 +24327,8 @@ BEGIN TRY -- Try Block DECLARE @RevDate varchar(255) DECLARE @RevDescription varchar(255) - set @RevDate = '07/10/2025 2:30 PM' - set @RevDescription = 'C2025-027 Annotation Type Filtering' + set @RevDate = '07/31/2025 10:30 AM' + set @RevDescription = 'SQL Optimization' Select cast(@RevDate as datetime) RevDate, @RevDescription RevDescription PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription From a7c7744ff3060fa77f80615cf2de60a1e013573d Mon Sep 17 00:00:00 2001 From: Paul Larsen Date: Thu, 31 Jul 2025 23:06:29 -0400 Subject: [PATCH 20/25] C2025-047-AnnotationsTypeSelectChanges --- .../DlgAnnotationsSelect.cs | 30 ++++- .../VEPROMS User Interface/VEPROMS_UI.csproj | 9 ++ .../dlgAnnotationsSelect.Designer.cs | 4 +- .../dlgSaveAnnotationSelections.Designer.cs | 47 +++++++ .../dlgSaveAnnotationSelections.cs | 20 +++ .../dlgSaveAnnotationSelections.resx | 120 ++++++++++++++++++ 6 files changed, 225 insertions(+), 5 deletions(-) create mode 100644 PROMS/VEPROMS User Interface/dlgSaveAnnotationSelections.Designer.cs create mode 100644 PROMS/VEPROMS User Interface/dlgSaveAnnotationSelections.cs create mode 100644 PROMS/VEPROMS User Interface/dlgSaveAnnotationSelections.resx diff --git a/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs b/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs index 1786e97c..ac31fad0 100644 --- a/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs +++ b/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs @@ -63,18 +63,21 @@ namespace VEPROMS lstFrom.Items.Remove(item); } SetButtonsEditable(); + btnUpdate.Enabled = true; } // Move all items to lstSelected. private void btnSelectAll_Click(object sender, EventArgs e) { MoveAllItems(lstUnselected, lstSelected); + btnUpdate.Enabled = true; } // Move all items to lstUnselected. private void btnDeselectAll_Click(object sender, EventArgs e) { MoveAllItems(lstSelected, lstUnselected); + btnUpdate.Enabled = true; } // Move all items from one ListBox to another. @@ -83,6 +86,7 @@ namespace VEPROMS lstTo.Items.AddRange(lstFrom.Items); lstFrom.Items.Clear(); SetButtonsEditable(); + btnUpdate.Enabled = true; } // Enable and disable buttons. @@ -93,8 +97,10 @@ namespace VEPROMS // Save selected list to DB. private void btnUpdate_Click(object sender, EventArgs e) { - DataTable dt2 = coverToTable(); - VEPROMS.CSLA.Library.AnnotationstypeSelections.Update(dt2, UserID); + saveChanges(); + //DataTable dt2 = coverToTable(); + //VEPROMS.CSLA.Library.AnnotationstypeSelections.Update(dt2, UserID); + //btnUpdate.Enabled = false; } public class AnnotataionItem { @@ -154,7 +160,19 @@ namespace VEPROMS private void btnCancel_Click_1(object sender, EventArgs e) { - this.Close(); + string message = "Changes have not yet been saved. Do you want to save the changes prior to closing?"; + string title = "Save Annotation Selections"; + MessageBoxButtons buttons = MessageBoxButtons.YesNo; + DialogResult result = MessageBox.Show(message, title, buttons); + if (result == DialogResult.Yes) + { + saveChanges(); + this.Close(); + } + else + { + this.Close(); + } } private DataTable coverToTable() @@ -169,6 +187,12 @@ namespace VEPROMS } return dt; } + private void saveChanges() + { + DataTable dt2 = coverToTable(); + VEPROMS.CSLA.Library.AnnotationstypeSelections.Update(dt2, UserID); + btnUpdate.Enabled = false; + } } } diff --git a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj index 34aae1a6..d9859e1a 100644 --- a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj +++ b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj @@ -229,6 +229,12 @@ DlgPrintProcedure.cs + + Form + + + dlgSaveAnnotationSelections.cs + Form @@ -368,6 +374,9 @@ DlgPrintProcedure.cs Designer + + dlgSaveAnnotationSelections.cs + dlgSetChangeBarStartDate.cs diff --git a/PROMS/VEPROMS User Interface/dlgAnnotationsSelect.Designer.cs b/PROMS/VEPROMS User Interface/dlgAnnotationsSelect.Designer.cs index 22a5f7c5..ec7a1f11 100644 --- a/PROMS/VEPROMS User Interface/dlgAnnotationsSelect.Designer.cs +++ b/PROMS/VEPROMS User Interface/dlgAnnotationsSelect.Designer.cs @@ -158,7 +158,7 @@ namespace VEPROMS this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(100, 35); this.btnCancel.TabIndex = 9; - this.btnCancel.Text = "Cancel"; + this.btnCancel.Text = "Close"; this.btnCancel.UseVisualStyleBackColor = true; this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click_1); // @@ -203,7 +203,7 @@ namespace VEPROMS this.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.Name = "dlgAnnotationsSelect"; - this.Text = "Select Annotation Types"; + this.Text = "Filter Annotation Types"; this.Load += new System.EventHandler(this.DlgAnnotationsSelect_Load); this.tableLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); diff --git a/PROMS/VEPROMS User Interface/dlgSaveAnnotationSelections.Designer.cs b/PROMS/VEPROMS User Interface/dlgSaveAnnotationSelections.Designer.cs new file mode 100644 index 00000000..a6438b26 --- /dev/null +++ b/PROMS/VEPROMS User Interface/dlgSaveAnnotationSelections.Designer.cs @@ -0,0 +1,47 @@ + +namespace VEPROMS +{ + partial class dlgSaveAnnotationSelections + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.SuspendLayout(); + // + // dlgSaveAnnotationSelections + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(634, 351); + this.Name = "dlgSaveAnnotationSelections"; + this.Text = "Save Annotation Selections"; + this.ResumeLayout(false); + + } + + #endregion + } +} \ No newline at end of file diff --git a/PROMS/VEPROMS User Interface/dlgSaveAnnotationSelections.cs b/PROMS/VEPROMS User Interface/dlgSaveAnnotationSelections.cs new file mode 100644 index 00000000..1714cf15 --- /dev/null +++ b/PROMS/VEPROMS User Interface/dlgSaveAnnotationSelections.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace VEPROMS +{ + public partial class dlgSaveAnnotationSelections : Form + { + public dlgSaveAnnotationSelections() + { + InitializeComponent(); + } + } +} diff --git a/PROMS/VEPROMS User Interface/dlgSaveAnnotationSelections.resx b/PROMS/VEPROMS User Interface/dlgSaveAnnotationSelections.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/PROMS/VEPROMS User Interface/dlgSaveAnnotationSelections.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file From 6e20774edf96dcf9ea79854e611ef6959b6acd76 Mon Sep 17 00:00:00 2001 From: Paul Larsen Date: Fri, 1 Aug 2025 07:34:33 -0400 Subject: [PATCH 21/25] C2025-047-AnnotationsTypeSelectChanges --- .../DlgAnnotationsSelect.cs | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs b/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs index ac31fad0..e40b8520 100644 --- a/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs +++ b/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs @@ -156,18 +156,26 @@ namespace VEPROMS { lstSelected.Items.Add(new AnnotataionItem(lstSelectedRow["Name"].ToString(), (int)lstSelectedRow["TypeID"])); } + btnUpdate.Enabled = false; } private void btnCancel_Click_1(object sender, EventArgs e) { - string message = "Changes have not yet been saved. Do you want to save the changes prior to closing?"; - string title = "Save Annotation Selections"; - MessageBoxButtons buttons = MessageBoxButtons.YesNo; - DialogResult result = MessageBox.Show(message, title, buttons); - if (result == DialogResult.Yes) + if (btnUpdate.Enabled == true) { - saveChanges(); - this.Close(); + string message = "Changes have not yet been saved. Do you want to save the changes prior to closing?"; + string title = "Save Annotation Selections"; + MessageBoxButtons buttons = MessageBoxButtons.YesNo; + DialogResult result = MessageBox.Show(message, title, buttons); + if (result == DialogResult.Yes) + { + saveChanges(); + this.Close(); + } + else + { + this.Close(); + } } else { From 371d1177467bc8315c3d6eb1c45014f368e8c4e5 Mon Sep 17 00:00:00 2001 From: Paul Larsen Date: Fri, 1 Aug 2025 14:44:48 -0400 Subject: [PATCH 22/25] C2025-047-cleanup --- .../DlgAnnotationsSelect.cs | 3 - .../VEPROMS User Interface/VEPROMS_UI.csproj | 9 -- .../dlgSaveAnnotationSelections.Designer.cs | 47 ------- .../dlgSaveAnnotationSelections.cs | 20 --- .../dlgSaveAnnotationSelections.resx | 120 ------------------ 5 files changed, 199 deletions(-) delete mode 100644 PROMS/VEPROMS User Interface/dlgSaveAnnotationSelections.Designer.cs delete mode 100644 PROMS/VEPROMS User Interface/dlgSaveAnnotationSelections.cs delete mode 100644 PROMS/VEPROMS User Interface/dlgSaveAnnotationSelections.resx diff --git a/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs b/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs index e40b8520..c27bba37 100644 --- a/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs +++ b/PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs @@ -98,9 +98,6 @@ namespace VEPROMS private void btnUpdate_Click(object sender, EventArgs e) { saveChanges(); - //DataTable dt2 = coverToTable(); - //VEPROMS.CSLA.Library.AnnotationstypeSelections.Update(dt2, UserID); - //btnUpdate.Enabled = false; } public class AnnotataionItem { diff --git a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj index d9859e1a..34aae1a6 100644 --- a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj +++ b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj @@ -229,12 +229,6 @@ DlgPrintProcedure.cs - - Form - - - dlgSaveAnnotationSelections.cs - Form @@ -374,9 +368,6 @@ DlgPrintProcedure.cs Designer - - dlgSaveAnnotationSelections.cs - dlgSetChangeBarStartDate.cs diff --git a/PROMS/VEPROMS User Interface/dlgSaveAnnotationSelections.Designer.cs b/PROMS/VEPROMS User Interface/dlgSaveAnnotationSelections.Designer.cs deleted file mode 100644 index a6438b26..00000000 --- a/PROMS/VEPROMS User Interface/dlgSaveAnnotationSelections.Designer.cs +++ /dev/null @@ -1,47 +0,0 @@ - -namespace VEPROMS -{ - partial class dlgSaveAnnotationSelections - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.SuspendLayout(); - // - // dlgSaveAnnotationSelections - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(634, 351); - this.Name = "dlgSaveAnnotationSelections"; - this.Text = "Save Annotation Selections"; - this.ResumeLayout(false); - - } - - #endregion - } -} \ No newline at end of file diff --git a/PROMS/VEPROMS User Interface/dlgSaveAnnotationSelections.cs b/PROMS/VEPROMS User Interface/dlgSaveAnnotationSelections.cs deleted file mode 100644 index 1714cf15..00000000 --- a/PROMS/VEPROMS User Interface/dlgSaveAnnotationSelections.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace VEPROMS -{ - public partial class dlgSaveAnnotationSelections : Form - { - public dlgSaveAnnotationSelections() - { - InitializeComponent(); - } - } -} diff --git a/PROMS/VEPROMS User Interface/dlgSaveAnnotationSelections.resx b/PROMS/VEPROMS User Interface/dlgSaveAnnotationSelections.resx deleted file mode 100644 index 1af7de15..00000000 --- a/PROMS/VEPROMS User Interface/dlgSaveAnnotationSelections.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file From e2a276085bd91e51d8c922183051298456d144c6 Mon Sep 17 00:00:00 2001 From: John Jenko Date: Mon, 4 Aug 2025 10:30:20 -0400 Subject: [PATCH 23/25] =?UTF-8?q?C2025-039=20Per=20the=20customer=E2=80=99?= =?UTF-8?q?s=20request,=20adjusted=20the=20=E2=80=9C{Proc=20Num}=20(Proced?= =?UTF-8?q?ure=20Number=20Only)"=20transition=20type=20in=20the=20Beaver?= =?UTF-8?q?=20Valley=20formats=20so=20that=20a=20procedure=20that=20contai?= =?UTF-8?q?ns=20only=20Word=20sections=20can=20be=20referenced.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/Formats/fmtall/BVPS1all.xml | Bin 132024 -> 132024 bytes PROMS/Formats/fmtall/BVPS2all.xml | Bin 98448 -> 98448 bytes PROMS/Formats/fmtall/BVPSAOPDEVall.xml | Bin 41498 -> 41498 bytes PROMS/Formats/fmtall/BVPSAOPall.xml | Bin 150204 -> 150204 bytes PROMS/Formats/fmtall/BVPSAtchall.xml | Bin 127018 -> 127018 bytes PROMS/Formats/fmtall/BVPSBCKall.xml | Bin 73400 -> 73400 bytes PROMS/Formats/fmtall/BVPSDEVall.xml | Bin 41498 -> 41498 bytes PROMS/Formats/fmtall/BVPSFlexDEVall.xml | Bin 39762 -> 39762 bytes PROMS/Formats/fmtall/BVPSNIBCKall.xml | Bin 71456 -> 71456 bytes PROMS/Formats/fmtall/BVPSSAMGBCKall.xml | Bin 70556 -> 70556 bytes PROMS/Formats/fmtall/BVPSSAMGDEVall.xml | Bin 41504 -> 41504 bytes PROMS/Formats/fmtall/BVPSSAMGall.xml | Bin 127746 -> 127746 bytes 12 files changed, 0 insertions(+), 0 deletions(-) diff --git a/PROMS/Formats/fmtall/BVPS1all.xml b/PROMS/Formats/fmtall/BVPS1all.xml index 1eaecf8f21da7ad1c6ef2fdb91487dbfd388c38a..5604d6cad77665e5ec996a2114ea0cb4f87424bf 100644 GIT binary patch delta 22 ecmdnd&atDNW5c3#ll4~XG@o0y{oFdnS0Mm^`3sl; delta 22 ecmdnd&atDNW5c3#ldERwG@o0y{oFdnS0Mm{&I{83 diff --git a/PROMS/Formats/fmtall/BVPS2all.xml b/PROMS/Formats/fmtall/BVPS2all.xml index 008ab87e18661e9ce6ee65079b38c49fd66a769a..f0d8b4cf299f7707b64d012a0a1b7bfd356059c6 100644 GIT binary patch delta 25 hcmbQx$Tp#oZ3EBR$qCDJChrOrn&ir|*>A1WWdMgW3a*s=TM6F) diff --git a/PROMS/Formats/fmtall/BVPSDEVall.xml b/PROMS/Formats/fmtall/BVPSDEVall.xml index 45236c45595471dcda53e3ab803e56393150172e..1c0d61cbdf55cd82f089920a9701a71eb5449e17 100644 GIT binary patch delta 18 acmbPrglX0hrVW05lYLrrHdpm65C#BIn+Qq( delta 18 acmbPrglX0hrVW05lhvwpHdpm65C#BHB?uY- diff --git a/PROMS/Formats/fmtall/BVPSFlexDEVall.xml b/PROMS/Formats/fmtall/BVPSFlexDEVall.xml index 6fd10bd4fbb60ad5765fe4f168d6d623606b9a64..7d2ac0ce4a81f4e77a3c714c65d5622af699a53f 100644 GIT binary patch delta 22 ecmcb#jp@=hrVVZFlMUK9CV!|?*}SQJfiM7puUX63<_Z9P=L(bn delta 22 ecmZpA#@_UdeM7+7$r>|tnrqf>uUX63<_Z9Nu?l1W From 22de686a44dc2592c68933f5cafb875eeea75103 Mon Sep 17 00:00:00 2001 From: Paul Larsen Date: Wed, 6 Aug 2025 11:25:44 -0400 Subject: [PATCH 24/25] B2025-036-SplitScreen-Print-Error --- PROMS/VEPROMS User Interface/frmVEPROMS.cs | 11 ++++++-- .../Volian.Controls.Library/StepTabRibbon.cs | 28 +++++++++++++++++-- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 6d7aafa8..8cd88ab2 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -1483,9 +1483,11 @@ namespace VEPROMS // and if they are not the same, use the CurrentItem from the main frmVEPROMS. ProcedureInfo piThis = null; if (_CurrentItem != null) piThis = _CurrentItem.MyProcedure; - ProcedureInfo pi = args.Proc as ProcedureInfo; - if (piThis != null && pi.ItemID != piThis.ItemID) pi = piThis; + if (args.OringFlg == 1) // B2025-036 split screen print issue. if oringFlg == 1 the ctrl-p keys was pressed. + { + if (piThis != null && pi.ItemID != piThis.ItemID) pi = piThis; + } // Check if Procedure Info is null if (pi == null) return; @@ -1527,8 +1529,11 @@ namespace VEPROMS if (_CurrentItem != null) piThis = _CurrentItem.MyProcedure; ProcedureInfo pi = args.Proc as ProcedureInfo; - if (piThis != null && pi.ItemID != piThis.ItemID) pi = piThis; + if (args.OringFlg == 1) // B2025-036 split screen print issue. if oringFlg == 1 the ctrl-p keys was pressed. + { + if (piThis != null && pi.ItemID != piThis.ItemID) pi = piThis; + } // Check if Procedure Info is null if (pi == null) return; diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index 77ed9197..6a81f477 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -618,6 +618,15 @@ namespace Volian.Controls.Library } private int _MyLastFormatID = -1; private StepRTB _MyStepRTB; + private static int _OringFlg; + public static int OringFlg + { + get { return _OringFlg; } + set + { + _OringFlg = value; + } + } public StepRTB MyStepRTB { get { return _MyStepRTB; } @@ -4143,16 +4152,22 @@ namespace Volian.Controls.Library private void btnPdfCreate_Click(object sender, EventArgs e) { + // B2025-036 split screen print issue. if oringFlg == 1 the ctrl-p keys was pressed. + _OringFlg = 0; + DevComponents.DotNetBar.eEventSource oring = ((DevComponents.DotNetBar.Events.EventSourceArgs)e).Source; + if (oring == eEventSource.Keyboard) + _OringFlg = 1; + if (MyItemInfo == null) return; // if creating a pdf before rtb exists, return; if (MyEditItem != null) MyEditItem.SaveCurrentAndContents(); - OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure), 0); + OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure, _OringFlg), 0); } private void btnPdfQuickCreate_Click(object sender, EventArgs e) { if (MyItemInfo == null) return; // if creating a pdf before rtb exists, return; if (MyEditItem != null) MyEditItem.SaveCurrentAndContents(); - OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure), 1); + OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure, _OringFlg), 1); } private void btnCASCreate_Click(object sender, EventArgs e) @@ -4814,9 +4829,10 @@ namespace Volian.Controls.Library public class StepTabRibbonEventArgs : EventArgs { public StepTabRibbonEventArgs() { ; } - public StepTabRibbonEventArgs(ItemInfo proc) + public StepTabRibbonEventArgs(ItemInfo proc, int oringFlg = 0) { _Proc = proc; + OringFlg = oringFlg; } private ItemInfo _Proc; @@ -4825,6 +4841,12 @@ namespace Volian.Controls.Library get { return _Proc; } set { _Proc = value; } } + private int _OringFlg; + public int OringFlg + { + get { return _OringFlg; } + set { _OringFlg = value; } + } } public delegate void StepTabRibbonEvent(object sender, StepTabRibbonEventArgs args); From ad0d091b495539acb5cd8915cc588405efdfee84 Mon Sep 17 00:00:00 2001 From: Paul Larsen Date: Wed, 6 Aug 2025 11:28:28 -0400 Subject: [PATCH 25/25] B2025-036-SplitScreen-Print-Error --- PROMS/Volian.Controls.Library/StepTabRibbon.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index 6a81f477..6455fca1 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -4841,6 +4841,7 @@ namespace Volian.Controls.Library get { return _Proc; } set { _Proc = value; } } + // B2025-036 split screen print issue. if oringFlg == 1 the ctrl-p keys was pressed. private int _OringFlg; public int OringFlg {