diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs index 050823f2..642e7b30 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs @@ -125,13 +125,6 @@ namespace VEPROMS this.itemAnnotationsBindingSource = new System.Windows.Forms.BindingSource(this.components); this.searchPanel = new DevComponents.DotNetBar.ExpandablePanel(); this.searchTabControl = 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.navigationPanePanel3 = new DevComponents.DotNetBar.NavigationPanePanel(); - this.btnSimStpsRslt = new DevComponents.DotNetBar.ButtonItem(); - this.infotabResults = new DevComponents.DotNetBar.TabItem(this.components); this.tabControlPanel2 = new DevComponents.DotNetBar.TabControlPanel(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.lbxBookMarks = new System.Windows.Forms.ListBox(); @@ -139,6 +132,14 @@ namespace VEPROMS this.btnRmvCurBookMrk = new DevComponents.DotNetBar.ButtonX(); this.btnSetBookMrk = new DevComponents.DotNetBar.ButtonX(); this.infotabBookMarks = new DevComponents.DotNetBar.TabItem(this.components); + 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.navigationPanePanel3 = new DevComponents.DotNetBar.NavigationPanePanel(); + this.btnSimStpsRslt = new DevComponents.DotNetBar.ButtonItem(); + this.infotabResults = new DevComponents.DotNetBar.TabItem(this.components); + this.expandableSplitter4 = new DevComponents.DotNetBar.ExpandableSplitter(); ((System.ComponentModel.ISupportInitialize)(this.bottomBar)).BeginInit(); this.epAnnotations.SuspendLayout(); this.expandablePanel2.SuspendLayout(); @@ -157,11 +158,11 @@ namespace VEPROMS this.searchPanel.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.searchTabControl)).BeginInit(); this.searchTabControl.SuspendLayout(); + this.tabControlPanel2.SuspendLayout(); + this.panelEx3.SuspendLayout(); this.annotationSearch.SuspendLayout(); this.navpaneResults.SuspendLayout(); this.navpanSrchRslts.SuspendLayout(); - this.tabControlPanel2.SuspendLayout(); - this.panelEx3.SuspendLayout(); this.SuspendLayout(); // // ribbonControl1 @@ -575,7 +576,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 @@ -692,7 +693,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); // @@ -714,7 +715,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); // @@ -732,7 +733,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 @@ -770,7 +771,7 @@ namespace VEPROMS // 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"; + "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; @@ -797,7 +798,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; // @@ -851,11 +852,11 @@ namespace VEPROMS this.infoPanel.Controls.Add(this.infoTabs); this.infoPanel.Dock = System.Windows.Forms.DockStyle.Right; this.infoPanel.Expanded = false; - this.infoPanel.ExpandedBounds = new System.Drawing.Rectangle(357, 57, 230, 457); + this.infoPanel.ExpandedBounds = new System.Drawing.Rectangle(557, 57, 230, 457); this.infoPanel.ExpandOnTitleClick = true; this.infoPanel.Location = new System.Drawing.Point(757, 57); this.infoPanel.Name = "infoPanel"; - this.infoPanel.Size = new System.Drawing.Size(30, 457); + this.infoPanel.Size = new System.Drawing.Size(30, 460); this.infoPanel.Style.Alignment = System.Drawing.StringAlignment.Center; this.infoPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.infoPanel.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -906,7 +907,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; @@ -1163,7 +1164,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; @@ -1175,9 +1176,11 @@ namespace VEPROMS 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.Mydvi = null; this.displayRO.MyROFST = null; this.displayRO.MyRTB = null; this.displayRO.Name = "displayRO"; + this.displayRO.ProgressBar = null; this.displayRO.Size = new System.Drawing.Size(1, 429); this.displayRO.TabIndex = 0; // @@ -1186,6 +1189,7 @@ namespace VEPROMS this.infotabRO.AttachedControl = this.infotabControlPanelRO; this.infotabRO.Name = "infotabRO"; this.infotabRO.Text = "RO"; + this.infotabRO.Visible = false; this.infotabRO.Click += new System.EventHandler(this.infotabRO_Click); // // infotabControlPanelTransitions @@ -1199,7 +1203,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; @@ -1245,96 +1249,99 @@ namespace VEPROMS // // expandableSplitter1 // - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(45)))), ((int)(((byte)(150))))); + this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(45)))), ((int)(((byte)(150))))); + this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.ExpandLineColor = System.Drawing.SystemColors.ControlText; + this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripDarkColor = System.Drawing.SystemColors.ControlText; + this.expandableSplitter1.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.expandableSplitter1.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(223)))), ((int)(((byte)(237)))), ((int)(((byte)(254))))); + this.expandableSplitter1.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(205)))), ((int)(((byte)(208)))), ((int)(((byte)(213))))); this.expandableSplitter1.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(142)))), ((int)(((byte)(75))))); - this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(207)))), ((int)(((byte)(139))))); + this.expandableSplitter1.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(252)))), ((int)(((byte)(151)))), ((int)(((byte)(61))))); + this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(184)))), ((int)(((byte)(94))))); this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(45)))), ((int)(((byte)(150))))); + this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotExpandLineColor = System.Drawing.SystemColors.ControlText; + this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(45)))), ((int)(((byte)(150))))); + this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(223)))), ((int)(((byte)(237)))), ((int)(((byte)(254))))); + this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(205)))), ((int)(((byte)(208)))), ((int)(((byte)(213))))); this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; this.expandableSplitter1.Location = new System.Drawing.Point(34, 57); this.expandableSplitter1.Name = "expandableSplitter1"; this.expandableSplitter1.Size = new System.Drawing.Size(3, 460); + this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; this.expandableSplitter1.TabIndex = 5; this.expandableSplitter1.TabStop = false; // // expandableSplitter2 // - this.expandableSplitter2.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(45)))), ((int)(((byte)(150))))); + this.expandableSplitter2.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); this.expandableSplitter2.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.expandableSplitter2.Dock = System.Windows.Forms.DockStyle.Bottom; - this.expandableSplitter2.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(45)))), ((int)(((byte)(150))))); + this.expandableSplitter2.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); this.expandableSplitter2.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter2.ExpandLineColor = System.Drawing.SystemColors.ControlText; + this.expandableSplitter2.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.expandableSplitter2.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter2.GripDarkColor = System.Drawing.SystemColors.ControlText; + this.expandableSplitter2.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.expandableSplitter2.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter2.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(223)))), ((int)(((byte)(237)))), ((int)(((byte)(254))))); + this.expandableSplitter2.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(205)))), ((int)(((byte)(208)))), ((int)(((byte)(213))))); this.expandableSplitter2.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter2.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(142)))), ((int)(((byte)(75))))); - this.expandableSplitter2.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(207)))), ((int)(((byte)(139))))); + this.expandableSplitter2.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(252)))), ((int)(((byte)(151)))), ((int)(((byte)(61))))); + this.expandableSplitter2.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(184)))), ((int)(((byte)(94))))); this.expandableSplitter2.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; this.expandableSplitter2.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter2.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(45)))), ((int)(((byte)(150))))); + this.expandableSplitter2.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); this.expandableSplitter2.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter2.HotExpandLineColor = System.Drawing.SystemColors.ControlText; + this.expandableSplitter2.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.expandableSplitter2.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter2.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(45)))), ((int)(((byte)(150))))); + this.expandableSplitter2.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); this.expandableSplitter2.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter2.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(223)))), ((int)(((byte)(237)))), ((int)(((byte)(254))))); + this.expandableSplitter2.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(205)))), ((int)(((byte)(208)))), ((int)(((byte)(213))))); this.expandableSplitter2.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; this.expandableSplitter2.Location = new System.Drawing.Point(37, 514); this.expandableSplitter2.Name = "expandableSplitter2"; - this.expandableSplitter2.Size = new System.Drawing.Size(783, 3); + this.expandableSplitter2.Size = new System.Drawing.Size(720, 3); + this.expandableSplitter2.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; this.expandableSplitter2.TabIndex = 6; this.expandableSplitter2.TabStop = false; // // expandableSplitter3 // - this.expandableSplitter3.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(45)))), ((int)(((byte)(150))))); + this.expandableSplitter3.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); this.expandableSplitter3.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter3.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.expandableSplitter3.Dock = System.Windows.Forms.DockStyle.Right; - this.expandableSplitter3.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(45)))), ((int)(((byte)(150))))); + this.expandableSplitter3.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); this.expandableSplitter3.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter3.ExpandLineColor = System.Drawing.SystemColors.ControlText; + this.expandableSplitter3.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.expandableSplitter3.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter3.GripDarkColor = System.Drawing.SystemColors.ControlText; + this.expandableSplitter3.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.expandableSplitter3.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter3.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(223)))), ((int)(((byte)(237)))), ((int)(((byte)(254))))); + this.expandableSplitter3.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(205)))), ((int)(((byte)(208)))), ((int)(((byte)(213))))); this.expandableSplitter3.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter3.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(142)))), ((int)(((byte)(75))))); - this.expandableSplitter3.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(207)))), ((int)(((byte)(139))))); + this.expandableSplitter3.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(252)))), ((int)(((byte)(151)))), ((int)(((byte)(61))))); + this.expandableSplitter3.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(184)))), ((int)(((byte)(94))))); this.expandableSplitter3.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; this.expandableSplitter3.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter3.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(45)))), ((int)(((byte)(150))))); + this.expandableSplitter3.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); this.expandableSplitter3.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter3.HotExpandLineColor = System.Drawing.SystemColors.ControlText; + this.expandableSplitter3.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.expandableSplitter3.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter3.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(45)))), ((int)(((byte)(150))))); + this.expandableSplitter3.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); this.expandableSplitter3.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter3.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(223)))), ((int)(((byte)(237)))), ((int)(((byte)(254))))); + this.expandableSplitter3.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(205)))), ((int)(((byte)(208)))), ((int)(((byte)(213))))); this.expandableSplitter3.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter3.Location = new System.Drawing.Point(817, 57); + this.expandableSplitter3.Location = new System.Drawing.Point(754, 57); this.expandableSplitter3.Name = "expandableSplitter3"; this.expandableSplitter3.Size = new System.Drawing.Size(3, 457); + this.expandableSplitter3.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; this.expandableSplitter3.TabIndex = 7; this.expandableSplitter3.TabStop = false; // @@ -1366,7 +1373,7 @@ namespace VEPROMS 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(720, 457); + this.tc.Size = new System.Drawing.Size(717, 457); this.tc.TabIndex = 8; this.tc.ItemSelectedChanged += new Volian.Controls.Library.ItemSelectedChangedEvent(this.tc_ItemSelectedChanged); this.tc.LinkModifyTran += new Volian.Controls.Library.StepPanelLinkEvent(this.tc_LinkModifyTran); @@ -1395,9 +1402,9 @@ namespace VEPROMS this.searchPanel.Expanded = false; this.searchPanel.ExpandedBounds = new System.Drawing.Rectangle(587, 57, 230, 457); this.searchPanel.ExpandOnTitleClick = true; - this.searchPanel.Location = new System.Drawing.Point(787, 57); + this.searchPanel.Location = new System.Drawing.Point(790, 57); this.searchPanel.Name = "searchPanel"; - this.searchPanel.Size = new System.Drawing.Size(30, 457); + this.searchPanel.Size = new System.Drawing.Size(30, 460); this.searchPanel.Style.Alignment = System.Drawing.StringAlignment.Center; this.searchPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.searchPanel.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -1435,115 +1442,6 @@ namespace VEPROMS this.searchTabControl.Text = "tabControl1"; this.searchTabControl.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(3, 431); - 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.navigationPanePanel3); - 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 = 64; - this.navpaneResults.Padding = new System.Windows.Forms.Padding(1); - this.navpaneResults.Size = new System.Drawing.Size(1, 429); - 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(0, 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(0, 339); - 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.Margin = new System.Windows.Forms.Padding(2); - this.CtrlAnnotationSearch.Name = "CtrlAnnotationSearch"; - this.CtrlAnnotationSearch.Size = new System.Drawing.Size(0, 339); - this.CtrlAnnotationSearch.TabIndex = 0; - // - // navigationPanePanel3 - // - this.navigationPanePanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.navigationPanePanel3.Location = new System.Drawing.Point(1, 1); - this.navigationPanePanel3.Name = "navigationPanePanel3"; - this.navigationPanePanel3.ParentItem = this.btnSimStpsRslt; - this.navigationPanePanel3.Size = new System.Drawing.Size(0, 363); - this.navigationPanePanel3.Style.Alignment = System.Drawing.StringAlignment.Center; - this.navigationPanePanel3.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.navigationPanePanel3.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; - this.navigationPanePanel3.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.navigationPanePanel3.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.navigationPanePanel3.Style.GradientAngle = 90; - this.navigationPanePanel3.TabIndex = 3; - // - // btnSimStpsRslt - // - this.btnSimStpsRslt.Image = ((System.Drawing.Image)(resources.GetObject("btnSimStpsRslt.Image"))); - this.btnSimStpsRslt.ImageFixedSize = new System.Drawing.Size(16, 16); - this.btnSimStpsRslt.ImageListSizeSelection = DevComponents.DotNetBar.eButtonImageListSelection.NotSet; - 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"; - // // tabControlPanel2 // this.tabControlPanel2.Controls.Add(this.panelEx3); @@ -1555,7 +1453,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; @@ -1636,6 +1534,149 @@ namespace VEPROMS this.infotabBookMarks.Name = "infotabBookMarks"; this.infotabBookMarks.Text = "BookMarks"; // + // 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(3, 431); + 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.navigationPanePanel3); + 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 = 61; + this.navpaneResults.Padding = new System.Windows.Forms.Padding(1); + this.navpaneResults.Size = new System.Drawing.Size(1, 429); + 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(0, 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(0, 342); + 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.Margin = new System.Windows.Forms.Padding(2); + this.CtrlAnnotationSearch.Name = "CtrlAnnotationSearch"; + this.CtrlAnnotationSearch.Size = new System.Drawing.Size(0, 342); + this.CtrlAnnotationSearch.TabIndex = 0; + // + // navigationPanePanel3 + // + this.navigationPanePanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.navigationPanePanel3.Location = new System.Drawing.Point(1, 1); + this.navigationPanePanel3.Name = "navigationPanePanel3"; + this.navigationPanePanel3.ParentItem = this.btnSimStpsRslt; + this.navigationPanePanel3.Size = new System.Drawing.Size(0, 366); + this.navigationPanePanel3.Style.Alignment = System.Drawing.StringAlignment.Center; + this.navigationPanePanel3.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; + this.navigationPanePanel3.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; + this.navigationPanePanel3.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.navigationPanePanel3.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; + this.navigationPanePanel3.Style.GradientAngle = 90; + this.navigationPanePanel3.TabIndex = 3; + // + // btnSimStpsRslt + // + this.btnSimStpsRslt.Image = ((System.Drawing.Image)(resources.GetObject("btnSimStpsRslt.Image"))); + this.btnSimStpsRslt.ImageFixedSize = new System.Drawing.Size(16, 16); + this.btnSimStpsRslt.ImageListSizeSelection = DevComponents.DotNetBar.eButtonImageListSelection.NotSet; + 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"; + // + // expandableSplitter4 + // + this.expandableSplitter4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(241)))), ((int)(((byte)(242))))); + 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.Dock = System.Windows.Forms.DockStyle.Right; + 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(787, 57); + this.expandableSplitter4.Name = "expandableSplitter4"; + this.expandableSplitter4.Size = new System.Drawing.Size(3, 460); + this.expandableSplitter4.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; + this.expandableSplitter4.TabIndex = 3; + this.expandableSplitter4.TabStop = false; + // // frmVEPROMS // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); @@ -1643,11 +1684,12 @@ namespace VEPROMS this.AutoScroll = true; this.ClientSize = new System.Drawing.Size(824, 574); this.Controls.Add(this.tc); - this.Controls.Add(this.infoPanel); - this.Controls.Add(this.searchPanel); this.Controls.Add(this.expandableSplitter3); this.Controls.Add(this.expandableSplitter2); this.Controls.Add(this.expandableSplitter1); + this.Controls.Add(this.infoPanel); + this.Controls.Add(this.expandableSplitter4); + this.Controls.Add(this.searchPanel); this.Controls.Add(this.expandablePanel2); this.Controls.Add(this.epAnnotations); this.Controls.Add(this.bottomBar); @@ -1676,11 +1718,11 @@ namespace VEPROMS this.searchPanel.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.searchTabControl)).EndInit(); this.searchTabControl.ResumeLayout(false); + this.tabControlPanel2.ResumeLayout(false); + this.panelEx3.ResumeLayout(false); this.annotationSearch.ResumeLayout(false); this.navpaneResults.ResumeLayout(false); this.navpanSrchRslts.ResumeLayout(false); - this.tabControlPanel2.ResumeLayout(false); - this.panelEx3.ResumeLayout(false); this.ResumeLayout(false); } @@ -1798,6 +1840,7 @@ namespace VEPROMS private DevComponents.DotNetBar.ButtonX btnRmvCurBookMrk; private DevComponents.DotNetBar.ButtonX btnSetBookMrk; private DevComponents.DotNetBar.TabItem infotabBookMarks; + private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter4; } } diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 1c794600..a6b9fd85 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -30,7 +30,8 @@ namespace VEPROMS StepRTB _MyRTB; Color _CommentTitleBckColor; VETreeNode _PrevBookMark = null; - string _PathToROs = @"G:\VEHLP\RO\RO.FST"; + string _PathToROs = @"\\Volian-server\04 ve-proms files\PROMS_2010\vehlp\ro\ro.fst";//@"G:\promsdat\vehlp\ro\ro.fst";//@"G:\VEHLP\RO\RO.FST"; + //string _PathToROs = @"G:\debugdat\vebyron\RO\ro.fst";//@"G:\VEHLP\RO\RO.FST"; public frmVEPROMS() { @@ -664,7 +665,11 @@ namespace VEPROMS /// void tn_LoadingChildernDone(object sender, VETreeNodeEventArgs args) { +#if (DEBUG) ProgBarText = args.Info + " Seconds"; +#else + ProgBarText = ""; +#endif } public int ProgBarMax @@ -975,10 +980,18 @@ namespace VEPROMS infoPanel.Expanded = true; infoTabs.SelectedTab = infotabRO; StepTabPanel dtp = ((DisplayTabItem)tc.SelectedDisplayTabItem).MyStepTabPanel; - if (dtp == null) return; - ROFST rofst = new ROFST(_PathToROs); //"g:\\vehlp\\ro\\ro.fst"); + //DocVersionInfo dvi = (DocVersionInfo)dtp.MyStepPanel.MyProcedureItemInfo.MyProcedure.MyActiveParent; + DocVersionInfo dvi; + if (dtp == null) + dvi = (DocVersionInfo)tc.SelectedDisplayTabItem.MyItemInfo.MyActiveParent.ActiveParent; + else + dvi = (DocVersionInfo)dtp.MyStepPanel.MyProcedureItemInfo.MyProcedure.MyActiveParent; + //if (dtp == null) return; + ROFST rofst = new ROFST(_PathToROs, dvi); //"g:\\vehlp\\ro\\ro.fst"); displayRO.MyROFST = rofst; - displayRO.MyRTB = dtp.MyStepPanel.SelectedStepItem.MyStepRTB; + displayRO.MyRTB = (dtp == null) ? null : dtp.MyStepPanel.SelectedStepItem.MyStepRTB; + displayRO.Mydvi = dvi; + displayRO.ProgressBar = bottomProgBar; } #endregion #region InfoTabTransition @@ -1018,7 +1031,10 @@ namespace VEPROMS //vlnStackTrace.ShowStack("enter tc_ItemSelectedChanged {0}", _CurrentItem); if (args.MyStepItem == null) { - infotabRO.Visible = infotabTransition.Visible = false; + //infotabRO.Visible = infotabTransition.Visible = false; + infotabTransition.Visible = false; + infotabRO.Visible = true; + displayRO.MyRTB = null; infotabTags.Visible = true; //vlnStackTrace.ShowStack("enter tc_ItemSelectedChanged {0}", _CurrentItem); } @@ -1028,6 +1044,7 @@ namespace VEPROMS infotabRO.Visible = infotabTransition.Visible = infotabTags.Visible = true; displayTransition.MyRTB = args.MyStepItem.MyStepRTB; displayRO.MyRTB = args.MyStepItem.MyStepRTB; + displayRO.ProgressBar = bottomProgBar; } } ctrlAnnotationDetails.UpdateAnnotationGrid(_CurrentItem); @@ -1076,17 +1093,22 @@ namespace VEPROMS infoTabs.SelectedTab = infotabTransition; displayTransition.CurTrans = null; } - private void tc_LinkInsertRO(object sender, StepPanelLinkEventArgs args) - { - infoPanel.Expanded = true; - infoTabs.SelectedTab = infotabRO; - ROFST rofst = new ROFST(_PathToROs); //"g:\\vehlp\\ro\\ro.fst"); - displayRO.MyROFST = rofst; - StepTabPanel dtp = ((DisplayTabItem)tc.SelectedDisplayTabItem).MyStepTabPanel; - if (dtp == null) return; - displayRO.MyRTB = dtp.MyStepPanel.SelectedStepItem.MyStepRTB; - displayRO.CurROLink = null; - } + + // This doesn't seem to be used... + // + //private void tc_LinkInsertRO(object sender, StepPanelLinkEventArgs args) + //{ + // infoPanel.Expanded = true; + // infoTabs.SelectedTab = infotabRO; + // ROFST rofst = new ROFST(_PathToROs, _LastDocVersionInfo); //"g:\\vehlp\\ro\\ro.fst"); + // displayRO.MyROFST = rofst; + // StepTabPanel dtp = ((DisplayTabItem)tc.SelectedDisplayTabItem).MyStepTabPanel; + // if (dtp == null) return; + // displayRO.MyRTB = dtp.MyStepPanel.SelectedStepItem.MyStepRTB; + // displayRO.CurROLink = null; + // //displayRO.Mydvi = dvi; + //} + private void tc_LinkModifyTran(object sender, StepPanelLinkEventArgs args) { infoPanel.Expanded = true; @@ -1100,11 +1122,16 @@ namespace VEPROMS { infoPanel.Expanded = true; infoTabs.SelectedTab = infotabRO; - ROFST rofst = new ROFST(_PathToROs); //"g:\\vehlp\\ro\\ro.fst"); - displayRO.MyROFST = rofst; + StepTabPanel dtp = ((DisplayTabItem)tc.SelectedDisplayTabItem).MyStepTabPanel; + DocVersionInfo dvi = (DocVersionInfo)dtp.MyStepPanel.MyProcedureItemInfo.MyProcedure.MyActiveParent; if (dtp == null) return; + ROFST rofst = new ROFST(_PathToROs, dvi); //_LastDocVersionInfo); //"g:\\vehlp\\ro\\ro.fst"); + displayRO.MyROFST = rofst; displayRO.MyRTB = dtp.MyStepPanel.SelectedStepItem.MyStepRTB; + displayRO.CurROLink = args.MyLinkText.RoUsageid; // TODO: this is wrong - use for now. + displayRO.Mydvi = dvi; + displayRO.ProgressBar = bottomProgBar; displayRO.CurROLink = args.MyLinkText.RoUsageid; // this is wrong - use for now. } #endregion diff --git a/PROMS/VEPROMS User Interface/frmVersionsProperties.cs b/PROMS/VEPROMS User Interface/frmVersionsProperties.cs index 663b7c0f..fee299c2 100644 --- a/PROMS/VEPROMS User Interface/frmVersionsProperties.cs +++ b/PROMS/VEPROMS User Interface/frmVersionsProperties.cs @@ -255,7 +255,7 @@ namespace VEPROMS string tpath = ppTxbxRoFoldLoc.Text + "\\RO.FST"; if (File.Exists(tpath)) { - ROFST rofst = new ROFST(tpath); + ROFST rofst = new ROFST(tpath, null); ROFST.rodbi[] rodblist = rofst.GetRODatabaseList(); for (int i = 0; i < rodblist.Length; i++) {