diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs index fcfaab3c..cb3a9689 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs @@ -218,24 +218,21 @@ namespace VEPROMS this.labelItem14 = new DevComponents.DotNetBar.LabelItem(); this.btnGetRoVals = new DevComponents.DotNetBar.ButtonItem(); this.epAnnotations = new DevComponents.DotNetBar.ExpandablePanel(); + this.ctrlAnnotationDetails = new Volian.Controls.Library.AnnotationDetails(); this.btnAnnoDetailsPushPin = new DevComponents.DotNetBar.ButtonX(); - this.pannelAnnoEdit = new DevComponents.DotNetBar.PanelEx(); - this.rtxbComment = new System.Windows.Forms.RichTextBox(); - this.btnSaveAnnotation = new DevComponents.DotNetBar.ButtonX(); - this.btnCancelAnnoation = new DevComponents.DotNetBar.ButtonX(); - this.labelX1 = new DevComponents.DotNetBar.LabelX(); - this.cbGridAnnoType = new DevComponents.DotNetBar.Controls.ComboBoxEx(); - this.panelAnnoEditBtns = new DevComponents.DotNetBar.PanelEx(); - this.btnRemoveAnnotation = new DevComponents.DotNetBar.ButtonX(); - this.btnAddAnnotation = new DevComponents.DotNetBar.ButtonX(); - this.expandableSplitter4 = new DevComponents.DotNetBar.ExpandableSplitter(); - this.pannelAnnoGrid = new DevComponents.DotNetBar.PanelEx(); - this.c1AnnotationGrid = new C1.Win.C1FlexGrid.C1FlexGrid(); this.itemAnnotationsBindingSource = new System.Windows.Forms.BindingSource(this.components); this.expandablePanel2 = new DevComponents.DotNetBar.ExpandablePanel(); this.tv = new Volian.Controls.Library.vlnTreeView(); this.infoPanel = new DevComponents.DotNetBar.ExpandablePanel(); this.infoTabs = new DevComponents.DotNetBar.TabControl(); + this.annotationSearch = new DevComponents.DotNetBar.TabControlPanel(); + this.navpaneResults = new DevComponents.DotNetBar.NavigationPane(); + this.navpanSrchRslts = new DevComponents.DotNetBar.NavigationPanePanel(); + this.CtrlAnnotationSearch = new Volian.Controls.Library.AnnotationSearch(); + this.btnSrchRslt = new DevComponents.DotNetBar.ButtonItem(); + this.navigationPanePanel2 = new DevComponents.DotNetBar.NavigationPanePanel(); + this.btnSimStpsRslt = new DevComponents.DotNetBar.ButtonItem(); + this.infotabResults = new DevComponents.DotNetBar.TabItem(this.components); this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.groupPanel4 = new DevComponents.DotNetBar.Controls.GroupPanel(); @@ -250,15 +247,9 @@ namespace VEPROMS this.txbChgMsg2 = new DevComponents.DotNetBar.Controls.TextBoxX(); this.checkBoxX1 = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.infotabTags = new DevComponents.DotNetBar.TabItem(this.components); - this.tabControlPanel3 = new DevComponents.DotNetBar.TabControlPanel(); - this.navpaneResults = new DevComponents.DotNetBar.NavigationPane(); - this.navpanSrchRslts = new DevComponents.DotNetBar.NavigationPanePanel(); - this.lbResults = new System.Windows.Forms.ListBox(); - this.cbAnnoType = new DevComponents.DotNetBar.Controls.ComboBoxEx(); - this.btnSrchRslt = new DevComponents.DotNetBar.ButtonItem(); - this.navigationPanePanel2 = new DevComponents.DotNetBar.NavigationPanePanel(); - this.btnSimStpsRslt = new DevComponents.DotNetBar.ButtonItem(); - this.infotabResults = new DevComponents.DotNetBar.TabItem(this.components); + this.infotabControlPanelRO = new DevComponents.DotNetBar.TabControlPanel(); + this.displayRO = new Volian.Controls.Library.DisplayRO(); + this.infotabRO = new DevComponents.DotNetBar.TabItem(this.components); this.infotabControlPanelTransitions = new DevComponents.DotNetBar.TabControlPanel(); this.displayTransition = new Volian.Controls.Library.DisplayTransition(); this.infotabTransition = new DevComponents.DotNetBar.TabItem(this.components); @@ -269,17 +260,14 @@ namespace VEPROMS this.btnRmvCurBookMrk = new DevComponents.DotNetBar.ButtonX(); this.btnSetBookMrk = new DevComponents.DotNetBar.ButtonX(); this.infotabBookMarks = new DevComponents.DotNetBar.TabItem(this.components); - this.infotabControlPanelRO = new DevComponents.DotNetBar.TabControlPanel(); - this.displayRO = new Volian.Controls.Library.DisplayRO(); - this.infotabRO = new DevComponents.DotNetBar.TabItem(this.components); this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter(); this.expandableSplitter2 = new DevComponents.DotNetBar.ExpandableSplitter(); this.expandableSplitter3 = new DevComponents.DotNetBar.ExpandableSplitter(); this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); + this.tmrTreeView = new System.Windows.Forms.Timer(this.components); this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); this.tc = new Volian.Controls.Library.DisplayTabControl(); - this.tmrTreeView = new System.Windows.Forms.Timer(this.components); this.ribbonControl1.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); @@ -287,28 +275,24 @@ namespace VEPROMS this.ribbonPanel3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bottomBar)).BeginInit(); this.epAnnotations.SuspendLayout(); - this.pannelAnnoEdit.SuspendLayout(); - this.panelAnnoEditBtns.SuspendLayout(); - this.pannelAnnoGrid.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.c1AnnotationGrid)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.itemAnnotationsBindingSource)).BeginInit(); this.expandablePanel2.SuspendLayout(); this.infoPanel.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.infoTabs)).BeginInit(); this.infoTabs.SuspendLayout(); + this.annotationSearch.SuspendLayout(); + this.navpaneResults.SuspendLayout(); + this.navpanSrchRslts.SuspendLayout(); this.tabControlPanel1.SuspendLayout(); this.panelEx1.SuspendLayout(); this.groupPanel4.SuspendLayout(); this.groupPanel3.SuspendLayout(); this.groupPanel2.SuspendLayout(); this.groupPanel1.SuspendLayout(); - this.tabControlPanel3.SuspendLayout(); - this.navpaneResults.SuspendLayout(); - this.navpanSrchRslts.SuspendLayout(); + this.infotabControlPanelRO.SuspendLayout(); this.infotabControlPanelTransitions.SuspendLayout(); this.tabControlPanel2.SuspendLayout(); this.panelEx4.SuspendLayout(); - this.infotabControlPanelRO.SuspendLayout(); this.SuspendLayout(); // // ribbonControl1 @@ -418,7 +402,7 @@ namespace VEPROMS this.btnFindRplDlg.RibbonWordWrap = false; this.btnFindRplDlg.SubItemsExpandWidth = 14; this.superTooltip1.SetSuperTooltip(this.btnFindRplDlg, new DevComponents.DotNetBar.SuperTooltipInfo("Find Utility", "", "The Find button display a dialog window allowing you to look for text and optiona" + - "lly replace it.", ((System.Drawing.Image)(resources.GetObject("btnFindRplDlg.SuperTooltip"))), null, DevComponents.DotNetBar.eTooltipColor.System, true, true, new System.Drawing.Size(358, 134))); + "lly replace it.", ((System.Drawing.Image)(resources.GetObject("btnFindRplDlg.SuperTooltip"))), null, DevComponents.DotNetBar.eTooltipColor.System, true, true, new System.Drawing.Size(358, 134))); this.btnFindRplDlg.Text = "Find /\r\nReplace"; this.btnFindRplDlg.Click += new System.EventHandler(this.btnFindRplDlg_Click_1); // @@ -437,7 +421,7 @@ namespace VEPROMS this.btnCpyStp.Name = "btnCpyStp"; this.btnCpyStp.SubItemsExpandWidth = 14; this.superTooltip1.SetSuperTooltip(this.btnCpyStp, new DevComponents.DotNetBar.SuperTooltipInfo("Copy Step", "", "Allows you to copy an entire or part of a step, including Transition and RO links" + - ".", null, null, DevComponents.DotNetBar.eTooltipColor.System)); + ".", null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.btnCpyStp.Text = "Copy\r\nStep"; // // rbnInsert @@ -506,8 +490,8 @@ namespace VEPROMS this.buttonItem68, this.buttonItem84}); this.superTooltip1.SetSuperTooltip(this.galleryContainer3, new DevComponents.DotNetBar.SuperTooltipInfo("Symbol", "", "Selecting a symbol character from this list will insert the character at your cur" + - "rent cursor location.\r\n\r\nThe button below the scroll down button will display a " + - "gallery of special characters.", null, null, DevComponents.DotNetBar.eTooltipColor.System, true, true, new System.Drawing.Size(194, 159))); + "rent cursor location.\r\n\r\nThe button below the scroll down button will display a " + + "gallery of special characters.", null, null, DevComponents.DotNetBar.eTooltipColor.System, true, true, new System.Drawing.Size(194, 159))); // // galleryGroup1 // @@ -813,7 +797,6 @@ namespace VEPROMS // itemContainer13 // this.itemContainer13.LayoutOrientation = DevComponents.DotNetBar.eOrientation.Vertical; - this.itemContainer13.MinimumSize = new System.Drawing.Size(0, 0); this.itemContainer13.Name = "itemContainer13"; this.itemContainer13.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btnInsPgBrk, @@ -838,7 +821,7 @@ namespace VEPROMS this.btnInsHrdSpc.Name = "btnInsHrdSpc"; this.btnInsHrdSpc.SubItemsExpandWidth = 14; this.superTooltip1.SetSuperTooltip(this.btnInsHrdSpc, new DevComponents.DotNetBar.SuperTooltipInfo("Hard Space", "", "Inserts a Hard Space.\r\n\r\nA Hard Space will print as a normal space but will tie t" + - "he word before and after it so that they will not be broken between two lines.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); + "he word before and after it so that they will not be broken between two lines.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.btnInsHrdSpc.Text = " Hard Space"; // // labelItem25 @@ -955,7 +938,6 @@ namespace VEPROMS // itemContainer12 // this.itemContainer12.LayoutOrientation = DevComponents.DotNetBar.eOrientation.Vertical; - this.itemContainer12.MinimumSize = new System.Drawing.Size(0, 0); this.itemContainer12.Name = "itemContainer12"; this.itemContainer12.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btnInsBefore, @@ -992,7 +974,6 @@ namespace VEPROMS // itemContainer11 // this.itemContainer11.LayoutOrientation = DevComponents.DotNetBar.eOrientation.Vertical; - this.itemContainer11.MinimumSize = new System.Drawing.Size(0, 0); this.itemContainer11.Name = "itemContainer11"; this.itemContainer11.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btnInsTrans, @@ -1007,7 +988,7 @@ namespace VEPROMS this.btnInsTrans.Name = "btnInsTrans"; this.btnInsTrans.RibbonWordWrap = false; this.superTooltip1.SetSuperTooltip(this.btnInsTrans, new DevComponents.DotNetBar.SuperTooltipInfo("Insert", "", "Insert a New Transition\r\n\r\nA Transition is a live reference to different step, se" + - "ction, and/or procedure.\r\n", null, null, DevComponents.DotNetBar.eTooltipColor.System, true, true, new System.Drawing.Size(160, 130))); + "ction, and/or procedure.\r\n", null, null, DevComponents.DotNetBar.eTooltipColor.System, true, true, new System.Drawing.Size(160, 130))); this.btnInsTrans.Text = "Transition"; this.btnInsTrans.Tooltip = "Insert New or Modify Existing Transition"; this.btnInsTrans.Click += new System.EventHandler(this.btnInsTrans_Click); @@ -1021,7 +1002,7 @@ namespace VEPROMS this.btnInsRO.Name = "btnInsRO"; this.btnInsRO.RibbonWordWrap = false; this.superTooltip1.SetSuperTooltip(this.btnInsRO, new DevComponents.DotNetBar.SuperTooltipInfo("Insert Referenced Object", "", "Insert a New Referenced Object.\r\n\r\nA Referenced Object is a live reference to a v" + - "alue in the Referenced Object Database.\r\n", null, null, DevComponents.DotNetBar.eTooltipColor.System)); + "alue in the Referenced Object Database.\r\n", null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.btnInsRO.Text = "Referenced\r\nObject"; // // rbnFont @@ -1041,7 +1022,6 @@ namespace VEPROMS // itemContainer6 // this.itemContainer6.LayoutOrientation = DevComponents.DotNetBar.eOrientation.Vertical; - this.itemContainer6.MinimumSize = new System.Drawing.Size(0, 0); this.itemContainer6.Name = "itemContainer6"; this.itemContainer6.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.itemContainer7, @@ -1049,7 +1029,6 @@ namespace VEPROMS // // itemContainer7 // - this.itemContainer7.MinimumSize = new System.Drawing.Size(0, 0); this.itemContainer7.Name = "itemContainer7"; this.itemContainer7.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btnBold, @@ -1115,7 +1094,7 @@ namespace VEPROMS this.btnLowCase, this.btnTitleCase}); this.superTooltip1.SetSuperTooltip(this.btnChgCase, new DevComponents.DotNetBar.SuperTooltipInfo("Font", "", "Change the letter case for the selected text:\r\n \r\n- UPPER CASE\r\n- lower case\r\n- T" + - "itle Case\r\n", null, null, DevComponents.DotNetBar.eTooltipColor.System)); + "itle Case\r\n", null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.btnChgCase.Text = "Change Case"; // // btnUpCase @@ -1155,7 +1134,6 @@ namespace VEPROMS // itemContainer8 // this.itemContainer8.LayoutOrientation = DevComponents.DotNetBar.eOrientation.Vertical; - this.itemContainer8.MinimumSize = new System.Drawing.Size(0, 0); this.itemContainer8.Name = "itemContainer8"; this.itemContainer8.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btnClpBrdCopy, @@ -1227,7 +1205,6 @@ namespace VEPROMS // itemContainer10 // this.itemContainer10.LayoutOrientation = DevComponents.DotNetBar.eOrientation.Vertical; - this.itemContainer10.MinimumSize = new System.Drawing.Size(0, 0); this.itemContainer10.Name = "itemContainer10"; this.itemContainer10.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btnRepaginate, @@ -1322,7 +1299,6 @@ namespace VEPROMS // itemContainer9 // this.itemContainer9.LayoutOrientation = DevComponents.DotNetBar.eOrientation.Vertical; - this.itemContainer9.MinimumSize = new System.Drawing.Size(0, 0); this.itemContainer9.Name = "itemContainer9"; this.itemContainer9.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btnNew2, @@ -1618,8 +1594,8 @@ namespace VEPROMS this.btnAprvSel.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; this.btnAprvSel.Name = "btnAprvSel"; this.superTooltip1.SetSuperTooltip(this.btnAprvSel, new DevComponents.DotNetBar.SuperTooltipInfo("Approve", "", "This will allow you to select procedures to approve. Note that due to inter-rela" + - "tionships and shared references, additional procedures may also need approved al" + - "ong with the selected procedures.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); + "tionships and shared references, additional procedures may also need approved al" + + "ong with the selected procedures.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.btnAprvSel.Text = "Selected\r\nProcedures"; // // rbnMultiUser @@ -1666,7 +1642,7 @@ namespace VEPROMS this.btnLock.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; this.btnLock.Name = "btnLock"; this.superTooltip1.SetSuperTooltip(this.btnLock, new DevComponents.DotNetBar.SuperTooltipInfo("Multi User", "", "Set a lock at this level (of the procedures tree).\r\n\r\nA lock will prevent other u" + - "sers from entering at this level.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); + "sers from entering at this level.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.btnLock.Text = "Lock"; // // labelItem5 @@ -1684,7 +1660,7 @@ namespace VEPROMS this.btnListUsers.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; this.btnListUsers.Name = "btnListUsers"; this.superTooltip1.SetSuperTooltip(this.btnListUsers, new DevComponents.DotNetBar.SuperTooltipInfo("Multi User", "", "This will display a list of the users currently working in this area of your proc" + - "edures.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); + "edures.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.btnListUsers.Text = "List Users"; // // rtabHome @@ -1738,7 +1714,6 @@ namespace VEPROMS // this.itemContainer1.BackgroundStyle.Class = "RibbonFileMenuContainer"; this.itemContainer1.LayoutOrientation = DevComponents.DotNetBar.eOrientation.Vertical; - this.itemContainer1.MinimumSize = new System.Drawing.Size(0, 0); this.itemContainer1.Name = "itemContainer1"; this.itemContainer1.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.itemContainer2, @@ -1751,7 +1726,6 @@ namespace VEPROMS // this.itemContainer2.BackgroundStyle.Class = "RibbonFileMenuTwoColumnContainer"; this.itemContainer2.ItemSpacing = 0; - this.itemContainer2.MinimumSize = new System.Drawing.Size(0, 0); this.itemContainer2.Name = "itemContainer2"; this.itemContainer2.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.itemContainer3, @@ -1862,7 +1836,6 @@ namespace VEPROMS // this.itemContainer5.BackgroundStyle.Class = "RibbonFileMenuBottomContainer"; this.itemContainer5.HorizontalItemAlignment = DevComponents.DotNetBar.eHorizontalItemsAlignment.Right; - this.itemContainer5.MinimumSize = new System.Drawing.Size(0, 0); this.itemContainer5.Name = "itemContainer5"; this.itemContainer5.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btnOptions, @@ -2014,7 +1987,7 @@ namespace VEPROMS this.btnSetLock, this.btnReleaseLck}); this.superTooltip1.SetSuperTooltip(this.btnLckUlck, new DevComponents.DotNetBar.SuperTooltipInfo("Procedure Lock", "", "This will allow you to set or remove a lock on the current procedure. The button" + - " tells you the current lock status.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); + " tells you the current lock status.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.btnLckUlck.Text = "Unlocked"; // // btnSetLock @@ -2122,7 +2095,7 @@ namespace VEPROMS this.btnMarkPrevPos.Name = "btnMarkPrevPos"; this.btnMarkPrevPos.PopupSide = DevComponents.DotNetBar.ePopupSide.Top; this.superTooltip1.SetSuperTooltip(this.btnMarkPrevPos, new DevComponents.DotNetBar.SuperTooltipInfo("Simple Bookmark", "", "Mark your current positon and/or jump to the previously marked position. Note th" + - "at markking the the current position will also add to the list of bookmarks", null, null, DevComponents.DotNetBar.eTooltipColor.System)); + "at markking the the current position will also add to the list of bookmarks", null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.btnMarkPrevPos.Text = "BookMark"; this.btnMarkPrevPos.Click += new System.EventHandler(this.btnMarkPrevPos_Click); // @@ -2143,7 +2116,7 @@ namespace VEPROMS this.btnPrevPos.Name = "btnPrevPos"; this.btnPrevPos.PopupSide = DevComponents.DotNetBar.ePopupSide.Top; this.superTooltip1.SetSuperTooltip(this.btnPrevPos, new DevComponents.DotNetBar.SuperTooltipInfo("Simple Bookmark", "", "Mark your current positon and/or jump to the previously marked position. Note th" + - "at markking the the current position will also add to the list of bookmarks", null, null, DevComponents.DotNetBar.eTooltipColor.System)); + "at markking the the current position will also add to the list of bookmarks", null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.btnPrevPos.Text = "Previous Positon"; this.btnPrevPos.Click += new System.EventHandler(this.btnPrevPos_Click); // @@ -2160,7 +2133,7 @@ namespace VEPROMS this.btnGetRoVals.ImagePaddingHorizontal = 8; this.btnGetRoVals.Name = "btnGetRoVals"; this.superTooltip1.SetSuperTooltip(this.btnGetRoVals, new DevComponents.DotNetBar.SuperTooltipInfo("Update Referenced Object Values", "", "This will update the RO Values in this procedure set.\r\n\r\nThis button will become " + - "active when new Referenced Object Values are available.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); + "active when new Referenced Object Values are available.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.btnGetRoVals.Text = "Update RO Values"; // // epAnnotations @@ -2168,12 +2141,9 @@ namespace VEPROMS this.epAnnotations.CanvasColor = System.Drawing.SystemColors.Control; this.epAnnotations.CollapseDirection = DevComponents.DotNetBar.eCollapseDirection.TopToBottom; this.epAnnotations.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.epAnnotations.Controls.Add(this.ctrlAnnotationDetails); this.epAnnotations.Controls.Add(this.btnAnnoDetailsPushPin); - this.epAnnotations.Controls.Add(this.pannelAnnoEdit); - this.epAnnotations.Controls.Add(this.expandableSplitter4); - this.epAnnotations.Controls.Add(this.pannelAnnoGrid); this.epAnnotations.Dock = System.Windows.Forms.DockStyle.Bottom; - this.epAnnotations.ExpandedBounds = new System.Drawing.Rectangle(4, 547, 1114, 202); this.epAnnotations.ExpandOnTitleClick = true; this.epAnnotations.Location = new System.Drawing.Point(4, 547); this.epAnnotations.Name = "epAnnotations"; @@ -2195,7 +2165,19 @@ namespace VEPROMS this.epAnnotations.TitleStyle.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; this.epAnnotations.TitleStyle.GradientAngle = 90; this.epAnnotations.TitleText = "Annotation Details"; - this.epAnnotations.Layout += new System.Windows.Forms.LayoutEventHandler(this.epAnnotations_Layout); + // + // ctrlAnnotationDetails + // + this.ctrlAnnotationDetails.AnnotationRTFText = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang1033{\\fonttbl{\\f0\\fnil\\fcharset0 Microsoft S" + + "ans Serif;}}\r\n\\viewkind4\\uc1\\pard\\f0\\fs20\\par\r\n}\r\n"; + this.ctrlAnnotationDetails.Annotations = null; + this.ctrlAnnotationDetails.AnnotationText = ""; + this.ctrlAnnotationDetails.CurrentAnnotation = null; + this.ctrlAnnotationDetails.Dock = System.Windows.Forms.DockStyle.Fill; + this.ctrlAnnotationDetails.Location = new System.Drawing.Point(0, 26); + this.ctrlAnnotationDetails.Name = "ctrlAnnotationDetails"; + this.ctrlAnnotationDetails.Size = new System.Drawing.Size(1114, 176); + this.ctrlAnnotationDetails.TabIndex = 15; // // btnAnnoDetailsPushPin // @@ -2213,216 +2195,10 @@ namespace VEPROMS this.btnAnnoDetailsPushPin.ShowSubItems = false; this.btnAnnoDetailsPushPin.Size = new System.Drawing.Size(27, 23); this.superTooltip1.SetSuperTooltip(this.btnAnnoDetailsPushPin, new DevComponents.DotNetBar.SuperTooltipInfo("Annotation Details Push Pin", "", "This will toggle between keeping the Annotation Details window opened or to open/" + - "close automatically.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + "close automatically.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.btnAnnoDetailsPushPin.TabIndex = 14; this.btnAnnoDetailsPushPin.ThemeAware = true; // - // pannelAnnoEdit - // - this.pannelAnnoEdit.CanvasColor = System.Drawing.SystemColors.Control; - this.pannelAnnoEdit.Controls.Add(this.rtxbComment); - this.pannelAnnoEdit.Controls.Add(this.btnSaveAnnotation); - this.pannelAnnoEdit.Controls.Add(this.btnCancelAnnoation); - this.pannelAnnoEdit.Controls.Add(this.labelX1); - this.pannelAnnoEdit.Controls.Add(this.cbGridAnnoType); - this.pannelAnnoEdit.Controls.Add(this.panelAnnoEditBtns); - this.pannelAnnoEdit.Dock = System.Windows.Forms.DockStyle.Fill; - this.pannelAnnoEdit.Location = new System.Drawing.Point(507, 26); - this.pannelAnnoEdit.Name = "pannelAnnoEdit"; - this.pannelAnnoEdit.Size = new System.Drawing.Size(607, 176); - this.pannelAnnoEdit.Style.Alignment = System.Drawing.StringAlignment.Center; - this.pannelAnnoEdit.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.pannelAnnoEdit.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.pannelAnnoEdit.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.pannelAnnoEdit.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.pannelAnnoEdit.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.pannelAnnoEdit.Style.GradientAngle = 90; - this.pannelAnnoEdit.TabIndex = 13; - this.pannelAnnoEdit.Text = "panelEx2"; - this.pannelAnnoEdit.ThemeAware = true; - // - // rtxbComment - // - this.rtxbComment.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.rtxbComment.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); - this.rtxbComment.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.rtxbComment.Location = new System.Drawing.Point(87, 33); - this.rtxbComment.Name = "rtxbComment"; - this.rtxbComment.Size = new System.Drawing.Size(520, 176); - this.superTooltip1.SetSuperTooltip(this.rtxbComment, new DevComponents.DotNetBar.SuperTooltipInfo("Annotation", "", "Enter the annotation information here.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); - this.rtxbComment.TabIndex = 1; - this.rtxbComment.Text = ""; - this.rtxbComment.TextChanged += new System.EventHandler(this.rtxbComment_TextChanged); - // - // btnSaveAnnotation - // - this.btnSaveAnnotation.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnSaveAnnotation.Enabled = false; - this.btnSaveAnnotation.Location = new System.Drawing.Point(419, 8); - this.btnSaveAnnotation.Name = "btnSaveAnnotation"; - this.btnSaveAnnotation.Size = new System.Drawing.Size(71, 20); - this.superTooltip1.SetSuperTooltip(this.btnSaveAnnotation, new DevComponents.DotNetBar.SuperTooltipInfo("Save Changes", "", "This will save the new annotation or changes made to an existing annotation.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); - this.btnSaveAnnotation.TabIndex = 9; - this.btnSaveAnnotation.Text = "Save"; - this.btnSaveAnnotation.Click += new System.EventHandler(this.btnSaveAnnotation_Click); - // - // btnCancelAnnoation - // - this.btnCancelAnnoation.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnCancelAnnoation.Enabled = false; - this.btnCancelAnnoation.Location = new System.Drawing.Point(329, 8); - this.btnCancelAnnoation.Name = "btnCancelAnnoation"; - this.btnCancelAnnoation.Size = new System.Drawing.Size(70, 20); - this.superTooltip1.SetSuperTooltip(this.btnCancelAnnoation, new DevComponents.DotNetBar.SuperTooltipInfo("Cancel", "", "This will cancel the changes made to the annotation text and type selection", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(145, 100))); - this.btnCancelAnnoation.TabIndex = 8; - this.btnCancelAnnoation.Text = "Cancel"; - this.btnCancelAnnoation.Click += new System.EventHandler(this.btnCancelAnnoation_Click); - // - // labelX1 - // - this.labelX1.AutoSize = true; - this.labelX1.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelX1.Location = new System.Drawing.Point(93, 8); - this.labelX1.Name = "labelX1"; - this.labelX1.Size = new System.Drawing.Size(29, 14); - this.labelX1.TabIndex = 10; - this.labelX1.Text = "Type:"; - // - // cbGridAnnoType - // - this.cbGridAnnoType.FlatStyle = System.Windows.Forms.FlatStyle.Standard; - this.cbGridAnnoType.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbGridAnnoType.FormattingEnabled = true; - this.cbGridAnnoType.Location = new System.Drawing.Point(134, 4); - this.cbGridAnnoType.Name = "cbGridAnnoType"; - this.cbGridAnnoType.PreventEnterBeep = true; - this.cbGridAnnoType.Size = new System.Drawing.Size(165, 21); - this.superTooltip1.SetSuperTooltip(this.cbGridAnnoType, new DevComponents.DotNetBar.SuperTooltipInfo("Select Annotation Type", "", "This drop down list contains the posible annotation types.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); - this.cbGridAnnoType.TabIndex = 7; - this.cbGridAnnoType.WatermarkText = "Select Annotation Type"; - this.cbGridAnnoType.Validating += new System.ComponentModel.CancelEventHandler(this.cbGridAnnoType_Validating); - this.cbGridAnnoType.SelectedValueChanged += new System.EventHandler(this.cbGridAnnoType_SelectedValueChanged); - // - // panelAnnoEditBtns - // - this.panelAnnoEditBtns.CanvasColor = System.Drawing.SystemColors.Control; - this.panelAnnoEditBtns.Controls.Add(this.btnRemoveAnnotation); - this.panelAnnoEditBtns.Controls.Add(this.btnAddAnnotation); - this.panelAnnoEditBtns.Dock = System.Windows.Forms.DockStyle.Left; - this.panelAnnoEditBtns.Location = new System.Drawing.Point(0, 0); - this.panelAnnoEditBtns.Name = "panelAnnoEditBtns"; - this.panelAnnoEditBtns.Size = new System.Drawing.Size(87, 176); - this.panelAnnoEditBtns.Style.Alignment = System.Drawing.StringAlignment.Center; - this.panelAnnoEditBtns.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.panelAnnoEditBtns.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.panelAnnoEditBtns.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.panelAnnoEditBtns.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.panelAnnoEditBtns.Style.GradientAngle = 90; - this.panelAnnoEditBtns.TabIndex = 11; - this.panelAnnoEditBtns.ThemeAware = true; - // - // btnRemoveAnnotation - // - this.btnRemoveAnnotation.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnRemoveAnnotation.Location = new System.Drawing.Point(6, 34); - this.btnRemoveAnnotation.Name = "btnRemoveAnnotation"; - this.btnRemoveAnnotation.Size = new System.Drawing.Size(71, 20); - this.superTooltip1.SetSuperTooltip(this.btnRemoveAnnotation, new DevComponents.DotNetBar.SuperTooltipInfo("Remove Annotation", "", "This will remove the currently selected annotation.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); - this.btnRemoveAnnotation.TabIndex = 4; - this.btnRemoveAnnotation.Text = "Remove"; - this.btnRemoveAnnotation.Click += new System.EventHandler(this.btnRemoveAnnotation_Click); - // - // btnAddAnnotation - // - this.btnAddAnnotation.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnAddAnnotation.Location = new System.Drawing.Point(6, 4); - this.btnAddAnnotation.Name = "btnAddAnnotation"; - this.btnAddAnnotation.Size = new System.Drawing.Size(71, 20); - this.superTooltip1.SetSuperTooltip(this.btnAddAnnotation, new DevComponents.DotNetBar.SuperTooltipInfo("Add New Annotation", "", "This button will create a new annotation.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); - this.btnAddAnnotation.TabIndex = 3; - this.btnAddAnnotation.Text = "Add"; - this.btnAddAnnotation.Click += new System.EventHandler(this.btnAddAnnotation_Click); - // - // expandableSplitter4 - // - this.expandableSplitter4.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); - this.expandableSplitter4.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter4.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.expandableSplitter4.ExpandableControl = this.epAnnotations; - this.expandableSplitter4.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); - this.expandableSplitter4.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter4.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.expandableSplitter4.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter4.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.expandableSplitter4.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter4.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(205)))), ((int)(((byte)(208)))), ((int)(((byte)(213))))); - this.expandableSplitter4.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter4.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(252)))), ((int)(((byte)(151)))), ((int)(((byte)(61))))); - this.expandableSplitter4.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(184)))), ((int)(((byte)(94))))); - this.expandableSplitter4.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; - this.expandableSplitter4.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter4.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); - this.expandableSplitter4.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter4.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.expandableSplitter4.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter4.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); - this.expandableSplitter4.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter4.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(205)))), ((int)(((byte)(208)))), ((int)(((byte)(213))))); - this.expandableSplitter4.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter4.Location = new System.Drawing.Point(504, 26); - this.expandableSplitter4.Name = "expandableSplitter4"; - this.expandableSplitter4.Size = new System.Drawing.Size(3, 176); - this.expandableSplitter4.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; - this.expandableSplitter4.TabIndex = 12; - this.expandableSplitter4.TabStop = false; - // - // pannelAnnoGrid - // - this.pannelAnnoGrid.CanvasColor = System.Drawing.SystemColors.Control; - this.pannelAnnoGrid.Controls.Add(this.c1AnnotationGrid); - this.pannelAnnoGrid.Dock = System.Windows.Forms.DockStyle.Left; - this.pannelAnnoGrid.Location = new System.Drawing.Point(0, 26); - this.pannelAnnoGrid.Name = "pannelAnnoGrid"; - this.pannelAnnoGrid.Size = new System.Drawing.Size(504, 176); - this.pannelAnnoGrid.Style.Alignment = System.Drawing.StringAlignment.Center; - this.pannelAnnoGrid.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.pannelAnnoGrid.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.pannelAnnoGrid.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.pannelAnnoGrid.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.pannelAnnoGrid.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.pannelAnnoGrid.Style.GradientAngle = 90; - this.pannelAnnoGrid.TabIndex = 11; - this.pannelAnnoGrid.Text = "panelEx2"; - this.pannelAnnoGrid.ThemeAware = true; - // - // c1AnnotationGrid - // - this.c1AnnotationGrid.AllowAddNew = true; - this.c1AnnotationGrid.AllowDelete = true; - this.c1AnnotationGrid.AllowEditing = false; - this.c1AnnotationGrid.AutoGenerateColumns = false; - this.c1AnnotationGrid.AutoResize = false; - this.c1AnnotationGrid.BackColor = System.Drawing.Color.Transparent; - this.c1AnnotationGrid.CausesValidation = false; - this.c1AnnotationGrid.ColumnInfo = resources.GetString("c1AnnotationGrid.ColumnInfo"); - this.c1AnnotationGrid.DataSource = this.itemAnnotationsBindingSource; - this.c1AnnotationGrid.Dock = System.Windows.Forms.DockStyle.Fill; - this.c1AnnotationGrid.ExtendLastCol = true; - this.c1AnnotationGrid.Location = new System.Drawing.Point(0, 0); - this.c1AnnotationGrid.Name = "c1AnnotationGrid"; - this.c1AnnotationGrid.Rows.Count = 1; - this.c1AnnotationGrid.Rows.DefaultSize = 17; - this.c1AnnotationGrid.SelectionMode = C1.Win.C1FlexGrid.SelectionModeEnum.Row; - this.c1AnnotationGrid.ShowErrors = true; - this.c1AnnotationGrid.Size = new System.Drawing.Size(504, 176); - this.c1AnnotationGrid.StyleInfo = resources.GetString("c1AnnotationGrid.StyleInfo"); - this.superTooltip1.SetSuperTooltip(this.c1AnnotationGrid, new DevComponents.DotNetBar.SuperTooltipInfo("Annotation List", "", "This is a list of the annotations associated with the currenly selected procedure" + - " item.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 80))); - this.c1AnnotationGrid.TabIndex = 2; - this.c1AnnotationGrid.EnterCell += new System.EventHandler(this.c1AnnotationGrid_EnterCell); - // // itemAnnotationsBindingSource // this.itemAnnotationsBindingSource.DataSource = typeof(VEPROMS.CSLA.Library.ItemAnnotation); @@ -2502,10 +2278,10 @@ namespace VEPROMS // this.infoTabs.BackColor = System.Drawing.Color.Transparent; this.infoTabs.CanReorderTabs = true; - this.infoTabs.Controls.Add(this.infotabControlPanelTransitions); - this.infoTabs.Controls.Add(this.infotabControlPanelRO); this.infoTabs.Controls.Add(this.tabControlPanel1); - this.infoTabs.Controls.Add(this.tabControlPanel3); + this.infoTabs.Controls.Add(this.annotationSearch); + this.infoTabs.Controls.Add(this.infotabControlPanelRO); + this.infoTabs.Controls.Add(this.infotabControlPanelTransitions); this.infoTabs.Controls.Add(this.tabControlPanel2); this.infoTabs.Dock = System.Windows.Forms.DockStyle.Fill; this.infoTabs.Location = new System.Drawing.Point(0, 26); @@ -2524,6 +2300,124 @@ namespace VEPROMS this.infoTabs.Text = "tabControl1"; this.infoTabs.ThemeAware = true; // + // annotationSearch + // + this.annotationSearch.Controls.Add(this.navpaneResults); + this.annotationSearch.Dock = System.Windows.Forms.DockStyle.Fill; + this.annotationSearch.Location = new System.Drawing.Point(0, 0); + this.annotationSearch.Name = "annotationSearch"; + this.annotationSearch.Padding = new System.Windows.Forms.Padding(1); + this.annotationSearch.Size = new System.Drawing.Size(203, 374); + this.annotationSearch.Style.BackColor1.Color = System.Drawing.SystemColors.Control; + this.annotationSearch.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.annotationSearch.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) + | DevComponents.DotNetBar.eBorderSide.Bottom))); + this.annotationSearch.Style.GradientAngle = 180; + this.annotationSearch.TabIndex = 3; + this.annotationSearch.TabItem = this.infotabResults; + this.annotationSearch.ThemeAware = true; + // + // navpaneResults + // + this.navpaneResults.Controls.Add(this.navpanSrchRslts); + this.navpaneResults.Controls.Add(this.navigationPanePanel2); + this.navpaneResults.Dock = System.Windows.Forms.DockStyle.Fill; + this.navpaneResults.ItemPaddingBottom = 2; + this.navpaneResults.ItemPaddingTop = 2; + this.navpaneResults.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btnSrchRslt, + this.btnSimStpsRslt}); + this.navpaneResults.Location = new System.Drawing.Point(1, 1); + this.navpaneResults.Name = "navpaneResults"; + this.navpaneResults.NavigationBarHeight = 33; + this.navpaneResults.Padding = new System.Windows.Forms.Padding(1); + this.navpaneResults.Size = new System.Drawing.Size(201, 372); + this.navpaneResults.TabIndex = 0; + // + // + // + this.navpaneResults.TitlePanel.Dock = System.Windows.Forms.DockStyle.Top; + this.navpaneResults.TitlePanel.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.navpaneResults.TitlePanel.Location = new System.Drawing.Point(1, 1); + this.navpaneResults.TitlePanel.Name = "panelTitle"; + this.navpaneResults.TitlePanel.Size = new System.Drawing.Size(199, 24); + this.navpaneResults.TitlePanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.navpaneResults.TitlePanel.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.navpaneResults.TitlePanel.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.navpaneResults.TitlePanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.navpaneResults.TitlePanel.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.Bottom; + this.navpaneResults.TitlePanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.navpaneResults.TitlePanel.Style.GradientAngle = 90; + this.navpaneResults.TitlePanel.Style.MarginLeft = 4; + this.navpaneResults.TitlePanel.TabIndex = 0; + this.navpaneResults.TitlePanel.Text = "Annotation Search"; + // + // navpanSrchRslts + // + this.navpanSrchRslts.Controls.Add(this.CtrlAnnotationSearch); + this.navpanSrchRslts.Dock = System.Windows.Forms.DockStyle.Fill; + this.navpanSrchRslts.Location = new System.Drawing.Point(1, 25); + this.navpanSrchRslts.Name = "navpanSrchRslts"; + this.navpanSrchRslts.ParentItem = this.btnSrchRslt; + this.navpanSrchRslts.Size = new System.Drawing.Size(199, 313); + this.navpanSrchRslts.Style.Alignment = System.Drawing.StringAlignment.Center; + this.navpanSrchRslts.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; + this.navpanSrchRslts.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; + this.navpanSrchRslts.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.navpanSrchRslts.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; + this.navpanSrchRslts.Style.GradientAngle = 90; + this.navpanSrchRslts.TabIndex = 2; + // + // CtrlAnnotationSearch + // + this.CtrlAnnotationSearch.Dock = System.Windows.Forms.DockStyle.Fill; + this.CtrlAnnotationSearch.LoadingList = false; + this.CtrlAnnotationSearch.Location = new System.Drawing.Point(0, 0); + this.CtrlAnnotationSearch.Name = "CtrlAnnotationSearch"; + this.CtrlAnnotationSearch.Size = new System.Drawing.Size(199, 313); + this.CtrlAnnotationSearch.TabIndex = 0; + // + // btnSrchRslt + // + this.btnSrchRslt.Checked = true; + this.btnSrchRslt.Image = ((System.Drawing.Image)(resources.GetObject("btnSrchRslt.Image"))); + this.btnSrchRslt.ImageFixedSize = new System.Drawing.Size(16, 16); + this.btnSrchRslt.ImagePaddingHorizontal = 8; + this.btnSrchRslt.Name = "btnSrchRslt"; + this.btnSrchRslt.OptionGroup = "navBar"; + this.superTooltip1.SetSuperTooltip(this.btnSrchRslt, new DevComponents.DotNetBar.SuperTooltipInfo("Annotation Search", "", "Will display a list of all annotations of a selected type.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); + this.btnSrchRslt.Text = "Annotation Search"; + // + // navigationPanePanel2 + // + this.navigationPanePanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.navigationPanePanel2.Location = new System.Drawing.Point(1, 1); + this.navigationPanePanel2.Name = "navigationPanePanel2"; + this.navigationPanePanel2.ParentItem = this.btnSimStpsRslt; + this.navigationPanePanel2.Size = new System.Drawing.Size(199, 337); + this.navigationPanePanel2.Style.Alignment = System.Drawing.StringAlignment.Center; + this.navigationPanePanel2.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; + this.navigationPanePanel2.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; + this.navigationPanePanel2.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.navigationPanePanel2.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; + this.navigationPanePanel2.Style.GradientAngle = 90; + this.navigationPanePanel2.TabIndex = 3; + // + // btnSimStpsRslt + // + this.btnSimStpsRslt.Image = ((System.Drawing.Image)(resources.GetObject("btnSimStpsRslt.Image"))); + this.btnSimStpsRslt.ImageFixedSize = new System.Drawing.Size(16, 16); + this.btnSimStpsRslt.ImagePaddingHorizontal = 8; + this.btnSimStpsRslt.Name = "btnSimStpsRslt"; + this.btnSimStpsRslt.OptionGroup = "navBar"; + this.btnSimStpsRslt.Text = "Similar Steps"; + // + // infotabResults + // + this.infotabResults.AttachedControl = this.annotationSearch; + this.infotabResults.Name = "infotabResults"; + this.infotabResults.Text = "Search"; + // // tabControlPanel1 // this.tabControlPanel1.Controls.Add(this.panelEx1); @@ -2535,7 +2429,7 @@ namespace VEPROMS 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.Top) - | DevComponents.DotNetBar.eBorderSide.Bottom))); + | DevComponents.DotNetBar.eBorderSide.Bottom))); this.tabControlPanel1.Style.GradientAngle = 180; this.tabControlPanel1.TabIndex = 1; this.tabControlPanel1.TabItem = this.infotabTags; @@ -2598,10 +2492,10 @@ namespace VEPROMS this.comboBoxEx1.DisplayMember = "Text"; this.comboBoxEx1.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxEx1.FormattingEnabled = true; - this.comboBoxEx1.ItemHeight = 14; + this.comboBoxEx1.ItemHeight = 17; this.comboBoxEx1.Location = new System.Drawing.Point(4, 20); this.comboBoxEx1.Name = "comboBoxEx1"; - this.comboBoxEx1.Size = new System.Drawing.Size(189, 20); + this.comboBoxEx1.Size = new System.Drawing.Size(189, 23); this.comboBoxEx1.TabIndex = 0; this.comboBoxEx1.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.comboBoxEx1.WatermarkText = "select signoff / checkoff"; @@ -2748,7 +2642,7 @@ namespace VEPROMS this.txbChgMsg1.Location = new System.Drawing.Point(16, 38); this.txbChgMsg1.MaxLength = 3; this.txbChgMsg1.Name = "txbChgMsg1"; - this.txbChgMsg1.Size = new System.Drawing.Size(36, 20); + this.txbChgMsg1.Size = new System.Drawing.Size(36, 23); this.txbChgMsg1.TabIndex = 1; this.txbChgMsg1.WatermarkText = "XXX"; // @@ -2762,7 +2656,7 @@ namespace VEPROMS this.txbChgMsg2.Location = new System.Drawing.Point(16, 66); this.txbChgMsg2.MaxLength = 3; this.txbChgMsg2.Name = "txbChgMsg2"; - this.txbChgMsg2.Size = new System.Drawing.Size(36, 20); + this.txbChgMsg2.Size = new System.Drawing.Size(36, 23); this.txbChgMsg2.TabIndex = 2; this.txbChgMsg2.WatermarkText = "XXX"; // @@ -2781,139 +2675,41 @@ namespace VEPROMS this.infotabTags.Text = "Tags"; this.infotabTags.Visible = false; // - // tabControlPanel3 + // infotabControlPanelRO // - this.tabControlPanel3.Controls.Add(this.navpaneResults); - this.tabControlPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControlPanel3.Location = new System.Drawing.Point(0, 0); - this.tabControlPanel3.Name = "tabControlPanel3"; - this.tabControlPanel3.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel3.Size = new System.Drawing.Size(203, 374); - 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.Top) - | DevComponents.DotNetBar.eBorderSide.Bottom))); - this.tabControlPanel3.Style.GradientAngle = 180; - this.tabControlPanel3.TabIndex = 3; - this.tabControlPanel3.TabItem = this.infotabResults; - this.tabControlPanel3.ThemeAware = true; + this.infotabControlPanelRO.Controls.Add(this.displayRO); + this.infotabControlPanelRO.Dock = System.Windows.Forms.DockStyle.Fill; + this.infotabControlPanelRO.Location = new System.Drawing.Point(0, 0); + this.infotabControlPanelRO.Name = "infotabControlPanelRO"; + this.infotabControlPanelRO.Padding = new System.Windows.Forms.Padding(1); + this.infotabControlPanelRO.Size = new System.Drawing.Size(203, 374); + this.infotabControlPanelRO.Style.BackColor1.Color = System.Drawing.SystemColors.Control; + this.infotabControlPanelRO.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.infotabControlPanelRO.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) + | DevComponents.DotNetBar.eBorderSide.Bottom))); + this.infotabControlPanelRO.Style.GradientAngle = 180; + this.infotabControlPanelRO.TabIndex = 4; + this.infotabControlPanelRO.TabItem = this.infotabRO; + this.infotabControlPanelRO.ThemeAware = true; // - // navpaneResults + // displayRO // - this.navpaneResults.Controls.Add(this.navpanSrchRslts); - this.navpaneResults.Controls.Add(this.navigationPanePanel2); - this.navpaneResults.Dock = System.Windows.Forms.DockStyle.Fill; - this.navpaneResults.ItemPaddingBottom = 2; - this.navpaneResults.ItemPaddingTop = 2; - this.navpaneResults.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btnSrchRslt, - this.btnSimStpsRslt}); - this.navpaneResults.Location = new System.Drawing.Point(1, 1); - this.navpaneResults.Name = "navpaneResults"; - this.navpaneResults.Padding = new System.Windows.Forms.Padding(1); - this.navpaneResults.Size = new System.Drawing.Size(201, 372); - this.navpaneResults.TabIndex = 0; + this.displayRO.CurROLink = null; + this.displayRO.Dock = System.Windows.Forms.DockStyle.Fill; + this.displayRO.Location = new System.Drawing.Point(1, 1); + this.displayRO.Margin = new System.Windows.Forms.Padding(4); + this.displayRO.MyROFST = null; + this.displayRO.MyRTB = null; + this.displayRO.Name = "displayRO"; + this.displayRO.Size = new System.Drawing.Size(201, 372); + this.displayRO.TabIndex = 0; // + // infotabRO // - // - this.navpaneResults.TitlePanel.Dock = System.Windows.Forms.DockStyle.Top; - this.navpaneResults.TitlePanel.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.navpaneResults.TitlePanel.Location = new System.Drawing.Point(1, 1); - this.navpaneResults.TitlePanel.Name = "panelTitle"; - this.navpaneResults.TitlePanel.Size = new System.Drawing.Size(199, 24); - this.navpaneResults.TitlePanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.navpaneResults.TitlePanel.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.navpaneResults.TitlePanel.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.navpaneResults.TitlePanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.navpaneResults.TitlePanel.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.Bottom; - this.navpaneResults.TitlePanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.navpaneResults.TitlePanel.Style.GradientAngle = 90; - this.navpaneResults.TitlePanel.Style.MarginLeft = 4; - this.navpaneResults.TitlePanel.TabIndex = 0; - this.navpaneResults.TitlePanel.Text = "Annotation Search"; - // - // navpanSrchRslts - // - this.navpanSrchRslts.Controls.Add(this.lbResults); - this.navpanSrchRslts.Controls.Add(this.cbAnnoType); - this.navpanSrchRslts.Dock = System.Windows.Forms.DockStyle.Fill; - this.navpanSrchRslts.Location = new System.Drawing.Point(1, 25); - this.navpanSrchRslts.Name = "navpanSrchRslts"; - this.navpanSrchRslts.ParentItem = this.btnSrchRslt; - this.navpanSrchRslts.Size = new System.Drawing.Size(199, 314); - this.navpanSrchRslts.Style.Alignment = System.Drawing.StringAlignment.Center; - this.navpanSrchRslts.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.navpanSrchRslts.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; - this.navpanSrchRslts.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.navpanSrchRslts.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.navpanSrchRslts.Style.GradientAngle = 90; - this.navpanSrchRslts.TabIndex = 2; - // - // lbResults - // - this.lbResults.Dock = System.Windows.Forms.DockStyle.Fill; - this.lbResults.FormattingEnabled = true; - this.lbResults.Location = new System.Drawing.Point(0, 20); - this.lbResults.Name = "lbResults"; - this.lbResults.Size = new System.Drawing.Size(199, 290); - this.lbResults.TabIndex = 1; - this.lbResults.SelectedValueChanged += new System.EventHandler(this.lbResults_SelectedValueChanged); - // - // cbAnnoType - // - this.cbAnnoType.DisplayMember = "Text"; - this.cbAnnoType.Dock = System.Windows.Forms.DockStyle.Top; - this.cbAnnoType.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.cbAnnoType.FormattingEnabled = true; - this.cbAnnoType.ItemHeight = 14; - this.cbAnnoType.Location = new System.Drawing.Point(0, 0); - this.cbAnnoType.Name = "cbAnnoType"; - this.cbAnnoType.Size = new System.Drawing.Size(199, 20); - this.superTooltip1.SetSuperTooltip(this.cbAnnoType, new DevComponents.DotNetBar.SuperTooltipInfo("Annotation Type", "", "Select the annotation type.\r\n\r\nThe window below will display all of the annotatio" + - "ns of that type.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 110))); - this.cbAnnoType.TabIndex = 0; - this.cbAnnoType.SelectedValueChanged += new System.EventHandler(this.cbAnnoType_SelectedValueChanged); - // - // btnSrchRslt - // - this.btnSrchRslt.Checked = true; - this.btnSrchRslt.Image = ((System.Drawing.Image)(resources.GetObject("btnSrchRslt.Image"))); - this.btnSrchRslt.ImageFixedSize = new System.Drawing.Size(16, 16); - this.btnSrchRslt.ImagePaddingHorizontal = 8; - this.btnSrchRslt.Name = "btnSrchRslt"; - this.btnSrchRslt.OptionGroup = "navBar"; - this.superTooltip1.SetSuperTooltip(this.btnSrchRslt, new DevComponents.DotNetBar.SuperTooltipInfo("Annotation Search", "", "Will display a list of all annotations of a selected type.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); - this.btnSrchRslt.Text = "Annotation Search"; - // - // navigationPanePanel2 - // - this.navigationPanePanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.navigationPanePanel2.Location = new System.Drawing.Point(1, 1); - this.navigationPanePanel2.Name = "navigationPanePanel2"; - this.navigationPanePanel2.ParentItem = this.btnSimStpsRslt; - this.navigationPanePanel2.Size = new System.Drawing.Size(199, 338); - this.navigationPanePanel2.Style.Alignment = System.Drawing.StringAlignment.Center; - this.navigationPanePanel2.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.navigationPanePanel2.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; - this.navigationPanePanel2.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.navigationPanePanel2.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.navigationPanePanel2.Style.GradientAngle = 90; - this.navigationPanePanel2.TabIndex = 3; - // - // btnSimStpsRslt - // - this.btnSimStpsRslt.Image = ((System.Drawing.Image)(resources.GetObject("btnSimStpsRslt.Image"))); - this.btnSimStpsRslt.ImageFixedSize = new System.Drawing.Size(16, 16); - this.btnSimStpsRslt.ImagePaddingHorizontal = 8; - this.btnSimStpsRslt.Name = "btnSimStpsRslt"; - this.btnSimStpsRslt.OptionGroup = "navBar"; - this.btnSimStpsRslt.Text = "Similar Steps"; - // - // infotabResults - // - this.infotabResults.AttachedControl = this.tabControlPanel3; - this.infotabResults.Name = "infotabResults"; - this.infotabResults.Text = "Search"; + this.infotabRO.AttachedControl = this.infotabControlPanelRO; + this.infotabRO.Name = "infotabRO"; + this.infotabRO.Text = "RO"; + this.infotabRO.Click += new System.EventHandler(this.infotabRO_Click); // // infotabControlPanelTransitions // @@ -2926,7 +2722,7 @@ namespace VEPROMS this.infotabControlPanelTransitions.Style.BackColor1.Color = System.Drawing.SystemColors.Control; this.infotabControlPanelTransitions.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.infotabControlPanelTransitions.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) - | DevComponents.DotNetBar.eBorderSide.Bottom))); + | DevComponents.DotNetBar.eBorderSide.Bottom))); this.infotabControlPanelTransitions.Style.GradientAngle = 180; this.infotabControlPanelTransitions.TabIndex = 5; this.infotabControlPanelTransitions.TabItem = this.infotabTransition; @@ -2966,7 +2762,7 @@ namespace VEPROMS 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.Top) - | DevComponents.DotNetBar.eBorderSide.Bottom))); + | DevComponents.DotNetBar.eBorderSide.Bottom))); this.tabControlPanel2.Style.GradientAngle = 180; this.tabControlPanel2.TabIndex = 2; this.tabControlPanel2.TabItem = this.infotabBookMarks; @@ -2998,9 +2794,10 @@ namespace VEPROMS this.lbxBookMarks.Dock = System.Windows.Forms.DockStyle.Fill; this.lbxBookMarks.FormattingEnabled = true; this.lbxBookMarks.HorizontalScrollbar = true; + this.lbxBookMarks.ItemHeight = 16; this.lbxBookMarks.Location = new System.Drawing.Point(0, 87); this.lbxBookMarks.Name = "lbxBookMarks"; - this.lbxBookMarks.Size = new System.Drawing.Size(201, 277); + this.lbxBookMarks.Size = new System.Drawing.Size(201, 276); this.lbxBookMarks.TabIndex = 3; this.lbxBookMarks.Click += new System.EventHandler(this.lbxBookMarks_Click); // @@ -3046,42 +2843,6 @@ namespace VEPROMS this.infotabBookMarks.Name = "infotabBookMarks"; this.infotabBookMarks.Text = "BookMarks"; // - // infotabControlPanelRO - // - this.infotabControlPanelRO.Controls.Add(this.displayRO); - this.infotabControlPanelRO.Dock = System.Windows.Forms.DockStyle.Fill; - this.infotabControlPanelRO.Location = new System.Drawing.Point(0, 0); - this.infotabControlPanelRO.Name = "infotabControlPanelRO"; - this.infotabControlPanelRO.Padding = new System.Windows.Forms.Padding(1); - this.infotabControlPanelRO.Size = new System.Drawing.Size(203, 374); - this.infotabControlPanelRO.Style.BackColor1.Color = System.Drawing.SystemColors.Control; - this.infotabControlPanelRO.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.infotabControlPanelRO.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) - | DevComponents.DotNetBar.eBorderSide.Bottom))); - this.infotabControlPanelRO.Style.GradientAngle = 180; - this.infotabControlPanelRO.TabIndex = 4; - this.infotabControlPanelRO.TabItem = this.infotabRO; - this.infotabControlPanelRO.ThemeAware = true; - // - // displayRO - // - this.displayRO.CurROLink = null; - this.displayRO.Dock = System.Windows.Forms.DockStyle.Fill; - this.displayRO.Location = new System.Drawing.Point(1, 1); - this.displayRO.Margin = new System.Windows.Forms.Padding(4); - this.displayRO.MyROFST = null; - this.displayRO.MyRTB = null; - this.displayRO.Name = "displayRO"; - this.displayRO.Size = new System.Drawing.Size(201, 372); - this.displayRO.TabIndex = 0; - // - // infotabRO - // - this.infotabRO.AttachedControl = this.infotabControlPanelRO; - this.infotabRO.Name = "infotabRO"; - this.infotabRO.Text = "RO"; - this.infotabRO.Click += new System.EventHandler(this.infotabRO_Click); - // // expandableSplitter1 // this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(45)))), ((int)(((byte)(150))))); @@ -3181,6 +2942,11 @@ namespace VEPROMS // this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; // + // tmrTreeView + // + this.tmrTreeView.Interval = 10; + this.tmrTreeView.Tick += new System.EventHandler(this.tmrTreeView_Tick); + // // buttonItem1 // this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); @@ -3193,7 +2959,7 @@ namespace VEPROMS // this.tc.Dock = System.Windows.Forms.DockStyle.Fill; this.tc.Location = new System.Drawing.Point(37, 147); - this.tc.Margin = new System.Windows.Forms.Padding(4); + this.tc.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tc.Name = "tc"; this.tc.SelectedDisplayTabItem = null; this.tc.Size = new System.Drawing.Size(848, 397); @@ -3202,14 +2968,9 @@ namespace VEPROMS this.tc.LinkModifyTran += new Volian.Controls.Library.StepPanelLinkEvent(this.tc_LinkModifyTran); this.tc.LinkModifyRO += new Volian.Controls.Library.StepPanelLinkEvent(this.tc_LinkModifyRO); // - // tmrTreeView - // - this.tmrTreeView.Interval = 10; - this.tmrTreeView.Tick += new System.EventHandler(this.tmrTreeView_Tick); - // // frmVEPROMS // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScroll = true; this.ClientSize = new System.Drawing.Size(1122, 780); @@ -3235,30 +2996,25 @@ namespace VEPROMS this.ribbonPanel3.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.bottomBar)).EndInit(); this.epAnnotations.ResumeLayout(false); - this.pannelAnnoEdit.ResumeLayout(false); - this.pannelAnnoEdit.PerformLayout(); - this.panelAnnoEditBtns.ResumeLayout(false); - this.pannelAnnoGrid.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.c1AnnotationGrid)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.itemAnnotationsBindingSource)).EndInit(); this.expandablePanel2.ResumeLayout(false); this.infoPanel.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.infoTabs)).EndInit(); this.infoTabs.ResumeLayout(false); + this.annotationSearch.ResumeLayout(false); + this.navpaneResults.ResumeLayout(false); + this.navpanSrchRslts.ResumeLayout(false); this.tabControlPanel1.ResumeLayout(false); this.panelEx1.ResumeLayout(false); this.groupPanel4.ResumeLayout(false); this.groupPanel3.ResumeLayout(false); this.groupPanel2.ResumeLayout(false); this.groupPanel1.ResumeLayout(false); - this.tabControlPanel3.ResumeLayout(false); - this.navpaneResults.ResumeLayout(false); - this.navpanSrchRslts.ResumeLayout(false); + this.infotabControlPanelRO.ResumeLayout(false); this.infotabControlPanelTransitions.ResumeLayout(false); this.infotabControlPanelTransitions.PerformLayout(); this.tabControlPanel2.ResumeLayout(false); this.panelEx4.ResumeLayout(false); - this.infotabControlPanelRO.ResumeLayout(false); this.ResumeLayout(false); } @@ -3292,7 +3048,6 @@ namespace VEPROMS private DevComponents.DotNetBar.ExpandablePanel epAnnotations; private DevComponents.DotNetBar.ExpandablePanel expandablePanel2; private DevComponents.DotNetBar.ExpandablePanel infoPanel; - private System.Windows.Forms.RichTextBox rtxbComment; private Volian.Controls.Library.vlnTreeView tv; private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter1; private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter2; @@ -3328,7 +3083,6 @@ namespace VEPROMS private DevComponents.DotNetBar.Controls.CheckBoxX checkBoxX1; private System.Windows.Forms.CheckedListBox checkedListBox1; //private System.Windows.Forms.PropertyGrid pg; - private C1.Win.C1FlexGrid.C1FlexGrid c1AnnotationGrid; private DevComponents.DotNetBar.ButtonItem btnInsOvr; private DevComponents.DotNetBar.ButtonItem btnInsertMode; private DevComponents.DotNetBar.ButtonItem btnOverstrikeMode; @@ -3349,8 +3103,6 @@ namespace VEPROMS private DevComponents.DotNetBar.ButtonX btnClrBookMrks; private System.Windows.Forms.ListBox lbxBookMarks; private DevComponents.DotNetBar.SuperTooltip superTooltip1; - private DevComponents.DotNetBar.ButtonX btnRemoveAnnotation; - private DevComponents.DotNetBar.ButtonX btnAddAnnotation; private DevComponents.DotNetBar.ButtonItem btnMarkPrevPos; private DevComponents.DotNetBar.ButtonItem btnPrevPos; private DevComponents.DotNetBar.LabelItem labelItem2; @@ -3464,7 +3216,7 @@ namespace VEPROMS private DevComponents.DotNetBar.ItemContainer itemContainer9; private DevComponents.DotNetBar.ItemContainer itemContainer10; private DevComponents.DotNetBar.ButtonItem btnPrnPreview; - private DevComponents.DotNetBar.TabControlPanel tabControlPanel3; + private DevComponents.DotNetBar.TabControlPanel annotationSearch; private DevComponents.DotNetBar.TabItem infotabResults; private DevComponents.DotNetBar.NavigationPane navpaneResults; private DevComponents.DotNetBar.NavigationPanePanel navpanSrchRslts; @@ -3502,21 +3254,13 @@ namespace VEPROMS private Volian.Controls.Library.DisplayTabControl tc; private Volian.Controls.Library.DisplayTransition displayTransition; private Volian.Controls.Library.DisplayRO displayRO; - private DevComponents.DotNetBar.Controls.ComboBoxEx cbAnnoType; - private System.Windows.Forms.ListBox lbResults; private System.Windows.Forms.ToolTip toolTip1; //private System.Windows.Forms.ComboBox cbGridAnnoType; - private DevComponents.DotNetBar.Controls.ComboBoxEx cbGridAnnoType; - private DevComponents.DotNetBar.ButtonX btnCancelAnnoation; - private DevComponents.DotNetBar.ButtonX btnSaveAnnotation; - private DevComponents.DotNetBar.LabelX labelX1; - private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter4; - private DevComponents.DotNetBar.PanelEx pannelAnnoGrid; - private DevComponents.DotNetBar.PanelEx pannelAnnoEdit; - private DevComponents.DotNetBar.PanelEx panelAnnoEditBtns; private DevComponents.DotNetBar.ButtonX btnAnnoDetailsPushPin; private DevComponents.DotNetBar.ButtonItem buttonItem1; private System.Windows.Forms.Timer tmrTreeView; + private Volian.Controls.Library.AnnotationSearch CtrlAnnotationSearch; + private Volian.Controls.Library.AnnotationDetails ctrlAnnotationDetails; } } diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 5834c3a7..86a422b5 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -87,6 +87,7 @@ namespace VEPROMS SaveMRU(); //Settings.Default.Save(); } + private void ShutDownRibbons() { rtabEdit.Visible = false; @@ -95,6 +96,7 @@ namespace VEPROMS rtabTools.Visible = false; ribbonControl1.Height = 50; } + private void frmVEPROMS_Load(object sender, EventArgs e) { // get the saved location and size of the VE-PROMS appication for this user @@ -106,18 +108,8 @@ namespace VEPROMS _MyBookMarks = MostRecentItemList.GetMRILst((System.Collections.Specialized.StringCollection)(Properties.Settings.Default["BookMarks"])); SetupMRU(); SetupBookMarks(); - SetupAnnotations(); - } - - private void SetupAnnotations() - { - cbAnnoType.DisplayMember = "Name"; - cbAnnoType.DataSource = AnnotationTypeInfoList.Get(); - lbResults.MouseMove += new MouseEventHandler(lbResults_MouseMove); - - cbGridAnnoType.DisplayMember = "Name"; - cbGridAnnoType.ValueMember = "TypeId"; - cbGridAnnoType.DataSource = AnnotationTypeInfoList.Get().Clone(); + CtrlAnnotationSearch.SetupAnnotationSearch(ctrlAnnotationDetails, tc); + ctrlAnnotationDetails.SetupAnnotations(CtrlAnnotationSearch); } #region MRU @@ -193,79 +185,65 @@ namespace VEPROMS /// VETreeNode void SetupNodes(VETreeNode node) { - //if (!node.Equals(_LastTreeNode)) - //{ - _LastTreeNode = node; - _LastFolderInfo = null; - _LastFolder = null; - _LastDocVersion = null; - _LastProcedure = null; - _LastSection = null; - _LastStep = null; - epAnnotations.Expanded = false; - rtxbComment.Text = ""; - epAnnotations.TitleStyle.BackColor1.Color = _CommentTitleBckColor; - if (_MyMRIList.Add(node.VEObject) != null) - SetupMRU(); - if (node.VEObject.GetType() == typeof(FolderInfo)) - { - _LastFolderInfo = (FolderInfo)(_LastTreeNode.VEObject); - _LastFolder = _LastFolderInfo.Get(); - } - else if (node.VEObject.GetType() == typeof(DocVersionInfo)) - { - _LastDocVersionInfo = (DocVersionInfo)(node.VEObject); - _LastDocVersion = _LastDocVersionInfo.Get(); - } - else if (node.VEObject.GetType() == typeof(ProcedureInfo)) - { - _LastProcedureInfo = (ProcedureInfo)(_LastTreeNode.VEObject); - _LastProcedure = _LastProcedureInfo.Get(); + _LastTreeNode = node; + _LastFolderInfo = null; + _LastFolder = null; + _LastDocVersion = null; + _LastProcedure = null; + _LastSection = null; + _LastStep = null; + epAnnotations.Expanded = false; + epAnnotations.TitleStyle.BackColor1.Color = _CommentTitleBckColor; + if (_MyMRIList.Add(node.VEObject) != null) + SetupMRU(); + if (node.VEObject.GetType() == typeof(FolderInfo)) + { + _LastFolderInfo = (FolderInfo)(_LastTreeNode.VEObject); + _LastFolder = _LastFolderInfo.Get(); + } + else if (node.VEObject.GetType() == typeof(DocVersionInfo)) + { + _LastDocVersionInfo = (DocVersionInfo)(node.VEObject); + _LastDocVersion = _LastDocVersionInfo.Get(); + } + else if (node.VEObject.GetType() == typeof(ProcedureInfo)) + { + _LastProcedureInfo = (ProcedureInfo)(_LastTreeNode.VEObject); + _LastProcedure = _LastProcedureInfo.Get(); - tc.OpenItem((ItemInfo)_LastProcedureInfo); - // Display any annotations - //itemAnnotationsBindingSource.DataSource = _LastProcedureInfo.ItemAnnotations; - } - else if (node.VEObject.GetType() == typeof(SectionInfo)) - { - _LastSectionInfo = (SectionInfo)(_LastTreeNode.VEObject); - _LastSection = _LastSectionInfo.Get(); - tc.OpenItem((ItemInfo)_LastSectionInfo); - // Display any annotations - //itemAnnotationsBindingSource.DataSource = _LastSectionInfo.ItemAnnotations; - } - else if (node.VEObject.GetType() == typeof(StepInfo)) - { - _LastStepInfo = (StepInfo)(_LastTreeNode.VEObject); - _LastStep = _LastStepInfo.Get(); - tc.OpenItem((ItemInfo)_LastStepInfo); - // Display any annotations - //itemAnnotationsBindingSource.DataSource = _LastStepInfo.ItemAnnotations; - #region Sample Display Table Code - // display an exiting table in that rtf grid thing - //if ((_LastStepInfo.MyContent.Type == 20007) || (_LastStepInfo.MyContent.Type == 20009)) - //{ - // //MessageBox.Show("Source Grid"); - // //frmTable newtable1 = new frmTable(_LastStepInfo.MyContent.Text); - // //newtable1.ShowDialog(); - // //MessageBox.Show("IGrid"); - // //frmIGrid newtable2 = new frmIGrid(_LastStepInfo.MyContent.Text); - // //newtable2.ShowDialog(); - // //MessageBox.Show("GridView"); //standard Visual Studio Control - // //frmGridView newtable3 = new frmGridView(_LastStepInfo.MyContent.Text); - // //newtable3.ShowDialog(); - // MessageBox.Show("FlexCell"); - // frmFlexCell newtable4 = new frmFlexCell(_LastStepInfo.MyContent.Text); - // newtable4.ShowDialog(); - //} - #endregion - } - //break; - //default: - //break; + tc.OpenItem((ItemInfo)_LastProcedureInfo); + } + else if (node.VEObject.GetType() == typeof(SectionInfo)) + { + _LastSectionInfo = (SectionInfo)(_LastTreeNode.VEObject); + _LastSection = _LastSectionInfo.Get(); + tc.OpenItem((ItemInfo)_LastSectionInfo); + } + else if (node.VEObject.GetType() == typeof(StepInfo)) + { + _LastStepInfo = (StepInfo)(_LastTreeNode.VEObject); + _LastStep = _LastStepInfo.Get(); + tc.OpenItem((ItemInfo)_LastStepInfo); + #region Sample Display Table Code + // display an exiting table in that rtf grid thing + //if ((_LastStepInfo.MyContent.Type == 20007) || (_LastStepInfo.MyContent.Type == 20009)) + //{ + // //MessageBox.Show("Source Grid"); + // //frmTable newtable1 = new frmTable(_LastStepInfo.MyContent.Text); + // //newtable1.ShowDialog(); + // //MessageBox.Show("IGrid"); + // //frmIGrid newtable2 = new frmIGrid(_LastStepInfo.MyContent.Text); + // //newtable2.ShowDialog(); + // //MessageBox.Show("GridView"); //standard Visual Studio Control + // //frmGridView newtable3 = new frmGridView(_LastStepInfo.MyContent.Text); + // //newtable3.ShowDialog(); + // MessageBox.Show("FlexCell"); + // frmFlexCell newtable4 = new frmFlexCell(_LastStepInfo.MyContent.Text); + // newtable4.ShowDialog(); //} - SetCaption((VETreeNode)node); - //} + #endregion + } + SetCaption((VETreeNode)node); } private void SetCaption(VETreeNode tn) @@ -375,10 +353,12 @@ namespace VEPROMS } } } + private void SaveIfChanged2(Item tmp) { SaveIfChanged(tmp); } + /// /// When the treeview is clicked - a timer is set /// This is done because the focus is returned to the treeview after the click event @@ -389,6 +369,7 @@ namespace VEPROMS { tmrTreeView.Enabled = true; } + /// /// This event is fired from the timer after the treeview click event completes /// @@ -401,6 +382,7 @@ namespace VEPROMS VETreeNode tn = tv.SelectedNode as VETreeNode; if (tn != null) SetupNodes(tn); } + private void tv_KeyPress(object sender, KeyPressEventArgs e) { if (e.KeyChar == '\r') @@ -410,6 +392,7 @@ namespace VEPROMS e.Handled = true; } } + private void tv_BeforeExpand(object sender, TreeViewCancelEventArgs e) { VETreeNode tn = ((VETreeNode)e.Node); @@ -418,12 +401,13 @@ namespace VEPROMS tn.LoadingChildernValue += new VETreeNodeEvent(tn_LoadingChildernValue); tn.LoadingChildrenSQL += new VETreeNodeEvent(tn_LoadingChildrenSQL); tn.LoadChildren(true); - } + void tv_NodeProperties(object sender, Volian.Controls.Library.vlnTreeEventArgs args) { DisplayProperties(); } + #endregion #region Property Page and Grid @@ -1156,181 +1140,67 @@ namespace VEPROMS displayTransition.CurTrans = null; } #endregion - private AnnotationInfoList _Annotations; private ItemInfo _CurrentItem = null; private void tc_ItemSelectedChanged(object sender, ItemSelectedChangedEventArgs args) { - //CurrentAnnotation = null; if (args == null) { _CurrentItem = null; - CurrentAnnotation = null; - _Annotations = null; - itemAnnotationsBindingSource.DataSource = _Annotations; - AnnotationPanelView(); + ctrlAnnotationDetails.CurrentAnnotation = null; + ctrlAnnotationDetails.Annotations = null; infotabRO.Visible = infotabTransition.Visible = infotabTags.Visible = false; - return; - } - if (_CurrentItem != args.MyItemInfo) - _CurrentItem = args.MyItemInfo; //tc.SelectedDisplayTabItem.MyItemInfo; - //vlnStackTrace.ShowStack("enter tc_ItemSelectedChanged {0}", _CurrentItem); - if (args.MyStepItem == null) - { - infotabRO.Visible = infotabTransition.Visible = false; - infotabTags.Visible = true; - //vlnStackTrace.ShowStack("enter tc_ItemSelectedChanged {0}", _CurrentItem); } else { + if (_CurrentItem != args.MyItemInfo) + _CurrentItem = args.MyItemInfo; //vlnStackTrace.ShowStack("enter tc_ItemSelectedChanged {0}", _CurrentItem); - infotabRO.Visible = infotabTransition.Visible = infotabTags.Visible = true; - displayTransition.MyRTB = args.MyStepItem.MyStepRTB; - displayRO.MyRTB = args.MyStepItem.MyStepRTB; - } - UpdateAnnotationGrid(); - } - private void UpdateAnnotationGrid() - { - //ShowItemAnnotations("UpdateAnnotationGrid before RefreshItemAnnotations"); - //_CurrentItem.RefreshItemAnnotations(); - //ShowItemAnnotations("UpdateAnnotationGrid"); - _LoadingGrid = true; - _Annotations = _CurrentItem.ItemAnnotations; - itemAnnotationsBindingSource.DataSource = _Annotations; - AnnotationPanelView(); - if ((CurrentAnnotation == null || (_CurrentItem.ItemID != CurrentAnnotation.ItemID))) - { - if (_Annotations != null && _Annotations.Count > 0) - CurrentAnnotation = _Annotations[0]; - else - CurrentAnnotation = null; - //InitializeAnnotation(); - } - FindCurrentAnnotation(); - _LoadingGrid = false; - } - private void FindCurrentAnnotation() - { - int row = 0; - if (CurrentAnnotation != null) - { - if (_Annotations != null) + if (args.MyStepItem == null) { - foreach (AnnotationInfo ai in _Annotations) - { - if (ai.AnnotationID == CurrentAnnotation.AnnotationID) - { - row = _Annotations.IndexOf(ai) + 1; - break; - } - } + infotabRO.Visible = infotabTransition.Visible = false; + infotabTags.Visible = true; + //vlnStackTrace.ShowStack("enter tc_ItemSelectedChanged {0}", _CurrentItem); + } + else + { + //vlnStackTrace.ShowStack("enter tc_ItemSelectedChanged {0}", _CurrentItem); + infotabRO.Visible = infotabTransition.Visible = infotabTags.Visible = true; + displayTransition.MyRTB = args.MyStepItem.MyStepRTB; + displayRO.MyRTB = args.MyStepItem.MyStepRTB; } } - //Console.WriteLine("Row = {0}", row); - c1AnnotationGrid.Select(row, 0, true); + ctrlAnnotationDetails.UpdateAnnotationGrid(_CurrentItem); + AnnotationPanelView(); } - //private void ShowItemAnnotations(string title) - //{ - // Console.WriteLine("{0} CurrentItem {1} {2} ItemAnnotationsCount {3}", title, _CurrentItem.ItemID, _CurrentItem.MyItemInfoUnique, _CurrentItem.ItemAnnotationCount); - //} - //private void itemAnnotationsBindingSource_DataSourceChanged(object sender, EventArgs e) - //{ - //_LoadingGrid = true; - //Console.WriteLine("itemAnnotationsBindingSource_DataSourceChanged 1"); - //AnnotationInfoList myAnnotations = itemAnnotationsBindingSource.DataSource as AnnotationInfoList; - //Console.WriteLine("itemAnnotationsBindingSource_DataSourceChanged 2"); - //AnnotationPannelView(_Annotations); - //Console.WriteLine("itemAnnotationsBindingSource_DataSourceChanged 3"); - //_LoadingGrid = false; - //} + + #region Annotations + /// + /// Display or hide the Annotation Details panel + /// private void AnnotationPanelView() { - if (_Annotations != null && _Annotations.Count != 0) + if (ctrlAnnotationDetails.Annotations != null && ctrlAnnotationDetails.Annotations.Count != 0) { if (Settings.Default.AutoPopUpAnnotations) //cbAnnotationPopup.Checked epAnnotations.Expanded = true; else epAnnotations.TitleStyle.BackColor1.Color = Color.Yellow; - rtxbComment.SelectionStart = rtxbComment.TextLength; } else { if (!btnAnnoDetailsPushPin.Checked) epAnnotations.Expanded = false; epAnnotations.TitleStyle.BackColor1.Color = _CommentTitleBckColor; - rtxbComment.Text = null; + ctrlAnnotationDetails.AnnotationText = null; } } - - private AnnotationInfo _CurrentAnnotation = null; - private AnnotationInfo CurrentAnnotation - { - get { return _CurrentAnnotation; } - set - { - if (_CurrentAnnotation == null && value == null) return; // No Change - if (_CurrentAnnotation != null && value != null) - if (_CurrentAnnotation.AnnotationID == value.AnnotationID) return; // No Change - //vlnStackTrace.ShowStack("CurrentAnnotation = '{0}' Old = '{1}'", value, _CurrentAnnotation); - if (_CurrentAnnotation != null || _AddingAnnotation) - { - //if (_CurrentAnnotation.TypeID != (int)cbGridAnnoType.SelectedValue) SaveAnnotation(); - //else if (_CurrentAnnotation.RtfText != string.Empty && _CurrentAnnotation.RtfText != rtxbComment.Rtf) - // SaveAnnotation(); - //else if (_CurrentAnnotation.RtfText == string.Empty && _CurrentAnnotation.SearchText != rtxbComment.Text) - if (AnnotationDirty) - SaveAnnotation(); - } - _CurrentAnnotation = value; - InitializeAnnotation(); - } - } - - private void SaveAnnotation() - { - if (cbGridAnnoType.SelectedIndex == -1) return; - if (rtxbComment.Text == string.Empty) return; - using (AnnotationType annotationType = AnnotationType.Get((int)cbGridAnnoType.SelectedValue)) - { - if (_AddingAnnotation) - { - _AddingAnnotation = false; - using (Item myItem = _CurrentItem.Get()) - { - using (Annotation annotation = Annotation.MakeAnnotation(myItem, annotationType, rtxbComment.Rtf, rtxbComment.Text, "")) - { - CurrentAnnotation = AnnotationInfo.Get(annotation.AnnotationID); - annotation.DTS = DateTime.Now; - annotation.Save(); - } - } - } - else - { - using (Annotation annotation = CurrentAnnotation.Get()) - { - annotation.RtfText = rtxbComment.Rtf; - annotation.SearchText = rtxbComment.Text; - annotation.MyAnnotationType = annotationType; - annotation.DTS = DateTime.Now; - //Console.WriteLine("Before Annotation Type = {0} ({1})", CurrentAnnotation.MyAnnotationType, CurrentAnnotation.MyAnnotationType.AnnotationTypeAnnotations.Count); - //Console.WriteLine("Before Annotation Type = {0}", CurrentAnnotation.MyAnnotationType); - annotation.Save(); - //Console.WriteLine("After Annotation Type = {0} ({1})", CurrentAnnotation.MyAnnotationType, CurrentAnnotation.MyAnnotationType.AnnotationTypeAnnotations.Count); - } - } - } - AnnotationDirty = false; - UpdateAnnotationGrid(); - //UpdateAnnotationSearchResults(); - } - + #endregion private void btnSave_Click(object sender, EventArgs e) { - } + private void tc_LinkActiveChanged(object sender, StepPanelLinkEventArgs args) { // determine if any infotabs are visisble, and if it is the Transition, @@ -1340,12 +1210,14 @@ namespace VEPROMS displayTransition.CurTrans = null; } } + private void tc_LinkInsertTran(object sender, StepPanelLinkEventArgs args) { infoPanel.Expanded = true; infoTabs.SelectedTab = infotabTransition; displayTransition.CurTrans = null; } + private void tc_LinkInsertRO(object sender, StepPanelLinkEventArgs args) { infoPanel.Expanded = true; @@ -1357,6 +1229,7 @@ namespace VEPROMS displayRO.MyRTB = dtp.MyStepPanel.SelectedStepItem.MyStepRTB; displayRO.CurROLink = null; } + private void tc_LinkModifyTran(object sender, StepPanelLinkEventArgs args) { infoPanel.Expanded = true; @@ -1379,211 +1252,10 @@ namespace VEPROMS displayRO.CurROLink = args.MyLinkText.RoUsageid; // this is wrong - use for now. } - private bool _LoadingList = false; - private void cbAnnoType_SelectedValueChanged(object sender, EventArgs e) - { - UpdateAnnotationSearchResults(); - } - - private void UpdateAnnotationSearchResults() - { - AnnotationTypeInfo ati = cbAnnoType.SelectedValue as AnnotationTypeInfo; - _LoadingList = true; - lbResults.DisplayMember = "SearchText"; - lbResults.DataSource = ati.AnnotationTypeAnnotations; - lbResults.SelectedIndex = -1; - LastResultsMouseOverIndex = -1; - _LoadingList = false; - } - - private int LastResultsMouseOverIndex = -1; - void lbResults_MouseMove(object sender, MouseEventArgs e) - { - int ResultsMouseOverIndex = lbResults.IndexFromPoint(e.Location); - if (ResultsMouseOverIndex != -1 && ResultsMouseOverIndex != LastResultsMouseOverIndex) - { - AnnotationInfo ai = lbResults.Items[ResultsMouseOverIndex] as AnnotationInfo; - - toolTip1.SetToolTip(lbResults, ai.MyItem.Path); - LastResultsMouseOverIndex = ResultsMouseOverIndex; - } - } - private void lbResults_SelectedValueChanged(object sender, EventArgs e) - { - if (!_LoadingList) - { - //AnnotationInfo ai = lbResults.SelectedValue as AnnotationInfo; - //if(ai != null) - // tc.OpenItem(ai.MyItem); - CurrentAnnotation = lbResults.SelectedValue as AnnotationInfo; - if (CurrentAnnotation != null) - { - tc.OpenItem(CurrentAnnotation.MyItem); - } - FindCurrentAnnotation(); - } - } private void lbxBookMarks_Click(object sender, EventArgs e) { MostRecentItem itm = lbxBookMarks.SelectedValue as MostRecentItem; tc.OpenItem(itm.MyItemInfo); } - private void cbGridAnnoType_Validating(object sender, CancelEventArgs e) - { - //try - //{ - // //bool test1 = c1AnnotationGrid.IsCellSelected(c1AnnotationGrid.RowSel, c1AnnotationGrid.ColSel); - // //bool test2 = c1AnnotationGrid.IsCellValid(c1AnnotationGrid.RowSel, c1AnnotationGrid.ColSel); - // //AnnotationTypeInfo celldat = (AnnotationTypeInfo)c1AnnotationGrid.GetData(c1AnnotationGrid.RowSel, c1AnnotationGrid.ColSel); - // AnnotationTypeInfo newcelldat = (AnnotationTypeInfo)cbGridAnnoType.SelectedItem; - - // AnnotationInfo ani = ((AnnotationInfoList)itemAnnotationsBindingSource.DataSource)[c1AnnotationGrid.RowSel - 1] as AnnotationInfo; - // Annotation ano = ani.Get(); - // if (ano.TypeID != newcelldat.TypeID) - // { - // ano.Update(newcelldat.TypeID); - // //btnCancelAnnoation.Enabled = true; - // c1AnnotationGrid.Refresh(); - // } - //} - //catch (Exception ex) - //{ - // log.ErrorFormat("Error saving Annotation Type Change: {0}", ex.Message); - //} - } - private void epAnnotations_Layout(object sender, LayoutEventArgs e) - { - //cbGridAnnoType.Visible = false; - } - //private void btnSaveAnnoation_Click(object sender, EventArgs e) - //{ - // AnnotationInfoList ail = (AnnotationInfoList)itemAnnotationsBindingSource.DataSource; - // foreach (AnnotationInfo ai in ail) - // { - // Annotation ano = ai.Get(); - // ano.CommitChanges(); - // } - // btnCancelAnnoation.Enabled = false; - //} - private bool _AddingAnnotation = false; - private void btnAddAnnotation_Click(object sender, EventArgs e) - { - c1AnnotationGrid.Row = -1; - CurrentAnnotation = null; - _AddingAnnotation = true; - //InitializeAnnotation(); - } - private bool _LoadingAnnotation = false; - private bool _LoadingGrid = false; - private void c1AnnotationGrid_EnterCell(object sender, EventArgs e) - { - if (!_LoadingGrid) // Only set the Current Annotation when not loading the grid - { - if ((_Annotations != null) && (c1AnnotationGrid.Row > 0)) - CurrentAnnotation = _Annotations[c1AnnotationGrid.Row - 1]; - else - CurrentAnnotation = null; - } - //InitializeAnnotation(); - } - private void InitializeAnnotation() - { - //vlnCSLAStackTrace.ShowStack("InitializeAnnotation - CurrentAnnotation = {0}", CurrentAnnotation); - _LoadingAnnotation = true; - if (CurrentAnnotation == null) - { - cbGridAnnoType.SelectedIndex = -1; - rtxbComment.Text = ""; - } - else - { - cbGridAnnoType.SelectedValue = CurrentAnnotation.TypeID; - if (CurrentAnnotation.RtfText != "") - rtxbComment.Rtf = CurrentAnnotation.RtfText; - else - rtxbComment.Text = CurrentAnnotation.SearchText; - } - _LoadingAnnotation = false; - AnnotationDirty = false; - if (!_LoadingGrid) - { - rtxbComment.SelectionStart = rtxbComment.TextLength; // Position the cursor at the end of the current text - rtxbComment.Focus(); // Set the focus to the comment text - } - } - private bool _AnnotationDirty = false; - private bool AnnotationDirty - { - get { return _AnnotationDirty; } - set - { - btnRemoveAnnotation.Enabled = btnAddAnnotation.Enabled = !value; - btnSaveAnnotation.Enabled = btnCancelAnnoation.Enabled = value; - _AddingAnnotation = value && (CurrentAnnotation == null); - _AnnotationDirty = value; - } - } - - private void rtxbComment_TextChanged(object sender, EventArgs e) - { - if (!_LoadingAnnotation) - { - AnnotationDirty = true; - } - } - - private void btnCancelAnnoation_Click(object sender, EventArgs e) - { - InitializeAnnotation(); - } - - private void cbGridAnnoType_SelectedValueChanged(object sender, EventArgs e) - { - if (!_LoadingAnnotation) - { - AnnotationDirty = true; - } - - } - - private void btnSaveAnnotation_Click(object sender, EventArgs e) - { - if (cbGridAnnoType.SelectedIndex == -1) - { - MessageBox.Show("You Must Select an Annotation Type", "Annotation Type Not Selected", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); - cbGridAnnoType.Focus(); - return; - } - if (rtxbComment.Text == string.Empty) - { - MessageBox.Show("You Must Enter Annotation Text", "Annotation Text Is Blank", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); - rtxbComment.Focus(); - return; - } - SaveAnnotation(); - } - - private void btnRemoveAnnotation_Click(object sender, EventArgs e) - { - using (Annotation annotation = CurrentAnnotation.Get()) - { - //ShowItemAnnotations("btnRemoveAnnotation_Click Start"); - //annotation.DTS = DateTime.Now; - //annotation.Save(); - //ShowItemAnnotations("btnRemoveAnnotation_Click After Change Save"); - annotation.Delete(); - _LoadingList = true; - annotation.Save(); - _LoadingList = false; - CurrentAnnotation = null; - //ShowItemAnnotations("btnRemoveAnnotation_Click After Delete Save"); - //c1AnnotationGrid.Row = -1; - //ShowItemAnnotations("btnRemoveAnnotation_Click Before Update Grid"); - UpdateAnnotationGrid(); - //ShowItemAnnotations("After UpdateAnnotationGrid After Update Grid"); - UpdateAnnotationSearchResults(); - } - } - } } diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.resx b/PROMS/VEPROMS User Interface/frmVEPROMS.resx index be1223d3..2ff43f6a 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.resx +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.resx @@ -168,8 +168,8 @@ iVBORw0KGgoAAAANSUhEUgAAALQAAABfCAYAAABBTu1zAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAQPxJREFUeF7tfWd0XMeVpnbO7v7dM//mnDm7O95Z7+6ZHY+tLFkjyZIlihKVbMuSSOVo + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAQPxJREFUeF7tfWd0XMeVpnbO7v7dM//mnDm7O95Z7+6ZHY+tLFkjyZIlihKVbMuSSOVo WyIlihHMIEgQAEHkDBAgkTORiJwz0Mg5dCPnHAhmSd9+t1432ARBSk0CS1MGzrl4r9+reOur+25V3br1 HxJT0vpsrA//l//4n/7zfX/3d39339rfGgfuNQ4AuO+77769b++uP8/dt/GdDxYef3Idnn3+NTxDenbd 6/jNc6/i6d++QnoZTz2zAU89u0Hda8+M9Kz8XvJs6XsVhuEZX0vDLP516SzzfLmwa8+W5+HfOF9+w/r/ @@ -488,8 +488,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAIdJREFUOE/tlOsKgDAIhRf0/q9sKiqmC4skCtpwTH98O17YAgCjdRGw01phnG2nuoeA + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAIdJREFUOE/tlOsKgDAIhRf0/q9sKiqmC4skCtpwTH98O17YAgCjdRGw01phnG2nuoeA A2uKGxcdpcUMc8oCgxWxaATlO23vayw0NQEZICoNoL5/TGMV0GBeUSiDKab4D5x2WeuoY5N87fCVGvoZ PALyRJxtiqmTefRzuVNeAm/+Pl/8HN6W8gYgJNCzhmmGgQAAAABJRU5ErkJggg== @@ -497,8 +497,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAKdJREFUOE/NlIsOgCAIRW32/79M4oRAiUFzrZxblh4vzwMAytYHgTxLe0+MJgRqrWre + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAKdJREFUOE/NlIsOgCAIRW32/79M4oRAiUFzrZxblh4vzwMAytYHgTxLe0+MJgRqrWre MAQnBsL6fikIrX2rMA882+1yopqxRlgeKADKFQ3KsLTJpFD6djewq8OLaHhBId+wjwyFKSDd+gRU3yMK pfOtw6wuavJ3QIqsFfVMpcgEVrkn0ygMHKqWAM3VEwYOFarMrObxC6Db1lyF08+510XWS4OMHPL2XD36 anow/cNbAAAAAElFTkSuQmCC @@ -507,8 +507,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAH9JREFUOE/NlIEKwCAIRDfY//+y81xuDa1RSauQiuhxXtZORFtoAzAyQmGSraeOLYAP + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAH9JREFUOE/NlIEKwCAIRDfY//+y81xuDa1RSauQiuhxXtZORFtoAzAyQmGSraeOLYAP 1ShlNQfIruKeRCEdvEKg6xxjwXt/4zr+QNP6Be0BQtGtVKGqshdooBFA19NlFIZ6aGB56bSmbOowr0GA W4Bfz04K/lfgyHc25/taSuEJla3I41YVDssAAAAASUVORK5CYII= @@ -516,8 +516,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAHpJREFUOE/llOEKgDAIhBf0/q9snVjouj+m9aM2hLHBx506FxEZrQvAzmiFqVumbk8B + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAHpJREFUOE/llOEKgDAIhBf0/q9snVjouj+m9aM2hLHBx506FxEZrQvAzmiFqVumbk8B 8gDtQ1YLnG2f78QdV6g8g07AcP8tIPIV7LE0ZCw/AvRQWvmsQgr0Vb8DDNZdL2pPpoGm5tKTh8o0cP4Z ZYU/AhZm5DvzsDLBN+52u9zoVlmTAAAAAElFTkSuQmCC @@ -525,8 +525,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAHNJREFUOE9j/P//PwNVAchAamKqGgb2LTVdh9NAYJiCAgIMQWxsGJdDsLoQlyHI4lQx + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAHNJREFUOE9j/P//PwNVAchAamKqGgb2LTVdh9NAYJiCAgIMQWxsGJdDsLoQlyHI4lQx 8D8LwsUkGQj2LFAzsgHgYICKgeVxpA7sEqMGwmJ3kIUhNGJQ0h4olmGQ5FjGklOQjCMx2VBQAtGncKCk BBr8LgQAn2/gt5b9HCMAAAAASUVORK5CYII= @@ -534,8 +534,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAH9JREFUOE9j/P//PwNVAchAdAy0AGQLSAYrhMtj0ztqIDg84WHEAgxDEAZBGBtIkx+G + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAH9JREFUOE9j/P//PwNVAchAdAy0AGQLSAYrhMtj0ztqIDg84WHEAgxDEAZBGBtIkx+G MMNgUQM1dNRAlHSMkagxIgU5aVMahhi5BSmGwXKk5hRYbOKiSTYQlPbQDQOlSfKTDY7CAV5kkOpl5NyB wQZZRrKBVHfhoDUQW9gQKwYA3Mt2Kr495a0AAAAASUVORK5CYII= @@ -543,8 +543,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAIdJREFUOE/tlNEKgDAIRRf0/79szsjUaTEnPbVhEMLl6HVuANBKTxesjFIxqtala0iN + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAIdJREFUOE/tlNEKgDAIRRf0/79szsjUaTEnPbVhEMLl6HVuANBKTxesjFIxqtala0iN F0//qDgzcVW+4O6LXeKA+ahNbkJSMZEhTgkSibyC/BdkLx5NsT1kl2fHxpu/wfnghb2OTclgq9L04Nx/ GULqYRQpwYgua4p5J1p+hnBlP360Dxe2+AE5U7i7XUfchAAAAABJRU5ErkJggg== @@ -552,8 +552,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAH9JREFUOE/dVAEKgDAIXND/v2y6crjQQXpEtGFRsuPcnW5E1KBLAJEBBevVuuwas+bN + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAH9JREFUOE/dVAEKgDAIXND/v2y6crjQQXpEtGFRsuPcnW5E1KBLAJEBBevVuuwas+bN Sx5TnJm4qhDQA9N/JUDa+biEYdy/g7t3E4OJAdNSR+6fgEthMiXDAa3CHxVF3KfWud4p20wm1lazxoa3 3tNOuQtg1c4Nh8KMfGkeFhgeIIeryKLL0A0AAAAASUVORK5CYII= @@ -561,8 +561,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAH5JREFUOE/dlIEKwCAIRBvs/3/ZeW6JgZErGdsKC4RedyZtRFRSB4CZkQoTt5nqHgQW + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAH5JREFUOE/dlIEKwCAIRBvs/3/ZeW6JgZErGdsKC4RedyZtRFRSB4CZkQoTt5nqHgQW ritPHli64bnzLQdguCgMtKpoP9VaxZpzOsRVWIFy0AAbKK74IRC2qu1r13LMWJaX1Cdp20jy0RqOelBV 3wH2oFZxXOHCD/TVz+FNlg+KLdeMaYotpAAAAABJRU5ErkJggg== @@ -570,8 +570,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAItJREFUOE/dlEEOgDAIBGvi/7+MLgaFBg4U0oM2aC9OBko5iGi0PgB2RiuMs3XtBpcB + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAItJREFUOE/dlEEOgDAIBGvi/7+MLgaFBg4U0oM2aC9OBko5iGi0PgB2RiuMs3XtBpcB LzfunEKRfUA6P0vseeErEdQ+NBSATttAO4CAlwzFDmbGFGlnDV+Y1E9B2TIDNDAF1KZ/Bc69p3tzpYbc Jk9L8zInnQHOP893On3KnpHuyfxwKMzITfOwYHgBIcyz3GpBxx0AAAAASUVORK5CYII= @@ -579,8 +579,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAG5JREFUOE/VVFsKACAIK+j+VzYnFEQvsBVkGNTH2qYZRSRQA4DMpIKZWia7x4BJvdXU + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAG5JREFUOE/VVFsKACAIK+j+VzYnFEQvsBVkGNTH2qYZRSRQA4DMpIKZWia7x4BJvdXU wNbkStVU8gio3B0BgmWzcF50xpYhDRCsOu/A1cuQDlgLcNtDPHRUFFofjjw0diiMp228f/zn4eAcvHTJ GQ50BGLnnh0kAAAAAElFTkSuQmCC @@ -588,32 +588,32 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAFlJREFUOE9j/P//PwNVAchAamKqGgb2LTVdR7SBwDAGBQxRlhOnCGQgCxUNBBkGdiUR + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAFlJREFUOE9j/P//PwNVAchAamKqGgb2LTVdR7SBwDAGBQxRlhOnCGQgCxUNBBkGdiUR EUiUC8Guo6aXaeJCqnt51ECcqYO4ZANMMoM8DInIIbBcRJyXh5WBABRZUBLQnVBRAAAAAElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAFFJREFUOE9j/P//PwNVAchAamKqGgb2LTVdh9dAaLiCAhgd43UETkl8EYXPV/gMxOY6 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAFFJREFUOE9j/P//PwNVAchAamKqGgb2LTVdh9dAaLiCAhgd43UETkl8EYXPV/gMxOY6 sBglBmJ16PA2EGs4Dm8vD/5Ypl6kkFto0K+0GTQuBACUuJiTTPFroQAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAADxJREFUOE9j/P//PwNVAchAamKqGgb2LTVdN8QNBMY8KPpxYlxBhTMMRw3ECMvRMISn + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAADxJREFUOE9j/P//PwNVAchAamKqGgb2LTVdN8QNBMY8KPpxYlxBhTMMRw3ECMvRMISn ltGsR3nZOPjDEAD6FPM4KprXiAAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAINJREFUOE/NlOEKgDAIhAt6/1e2bkyx0sDtqDZk7Mc+zjvZKiILdQHILCqsdctUlwIP + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAINJREFUOE/NlOEKgDAIhAt6/1e2bkyx0sDtqDZk7Mc+zjvZKiILdQHILCqsdctUlwIP T2HE806sChUC6Eu2DsepVQHi+RWq92Fg09TVRPDM+zgUdU/bc26a0mrLdIVUD28p+wEaSdnmMPBwLmWX tIF0JiuhZP6dhv1T4MyH8c5v8yuFO1DV07yWmDh+AAAAAElFTkSuQmCC @@ -621,8 +621,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAIlJREFUOE+9lN0KgDAIhRf0/q9sKihabuAPFV6s8NvxKF4AsEYfAk7GKIyrnVS3By60 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAIlJREFUOE+9lN0KgDAIhRf0/q9sKihabuAPFV6s8NvxKF4AsEYfAk7GKIyrnVS3By60 4fCi55gbWxUrJNjtgyA28kDO9xA582UZhRFILRDlFaCWbf3sAJ1nAq0ApbwxDz9+BQ1KNSUC2m+1OXx7 ZueS/lW6vPMwrfAE0uHOKOwsjJ+2TWPpjit8AH+V07iuhEoDAAAAAElFTkSuQmCC @@ -630,8 +630,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAG9JREFUOE9j/P//PwNVAchAamKqGgb2LTVdh9tABmAwIEFgGIMCGhQ4qBBLcGF3IUgb + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAG9JREFUOE9j/P//PwNVAchAamKqGgb2LTVdh9tABmAwIEFgGIMCGhQ4qBBLcGF3IUgb CwLDDUQSA8uTZCCSoSguhBkKkh8wA2EuIkQT7UJCBsGDYMC8DE8c0AgYjRRwrgHnHKIjhYISiE6Fw7B2 IQBXTc/Ii1NFYgAAAABJRU5ErkJggg== @@ -639,8 +639,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAHpJREFUOE9j/P//PwNVAchAamKqGgb2LTVdR0cDGYDhigSBkQaKOVBoo0Is4Y/dyyBt + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAHpJREFUOE9j/P//PwNVAchAamKqGgb2LTVdR0cDGYDhigSBkQaKOVBoo0Is4Y/dyyBt LAgMNxBJDCxPkoFIhqK4EGYoSJ5cA1E8So6BMBcRool2ISGD4EEwYF6Ghxk0vKgeKdQzEJp0MNIhLHkT HYYUlEBDtXAYTF4GABL477TaAfezAAAAAElFTkSuQmCC @@ -648,16 +648,16 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAFFJREFUOE9j/P//PwNVAchAamKqGgb2LTVdN4QNhMY6KPrRMXKCAPoQM0KxhiEWg7AZ + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAFFJREFUOE9j/P//PwNVAchAamKqGgb2LTVdN4QNhMY6KPrRMXKCAPoQM0KxhiEWg7AZ TrKBKK7B5lpSXEhUWifVwJEUhpTkntGsR3nZOPjDEAAZ/81eNzDEKwAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAF5JREFUOE9j/P//PwNVAchAamKqGgb2LTVdR0cDGcARBSLA+D8LMJxBEEQDMVgMR9hj + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAF5JREFUOE9j/P//PwNVAchAamKqGgb2LTVdR0cDGcARBSLA+D8LMJxBEEQDMVgMR9hj 9TJYA5oBGBaQYiDUPXAXwflIlpDkwsFvIHJ44WKPehme/IZq1qOgSBuBXgYAUGAHm432490AAAAASUVO RK5CYII= @@ -665,8 +665,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAKhJREFUOE/NlFkOwCAIRNuk97+yBSKExQUTmlSjHy7PEUbv1tpVWhBY2UphdFtRd4FS + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAKhJREFUOE/NlFkOwCAIRNuk97+yBSKExQUTmlSjHy7PEUbv1tpVWhBY2UphdFtRd4FS qFCwQ92hruaYI0BevAOODqKxHrq1wgcW9iYHqTGa45oC4mIFlM0M1UE5AYYwVABZ3TTWWYVeHTnAxzWd lG4jE3wXV7HYTKG2hcmsTsCJQg/k6xn/ATAkaqfQbHDeG5o/Azx6fivg9FWoqwb7BGDRN/bh9/VXhS9A +GdRV5V7oAAAAABJRU5ErkJggg== @@ -675,8 +675,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAKFJREFUOE/NlNsOgCAMQzHx/38Zt4WZbtzJTJTgA2I5pYwr55xCHxaM7KFi4tbQJaKl + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAKFJREFUOE/NlNsOgCAMQzHx/38Zt4WZbtzJTJTgA2I5pYwr55xCHxaM7KFi4tbQJaKl Rg+/mL1qzW/g0gjq5PenmwSxl8X8GELNCVUQyWFMPPQI1aCx5QRlToRgb5FjQhMSEZoFdi37ZDG8I0Kk q07CSih4+lp0HMqWZS+oqQppSfhIcLR3Zh9noeB5NFUBVbNNOKrnqt67hAFX2cfX1x8JH9infzlwvl0u AAAAAElFTkSuQmCC @@ -685,8 +685,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAJRJREFUOE/NlNEKgDAIRRf0/79salPWrLiSgwpftjxeTd2IqJU+Aqy0CGscAHg5K9YR + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAJRJREFUOE/NlNEKgDAIRRf0/79salPWrLiSgwpftjxeTd2IqJU+Aqy0CGscAHg5K9YR xbwCxWk2CaYwCQoD99PpyYjvU8ARNKYfzhGFFydT0msa0s8ANa0BqHXrZwaGaugfrwT6X61Q6DCp46+A oZaTutSklPahNvKKSbGZvZtlnx60sZFtg8/yx/1Yulx1+1dua2EdD2qAIPUd5s8AAAAASUVORK5CYII= @@ -694,8 +694,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAIdJREFUOE/NlOEKwCAIhBvs/V/ZacywKduFsi3xT9THnaUbEbXSJcDKLIV1t05dY8WX + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAIdJREFUOE/NlOEKwCAIhBvs/V/ZacywKduFsi3xT9THnaUbEbXSJcDKLIV1t05dY8WX 4JKIDx+Bu0egwDQdEgbufPXMCWj2OxwGymG+bGFDpUA1VoARzFlHgXewCYoAEdiAfgKUgiMql1+59FH0 W4TfxvYLUsOo7X7aKcZabjgk5+ML8zCp8AC0/YvYhcL59wAAAABJRU5ErkJggg== @@ -703,8 +703,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAIBJREFUOE/VlOEKwCAIhDfY+7+yeZJh2xqYFqzhjxkcn3fhSURH6oFgZqWKybSZdPsE + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAIBJREFUOE/VlOEKwCAIhDfY+7+yeZJh2xqYFqzhjxkcn3fhSURH6oFgZqWKybSZdPsE OSQk9Vmjyd5HFi2+ujgw+/G/9NEbhLlPEHSNplJ21F7CZYJK2ejU1xlCSxkXhG/Vx4fYTMr2udzD8T8b +GSqI9S+y8PABvrpcoistPSRC/8z/5QTH8xtAAAAAElFTkSuQmCC @@ -712,8 +712,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAJBJREFUOE/NlIEKwCAIRBvs/3/ZqaSYOqIl2woJCl7nmR0A0EoHASujFMbZVqrLgQ0t + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAJBJREFUOE/NlIEKwCAIRBvs/3/ZqaSYOqIl2woJCl7nmR0A0EoHASujFMbZVqrLgQ0t MBP9JZM1xtNoV1TYYR50C3Y1SIGDohNVUNDENahdATJIYGKDgfIlM6AoEEVWVbq3CgzeddV68efA7ZTJ J02noigWSGBf5UfPxkOzR64dMyuKb6391tv8zl74bf6m8AKNAJvwV1fzVAAAAABJRU5ErkJggg== @@ -721,8 +721,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAHpJREFUOE/tlFEKACEIRFvo/ld2zRrW+pBQif2oCKLoMWNTDxGV1NaAmSMVJm5NdYXV + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAHpJREFUOE/tlFEKACEIRFvo/ld2zRrW+pBQif2oCKLoMWNTDxGV1NaAmSMVJm5NdYXV c+fWfHzdcLUNnKBuYO3q9CBes1zZmwoG66LUq1AOD5WoYAgo9hZgyPIF9mBHYgMAbhs1dcdmikrK09Ox GfOYZcfXdvj7+oPCFzUrDpjs1cCOAAAAAElFTkSuQmCC @@ -730,8 +730,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAHxJREFUOE/tlL0OwCAIhDXp+78ycqRnSQcGIKZDNQw6nN/JzxSR0bog2BmtYuY2pBtK + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAHxJREFUOE/tlL0OwCAIhDXp+78ycqRnSQcGIKZDNQw6nN/JzxSR0bog2BmtYuY2pBtK r1sXfDw7cHVY8FIqjU14nyNXMeFbEKZxl7b8C1rhVP7QsuuzzJrMJgWCDBa4PZIV9CJbuGKZzeYp7S5N 6OuQXVIiTIy2w+PrC4QLMHgOlOq5QDwAAAAASUVORK5CYII= @@ -739,8 +739,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAGRJREFUOE9j/P//PwNVAchAamKqGgb2LTVdNxQNZABGEBQCYx4U/aAoQ0AWIBuEkSFa + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAGRJREFUOE9j/P//PwNVAchAamKqGgb2LTVdNxQNZABGEBQCYx4U/aAoQ0AWIBuEkSFa pKKGIbph6JrJMRDuMmyaSTUQZhgpNHoqwfAyVV2IHNjgCKFGGFI3lqmQr0d81hsRYQgA/B8AgiUdBGUA AAAASUVORK5CYII= @@ -748,8 +748,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAGtJREFUOE9j/P//PwNVAchAamKqGgb2LTVdNxQNZABGEAyyAFkgjASBqQGUJEDRiIBo + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAGtJREFUOE9j/P//PwNVAchAamKqGgb2LTVdNxQNZABGEAyyAFkgjASBqQGUJEDRiIBo kYoahgQMBFmAYSilBmIYis9AmO2k0OiphGQvk+RClMDGEikww6gWKeAYRot5/F6mQr4e8VlvRIQhAIwr AYWdxFZmAAAAAElFTkSuQmCC @@ -757,8 +757,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAADxJREFUOE9j/P//PwNVAchAamKiDAP6AGgncRaPGog9nEbDEG/KGE02o8kGWsIM/pxC + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAADxJREFUOE9j/P//PwNVAchAamKiDAP6AGgncRaPGog9nEbDEG/KGE02o8kGWsIM/pxC bFkILv1JUUyMWgDrxVLnzhXMLQAAAABJRU5ErkJggg== @@ -780,8 +780,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAHlJREFUOE/llI0KwCAIhB2+/zO7GQhmLQ2OYCyQ/uzjrqRLRAjaFIgMKKy5Rar7CJCZ + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAHlJREFUOE/llI0KwCAIhB2+/zO7GQhmLQ2OYCyQ/uzjrqRLRAjaFIgMKKy5Rar7CJCZ yYU8Yw2/NhtbXuwpJleBei7mtvkbcEelMQagQaoqZ7Y7y8N9JHe5tBwtVlSeA3qr/vVWKstlk9Vfup8m uHorPdofPwf0f3gD43NpwwQa5WcAAAAASUVORK5CYII= @@ -789,8 +789,8 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAPxJREFUOE9j/P//PwOl4DPQAJAppOLPMMuXAzVvBOL1JGCQ+uUwA5KAnAwgTicBg9Qn + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAPxJREFUOE9j/P//PwOl4DPQAJAppOLPMMuXAzVvBOL1JGCQ+uUwA5KAnAwgTicBg9Qn wQzoBHImAfEEEjBIfSfF4YfLAGag6azEYLABbGxs9yUlJd9CYyETSCcC8S0gPokHnwHKHQAboKqq+nnJ kiWwKGwASggBsR8Qe+DBnkA5V5gXlkKjby+Q9gLiWCA+BcS78GCQ2o1UD0QLoKlrgHgeEINcJQ7EHEC8 FmQbEG9AwpuA7BXoLogqKCj4n5KSAgsPTaAiEPCFhgkoXGDYH+RddANCpaSk/ouLi4Pyxj8gVgViNiA+ @@ -868,8 +868,8 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAADpJREFUOE9j/P//PwNFAGQAJRismZmZ+T86RjaUhYnlPzoGqQe7nhLbR5oBo4GIO7WS + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAADpJREFUOE9j/P//PwNFAGQAJRismZmZ+T86RjaUhYnlPzoGqQe7nhLbR5oBo4GIO7WS lJCQA3IYpUQA76epNf0QgmEAAAAASUVORK5CYII= @@ -908,8 +908,8 @@ iVBORw0KGgoAAAANSUhEUgAAAQAAAABmCAYAAAAkqE+VAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAGBdJREFUeF7tXXl0VFWaT4/9R0+PHnsWR7uZbu2eOTN2N7bSjo7YKrQaEVsRGlTUYysg + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAGBdJREFUeF7tXXl0VFWaT4/9R0+PHnsWR7uZbu2eOTN2N7bSjo7YKrQaEVsRGlTUYysg iNgsKYQACUISIMgSFoEUiQQIskcMIGsBWVgMEbOvkBASkkAgIWQnCeQ3777a3lZV79V6q+pyzj1Q1H3v fff7ft/vW+6tqh81t7Ti+NGDIVeuXgtpa2sPYX+YBpgGAlsD99xzd8h99/1ryJChr4WErFmzBgUFBWhs bERPTw8bTAcMA36GgetNzXBmfPnllwghzs8cnxEfw4D/YoA4f29vLz+IHbu7u3Hr1i1+dHV1oaOjgx/t @@ -1018,8 +1018,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAASxJREFUOE9j/P//PwNVAchAamKEYQxAg7HAu0+//m9Z9ur/5XufQVbjhlCH4TUQZtiy + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAASxJREFUOE9j/P//PwNVAchAamKEYQxAg7HAu0+//m9Z9ur/5XufQVbjhlCH4TUQZtiy w7//J3ddw28oIQORDZuw8f3/9Ckv/oc33f5///l37C4lZCDImwbhK/9bJ23637Ds/X/X4nP/NYOW/5d3 n0megbDQciq5+j+1985/abt2ysMQZKhe2qX/Su6T/0tZN5JmYFZh5f+M/Mr/6XkV/1Nyyv4nZZf+T8wo +R+XXvQ/JqXwf2RS/v/whLz/IXE5/4Nisv8HRGX+943I+O8Tnv7fMzQVmPIgyY9gssGbVJATEc0NzCiA @@ -1030,8 +1030,8 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAASlJREFUOE9j/P//PwNFAGQAJZgizWDXU2L7IDEgq7Dyf0Z+5f/0vIr/KTll/5OyS/8n + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAASlJREFUOE9j/P//PwNFAGQAJZgizWDXU2L7IDEgq7Dyf0Z+5f/0vIr/KTll/5OyS/8n ZpT8j0sv+h+TUvg/Min/f3hC3v+QuJz/QTHZ/wOiMv/7RmT89wlP/+8ZmgqMAQohhdqBsZBRAHF+am75 /2SQ8zNL/sdnFP2PTS36H5Vc8D8sseh/aHze/+BYkPOz/vtFQpzvFZr23zM4BbcHKmc/+B9Rdfi/f9Fu UFLDCXFKtCx79X/hvu//HVPXk2aAQ9Kq/5ndF/+DDJi5/ct/38Id/81jV/xX9ZiA1SAMF1y7++a/pv+c @@ -1061,8 +1061,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAJVJREFUOE/tk0ESgCAIRfX+hyZEcECJyEW1iMbJIXz8ACsAFDQoFZ++IweZ+IYj2Mip + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAJVJREFUOE/tk0ESgCAIRfX+hyZEcECJyEW1iMbJIXz8ACsAFDQoFZ++IweZ+IYj2Mip BsRljajKj2nYI1/Wd+e0yAmoQ1sagu0C3YO7wFDJjsLHgUvnnFaapgyF+vekfusgOPypyxHwWh3Ngx0b M1msLAeSKAX0xpXD6O4ES+XMAW+IzAN/hWdlzddwzIXT7W90+VWFB0CnMA5SEwr4AAAAAElFTkSuQmCC @@ -1088,8 +1088,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAGhJREFUOE9j/P//PwNVAchAamKqGgb2LTVdh9NAYJiCAhaOgYECCmZUMRxBhd2FSAaA + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAGhJREFUOE9j/P//PwNVAchAamKqGgb2LTVdh9NAYJiCAhaOgYECCmZUMRxBhd2FSAaA DINBmKFg/qiBsCAYDUNocoAmFPS0B+LDExGpyQY5/WFlk2IgNpdRllMoKIHoUzhQUgINfhcCAK1G3k1g YwCYAAAAAElFTkSuQmCC @@ -1127,8 +1127,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAJhJREFUOE/tlNEKgDAIRTe2///fQDAcGBd1rFkPPRRIYOt6NLuVmYu9eu8+6U75BBHV + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAJhJREFUOE/tlNEKgDAIRTe2///fQDAcGBd1rFkPPRRIYOt6NLuVmYu9eu8+6U75BBHV IoI2WmtMB22FvDPgUEySmZDiU8EMmRPMUOlY8H61nJ2ZkoWEmsSKSB49XwruzO9WyzM6S2rJpi2/Tmgr KxnOL2r1J+SCix196e/McLWHuFbR2cf/sq4VWuDww6w5ROZ8CWYsLBI8ASIt+Tz8pxenAAAAAElFTkSu QmCC @@ -1137,8 +1137,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAkZJREFUOE/VlF1IU2EYxxsbXUQJ0s0qCLooum6ZfaIXzjlbenL0QUa0UcxjbBOLIAdm + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAkZJREFUOE/VlF1IU2EYxxsbXUQJ0s0qCLooum6ZfaIXzjlbenL0QUa0UcxjbBOLIAdm VhcZG9K5KfJzq4TA40cWq5GsL83JgmgthyJqynLK5oY7zm307xzrhKm5GQT1wMv7+fx4/+/75xEAWMWF SCT6PlhBxONxwaLjHJBrQqGQ7ZKPH+fncue3n5O/BuTAPHyp8fy9hbebe77/V/Jy0rmv+zc+RbxhE0a9 EyirNKGR7sS5MiNOkgYMjk6u/IZhJoJXPS40W1+j1zMEx/A4aEcfKmrbUWSgIN68jVOe2Ie8LfZl5uDu @@ -1154,8 +1154,8 @@ iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAYAAADE6YVjAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAYFJREFUSEvtlTFrg0AUx2PTUhCEOGQQA8mS2UlDvkI+gd8ikCFDBCFDloAJxNCldnFx + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAYFJREFUSEvtlTFrg0AUx2PTUhCEOGQQA8mS2UlDvkI+gd8ikCFDBCFDloAJxNCldnFx cnC0zaAfSwK+eocJnrlLrlI79cGfO+R5P9//PVUAgE7rgSBtq3UAdqrtKgjIarXqdLtdWnueiwBe0R76 WskdyAsC8ESZd+POI4hQBYzHb5hVX9E1FoDHLmwViun0A6+TyTsBulRYhTiOQ1Rzt5K6TaxKUF7RTOHS j81mQ4es12uh7PoTWn/ShyL9tdrw3W5Hh7CmR+71QJZlplj3VaFXIkpOkqSxVFUFz/NguVzeDAEB+UyS @@ -1167,8 +1167,8 @@ iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAYAAADE6YVjAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAwBJREFUSEt9ljuOGkEQhmdYMLt47fUL24FtIhLLqUlISCwi7sEVyCDlChyBA5AgQbIr + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAwBJREFUSEt9ljuOGkEQhmdYMLt47fUL24FtIhLLqUlISCwi7sEVyCDlChyBA5AgQbIr JyQ+wUpOEQcAi9n6Sl2tmma8K9X2Y7rqr8ff1eRFUXSyLPsrchbhLw8jQyFSE6mL3IT5UcZT+IYOwhnO IqbfCOt/mYDkIjbavOb2+ebP2ZrRzqF3FaQexoaML9A1BRYGYHsoeYM6r9frGPbA6LGHjTfum+0pCAvQ myKgY5y5GfoY1vlsNqsJSIE4rz8F4y9lvBF5G2yir476NLVk484ZRwEDjIBqahwIDl2LvHaA7OGBOR9B @@ -1187,8 +1187,8 @@ iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAYAAADE6YVjAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAABlVJREFUSEu1lntQ1NcVx5fMpNPp2CZpxyax0TQz2EweplaiILDLG9HgA4NWFgwSWEQQ + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAABlVJREFUSEu1lntQ1NcVx5fMpNPp2CZpxyax0TQz2EweplaiILDLG9HgA4NWFgwSWEQQ EESQII8ICAiE1QkooEIAEQHlISCQGjQ1FuShlggCFmMBRZaHxAWEAp9e1nZ++SPPP3Jn7v529p7f/dzv Ofecs3qA7Gcfc5DzVWPMzZpqrXg+orTkISfzRsjMGCb14wEOqe+TnNRLfNy/+TDqLvvCugn7oIvgoFsE 7GrDz7edwICbhO29RcS+TrHWQcieDoJ23xLbCxFzH1WVj/i0dpy6z6bI+WSC3Bwt11rGaGwc5/LftVy6 @@ -1221,8 +1221,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAJtJREFUOE/VVIsOgCAIrP//KfsyE/K2RB5ari035hxyHKew55y3pYsAU0qhlaRHdI/J + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAJtJREFUOE/VVIsOgCAIrP//KfsyE/K2RB5ari035hxyHKew55y3pYsAU0qhlaRHdI/J ATAK8PzwNYCUPQLVGN5jOkAE0CXLvLJ9wOKlRZpgRxIL1AWUYHwukrPoxgM9YXiBVkkk03mGonwTUGbk s6JhI4NS9jKGIDSt4WcMoeXfGTrtN/wPlw6HkfFk9bA5vqKA4QFbhwr3/Vs7AVX9hX1v7jIzAAAAAElF TkSuQmCC @@ -1278,8 +1278,8 @@ iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAYAAADE6YVjAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAB6xJREFUSEt9lQk81ekaxx/EZJuZhBaU0u2OSZ0pmQ8lspTKVnPFFJG6tlKSi5sl4Vja + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAB6xJREFUSEt9lQk81ekaxx/EZJuZhBaU0u2OSZ0pmQ8lspTKVnPFFJG6tlKSi5sl4Vja EMpSp1KdpJWyTE2WlELGEpU+Mpm2a9LGib8czu++TjV3rntn3s/n+/m/z/N//8/vfZ7nfc+RERbW0lsR R2/eciQzSoE+V9Mg1dHyJN9ZSEQyJCMjS0MSGZIfhbV9nGzagFiG3ovFRBIJiQeHaGhIwmwJWyshBdlB Uux70yz7pZxQwXhKoqLSRFLqUx2kYZH9udeIn/EDxR0so/Tzdyir4BElJwkolR9BWWnJFBqapp25L31/ @@ -1318,8 +1318,8 @@ iVBORw0KGgoAAAANSUhEUgAAALQAAABjCAYAAAAy9iqlAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAJx1JREFUeF7tffd3FMf2J3v2e87+uP/Gnu/ue34mJ9vYGHAEbGyCAYNxwgkwGIzJOdgE + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAJx1JREFUeF7tffd3FMf2J3v2e87+uP/Gnu/ue34mJ9vYGHAEbGyCAYNxwgkwGIzJOdgE g9Ozcc429jM5RwkkJKGcc85plEcS4u7nUz0909PTEyQGmdA656or3LqVPnXrdldN1f948qU9xf+r/sz/ Lq5wDPiv//qfA+w/uwVutxYQGTBArl8f8M9//p+mAf8YMqH1gYcel4fGT5aHxtlkt8HtiYExwO79Y8a3 Dhg2bIRj9JhHZPjIMTLyvodl1P3jZeT9D8uI0WNl5OiH8GTYOBWu0TjFq4VrfmPcqAc8YSMhg3y6XJ1/ @@ -2738,8 +2738,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAJVJREFUOE/tk0ESgCAIRfX+hyZEcECJyEW1iMbJIXz8ACsAFDQoFZ++IweZ+IYj2Mip + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAJVJREFUOE/tk0ESgCAIRfX+hyZEcECJyEW1iMbJIXz8ACsAFDQoFZ++IweZ+IYj2Mip BsRljajKj2nYI1/Wd+e0yAmoQ1sagu0C3YO7wFDJjsLHgUvnnFaapgyF+vekfusgOPypyxHwWh3Ngx0b M1msLAeSKAX0xpXD6O4ES+XMAW+IzAN/hWdlzddwzIXT7W90+VWFB0CnMA5SEwr4AAAAAElFTkSuQmCC @@ -2747,8 +2747,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAKRJREFUOE/NlNEOgCAIRcv55P//ay8u61owJE03aavGJgInuC7XlNJi+gBoaaawPK1l + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAKRJREFUOE/NlNEOgCAIRcv55P//ay8u61owJE03aavGJgInuC7XlNJi+gBoaaawPK1l dwUwuLBpO8XgtxbHHmfc0nGH3vkU98hGACqAL+NYFzk9YP5AvIoArQGLnBEgCuSoukPEyegsmiPXivUe +YB2gVrTN38YKCF6rf1mh1IXWmM0Aug4xYZGNulQCi0PYVrD6VNu/Vqj+w8NrS6J726b33Z4AFzeFLS3 F5viAAAAAElFTkSuQmCC @@ -3387,8 +3387,8 @@ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAABEVJREFUWEfNV9tOlFcY/e56ZdMn6Cv4FD5AY7VWrVbFEyPtrRdNTJrGZ+g71BLjRdNo + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAABEVJREFUWEfNV9tOlFcY/e56ZdMn6Cv4FD5AY7VWrVbFEyPtrRdNTJrGZ+g71BLjRdNo bBPTtLYesCgUOXigOAKOMwNyHOBfXWvP/obNwGwghqQ7WSGBP986fN8+YPa/Wgdv1+zTX2GH7hC/wQ7/ DvvsLuzIX7DP78OOPiQewY71w44/gX0xSAzBTgzDTo4QY7Avn8NOvSDGa3Z64uTu/JH8wSTeGz8OApd/ Wsa+Uhl2prwLEXQ+8Abvjd5+4MD3wDc/N7Dv0hSsa2qHIhj7aA0B/1SAx9PAE0KiBgn9Thginr5tYjhi @@ -3412,8 +3412,8 @@ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAz9JREFUWEftl2tIk2EUxyXCEs0Ki8hkVtrKCvxQGFSmeJnm1MQuQlJiikJSU3CaZm1K + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAz9JREFUWEftl2tIk2EUxyXCEs0Ki8hkVtrKCvxQGFSmeJnm1MQuQlJiikJSU3CaZm1K ZJhkyIRpk+UNRaRQW9GU3kRRIy+laB90rEiyqBRU1Ozy77yOvM3pPjxCHxz84GEMzm/nfc7ltbBY/fwP GUj0EboSMimP7yxJdE4SGUiei59Qds3AKSb+FJyryIqBtijNmGL6jqhbBBIYZibQ31mKP5Ma/B5RmQ0J gIkApZ3r71Tj50AMJtsszSbFXwjCgyeV56SB6/8IoDOxrOS0QEc+pj5GY/zVerNRxh1EgfQMHvAkzaKi @@ -3433,8 +3433,8 @@ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAABWRJREFUWEfFl2tQVGUch/nuNDZ9yWb61AdrqrEZdaY+FGZjXhpKzEQhkMBrDCiKLhcB + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAABWRJREFUWEfFl2tQVGUch/nuNDZ9yWb61AdrqrEZdaY+FGZjXhpKzEQhkMBrDCiKLhcB EVTkzoYSF3FJZHUrL1wSUVdWUTSdadQ2MbVNK9BEBfG+lU//9xwXhj1rVO7omfnNnrN7zj7P+77/877n BAQ8+a1gaEBAQbeExxxhapsmQNl+Hmv0xvZtBTxtgsBcGJMnIg5oOQ37JHtPwZ4foNkJu76HnSehSaL2 1Xe75bc9co69XT9fXef4EfafgdazcPAcHJD9DQdhhgXCJIplEHhqKYyKdTA6zsE++dPe23p6bsK1G3Dl @@ -3463,8 +3463,8 @@ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAACZZJREFUWEfFl2dUVFkWRhXDCJIzigTFbItSpjEHBIlFFAMCY+oxgmIYTCWhwVYEJSmI + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAACZZJREFUWEfFl2dUVFkWRhXDCJIzigTFbItSpjEHBIlFFAMCY+oxgmIYTCWhwVYEJSmI VYoBoUREQRAVxJwds20r2CYMQIFEbeWbc28JDoPMcvwzrHXWg6pX7+z3nX3vo1q3auEn3L6TULHNJyet 9rVjP9e3NvkEhVaf6lm1LqffD3+GwpbFmW9utfT573kdQPPTjnu2Nz82/S83V1t1hdhFE4c8lCCdrIxk NxUkuahB7KSBeEctxNjrYqudnvf3NGrpnGYABT5t1PK82sikHspYY90VyZNVkTmtAw5PUcTByR1xwF0F @@ -3511,8 +3511,8 @@ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAABadJREFUWEftl1lMVFcYx89r0xcf2jRp04cqBglqkYALiCAVClqkbMowwIDsy4gCFZfg + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAABadJREFUWEftl1lMVFcYx89r0xcf2jRp04cqBglqkYALiCAVClqkbMowwIDsy4gCFZfg aSIaGKgjRLHaugA6NdJqjAKJSy4FAkEFBCoWquBQBEQEBGWHf883Aqm5jQyEx97kl+Ee7ve/v/vdM5Nz GPv/mK0DXhJnPqVg2yvAFPfB/GrB/B+CBTaCqZ6ABevBdrSBhXSAhXWBhb8Ei+gDi+yXZos27v8+ZXyP rhU9g0DfMDAwArwZBQYFQ2PA8L+gcxovejguBF4vkMD2Sp6oe4YXb4CeobcS/ULi9ZTItAx9EiRYSAJR @@ -3542,8 +3542,8 @@ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAA8JJREFUWEftln1M1HUcx/kjCRE4EWiwllB/XKutteqPVqtsJfjEQzYqXVSuMFM3L4sH + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAA8JJREFUWEftln1M1HUcx/kjCRE4EWiwllB/XKutteqPVqtsJfjEQzYqXVSuMFM3L4sH w+N+lE4nD00d8hAgSa6YMhK1MbHrcCytLSM2bOZIatacPcyJYFCxV+/fHXh33ulw+7n1h7e9tt/3e7f7 vu7z+Xw/94mIuPn6P0SgYK49RxiF6cEUaV2U4aM4kHl2Y50PmyX+OpyuXc7wtGhfHL6ClrI8JNBsiUCh BBj/lvGRVsaHGqfEwDGXKeCxRiDdFDjG6DeRU+bk3jjemW/vFXNMSkwW+FmvZy8LfTgX2u+/qqxyD/92 @@ -3565,8 +3565,8 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAt5JREFUOE990mlIFGEYwPEx61tEQfUlKoiCoMCgvnQa9KGIgm6prIgOrdUsu9Mao/uk + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAt5JREFUOE990mlIFGEYwPEx61tEQfUlKoiCoMCgvnQa9KGIgm6prIgOrdUsu9Mao/uk Qwm0UsotK0srLzowKDvddjfLbdXWaEjUckqzVdx1/j3jTkkEDfyZYdj39z7vsGGKec1/GKmEhU9VevRS lLCeitLDqus5PPQuzLyHf1cyh5zuWiMXYD0teKS6GuB/5VZAVHYHAzY1Zv4LLCpTa79DRSO4BXor98ov 4P0KVU1QrUNuucGYFIMl9gADN+tdSPcEUS/Uhp8CvCjFcSUFZ85eXDkpeF6V4vsGHwW/8dyg37IQEn01 @@ -3584,8 +3584,8 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAmVJREFUOE+lU1tsi2EY5u7//57Wrqtu7dodulI7VDY26RRzmLDZuLFgF+wCcdNLFxJ1 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAmVJREFUOE+lU1tsi2EY5u7//57Wrqtu7dodulI7VDY26RRzmLDZuLFgF+wCcdNLFxJ1 oavMeQkSMaeNYKMTyw5dpqWMOWQuiFo6P0NCikZiC0Me3/dVk7ZzIXzJ8+fL+/7v872H550OYNp/nRjB Dp4zEhzaI3C+GFwS3tdI4Iqz7eS50+S/RfRRFks/xKBwClykRcbhjJzHeZUMVzJScd2oRVeWFp2ZGlzS pOCcQmD+RoEDJYkncJwgwWeJs0OrQp85EwGrGUPz8nG/tACDJRb48nMYYZtKykh28ZwnnsBJje1aJQYs @@ -3601,8 +3601,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAm5JREFUOE/V1N9PklEYB3D7j5oX4kYujUSwCeTCMBnzZy5/IqYU+PKC/MjUV0HBH6kY + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAm5JREFUOE/V1N9PklEYB3D7j5oX4kYujUSwCeTCMBnzZy5/IqYU+PKC/MjUV0HBH6kY hgqJFWWOdM1y1hxUyua8SC9aF82buugmHB6/Hd/WRbr2XuRN5+y5OtvnPM95zp4zADJOdR2BpxknsQx6 wV+2rKAAR/HH+bGE/kPQ631P3O446e1ZIw/DOyQY3CKBQJJMTn4g4+MJMjq6Try+14jFNsje3jdy/P1P lNzdvUJGRzbhsMcQjf7A2PgXDHo/oYf7CLtzG2Z2E7V1r6gD6HQjwqDLtUwGBtZhZZ9ibu47BnwU69uB @@ -3618,8 +3618,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAqJJREFUOE+11Nsz1GEcx3H9B/0j3XTRRTNNE2MoCjnFThMbOUeOG4vdikJb2ZyKqW21 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAqJJREFUOE+11Nsz1GEcx3H9B/0j3XTRRTNNE2MoCjnFThMbOUeOG4vdikJb2ZyKqW21 hUZc2MHKMK0I01iHQgwt5Vg5LbvsmHfLjFXTr67W75lnnovfzGs+n+eZ+R4CnBz67YCO3A7Fdtva0znZ kv5nnXZ3JyoiYqfP3+u3lgcPylUfeVg7hrrpyx9p9hKqtOMUVhlIVXbt/xdK+LRhlIyyXmSqIcybVqYX N6jvmNndOyX3wKHJdXQ9P5CVtHK7SIM4qcB2a/sPa6+saRxBqx9FUtKDZWubqtZpalrH6eifR1rylj1w @@ -3633,15 +3633,9 @@ 4xKQjJsoHR+xHFGs4t+go2biAc5DB03uX5vZMUQuZEGBAAAAAElFTkSuQmCC - - 5,0,0,0,0,85,Columns:0{Width:109;Name:"MyAnnotationType";Caption:"Type";AllowEditing:False;Style:"TextAlign:GeneralCenter;";} 1{Width:66;Name:"DTS";Caption:"Date";AllowEditing:False;Style:"Format:""d"";DataType:System.DateTime;TextAlign:LeftCenter;";} 2{Width:91;Name:"UserID";Caption:"User";AllowEditing:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 3{Name:"BrokenRules";Caption:"BrokenRules";Visible:False;AllowEditing:False;Style:"TextAlign:GeneralCenter;";} 4{Width:82;Name:"SearchText";Caption:"Description";AllowEditing:False;Style:"DataType:System.String;TextAlign:GeneralCenter;";} - 156, 17 - - Normal{Font:Microsoft Sans Serif, 8pt;BackColor:Transparent;WordWrap:False;} Alternate{} Fixed{BackColor:Control;ForeColor:ControlText;Border:Flat,1,ControlDark,Both;BackgroundImageLayout:Hide;} Highlight{BackColor:Highlight;ForeColor:HighlightText;} Focus{} Editor{} Search{BackColor:Highlight;ForeColor:HighlightText;} Frozen{BackColor:Beige;} NewRow{} EmptyArea{BackColor:Transparent;Border:Flat,1,ControlDarkDark,Both;} SelectedColumnHeader{} SelectedRowHeader{} GrandTotal{BackColor:Black;ForeColor:White;} Subtotal0{BackColor:ControlDarkDark;ForeColor:White;} Subtotal1{BackColor:ControlDarkDark;ForeColor:White;} Subtotal2{BackColor:ControlDarkDark;ForeColor:White;} Subtotal3{BackColor:ControlDarkDark;ForeColor:White;} Subtotal4{BackColor:ControlDarkDark;ForeColor:White;} Subtotal5{BackColor:ControlDarkDark;ForeColor:White;} - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -3662,8 +3656,8 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAKRJREFUOE/NlNEOgCAIRcv55P//ay8u61owJE03aavGJgInuC7XlNJi+gBoaaawPK1l + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScAAA + EnABIZuYagAAAKRJREFUOE/NlNEOgCAIRcv55P//ay8u61owJE03aavGJgInuC7XlNJi+gBoaaawPK1l dwUwuLBpO8XgtxbHHmfc0nGH3vkU98hGACqAL+NYFzk9YP5AvIoArQGLnBEgCuSoukPEyegsmiPXivUe +YB2gVrTN38YKCF6rf1mh1IXWmM0Aug4xYZGNulQCi0PYVrD6VNu/Vqj+w8NrS6J726b33Z4AFzeFLS3 F5viAAAAAElFTkSuQmCC @@ -3672,15 +3666,15 @@ 402, 17 + + 499, 17 + R0lGODlhFAAUAPEAAAAAAP///////wAAACH5BAEAAAIALAAAAAAUABQAAAIjlI+py20AoUOxThFPdpKC 2WkfN4pguJFVeabXC8fyTNf2bRcAOw== - - 499, 17 - 41 diff --git a/PROMS/VEPROMS.CSLA.Library/Config/DocVersionConfig.cs b/PROMS/VEPROMS.CSLA.Library/Config/DocVersionConfig.cs index 7ccab391..15165115 100644 --- a/PROMS/VEPROMS.CSLA.Library/Config/DocVersionConfig.cs +++ b/PROMS/VEPROMS.CSLA.Library/Config/DocVersionConfig.cs @@ -687,6 +687,341 @@ namespace VEPROMS.CSLA.Library } } #endregion + #region Unit // From PROC.INI + [Category("Unit")] + [DisplayName("Unit Number")] + [RefreshProperties(RefreshProperties.All)] + [Description("Assigned Unit Number")] + public string Unit_Number + { + get + { + string s = _Xp["Unit", "Number"];// get the saved value + + //If there is no value to get, then get the parent value (a.k.a. default value). + if (s == string.Empty) + s = _Xp.ParentValue("Unit", "Number"); // get the parent value + // If there is no parent value, then use the volian default + if (s == string.Empty) + return s = "";// default to volian default + + return s; + } + set + { + // if value being saved is same as the parent value, then clear the value (save blank). This will + // reset the data to use the parent value. + + string parval = _Xp.ParentValue("Unit", "Number"); // get the parent value + + if (parval.Equals(string.Empty)) // if the parent value is empty, then use the volian default + parval = ""; + + if (parval.Equals(value)) + _Xp["Unit", "Number"] = string.Empty; // reset to parent value + else + _Xp["Unit", "Number"] = value; // save selected value + + OnPropertyChanged("Unit_Number"); + } + } + [Category("Unit")] + [DisplayName("Other Unit Number")] + [RefreshProperties(RefreshProperties.All)] + [Description("Assigned Other Unit Number")] + public string Other_Unit_Number + { + get + { + string s = _Xp["Unit", "OtherNumber"];// get the saved value + + //If there is no value to get, then get the parent value (a.k.a. default value). + if (s == string.Empty) + s = _Xp.ParentValue("Unit", "OtherNumber"); // get the parent value + // If there is no parent value, then use the volian default + if (s == string.Empty) + return s = "";// default to volian default + + return s; + } + set + { + // if value being saved is same as the parent value, then clear the value (save blank). This will + // reset the data to use the parent value. + + string parval = _Xp.ParentValue("Unit", "OtherNumber"); // get the parent value + + if (parval.Equals(string.Empty)) // if the parent value is empty, then use the volian default + parval = ""; + + if (parval.Equals(value)) + _Xp["Unit", "OtherNumber"] = string.Empty; // reset to parent value + else + _Xp["Unit", "OtherNumber"] = value; // save selected value + + OnPropertyChanged("Other_Unit_Number"); + } + } + [Category("Unit")] + [DisplayName("Unit Name")] + [RefreshProperties(RefreshProperties.All)] + [Description("Assigned Unit Name")] + public string Unit_Name + { + get + { + string s = _Xp["Unit", "Name"];// get the saved value + + //If there is no value to get, then get the parent value (a.k.a. default value). + if (s == string.Empty) + s = _Xp.ParentValue("Unit", "Name"); // get the parent value + // If there is no parent value, then use the volian default + if (s == string.Empty) + return s = "";// default to volian default + + return s; + } + set + { + // if value being saved is same as the parent value, then clear the value (save blank). This will + // reset the data to use the parent value. + + string parval = _Xp.ParentValue("Unit", "Name"); // get the parent value + + if (parval.Equals(string.Empty)) // if the parent value is empty, then use the volian default + parval = ""; + + if (parval.Equals(value)) + _Xp["Unit", "Name"] = string.Empty; // reset to parent value + else + _Xp["Unit", "Name"] = value; // save selected value + + OnPropertyChanged("Unit_Name"); + } + } + [Category("Unit")] + [DisplayName("Other Unit Name")] + [RefreshProperties(RefreshProperties.All)] + [Description("Assigned Other Unit Name")] + public string Unit_OtherName + { + get + { + string s = _Xp["Unit", "OtherName"];// get the saved value + + //If there is no value to get, then get the parent value (a.k.a. default value). + if (s == string.Empty) + s = _Xp.ParentValue("Unit", "OtherName"); // get the parent value + // If there is no parent value, then use the volian default + if (s == string.Empty) + return s = "";// default to volian default + + return s; + } + set + { + // if value being saved is same as the parent value, then clear the value (save blank). This will + // reset the data to use the parent value. + + string parval = _Xp.ParentValue("Unit", "OtherName"); // get the parent value + + if (parval.Equals(string.Empty)) // if the parent value is empty, then use the volian default + parval = ""; + + if (parval.Equals(value)) + _Xp["Unit", "OtherName"] = string.Empty; // reset to parent value + else + _Xp["Unit", "OtherName"] = value; // save selected value + + OnPropertyChanged("Unit_OtherName"); + } + } + [Category("Unit")] + [DisplayName("Unit Text")] + [RefreshProperties(RefreshProperties.All)] + [Description("Assigned Unit Text")] + public string Unit_Text + { + get + { + string s = _Xp["Unit", "Text"];// get the saved value + + //If there is no value to get, then get the parent value (a.k.a. default value). + if (s == string.Empty) + s = _Xp.ParentValue("Unit", "Text"); // get the parent value + // If there is no parent value, then use the volian default + if (s == string.Empty) + return s = "";// default to volian default + + return s; + } + set + { + // if value being saved is same as the parent value, then clear the value (save blank). This will + // reset the data to use the parent value. + + string parval = _Xp.ParentValue("Unit", "Text"); // get the parent value + + if (parval.Equals(string.Empty)) // if the parent value is empty, then use the volian default + parval = ""; + + if (parval.Equals(value)) + _Xp["Unit", "Text"] = string.Empty; // reset to parent value + else + _Xp["Unit", "Text"] = value; // save selected value + + OnPropertyChanged("Unit_Text"); + } + } + [Category("Unit")] + [DisplayName("Other Unit Text")] + [RefreshProperties(RefreshProperties.All)] + [Description("Assigned Other Unit Text")] + public string Other_Unit_Text + { + get + { + string s = _Xp["Unit", "OtherText"];// get the saved value + + //If there is no value to get, then get the parent value (a.k.a. default value). + if (s == string.Empty) + s = _Xp.ParentValue("Unit", "OtherText"); // get the parent value + // If there is no parent value, then use the volian default + if (s == string.Empty) + return s = "";// default to volian default + + return s; + } + set + { + // if value being saved is same as the parent value, then clear the value (save blank). This will + // reset the data to use the parent value. + + string parval = _Xp.ParentValue("Unit", "OtherText"); // get the parent value + + if (parval.Equals(string.Empty)) // if the parent value is empty, then use the volian default + parval = ""; + + if (parval.Equals(value)) + _Xp["Unit", "OtherText"] = string.Empty; // reset to parent value + else + _Xp["Unit", "OtherText"] = value; // save selected value + + OnPropertyChanged("Unit_OtherText"); + } + } + [Category("Unit")] + [DisplayName("Unit ID")] + [RefreshProperties(RefreshProperties.All)] + [Description("Assigned Unit ID")] + public string Unit_ID + { + get + { + string s = _Xp["Unit", "ID"];// get the saved value + + //If there is no value to get, then get the parent value (a.k.a. default value). + if (s == string.Empty) + s = _Xp.ParentValue("Unit", "ID"); // get the parent value + // If there is no parent value, then use the volian default + if (s == string.Empty) + return s = "";// default to volian default + + return s; + } + set + { + // if value being saved is same as the parent value, then clear the value (save blank). This will + // reset the data to use the parent value. + + string parval = _Xp.ParentValue("Unit", "ID"); // get the parent value + + if (parval.Equals(string.Empty)) // if the parent value is empty, then use the volian default + parval = ""; + + if (parval.Equals(value)) + _Xp["Unit", "ID"] = string.Empty; // reset to parent value + else + _Xp["Unit", "ID"] = value; // save selected value + + OnPropertyChanged("Unit_ID"); + } + } + [Category("Unit")] + [DisplayName("Other Unit ID")] + [RefreshProperties(RefreshProperties.All)] + [Description("Assigned Other Unit ID")] + public string Other_Unit_ID + { + get + { + string s = _Xp["Unit", "OtherID"];// get the saved value + + //If there is no value to get, then get the parent value (a.k.a. default value). + if (s == string.Empty) + s = _Xp.ParentValue("Unit", "OtherID"); // get the parent value + // If there is no parent value, then use the volian default + if (s == string.Empty) + return s = "";// default to volian default + + return s; + } + set + { + // if value being saved is same as the parent value, then clear the value (save blank). This will + // reset the data to use the parent value. + + string parval = _Xp.ParentValue("Unit", "OtherID"); // get the parent value + + if (parval.Equals(string.Empty)) // if the parent value is empty, then use the volian default + parval = ""; + + if (parval.Equals(value)) + _Xp["Unit", "OtherID"] = string.Empty; // reset to parent value + else + _Xp["Unit", "OtherID"] = value; // save selected value + + OnPropertyChanged("Unit_OtherID"); + } + } + [Category("Unit")] + [DisplayName("Unit Specific Procedure Number")] + [RefreshProperties(RefreshProperties.All)] + [Description("Assigned Unit Specific Procedure Number")] + public string Unit_ProcedureNumber + { + get + { + string s = _Xp["Unit", "ProcedureNumber"];// get the saved value + + //If there is no value to get, then get the parent value (a.k.a. default value). + if (s == string.Empty) + s = _Xp.ParentValue("Unit", "ProcedureNumber"); // get the parent value + // If there is no parent value, then use the volian default + if (s == string.Empty) + return s = "";// default to volian default + + return s; + } + set + { + // if value being saved is same as the parent value, then clear the value (save blank). This will + // reset the data to use the parent value. + + string parval = _Xp.ParentValue("Unit", "ProcedureNumber"); // get the parent value + + if (parval.Equals(string.Empty)) // if the parent value is empty, then use the volian default + parval = ""; + + if (parval.Equals(value)) + _Xp["Unit", "ProcedureNumber"] = string.Empty; // reset to parent value + else + _Xp["Unit", "ProcedureNumber"] = value; // save selected value + + OnPropertyChanged("Unit_ProcedureNumber"); + } + } + #endregion #region DELETE_ME /* #region ColorCategory // From veproms.ini diff --git a/PROMS/Volian.Controls.Library/AnnotationDetails.Designer.cs b/PROMS/Volian.Controls.Library/AnnotationDetails.Designer.cs new file mode 100644 index 00000000..aba78057 --- /dev/null +++ b/PROMS/Volian.Controls.Library/AnnotationDetails.Designer.cs @@ -0,0 +1,301 @@ +namespace Volian.Controls.Library +{ + partial class AnnotationDetails + { + /// + /// 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 Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AnnotationDetails)); + this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip(); + this.rtxbComment = new System.Windows.Forms.RichTextBox(); + this.btnSaveAnnotation = new DevComponents.DotNetBar.ButtonX(); + this.btnCancelAnnoation = new DevComponents.DotNetBar.ButtonX(); + this.cbGridAnnoType = new DevComponents.DotNetBar.Controls.ComboBoxEx(); + this.btnRemoveAnnotation = new DevComponents.DotNetBar.ButtonX(); + this.btnAddAnnotation = new DevComponents.DotNetBar.ButtonX(); + this.pannelAnnoEdit = new DevComponents.DotNetBar.PanelEx(); + this.labelX1 = new DevComponents.DotNetBar.LabelX(); + this.panelAnnoEditBtns = new DevComponents.DotNetBar.PanelEx(); + this.expandableSplitter4 = new DevComponents.DotNetBar.ExpandableSplitter(); + this.pannelAnnoGrid = new DevComponents.DotNetBar.PanelEx(); + this.c1AnnotationGrid = new C1.Win.C1FlexGrid.C1FlexGrid(); + this.itemAnnotationsBindingSource = new System.Windows.Forms.BindingSource(this.components); + this.pannelAnnoEdit.SuspendLayout(); + this.panelAnnoEditBtns.SuspendLayout(); + this.pannelAnnoGrid.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.c1AnnotationGrid)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.itemAnnotationsBindingSource)).BeginInit(); + this.SuspendLayout(); + // + // superTooltip1 + // + this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; + // + // rtxbComment + // + this.rtxbComment.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.rtxbComment.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); + this.rtxbComment.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.rtxbComment.Location = new System.Drawing.Point(87, 33); + this.rtxbComment.Name = "rtxbComment"; + this.rtxbComment.Size = new System.Drawing.Size(489, 292); + this.superTooltip1.SetSuperTooltip(this.rtxbComment, new DevComponents.DotNetBar.SuperTooltipInfo("Annotation", "", "Enter the annotation information here.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + this.rtxbComment.TabIndex = 1; + this.rtxbComment.Text = ""; + this.rtxbComment.TextChanged += new System.EventHandler(this.rtxbComment_TextChanged); + // + // btnSaveAnnotation + // + this.btnSaveAnnotation.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnSaveAnnotation.Enabled = false; + this.btnSaveAnnotation.Location = new System.Drawing.Point(419, 8); + this.btnSaveAnnotation.Name = "btnSaveAnnotation"; + this.btnSaveAnnotation.Size = new System.Drawing.Size(71, 20); + this.superTooltip1.SetSuperTooltip(this.btnSaveAnnotation, new DevComponents.DotNetBar.SuperTooltipInfo("Save Changes", "", "This will save the new annotation or changes made to an existing annotation.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + this.btnSaveAnnotation.TabIndex = 9; + this.btnSaveAnnotation.Text = "Save"; + this.btnSaveAnnotation.Click += new System.EventHandler(this.btnSaveAnnotation_Click); + // + // btnCancelAnnoation + // + this.btnCancelAnnoation.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnCancelAnnoation.Enabled = false; + this.btnCancelAnnoation.Location = new System.Drawing.Point(329, 8); + this.btnCancelAnnoation.Name = "btnCancelAnnoation"; + this.btnCancelAnnoation.Size = new System.Drawing.Size(70, 20); + this.superTooltip1.SetSuperTooltip(this.btnCancelAnnoation, new DevComponents.DotNetBar.SuperTooltipInfo("Cancel", "", "This will cancel the changes made to the annotation text and type selection", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(145, 100))); + this.btnCancelAnnoation.TabIndex = 8; + this.btnCancelAnnoation.Text = "Cancel"; + this.btnCancelAnnoation.Click += new System.EventHandler(this.btnCancelAnnoation_Click); + // + // cbGridAnnoType + // + this.cbGridAnnoType.DisplayMember = "Text"; + this.cbGridAnnoType.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.cbGridAnnoType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cbGridAnnoType.FlatStyle = System.Windows.Forms.FlatStyle.Standard; + this.cbGridAnnoType.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbGridAnnoType.ForeColor = System.Drawing.SystemColors.WindowText; + this.cbGridAnnoType.Location = new System.Drawing.Point(134, 4); + this.cbGridAnnoType.Name = "cbGridAnnoType"; + this.cbGridAnnoType.PreventEnterBeep = true; + this.cbGridAnnoType.Size = new System.Drawing.Size(165, 23); + this.superTooltip1.SetSuperTooltip(this.cbGridAnnoType, new DevComponents.DotNetBar.SuperTooltipInfo("Select Annotation Type", "", "This drop down list contains the posible annotation types.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + this.cbGridAnnoType.TabIndex = 7; + this.cbGridAnnoType.WatermarkBehavior = DevComponents.DotNetBar.eWatermarkBehavior.HideNonEmpty; + this.cbGridAnnoType.WatermarkText = "Select Annotation Type"; + this.cbGridAnnoType.SelectedValueChanged += new System.EventHandler(this.cbGridAnnoType_SelectedValueChanged); + // + // btnRemoveAnnotation + // + this.btnRemoveAnnotation.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnRemoveAnnotation.Location = new System.Drawing.Point(6, 34); + this.btnRemoveAnnotation.Name = "btnRemoveAnnotation"; + this.btnRemoveAnnotation.Size = new System.Drawing.Size(71, 20); + this.superTooltip1.SetSuperTooltip(this.btnRemoveAnnotation, new DevComponents.DotNetBar.SuperTooltipInfo("Remove Annotation", "", "This will remove the currently selected annotation.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + this.btnRemoveAnnotation.TabIndex = 4; + this.btnRemoveAnnotation.Text = "Remove"; + this.btnRemoveAnnotation.Click += new System.EventHandler(this.btnRemoveAnnotation_Click); + // + // btnAddAnnotation + // + this.btnAddAnnotation.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnAddAnnotation.Location = new System.Drawing.Point(6, 4); + this.btnAddAnnotation.Name = "btnAddAnnotation"; + this.btnAddAnnotation.Size = new System.Drawing.Size(71, 20); + this.superTooltip1.SetSuperTooltip(this.btnAddAnnotation, new DevComponents.DotNetBar.SuperTooltipInfo("Add New Annotation", "", "This button will create a new annotation.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + this.btnAddAnnotation.TabIndex = 3; + this.btnAddAnnotation.Text = "Add"; + this.btnAddAnnotation.Click += new System.EventHandler(this.btnAddAnnotation_Click); + // + // pannelAnnoEdit + // + this.pannelAnnoEdit.CanvasColor = System.Drawing.SystemColors.Control; + this.pannelAnnoEdit.Controls.Add(this.rtxbComment); + this.pannelAnnoEdit.Controls.Add(this.btnSaveAnnotation); + this.pannelAnnoEdit.Controls.Add(this.btnCancelAnnoation); + this.pannelAnnoEdit.Controls.Add(this.labelX1); + this.pannelAnnoEdit.Controls.Add(this.cbGridAnnoType); + this.pannelAnnoEdit.Controls.Add(this.panelAnnoEditBtns); + this.pannelAnnoEdit.Dock = System.Windows.Forms.DockStyle.Fill; + this.pannelAnnoEdit.Location = new System.Drawing.Point(548, 0); + this.pannelAnnoEdit.Name = "pannelAnnoEdit"; + this.pannelAnnoEdit.Size = new System.Drawing.Size(576, 325); + this.pannelAnnoEdit.Style.Alignment = System.Drawing.StringAlignment.Center; + this.pannelAnnoEdit.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.pannelAnnoEdit.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.pannelAnnoEdit.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.pannelAnnoEdit.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.pannelAnnoEdit.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.pannelAnnoEdit.Style.GradientAngle = 90; + this.pannelAnnoEdit.TabIndex = 16; + this.pannelAnnoEdit.Text = "panelEx2"; + this.pannelAnnoEdit.ThemeAware = true; + // + // labelX1 + // + this.labelX1.AutoSize = true; + this.labelX1.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelX1.Location = new System.Drawing.Point(93, 8); + this.labelX1.Name = "labelX1"; + this.labelX1.Size = new System.Drawing.Size(35, 17); + this.labelX1.TabIndex = 10; + this.labelX1.Text = "Type:"; + // + // panelAnnoEditBtns + // + this.panelAnnoEditBtns.CanvasColor = System.Drawing.SystemColors.Control; + this.panelAnnoEditBtns.Controls.Add(this.btnRemoveAnnotation); + this.panelAnnoEditBtns.Controls.Add(this.btnAddAnnotation); + this.panelAnnoEditBtns.Dock = System.Windows.Forms.DockStyle.Left; + this.panelAnnoEditBtns.Location = new System.Drawing.Point(0, 0); + this.panelAnnoEditBtns.Name = "panelAnnoEditBtns"; + this.panelAnnoEditBtns.Size = new System.Drawing.Size(87, 325); + this.panelAnnoEditBtns.Style.Alignment = System.Drawing.StringAlignment.Center; + this.panelAnnoEditBtns.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.panelAnnoEditBtns.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.panelAnnoEditBtns.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.panelAnnoEditBtns.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.panelAnnoEditBtns.Style.GradientAngle = 90; + this.panelAnnoEditBtns.TabIndex = 11; + this.panelAnnoEditBtns.ThemeAware = true; + // + // expandableSplitter4 + // + this.expandableSplitter4.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); + this.expandableSplitter4.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.expandableSplitter4.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.expandableSplitter4.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); + this.expandableSplitter4.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.expandableSplitter4.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.expandableSplitter4.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; + this.expandableSplitter4.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.expandableSplitter4.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; + this.expandableSplitter4.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(205)))), ((int)(((byte)(208)))), ((int)(((byte)(213))))); + this.expandableSplitter4.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; + this.expandableSplitter4.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(252)))), ((int)(((byte)(151)))), ((int)(((byte)(61))))); + this.expandableSplitter4.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(184)))), ((int)(((byte)(94))))); + this.expandableSplitter4.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; + this.expandableSplitter4.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; + this.expandableSplitter4.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); + this.expandableSplitter4.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.expandableSplitter4.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.expandableSplitter4.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; + this.expandableSplitter4.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); + this.expandableSplitter4.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.expandableSplitter4.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(205)))), ((int)(((byte)(208)))), ((int)(((byte)(213))))); + this.expandableSplitter4.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; + this.expandableSplitter4.Location = new System.Drawing.Point(545, 0); + this.expandableSplitter4.Name = "expandableSplitter4"; + this.expandableSplitter4.Size = new System.Drawing.Size(3, 325); + this.expandableSplitter4.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; + this.expandableSplitter4.TabIndex = 15; + this.expandableSplitter4.TabStop = false; + // + // pannelAnnoGrid + // + this.pannelAnnoGrid.CanvasColor = System.Drawing.SystemColors.Control; + this.pannelAnnoGrid.Controls.Add(this.c1AnnotationGrid); + this.pannelAnnoGrid.Dock = System.Windows.Forms.DockStyle.Left; + this.pannelAnnoGrid.Location = new System.Drawing.Point(0, 0); + this.pannelAnnoGrid.Name = "pannelAnnoGrid"; + this.pannelAnnoGrid.Size = new System.Drawing.Size(545, 325); + this.pannelAnnoGrid.Style.Alignment = System.Drawing.StringAlignment.Center; + this.pannelAnnoGrid.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.pannelAnnoGrid.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.pannelAnnoGrid.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.pannelAnnoGrid.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.pannelAnnoGrid.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.pannelAnnoGrid.Style.GradientAngle = 90; + this.pannelAnnoGrid.TabIndex = 14; + this.pannelAnnoGrid.Text = "panelEx2"; + this.pannelAnnoGrid.ThemeAware = true; + // + // c1AnnotationGrid + // + this.c1AnnotationGrid.AllowDragging = C1.Win.C1FlexGrid.AllowDraggingEnum.None; + this.c1AnnotationGrid.AllowEditing = false; + this.c1AnnotationGrid.AutoGenerateColumns = false; + this.c1AnnotationGrid.BackColor = System.Drawing.Color.Transparent; + this.c1AnnotationGrid.ColumnInfo = resources.GetString("c1AnnotationGrid.ColumnInfo"); + this.c1AnnotationGrid.DataSource = this.itemAnnotationsBindingSource; + this.c1AnnotationGrid.Dock = System.Windows.Forms.DockStyle.Fill; + this.c1AnnotationGrid.ExtendLastCol = true; + this.c1AnnotationGrid.FocusRect = C1.Win.C1FlexGrid.FocusRectEnum.Raised; + this.c1AnnotationGrid.Location = new System.Drawing.Point(0, 0); + this.c1AnnotationGrid.Name = "c1AnnotationGrid"; + this.c1AnnotationGrid.Rows.Count = 1; + this.c1AnnotationGrid.Rows.DefaultSize = 19; + this.c1AnnotationGrid.SelectionMode = C1.Win.C1FlexGrid.SelectionModeEnum.Row; + this.c1AnnotationGrid.Size = new System.Drawing.Size(545, 325); + this.c1AnnotationGrid.StyleInfo = resources.GetString("c1AnnotationGrid.StyleInfo"); + this.c1AnnotationGrid.TabIndex = 0; + this.c1AnnotationGrid.EnterCell += new System.EventHandler(this.c1AnnotationGrid_EnterCell); + // + // itemAnnotationsBindingSource + // + this.itemAnnotationsBindingSource.DataSource = typeof(VEPROMS.CSLA.Library.ItemAnnotation); + // + // AnnotationDetails + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.pannelAnnoEdit); + this.Controls.Add(this.expandableSplitter4); + this.Controls.Add(this.pannelAnnoGrid); + this.Name = "AnnotationDetails"; + this.Size = new System.Drawing.Size(1124, 325); + this.pannelAnnoEdit.ResumeLayout(false); + this.pannelAnnoEdit.PerformLayout(); + this.panelAnnoEditBtns.ResumeLayout(false); + this.pannelAnnoGrid.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.c1AnnotationGrid)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.itemAnnotationsBindingSource)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DevComponents.DotNetBar.SuperTooltip superTooltip1; + private DevComponents.DotNetBar.PanelEx pannelAnnoEdit; + private System.Windows.Forms.RichTextBox rtxbComment; + private DevComponents.DotNetBar.ButtonX btnSaveAnnotation; + private DevComponents.DotNetBar.ButtonX btnCancelAnnoation; + private DevComponents.DotNetBar.LabelX labelX1; + private DevComponents.DotNetBar.Controls.ComboBoxEx cbGridAnnoType; + private DevComponents.DotNetBar.PanelEx panelAnnoEditBtns; + private DevComponents.DotNetBar.ButtonX btnRemoveAnnotation; + private DevComponents.DotNetBar.ButtonX btnAddAnnotation; + private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter4; + private DevComponents.DotNetBar.PanelEx pannelAnnoGrid; + private C1.Win.C1FlexGrid.C1FlexGrid c1AnnotationGrid; + private System.Windows.Forms.BindingSource itemAnnotationsBindingSource; + } +} diff --git a/PROMS/Volian.Controls.Library/AnnotationDetails.cs b/PROMS/Volian.Controls.Library/AnnotationDetails.cs new file mode 100644 index 00000000..4fe377ce --- /dev/null +++ b/PROMS/Volian.Controls.Library/AnnotationDetails.cs @@ -0,0 +1,294 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Data; +using System.Text; +using System.Windows.Forms; +using VEPROMS.CSLA.Library; + +namespace Volian.Controls.Library +{ + public partial class AnnotationDetails : UserControl + { + #region Properties + private ItemInfo _CurrentItem = null; + private AnnotationSearch _AnnotationSearch; + + private AnnotationInfoList _Annotations; + public AnnotationInfoList Annotations + { + get { return _Annotations; } + set + { + _Annotations = value; + itemAnnotationsBindingSource.DataSource = _Annotations; + } + } + + private AnnotationInfo _CurrentAnnotation = null; + public AnnotationInfo CurrentAnnotation + { + get { return _CurrentAnnotation; } + set + { + if (_CurrentAnnotation == null && value == null) return; // No Change + if (_CurrentAnnotation != null && value != null) + if (_CurrentAnnotation.AnnotationID == value.AnnotationID) return; // No Change + //vlnStackTrace.ShowStack("CurrentAnnotation = '{0}' Old = '{1}'", value, _CurrentAnnotation); + if (_CurrentAnnotation != null || _AddingAnnotation) + { + if (AnnotationDirty) + SaveAnnotation(); + } + _CurrentAnnotation = value; + InitializeAnnotation(); + } + } + + private bool _AnnotationDirty = false; + private bool AnnotationDirty + { + get { return _AnnotationDirty; } + set + { + btnRemoveAnnotation.Enabled = btnAddAnnotation.Enabled = !value; + btnSaveAnnotation.Enabled = btnCancelAnnoation.Enabled = value; + _AddingAnnotation = value && (CurrentAnnotation == null); + _AnnotationDirty = value; + } + } + + public string AnnotationText + { + get { return rtxbComment.Text; } + set + { + rtxbComment.Text = value; + if (rtxbComment.Text != string.Empty) + rtxbComment.SelectionStart = rtxbComment.TextLength; // position cursor to end of text + } + } + + public string AnnotationRTFText + { + get { return rtxbComment.Rtf; } + set + { + rtxbComment.Rtf = value; + if (rtxbComment.Rtf != string.Empty) + rtxbComment.SelectionStart = rtxbComment.TextLength; // position cursor to end of text + } + } + + #endregion + + #region Constructors + public AnnotationDetails() + { + InitializeComponent(); + } + #endregion + + #region Events + private bool _AddingAnnotation = false; + private void btnAddAnnotation_Click(object sender, EventArgs e) + { + c1AnnotationGrid.Row = -1; + CurrentAnnotation = null; + _AddingAnnotation = true; + } + + private void btnRemoveAnnotation_Click(object sender, EventArgs e) + { + using (Annotation annotation = CurrentAnnotation.Get()) + { + annotation.Delete(); + _AnnotationSearch.LoadingList = true; + annotation.Save(); + _AnnotationSearch.LoadingList = false; + CurrentAnnotation = null; + UpdateAnnotationGrid(); + _AnnotationSearch.UpdateAnnotationSearchResults(); // update the search results + } + + } + + private void btnSaveAnnotation_Click(object sender, EventArgs e) + { + if (cbGridAnnoType.SelectedIndex == -1) + { + MessageBox.Show("You Must Select an Annotation Type", "Annotation Type Not Selected", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); + cbGridAnnoType.Focus(); + return; + } + if (rtxbComment.Text == string.Empty) + { + MessageBox.Show("You Must Enter Annotation Text", "Annotation Text Is Blank", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); + rtxbComment.Focus(); + return; + } + SaveAnnotation(); + + } + + private void btnCancelAnnoation_Click(object sender, EventArgs e) + { + InitializeAnnotation(); + } + + private void cbGridAnnoType_SelectedValueChanged(object sender, EventArgs e) + { + if (!_LoadingAnnotation) + AnnotationDirty = true; + } + + private bool _LoadingAnnotation = false; + private bool _LoadingGrid = false; + private void c1AnnotationGrid_EnterCell(object sender, EventArgs e) + { + if (!_LoadingGrid) // Only set the Current Annotation when not loading the grid + { + if ((_Annotations != null) && (c1AnnotationGrid.Row > 0)) + CurrentAnnotation = _Annotations[c1AnnotationGrid.Row - 1]; + else + CurrentAnnotation = null; + } + } + + private void rtxbComment_TextChanged(object sender, EventArgs e) + { + if (!_LoadingAnnotation) + AnnotationDirty = true; + } + + #endregion + + #region LoadControlData + + public void SetupAnnotations(AnnotationSearch annotation) + { + _AnnotationSearch = annotation; // reference the Annotation Search to update its lists + + cbGridAnnoType.DisplayMember = "Name"; + cbGridAnnoType.ValueMember = "TypeId"; + cbGridAnnoType.DataSource = AnnotationTypeInfoList.Get().Clone(); + cbGridAnnoType.SelectedIndex = -1; //don't pre-select an annotation type + } + + private void InitializeAnnotation() + { + //vlnCSLAStackTrace.ShowStack("InitializeAnnotation - CurrentAnnotation = {0}", CurrentAnnotation); + _LoadingAnnotation = true; + if (CurrentAnnotation == null) + { + cbGridAnnoType.SelectedIndex = -1; + AnnotationText = ""; + } + else + { + cbGridAnnoType.SelectedValue = CurrentAnnotation.TypeID; + if (CurrentAnnotation.RtfText != "") + AnnotationRTFText = CurrentAnnotation.RtfText; + else + AnnotationText = CurrentAnnotation.SearchText; + } + _LoadingAnnotation = false; + AnnotationDirty = false; + if (!_LoadingGrid) + rtxbComment.Focus(); // Set the focus to the comment text + } + + #endregion + + #region VariousSupportMethods + + /// + /// Set up the Annotation Grid for the given item + /// This is called from frmVEPROMS + /// + /// + public void UpdateAnnotationGrid(ItemInfo currentitem) + { + _CurrentItem = currentitem; + UpdateAnnotationGrid(); + } + + private void UpdateAnnotationGrid() + { + _LoadingGrid = true; + _Annotations = _CurrentItem.ItemAnnotations; + itemAnnotationsBindingSource.DataSource = _Annotations; + if ((CurrentAnnotation == null || (_CurrentItem.ItemID != CurrentAnnotation.ItemID))) + { + if (_Annotations != null && _Annotations.Count > 0) + CurrentAnnotation = _Annotations[0]; + else + CurrentAnnotation = null; + } + FindCurrentAnnotation(); // position to the grid row of the current annotation + _LoadingGrid = false; + } + + /// + /// Find the Current Annotation in the Annotation Grid select the corresponding row + /// Note: this is also called from AnnotationSearch.cs when a search results is selected + /// + public void FindCurrentAnnotation() + { + int row = 0; + if (CurrentAnnotation != null) + { + if (_Annotations != null) + { + foreach (AnnotationInfo ai in _Annotations) + { + if (ai.AnnotationID == CurrentAnnotation.AnnotationID) + { + row = _Annotations.IndexOf(ai) + 1; + break; + } + } + } + } + c1AnnotationGrid.Select(row, 0, true); // position to the corresponding grid row + } + + private void SaveAnnotation() + { + if (cbGridAnnoType.SelectedIndex == -1) return; + if (rtxbComment.Text == string.Empty) return; + using (AnnotationType annotationType = AnnotationType.Get((int)cbGridAnnoType.SelectedValue)) + { + if (_AddingAnnotation) + { + _AddingAnnotation = false; + using (Item myItem = _CurrentItem.Get()) + { + using (Annotation annotation = Annotation.MakeAnnotation(myItem, annotationType, rtxbComment.Rtf, rtxbComment.Text, "")) + { + CurrentAnnotation = AnnotationInfo.Get(annotation.AnnotationID); + annotation.DTS = DateTime.Now; + annotation.Save(); + } + } + } + else + { + using (Annotation annotation = CurrentAnnotation.Get()) + { + annotation.RtfText = rtxbComment.Rtf; + annotation.SearchText = rtxbComment.Text; + annotation.MyAnnotationType = annotationType; + annotation.DTS = DateTime.Now; + annotation.Save(); + } + } + } + AnnotationDirty = false; + UpdateAnnotationGrid(); + } + #endregion + + } +} diff --git a/PROMS/Volian.Controls.Library/AnnotationDetails.resx b/PROMS/Volian.Controls.Library/AnnotationDetails.resx new file mode 100644 index 00000000..60d08b16 --- /dev/null +++ b/PROMS/Volian.Controls.Library/AnnotationDetails.resx @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + + 18,1,0,0,0,95,Columns:0{Visible:False;} 1{Width:107;Name:"ErrorMessage";Caption:"ErrorMessage";Visible:False;AllowEditing:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 2{Width:100;Name:"AnnotationID";Caption:"AnnotationID";Visible:False;AllowEditing:False;Style:"DataType:System.Int32;TextAlign:RightCenter;";} 3{Width:173;Name:"MyAnnotation";Caption:"MyAnnotation";Visible:False;AllowEditing:False;Style:"DataType:VEPROMS.CSLA.Library.Annotation;TextAlign:GeneralCenter;";} 4{Width:66;Name:"TypeID";Caption:"TypeID";Visible:False;AllowEditing:False;Style:"DataType:System.Int32;TextAlign:RightCenter;";} 5{Width:145;Name:"MyAnnotationType";Caption:"Type";AllowDragging:False;AllowEditing:False;Style:"DataType:VEPROMS.CSLA.Library.AnnotationType;TextAlign:GeneralCenter;";} 6{Width:66;Name:"RtfText";Caption:"RtfText";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 7{Width:50;Name:"DTS";Caption:"Date";AllowDragging:False;AllowEditing:False;Style:"Format:""d"";DataType:System.DateTime;TextAlign:LeftCenter;";} 8{Width:64;Name:"UserID";Caption:"User";AllowDragging:False;AllowEditing:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 9{Width:91;Name:"SearchText";Caption:"Description";AllowDragging:False;AllowEditing:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 10{Width:62;Name:"Config";Caption:"Config";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 11{Width:160;Name:"AnnotationType_Name";Caption:"AnnotationType_Name";Visible:False;AllowEditing:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 12{Width:163;Name:"AnnotationType_Config";Caption:"AnnotationType_Config";Visible:False;AllowEditing:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 13{Width:151;Name:"AnnotationType_DTS";Caption:"AnnotationType_DTS";Visible:False;AllowEditing:False;Style:"Format:""d"";DataType:System.DateTime;TextAlign:LeftCenter;";} 14{Width:166;Name:"AnnotationType_UserID";Caption:"AnnotationType_UserID";Visible:False;AllowEditing:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 15{Width:123;Name:"HasBrokenRules";Caption:"HasBrokenRules";Visible:False;AllowEditing:False;Style:"DataType:VEPROMS.CSLA.Library.IVEHasBrokenRules;TextAlign:GeneralCenter;";} 16{Name:"BrokenRules";Caption:"BrokenRules";Visible:False;AllowEditing:False;Style:"DataType:Csla.Validation.BrokenRulesCollection;TextAlign:GeneralCenter;";} 17{Width:123;Name:"CurrentEditLevel";Caption:"CurrentEditLevel";Visible:False;AllowEditing:False;Style:"DataType:System.Int32;TextAlign:RightCenter;";} + + + 156, 17 + + + Normal{Font:Microsoft Sans Serif, 7.8pt;BackColor:Transparent;} Alternate{} Fixed{BackColor:Control;ForeColor:ControlText;Border:Raised,1,Black,Both;BackgroundImageLayout:Hide;} Highlight{BackColor:Highlight;ForeColor:HighlightText;} Focus{} Editor{} Search{BackColor:Highlight;ForeColor:HighlightText;} Frozen{BackColor:Beige;} NewRow{} EmptyArea{BackColor:Transparent;Border:Flat,1,ControlDarkDark,Both;} SelectedColumnHeader{} SelectedRowHeader{} GrandTotal{BackColor:Black;ForeColor:White;} Subtotal0{BackColor:ControlDarkDark;ForeColor:White;} Subtotal1{BackColor:ControlDarkDark;ForeColor:White;} Subtotal2{BackColor:ControlDarkDark;ForeColor:White;} Subtotal3{BackColor:ControlDarkDark;ForeColor:White;} Subtotal4{BackColor:ControlDarkDark;ForeColor:White;} Subtotal5{BackColor:ControlDarkDark;ForeColor:White;} + + \ No newline at end of file diff --git a/PROMS/Volian.Controls.Library/AnnotationSearch.Designer.cs b/PROMS/Volian.Controls.Library/AnnotationSearch.Designer.cs new file mode 100644 index 00000000..977c183b --- /dev/null +++ b/PROMS/Volian.Controls.Library/AnnotationSearch.Designer.cs @@ -0,0 +1,92 @@ +namespace Volian.Controls.Library +{ + partial class AnnotationSearch + { + /// + /// 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 Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + this.cbAnnoType = new DevComponents.DotNetBar.Controls.ComboBoxEx(); + this.lbResults = new System.Windows.Forms.ListBox(); + this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); + this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip(); + this.SuspendLayout(); + // + // cbAnnoType + // + this.cbAnnoType.DisplayMember = "Text"; + this.cbAnnoType.Dock = System.Windows.Forms.DockStyle.Top; + this.cbAnnoType.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.cbAnnoType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cbAnnoType.FormattingEnabled = true; + this.cbAnnoType.ItemHeight = 17; + this.cbAnnoType.Location = new System.Drawing.Point(0, 0); + this.cbAnnoType.Name = "cbAnnoType"; + this.cbAnnoType.Size = new System.Drawing.Size(239, 23); + this.superTooltip1.SetSuperTooltip(this.cbAnnoType, new DevComponents.DotNetBar.SuperTooltipInfo("Select Annotation Search Type", "", "This drop down list contains the posible annotation types. When selected, a list" + + " of the annotions of that type will be displayed below.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + this.cbAnnoType.TabIndex = 1; + this.cbAnnoType.WatermarkBehavior = DevComponents.DotNetBar.eWatermarkBehavior.HideNonEmpty; + this.cbAnnoType.WatermarkText = "Select Annotation Type"; + this.cbAnnoType.SelectedValueChanged += new System.EventHandler(this.cbAnnoType_SelectedValueChanged); + // + // lbResults + // + this.lbResults.Dock = System.Windows.Forms.DockStyle.Fill; + this.lbResults.FormattingEnabled = true; + this.lbResults.HorizontalScrollbar = true; + this.lbResults.ItemHeight = 16; + this.lbResults.Location = new System.Drawing.Point(0, 23); + this.lbResults.Name = "lbResults"; + this.lbResults.Size = new System.Drawing.Size(239, 372); + this.lbResults.TabIndex = 2; + this.lbResults.MouseMove += new System.Windows.Forms.MouseEventHandler(this.lbResults_MouseMove); + this.lbResults.SelectedValueChanged += new System.EventHandler(this.lbResults_SelectedValueChanged); + // + // superTooltip1 + // + this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; + // + // AnnotationSearch + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.lbResults); + this.Controls.Add(this.cbAnnoType); + this.Name = "AnnotationSearch"; + this.Size = new System.Drawing.Size(239, 397); + this.ResumeLayout(false); + + } + + #endregion + + private DevComponents.DotNetBar.Controls.ComboBoxEx cbAnnoType; + private System.Windows.Forms.ListBox lbResults; + private System.Windows.Forms.ToolTip toolTip1; + private DevComponents.DotNetBar.SuperTooltip superTooltip1; + } +} diff --git a/PROMS/Volian.Controls.Library/AnnotationSearch.cs b/PROMS/Volian.Controls.Library/AnnotationSearch.cs new file mode 100644 index 00000000..5e5aff3c --- /dev/null +++ b/PROMS/Volian.Controls.Library/AnnotationSearch.cs @@ -0,0 +1,91 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Data; +using System.Text; +using System.Windows.Forms; +using VEPROMS.CSLA.Library; + +namespace Volian.Controls.Library +{ + public partial class AnnotationSearch : UserControl + { + #region Properties + private AnnotationDetails _AnnotationDetails = null; + + private bool _LoadingList = false; + public bool LoadingList + { + get { return _LoadingList; } + set { _LoadingList = value; } + } + + private DisplayTabControl _TabControl; + + #endregion + + #region Constructors + public AnnotationSearch() + { + InitializeComponent(); + } + #endregion + + #region Events + private void cbAnnoType_SelectedValueChanged(object sender, EventArgs e) + { + UpdateAnnotationSearchResults(); + } + + private void lbResults_SelectedValueChanged(object sender, EventArgs e) + { + if (!_LoadingList) + { + _AnnotationDetails.CurrentAnnotation = lbResults.SelectedValue as AnnotationInfo; + if (_AnnotationDetails.CurrentAnnotation != null) + _TabControl.OpenItem(_AnnotationDetails.CurrentAnnotation.MyItem); // open the corresponding procedure text + _AnnotationDetails.FindCurrentAnnotation(); // position to corresponding row in annotation grid + } + } + + private int LastResultsMouseOverIndex = -1; + private void lbResults_MouseMove(object sender, MouseEventArgs e) + { + int ResultsMouseOverIndex = lbResults.IndexFromPoint(e.Location); + if (ResultsMouseOverIndex != -1 && ResultsMouseOverIndex != LastResultsMouseOverIndex) + { + AnnotationInfo ai = lbResults.Items[ResultsMouseOverIndex] as AnnotationInfo; + toolTip1.SetToolTip(lbResults, ai.MyItem.Path); // display location of corresponding procedure text in a tooltip + LastResultsMouseOverIndex = ResultsMouseOverIndex; + } + + } + #endregion + + #region LoadControlData + public void SetupAnnotationSearch(AnnotationDetails annotationDetails, DisplayTabControl tc) + { + _AnnotationDetails = annotationDetails; + cbAnnoType.DisplayMember = "Name"; + cbAnnoType.DataSource = AnnotationTypeInfoList.Get(); + lbResults.MouseMove += new MouseEventHandler(lbResults_MouseMove); + _TabControl = tc; + } + #endregion + + #region VariousSupportMethods + public void UpdateAnnotationSearchResults() + { + AnnotationTypeInfo ati = cbAnnoType.SelectedValue as AnnotationTypeInfo; + _LoadingList = true; + lbResults.DisplayMember = "SearchText"; + lbResults.DataSource = ati.AnnotationTypeAnnotations; + lbResults.SelectedIndex = -1; + LastResultsMouseOverIndex = -1; + _LoadingList = false; + } + #endregion + + } +} diff --git a/PROMS/Volian.Controls.Library/AnnotationSearch.resx b/PROMS/Volian.Controls.Library/AnnotationSearch.resx new file mode 100644 index 00000000..e8120083 --- /dev/null +++ b/PROMS/Volian.Controls.Library/AnnotationSearch.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 121, 17 + + + 17, 17 + + \ No newline at end of file diff --git a/PROMS/Volian.Controls.Library/DisplayRO.Designer.cs b/PROMS/Volian.Controls.Library/DisplayRO.Designer.cs index 115c031f..98d68739 100644 --- a/PROMS/Volian.Controls.Library/DisplayRO.Designer.cs +++ b/PROMS/Volian.Controls.Library/DisplayRO.Designer.cs @@ -44,12 +44,13 @@ namespace Volian.Controls.Library // tvROFST // this.tvROFST.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))); + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.tvROFST.HideSelection = false; - this.tvROFST.Location = new System.Drawing.Point(0, 52); + this.tvROFST.Location = new System.Drawing.Point(0, 64); + this.tvROFST.Margin = new System.Windows.Forms.Padding(4); this.tvROFST.Name = "tvROFST"; - this.tvROFST.Size = new System.Drawing.Size(226, 455); + this.tvROFST.Size = new System.Drawing.Size(300, 559); this.tvROFST.TabIndex = 5; this.tvROFST.BeforeExpand += new System.Windows.Forms.TreeViewCancelEventHandler(this.tvROFST_BeforeExpand); this.tvROFST.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tvROFST_AfterSelect); @@ -60,8 +61,9 @@ namespace Volian.Controls.Library this.panelValue.Controls.Add(this.panelRoValue); this.panelValue.Dock = System.Windows.Forms.DockStyle.Top; this.panelValue.Location = new System.Drawing.Point(0, 0); + this.panelValue.Margin = new System.Windows.Forms.Padding(4); this.panelValue.Name = "panelValue"; - this.panelValue.Size = new System.Drawing.Size(226, 53); + this.panelValue.Size = new System.Drawing.Size(301, 65); this.panelValue.TabIndex = 7; // // pnlROButtons @@ -69,19 +71,21 @@ namespace Volian.Controls.Library this.pnlROButtons.Controls.Add(this.btnCancelRO); this.pnlROButtons.Controls.Add(this.btnSaveRO); this.pnlROButtons.Dock = System.Windows.Forms.DockStyle.Fill; - this.pnlROButtons.Location = new System.Drawing.Point(0, 25); + this.pnlROButtons.Location = new System.Drawing.Point(0, 32); + this.pnlROButtons.Margin = new System.Windows.Forms.Padding(4); this.pnlROButtons.Name = "pnlROButtons"; - this.pnlROButtons.Size = new System.Drawing.Size(226, 28); + this.pnlROButtons.Size = new System.Drawing.Size(301, 33); this.pnlROButtons.TabIndex = 9; // // btnCancelRO // this.btnCancelRO.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnCancelRO.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnCancelRO.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnCancelRO.Location = new System.Drawing.Point(142, 0); + this.btnCancelRO.Dock = System.Windows.Forms.DockStyle.Right; + this.btnCancelRO.Location = new System.Drawing.Point(211, 0); + this.btnCancelRO.Margin = new System.Windows.Forms.Padding(4); this.btnCancelRO.Name = "btnCancelRO"; - this.btnCancelRO.Size = new System.Drawing.Size(84, 27); + this.btnCancelRO.Size = new System.Drawing.Size(90, 33); this.btnCancelRO.TabIndex = 9; this.btnCancelRO.Text = "Cancel"; this.btnCancelRO.Click += new System.EventHandler(this.btnCancelRO_Click); @@ -92,8 +96,9 @@ namespace Volian.Controls.Library this.btnSaveRO.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnSaveRO.Dock = System.Windows.Forms.DockStyle.Left; this.btnSaveRO.Location = new System.Drawing.Point(0, 0); + this.btnSaveRO.Margin = new System.Windows.Forms.Padding(4); this.btnSaveRO.Name = "btnSaveRO"; - this.btnSaveRO.Size = new System.Drawing.Size(78, 28); + this.btnSaveRO.Size = new System.Drawing.Size(92, 33); this.btnSaveRO.TabIndex = 8; this.btnSaveRO.Text = "Save RO"; this.btnSaveRO.Click += new System.EventHandler(this.btnSaveRO_Click); @@ -104,8 +109,9 @@ namespace Volian.Controls.Library this.panelRoValue.Controls.Add(this.lblROValue); this.panelRoValue.Dock = System.Windows.Forms.DockStyle.Top; this.panelRoValue.Location = new System.Drawing.Point(0, 0); + this.panelRoValue.Margin = new System.Windows.Forms.Padding(4); this.panelRoValue.Name = "panelRoValue"; - this.panelRoValue.Size = new System.Drawing.Size(226, 25); + this.panelRoValue.Size = new System.Drawing.Size(301, 32); this.panelRoValue.TabIndex = 8; // // tbROValue @@ -115,28 +121,33 @@ namespace Volian.Controls.Library // this.tbROValue.Border.Class = "TextBoxBorder"; this.tbROValue.Dock = System.Windows.Forms.DockStyle.Fill; - this.tbROValue.Location = new System.Drawing.Point(59, 0); + this.tbROValue.Location = new System.Drawing.Point(67, 0); + this.tbROValue.Margin = new System.Windows.Forms.Padding(4); this.tbROValue.Name = "tbROValue"; - this.tbROValue.Size = new System.Drawing.Size(167, 20); + this.tbROValue.Size = new System.Drawing.Size(234, 22); this.tbROValue.TabIndex = 7; // // lblROValue // this.lblROValue.Dock = System.Windows.Forms.DockStyle.Left; + this.lblROValue.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblROValue.Location = new System.Drawing.Point(0, 0); + this.lblROValue.Margin = new System.Windows.Forms.Padding(4); this.lblROValue.Name = "lblROValue"; - this.lblROValue.Size = new System.Drawing.Size(59, 25); + this.lblROValue.Size = new System.Drawing.Size(67, 32); this.lblROValue.TabIndex = 6; this.lblROValue.Text = "RO Value:"; + this.lblROValue.TextLineAlignment = System.Drawing.StringAlignment.Near; // // DisplayRO // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.panelValue); this.Controls.Add(this.tvROFST); + this.Margin = new System.Windows.Forms.Padding(4); this.Name = "DisplayRO"; - this.Size = new System.Drawing.Size(226, 507); + this.Size = new System.Drawing.Size(301, 624); this.panelValue.ResumeLayout(false); this.pnlROButtons.ResumeLayout(false); this.panelRoValue.ResumeLayout(false);