From 5521f34512da8ce31233bc8d85b1162acff89d18 Mon Sep 17 00:00:00 2001 From: Rich Date: Wed, 21 May 2008 21:35:48 +0000 Subject: [PATCH] Fix to code to use the Enter key from the treeview to perform same function as Open from the start menu. Start RO, Tags and Transition Info panels invisible. --- .../frmVEPROMS.Designer.cs | 104 +++++++++-------- PROMS/VEPROMS User Interface/frmVEPROMS.cs | 28 +++-- PROMS/VEPROMS User Interface/frmVEPROMS.resx | 108 +++++++++--------- 3 files changed, 128 insertions(+), 112 deletions(-) diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs index e6ac7ea3..fcfaab3c 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs @@ -418,7 +418,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 +437,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 +506,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,6 +813,7 @@ 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, @@ -837,7 +838,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 @@ -954,6 +955,7 @@ 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, @@ -990,6 +992,7 @@ 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, @@ -1004,7 +1007,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); @@ -1018,7 +1021,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 @@ -1038,6 +1041,7 @@ 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, @@ -1045,6 +1049,7 @@ 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, @@ -1110,7 +1115,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 @@ -1150,6 +1155,7 @@ 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, @@ -1221,6 +1227,7 @@ 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, @@ -1315,6 +1322,7 @@ 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, @@ -1610,8 +1618,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 @@ -1658,7 +1666,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 @@ -1676,7 +1684,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 @@ -1730,6 +1738,7 @@ 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, @@ -1742,6 +1751,7 @@ 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, @@ -1852,6 +1862,7 @@ 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, @@ -2003,7 +2014,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 @@ -2111,7 +2122,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); // @@ -2132,7 +2143,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); // @@ -2149,7 +2160,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 @@ -2202,7 +2213,7 @@ 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; // @@ -2233,8 +2244,8 @@ namespace VEPROMS // 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))); + | 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); @@ -2275,7 +2286,7 @@ namespace VEPROMS 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.Size = new System.Drawing.Size(29, 14); this.labelX1.TabIndex = 10; this.labelX1.Text = "Type:"; // @@ -2287,7 +2298,7 @@ namespace VEPROMS 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, 24); + 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"; @@ -2402,13 +2413,13 @@ namespace VEPROMS this.c1AnnotationGrid.Location = new System.Drawing.Point(0, 0); this.c1AnnotationGrid.Name = "c1AnnotationGrid"; this.c1AnnotationGrid.Rows.Count = 1; - this.c1AnnotationGrid.Rows.DefaultSize = 20; + 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))); + " 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); // @@ -2491,11 +2502,11 @@ 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.infotabControlPanelTransitions); this.infoTabs.Controls.Add(this.tabControlPanel2); - this.infoTabs.Controls.Add(this.infotabControlPanelRO); this.infoTabs.Dock = System.Windows.Forms.DockStyle.Fill; this.infoTabs.Location = new System.Drawing.Point(0, 26); this.infoTabs.Name = "infoTabs"; @@ -2524,7 +2535,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; @@ -2587,10 +2598,10 @@ namespace VEPROMS this.comboBoxEx1.DisplayMember = "Text"; this.comboBoxEx1.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxEx1.FormattingEnabled = true; - this.comboBoxEx1.ItemHeight = 17; + this.comboBoxEx1.ItemHeight = 14; this.comboBoxEx1.Location = new System.Drawing.Point(4, 20); this.comboBoxEx1.Name = "comboBoxEx1"; - this.comboBoxEx1.Size = new System.Drawing.Size(189, 23); + this.comboBoxEx1.Size = new System.Drawing.Size(189, 20); 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"; @@ -2737,7 +2748,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, 23); + this.txbChgMsg1.Size = new System.Drawing.Size(36, 20); this.txbChgMsg1.TabIndex = 1; this.txbChgMsg1.WatermarkText = "XXX"; // @@ -2751,7 +2762,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, 23); + this.txbChgMsg2.Size = new System.Drawing.Size(36, 20); this.txbChgMsg2.TabIndex = 2; this.txbChgMsg2.WatermarkText = "XXX"; // @@ -2768,6 +2779,7 @@ namespace VEPROMS this.infotabTags.AttachedControl = this.tabControlPanel1; this.infotabTags.Name = "infotabTags"; this.infotabTags.Text = "Tags"; + this.infotabTags.Visible = false; // // tabControlPanel3 // @@ -2780,7 +2792,7 @@ namespace VEPROMS 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))); + | DevComponents.DotNetBar.eBorderSide.Bottom))); this.tabControlPanel3.Style.GradientAngle = 180; this.tabControlPanel3.TabIndex = 3; this.tabControlPanel3.TabItem = this.infotabResults; @@ -2798,7 +2810,6 @@ namespace VEPROMS 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; @@ -2829,7 +2840,7 @@ namespace VEPROMS 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.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; @@ -2842,10 +2853,9 @@ namespace VEPROMS // this.lbResults.Dock = System.Windows.Forms.DockStyle.Fill; this.lbResults.FormattingEnabled = true; - this.lbResults.ItemHeight = 16; - this.lbResults.Location = new System.Drawing.Point(0, 23); + this.lbResults.Location = new System.Drawing.Point(0, 20); this.lbResults.Name = "lbResults"; - this.lbResults.Size = new System.Drawing.Size(199, 276); + this.lbResults.Size = new System.Drawing.Size(199, 290); this.lbResults.TabIndex = 1; this.lbResults.SelectedValueChanged += new System.EventHandler(this.lbResults_SelectedValueChanged); // @@ -2855,12 +2865,12 @@ namespace VEPROMS this.cbAnnoType.Dock = System.Windows.Forms.DockStyle.Top; this.cbAnnoType.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.cbAnnoType.FormattingEnabled = true; - this.cbAnnoType.ItemHeight = 17; + 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, 23); + 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))); + "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); // @@ -2881,7 +2891,7 @@ namespace VEPROMS 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.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; @@ -2916,7 +2926,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; @@ -2942,6 +2952,7 @@ namespace VEPROMS this.infotabTransition.AttachedControl = this.infotabControlPanelTransitions; this.infotabTransition.Name = "infotabTransition"; this.infotabTransition.Text = "Transition"; + this.infotabTransition.Visible = false; this.infotabTransition.Click += new System.EventHandler(this.infotabTransition_Click); // // tabControlPanel2 @@ -2955,7 +2966,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; @@ -2987,10 +2998,9 @@ 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, 276); + this.lbxBookMarks.Size = new System.Drawing.Size(201, 277); this.lbxBookMarks.TabIndex = 3; this.lbxBookMarks.Click += new System.EventHandler(this.lbxBookMarks_Click); // @@ -3047,7 +3057,7 @@ namespace VEPROMS 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))); + | DevComponents.DotNetBar.eBorderSide.Bottom))); this.infotabControlPanelRO.Style.GradientAngle = 180; this.infotabControlPanelRO.TabIndex = 4; this.infotabControlPanelRO.TabItem = this.infotabRO; @@ -3183,7 +3193,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, 4, 4, 4); + this.tc.Margin = new System.Windows.Forms.Padding(4); this.tc.Name = "tc"; this.tc.SelectedDisplayTabItem = null; this.tc.Size = new System.Drawing.Size(848, 397); @@ -3199,7 +3209,7 @@ namespace VEPROMS // // frmVEPROMS // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScroll = true; this.ClientSize = new System.Drawing.Size(1122, 780); diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index ff9ed8fe..5834c3a7 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -405,7 +405,8 @@ namespace VEPROMS { if (e.KeyChar == '\r') { - tv_Click(sender, new EventArgs()); + //tv_Click(sender, new EventArgs()); + OpenNode(tv.SelectedNode as VETreeNode); e.Handled = true; } } @@ -1079,20 +1080,25 @@ namespace VEPROMS else { VETreeNode tn = (VETreeNode)(tv.SelectedNode); - if (tn != null) + OpenNode(tn); + } + } + + private void OpenNode(VETreeNode tn) + { + if (tn != null) + { + if (tn.VEObject.GetType() == typeof(FolderInfo) || tn.VEObject.GetType() == typeof(DocVersionInfo)) { - if (tn.VEObject.GetType() == typeof(FolderInfo) || tn.VEObject.GetType() == typeof(DocVersionInfo)) + if (tn.Nodes.Count > 0) { - if (tn.Nodes.Count > 0) - { - tn.Expand(); - tv.SelectedNode = tn.Nodes[0]; - tv.Focus(); - } + tn.Expand(); + tv.SelectedNode = tn.Nodes[0]; + tv.Focus(); } - else - SetupNodes(tn); } + else + SetupNodes(tn); } } /// diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.resx b/PROMS/VEPROMS User Interface/frmVEPROMS.resx index 7886f2c5..be1223d3 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.resx +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.resx @@ -122,10 +122,10 @@ Qk1mAQAAAAAAAHYAAAAoAAAAFAAAABQAAAABAAQAAAAAAAAAAAB0EgAAdBIAABAAAAAQAAAAAAAA/wAA gP8AgAD/AICA/4AAAP+AAID/gIAA/8DAwP+AgID/AAD//wD/AP8A/////wAA//8A/////wD//////3d3 - d3d3d3d3d3cBAXd3d3d3d3d3d3cBAXd3d3d3d3d3d3cBAXd3d3R3d3d3d3cBAXd3d0RHd3d3d3cBAXd3 - dERHd3d3d3cBAXd3REdEd3d3d3cBAXd0RHd0R3d3d3cBAXd3R3d3R3d3d3cBAXd3d3d3dHd3d3cBAXd3 - d3d3d0d3d3cBAXd3d3d3d3R3d3cBAXdwcHAHdwBHd3cBAXdwcHBwcHd0d3cBAXdwAHAHcHd3R3cBAXdw - cHBwcHd3d3cBAXd3B3AHdwB3d3cBAXd3d3d3d3d3d3cBAXd3d3d3d3d3d3cBAXd3d3d3d3d3d3cBAQ== + d3d3d3d3d3eAP3d3d3d3d3d3d3eAP3d3d3d3d3d3d3eAP3d3d3R3d3d3d3eAP3d3d0RHd3d3d3eAP3d3 + dERHd3d3d3eAP3d3REdEd3d3d3eAP3d0RHd0R3d3d3eAP3d3R3d3R3d3d3eAP3d3d3d3dHd3d3eAP3d3 + d3d3d0d3d3eAP3d3d3d3d3R3d3eAP3dwcHAHdwBHd3eAP3dwcHBwcHd0d3eAP3dwAHAHcHd3R3eAP3dw + cHBwcHd3d3eAP3d3B3AHdwB3d3eAP3d3d3d3d3d3d3eAP3d3d3d3d3d3d3eAP3d3d3d3d3d3d3eAPw== @@ -134,8 +134,8 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDgAA - Cw4BQL7hQQAAApdJREFUOE+Nkt9PUnEYxukv6K6L5uZF3nTTbOuiuumiKy8Sy7W5tdZF6DDMtMylSWUz + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDQAA + Cw0B7QfALAAAApdJREFUOE+Nkt9PUnEYxukv6K6L5uZF3nTTbOuiuumiKy8Sy7W5tdZF6DDMtMylSWUz ZoVmuJjMBMTI9My0peVmDX+loagF/QJU8HcCogI7Bzic8/Q9HLZu3PC7vfvuvXg/z/M+ew8AkKR77r6j tkMZh0MHM09mzI93ZWWdPrdIB1yONfdiTCIA0lXcKTV7B48Du2qsjBaQvwmeD8cQsef0pR1Own3VLoS1 ADuJ8FoP+ccg9FvOmvTqAsDZnckvWfIR+dsLDjug/f0Q+tWhE/sDEAd3sdtMIWqhCIQiTijSg/Or9gdg @@ -152,8 +152,8 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDgAA - Cw4BQL7hQQAAAjlJREFUOE/Nk11IU2EYx2dgH6AQUthFUIFYBoW7SBkz7CIsFznCbLIuRg28cRdT2rR2 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDQAA + Cw0B7QfALAAAAjlJREFUOE/Nk11IU2EYx2dgH6AQUthFUIFYBoW7SBkz7CIsFznCbLIuRg28cRdT2rR2 2rqYO5xtacelQdEcs6LS0gbLJskQR4UxkEFRgS1X2XChk8qatv6975HNZXYR3XTg4eV9Pn7P/3k4bxYA 0T99FJAya9dwuIHzTJXUtI4v8/tX8gvNMxOlSkfP7OcEcsS6yEYJs4rG6Jnpz8z/BUC6+8/wA5DXX0Wx 3IadMkuMJvDXA1jJnwKlFZg6B/EtsYB7I6+h40ewbX8L1u7WZ6X8nkAYrHsMBRUWUrs0tgBobvPmmTp8 @@ -452,8 +452,8 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDgAA - Cw4BQL7hQQAAAoJJREFUOE99kd1LU2Ecx0939Rd022UXQdBFXZVdh10FERRBipXD1CRDS8tmRbhM09LE + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDQAA + Cw0B7QfALAAAAoJJREFUOE99kd1LU2Ecx0939Rd022UXQdBFXZVdh10FERRBipXD1CRDS8tmRbhM09LE WavUaCnpsqzhnNPlKvNlrFm+pem0Njdtup3nnPOc7dtznmGQbB34cODh+b78fs8WAMLmr981TtjZVjWm CgpNIMtUoCrlf1mhgqrGpZyM9G2CZrCZgY/jMjuD+6sPQ545vB+eht31DW/7v+BVzyi6bG7UmboID09m 4Bj0UgZsTje6e4dhsX6C2eJES7sdTc/eof7xa9QYLVpIcgNzpw2qGuNQqkJRKIdIMkQi4Xc4ghJ9lVZS @@ -765,8 +765,8 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDgAA - Cw4BQL7hQQAAActJREFUOE+NklkvA1EUx+ubeCJii6WNh0oQsb/ggQSJhK/gU+iLiHhQS6wJotFa0lJb + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDQAA + Cw0B7QfALAAAActJREFUOE+NklkvA1EUx+ubeCJii6WNh0oQsb/ggQSJhK/gU+iLiHhQS6wJotFa0lJb EWpLGUwbbVFLFbFVqp2Z/s29MhNpZpKe5OR/5845vzPnnEkBoCFmcbj/Dv+M53kNx3EaLhYjt4aWOl1X YoyGAIibt1hRlM04swFdTSfGLfvdUrykMsC0fq4K6Bu3wrbDSBDDf4gMmFlxqQKGZtdosuSKgKmlQ8QT EPF4nN7xvIDBaTt6R5ehre4gUXJh+TC54IQgCDi99FL1+ALgxETXhReRaAwnF9eYs+6pAwxGM3y3D2QT @@ -800,8 +800,8 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDgAA - Cw4BQL7hQQAAAM9JREFUOE9j/P//PwNFAGRAeMMjHZ/SU0DmfwZSMVhDSNP9/x75B1AMALoK5DS8GOx6 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDQAA + Cw0B7QfALAAAAM9JREFUOE9j/P//PwNFAGRAeMMjHZ/SU0DmfwZSMVhDSNP9/x75B1AMALoK5DS8GOx6 EBFYdlnTIXn1f8ekVX5kucA1e8d/i/Dp/439O0j2Bsl+Rnch2ICg+hv/A6qv/HfJ3t5FlhfAhtRdT7eJ XQD3AqEABMnDAzGk4aGPa9b2/7aJS/3JcoFnwYH/lhEz/hv5tgxQIPpXXfzvW37uv0PKavJd4Fdx7r9j +qY0WBiQFIggTR5FR2abBU8gzwUehQfBgWgTvTCQrFggVROyegA1/oH1CRXf9wAAAABJRU5ErkJggg== @@ -810,8 +810,8 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDgAA - Cw4BQL7hQQAAAl5JREFUOE+l019MUlEcB/B67M2HtrZ66aGHarW2/sxy5tJa2J8l2YNzMmuxjNWkEomu + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDQAA + Cw0B7QfALAAAAl5JREFUOE+l019MUlEcB/B67M2HtrZ66aGHarW2/sxy5tJa2J8l2YNzMmuxjNWkEomu AgJXvECJWCpMjH/ZkrKlzeyvLV5aWPNfw0BrJRVDrEAqWZT32720WtbVHjrbeTj3nu/n3Ps758wHMO+/ Ggtw9d6H91bZrVpBq1UHQipefqv7WhrXPM5wbbVsq9tOgQnTn1+RtKOJfOl2UOh0W4k/EU7gQjNFT42R LABETHBaSCTGtKnxgLcn43eEE7A3qD/R43VMgPoBNGrAjl2WGlhq5XBajXk/EU6gpV7JBIxwmdXAuAm2 @@ -827,8 +827,8 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDgAA - Cw4BQL7hQQAAAeFJREFUOE+l019IU1EcwPFJz9JbD/Vgj5Kr9CGikDCitIxIqJeiMHQ5kdU2wyXan7mc + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDQAA + Cw0B7QfALAAAAeFJREFUOE+l019IU1EcwPFJz9JbD/Vgj5Kr9CGikDCitIxIqJeiMHQ5kdU2wyXan7mc FmqQQURQFiG0RmgjGSbZcC6wMZz/bmqaTRcGpijOhNn9dibl3RLiUhc+3N85B7735Z4kQPNfTywg+Rr5 04D3DsGuBnrfNhB4U0/P6zo8LjvtDhvuZ9ZVqx//HSA6Ika/4FWl0pCnBIa6G4lG3okNh2oVhuNKwPeq huW5l2LjvmrlJceUQFfrDb6HH0HktmqW4qNKwNNiY368jpU5+xpma/kbiz5XCXS+sDITLIPpKtUsRUeU @@ -842,8 +842,8 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDgAA - Cw4BQL7hQQAAAm9JREFUOE+lk19Ik1EYxtdFkCh+Uo1ZTll0q4lJoJKuVNKLgZpKzihUrG34jxG2cC5q + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDQAA + Cw0B7QfALAAAAm9JREFUOE+lk19Ik1EYxtdFkCh+Uo1ZTll0q4lJoJKuVNKLgZpKzihUrG34jxG2cC5q WILh5rKZtQpiGSoj6EIU//CJrkKC1BxLRzqtzTU/3WIjy3B7+vZB0mSDogPPuTi8z+885z3n7AHA+q8R AISSZbyQ96r/9LamjtjqkhIHwtWFNAeKX/fnmBfnr/80T8t8HTXEwD8BjL3ZAvPkRZ/3+2Os2xphGs5A Zz1xLBQkZIK3L/Opj0tayJurIRQWwDgqQU8L1/FXAFLPl81PiXxN8kswGAxQKpWI48ZiZiAV6hpCtBsS @@ -859,8 +859,8 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDgAA - Cw4BQL7hQQAAAHxJREFUOE9j/P//PwNFAGRAQfehAiD+D6JBfFIwWDFIc2jLk/+y1lVALsQAFiaW//gw + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDQAA + Cw0B7QfALAAAAHxJREFUOE9j/P//PwNFAGRAQfehAiD+D6JBfFIwWDFIc2jLk/+y1lVALsQAFiaW//gw TB3MgAKQZiAmzwWkOBldLUn+xWYR3AujgUha4kEOTHAgJlYsLwDi/yCa1CiFGfDfs+jof0njTPJSIshm kGYgJs8FpDobIwwoMQAAEuaJ1nndlB8AAAAASUVORK5CYII= @@ -876,8 +876,8 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDgAA - Cw4BQL7hQQAAAdBJREFUOE+lk90rQ2Ecx/mL5MKFG7lSXLiUa3IjKS4okpS4UFJelmnY2GbeLcPYbOZt + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDQAA + Cw0B7QfALAAAAdBJREFUOE+lk90rQ2Ecx/mL5MKFG7lSXLiUa3IjKS4okpS4UFJelmnY2GbeLcPYbOZt mKERQmFnmMyFmdnOtq/ndzizJ1zg1K/O83Q+35fn6aQDSPvXQwJto/dInRbdPRrVftT03aGi6xYl7Tco bvWhsElAXr2AnBovsquvGcrMZQGNAxiwJ6C0xtFjjqHDJKJtOormsQga9K+o1bygShVCeW8IZd1BZJbt 8gJygmatH3UDflQq3p2LWnwoaPAi98OVnGkySpyfAvo5FxKJRHLW3RfcemHtUFpHxTiC4ThGTE5k5Zd+ @@ -891,8 +891,8 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDgAA - Cw4BQL7hQQAAAklJREFUOE+lk11I02EUxusuIogugqALIyK6iJpEEIUZIQWSK8kLQ/pAqUApKbEsl4kL + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDQAA + Cw0B7QfALAAAAklJREFUOE+lk11I02EUxusuIogugqALIyK6iJpEEIUZIQWSK8kLQ/pAqUApKbEsl4kL srQwQYeOVmp+VGamlo1lMUVJ+9DmdCbNBVqkzvyiD9vmr51/rP8IoqgXzuXzO88553nnAnP+6wmg8FY7 wZVf0UbO9WbOFTehy39ISk4difpq4tMriUstJSbZxK4ko1/qbx4AeLzwu/r0FcamZxkam6X/vY9Ol49V 2zP/DuC2O3AcCMW+X4Ot1a6IyxoHWLnt7J8B0lnEDJmZeXycZ7uX0eLwca3+NSsiggAy86/2A7bt+zQ/ @@ -1042,8 +1042,8 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDgAA - Cw4BQL7hQQAAArRJREFUOE99kntIU1Ecx6//9Fd/9kd/FSU9rD+0hxIoPcjcyppBRJZIiqlDA7HIFohl + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDQAA + Cw0B7QfALAAAArRJREFUOE99kntIU1Ecx6//9Fd/9kd/FSU9rD+0hxIoPcjcyppBRJZIiqlDA7HIFohl mr0081Gr+aD5mI/Kx3TO1po5zbmcaahIiKBkOvGBqTnndu+3cw45kmYHvpx7Lvf3Oed87s8DAFep7SYT OJ53kghrZ4Hn4sNEHhwZ1wqsYjJpn0RvZms2aGFFkwUCeFd4gceyQ8C8TYDvySgGT1RMiElwIX2QrVfD HlSaLlasNvThdXMvytVdKH5jQv/QOAOsFpcZlxGXM4Tw7GlEvVjZSmsZoKzR7Np9xcnjl13AzKKA7sFx @@ -1070,8 +1070,8 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDgAA - Cw4BQL7hQQAAAGxJREFUOE9j/P//PwNFAGQAJZgizWDXI9vOysL6Hwf+APRmChDzoLsW3QBjZANAioF8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDQAA + Cw0B7QfALAAAAGxJREFUOE9j/P//PwNFAGQAJZgizWDXI9vOysL6Hwf+APRmChDzoLsW3QBjZANAioF8 d5AYUDMIp+A1AKoB7goonxnJgEfkGEC+C5C88w/o/IVALE5fF5AcBkAnW1IUCxSnA3KSNHWT8oC4AACM 9Tog46ASzQAAAABJRU5ErkJggg== @@ -1079,8 +1079,8 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDgAA - Cw4BQL7hQQAAAHxJREFUOE9j/P//PwNFAGQAJZgizWDX47Md6DWQ/1Awunq8BrCysCrADACylbBZRsiA + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDQAA + Cw0B7QfALAAAAHxJREFUOE9j/P//PwNFAGQAJZgizWDX47Md6DWQ/1Awunq8BrCysCrADACylbBZRsiA EJABQM0huFxKlBeABjCTbADIVqjtCXjDCafJ0MDDZzvOWABqCoTankkojWCEASi0kUJeiyQDsMU7SIys MCBkM0yetkmZGFdQ7AIA76uD72svvEQAAAAASUVORK5CYII= @@ -1098,30 +1098,30 @@ Qk1mAQAAAAAAAHYAAAAoAAAAFAAAABQAAAABAAQAAAAAAAAAAAB0EgAAdBIAABAAAAAQAAAAAAAA/wAA gP8AgAD/AICA/4AAAP+AAID/gIAA/4CAgP/AwMD/AAD//wD/AP8A/////wAA//8A/////wD//////4iI - iIiIiIiIiIgBAYiId4iIiIiIh3gBAYiHAIiIiIiIcAgBAYhw8IiIiIiHDwgBAYcP8IiIiIhw+wgBAYD/ - 8IiIiIgPvwgBAYDw8IiIiIgLCwgBAYAP8IiICIgAvwgBAYD/8IiIAIgL+wgBAYAA8IAAAAgADwgBAYD/ - 8IAAAAgL+wgBAYAA8IiIAIgADwgBAYD/8IiICIgL+wgBAYAP8IiIiIgAvwgBAYDw8IiIiIgPCwgBAYgP - 8IiIiIiAvwgBAYiA8IiIiIiICwgBAYiIAIiIiIiIgAgBAYiIh4iIiIiIiHgBAYiIiIiIiIiIiIgBAQ== + iIiIiIiIiIiAP4iId4iIiIiIh3iAP4iHAIiIiIiIcAiAP4hw8IiIiIiHDwiAP4cP8IiIiIhw+wiAP4D/ + 8IiIiIgPvwiAP4Dw8IiIiIgLCwiAP4AP8IiICIgAvwiAP4D/8IiIAIgL+wiAP4AA8IAAAAgADwiAP4D/ + 8IAAAAgL+wiAP4AA8IiIAIgADwiAP4D/8IiICIgL+wiAP4AP8IiIiIgAvwiAP4Dw8IiIiIgPCwiAP4gP + 8IiIiIiAvwiAP4iA8IiIiIiICwiAP4iIAIiIiIiIgAiAP4iIh4iIiIiIiHiAP4iIiIiIiIiIiIiAPw== Qk1mAQAAAAAAAHYAAAAoAAAAFAAAABQAAAABAAQAAAAAAAAAAAB0EgAAdBIAABAAAAAQAAAAAAAA/wAA gP8AgAD/AICA/4AAAP+AAID/gIAA/4CAgP/AwMD/AAD//wD/AP8A/////wAA//8A/////wD//////4iI - iIiIiIiIiIgBAYiEREiIiIRESIgBAYh0/0SIiET/R4gBAYh0iPSIiE+IR4gBAYh0iISIiEiIR4gBAYiH - SIRIh0iEeIgBAYiIdERHdERHiIgBAYiIiERERESIiIgBAYiIiIRP9EiIiIgBAYiIiIcERHiIiIgBAYiI - iHD/DweIiIgBAYiIhw/wT/B4iIgBAYiIcP8IgP8HiIgBAYiHD/CIiA/weIgBAYhw/wiIiID/B4gBAYcP - 8IiIiIgP8HgBAYD/CIiIiIiA/wgBAYDwiIiIiIiIDwgBAYAIiIiIiIiIgAgBAYiIiIiIiIiIiIgBAQ== + iIiIiIiIiIiAP4iEREiIiIRESIiAP4h0/0SIiET/R4iAP4h0iPSIiE+IR4iAP4h0iISIiEiIR4iAP4iH + SIRIh0iEeIiAP4iIdERHdERHiIiAP4iIiERERESIiIiAP4iIiIRP9EiIiIiAP4iIiIcERHiIiIiAP4iI + iHD/DweIiIiAP4iIhw/wT/B4iIiAP4iIcP8IgP8HiIiAP4iHD/CIiA/weIiAP4hw/wiIiID/B4iAP4cP + 8IiIiIgP8HiAP4D/CIiIiIiA/wiAP4DwiIiIiIiIDwiAP4AIiIiIiIiIgAiAP4iIiIiIiIiIiIiAPw== Qk1mAQAAAAAAAHYAAAAoAAAAFAAAABQAAAABAAQAAAAAAAAAAAB0EgAAdBIAABAAAAAQAAAAAAAA/wAA gP8AgAD/AICA/4AAAP+AAID/gIAA/4CAgP/AwMD/AAD//wD/AP8A/////wAA//8A/////wD//////4iI - iIiIiIiIiIgBAYiIiIiIgAAAAAgBAYiHd3d3cO/v7wgBAYgAAAAAAPRETggBAYD4iIiIgO/v7wgBAYD4 - iIiIgPRETggBAYD4iIiIgO/v7wgBAYD4iAAAgPROAAgBAYD4iIAAgO/vAIgBAYD4iAAAgAAACIgBAYD4 - gACAiAeIiIgBAYD4AAiIiAeIiIgBAYD4gIiIiAeIiIgBAYD4iIiIiAeIiIgBAYD4iIiIiAeIiIgBAYD/ - AAAA/wiIiIgBAYgATExAAIiIiIgBAYiIxMTAiIiIiIgBAYiIjEwIiIiIiIgBAYiIiIiIiIiIiIgBAQ== + iIiIiIiIiIiAP4iIiIiIgAAAAAiAP4iHd3d3cO/v7wiAP4gAAAAAAPRETgiAP4D4iIiIgO/v7wiAP4D4 + iIiIgPRETgiAP4D4iIiIgO/v7wiAP4D4iAAAgPROAAiAP4D4iIAAgO/vAIiAP4D4iAAAgAAACIiAP4D4 + gACAiAeIiIiAP4D4AAiIiAeIiIiAP4D4gIiIiAeIiIiAP4D4iIiIiAeIiIiAP4D4iIiIiAeIiIiAP4D/ + AAAA/wiIiIiAP4gATExAAIiIiIiAP4iIxMTAiIiIiIiAP4iIjEwIiIiIiIiAP4iIiIiIiIiIiIiAPw== @@ -2669,8 +2669,8 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDgAA - Cw4BQL7hQQAAAxBJREFUOE+Nk/tPk2cUx3Wb2R+yGLMETYyo05hlupCiQg2gby0IDEdXyqVcCnaVS4v0 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDQAA + Cw0B7QfALAAAAxBJREFUOE+Nk/tPk2cUx3Wb2R+yGLMETYyo05hlupCiQg2gby0IDEdXyqVcCnaVS4v0 pU68lHZACcLWyiaToAj1JV4WGUzHwnDLogM3WabhUlMLyyyrIvazviwt8Tef5OQ5eXLO5zznPN9nNbAq uirtA1sjvpJw+P231rwR9/aaN1cH/128+3QhdCMcDnubzaqfYsFRRwbIVtU4UFTjlB54hoa5/mAMaWoA z2QtJZIWQfyC3KOeCU3VOW00ProvJ1fapULRLS303LvCnX/uMv5shoreeux/VJN/WckuWwMZ4gjppo5g @@ -2689,8 +2689,8 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDgAA - Cw4BQL7hQQAAATBJREFUOE9j/P//PwNFAGQAOgYaCDIVKAw2HM7GqhabIEwMZgheNVQzIDo6Otff33+X + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDQAA + Cw0B7QfALAAAATBJREFUOE9j/P//PwNFAGQAOgYaCDIVKAw2HM7GqhabIEwMZgheNVQzIDo6Otff33+X t7f3THd3dwGY82EWWFhYlAPxfyguh7sSxPD19e338fF57OHhccrV1fW/tbX1I2QDgJrSQBqRDAMZ5AJW AyKANtbDJIGGvLW0tIQHIEgcqPgMFgM64AaAGEFBQX1AfNXLy+sbTDEsEBMSEmBOh9NZWVkQS4CahEJD Q/+HhITcA7IF7O3tb5mbm6O74C7U72BnI2OQ/ysCAgL+u7m5LXZ2duYHav5mZmaGbgAsAFcBDRIEYqXV @@ -2701,8 +2701,8 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDgAA - Cw4BQL7hQQAAAoJJREFUOE99kd1LU2Ecx0939Rd022UXQdBFXZVdh10FERRBipXD1CRDS8tmRbhM09LE + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDQAA + Cw0B7QfALAAAAoJJREFUOE99kd1LU2Ecx0939Rd022UXQdBFXZVdh10FERRBipXD1CRDS8tmRbhM09LE WavUaCnpsqzhnNPlKvNlrFm+pem0Njdtup3nnPOc7dtznmGQbB34cODh+b78fs8WAMLmr981TtjZVjWm CgpNIMtUoCrlf1mhgqrGpZyM9G2CZrCZgY/jMjuD+6sPQ545vB+eht31DW/7v+BVzyi6bG7UmboID09m 4Bj0UgZsTje6e4dhsX6C2eJES7sdTc/eof7xa9QYLVpIcgNzpw2qGuNQqkJRKIdIMkQi4Xc4ghJ9lVZS @@ -2719,8 +2719,8 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDgAA - Cw4BQL7hQQAAArRJREFUOE99kntIU1Ecx6//9Fd/9kd/FSU9rD+0hxIoPcjcyppBRJZIiqlDA7HIFohl + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDQAA + Cw0B7QfALAAAArRJREFUOE99kntIU1Ecx6//9Fd/9kd/FSU9rD+0hxIoPcjcyppBRJZIiqlDA7HIFohl mr0081Gr+aD5mI/Kx3TO1po5zbmcaahIiKBkOvGBqTnndu+3cw45kmYHvpx7Lvf3Oed87s8DAFep7SYT OJ53kghrZ4Hn4sNEHhwZ1wqsYjJpn0RvZms2aGFFkwUCeFd4gceyQ8C8TYDvySgGT1RMiElwIX2QrVfD HlSaLlasNvThdXMvytVdKH5jQv/QOAOsFpcZlxGXM4Tw7GlEvVjZSmsZoKzR7Np9xcnjl13AzKKA7sFx @@ -3645,8 +3645,8 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDgAA - Cw4BQL7hQQAAAkNJREFUOE+d0l1IU2EYB/AZXSR0GV10bRclXWRdRB8kk5TIMV3iFgWC1FhgZbNlBNY2 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDQAA + Cw0B7QfALAAAAkNJREFUOE+d0l1IU2EYB/AZXSR0GV10bRclXWRdRB8kk5TIMV3iFgWC1FhgZbNlBNY2 KqEwzbkMwpVzKyoWeswuXNOWy8yZ8zPXyMlcbbbvj+NZ24x/74JC7BjSgQfOxfv+zv95zpMFgKN60LW+ KH9X0ez8At/1xb8tGqc3B4KRjRuysz/lbM1rquBtpzirPRmg941Nrm6nxrpMQwmj9SOMU07cowZwsUkP geRaoPxM/YnMObbilElubGnWdL43DY7/8NEMPEwSzhiDUR8Nauor5JoeFB6vTR0S1eSwAiaLTaPr7Iu7