diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs index 3b4bea6b..d4229291 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs @@ -83,6 +83,8 @@ namespace VEPROMS this.btnPrevPos = new DevComponents.DotNetBar.ButtonItem(); this.labelItem14 = new DevComponents.DotNetBar.LabelItem(); this.btnGetRoVals = new DevComponents.DotNetBar.ButtonItem(); + this.labelItem1 = new DevComponents.DotNetBar.LabelItem(); + this.btnItemInfo = new DevComponents.DotNetBar.ButtonItem(); this.epAnnotations = new DevComponents.DotNetBar.ExpandablePanel(); this.ctrlAnnotationDetails = new Volian.Controls.Library.AnnotationDetails(); this.btnAnnoDetailsPushPin = new DevComponents.DotNetBar.ButtonX(); @@ -126,8 +128,6 @@ namespace VEPROMS this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); this.itemAnnotationsBindingSource = new System.Windows.Forms.BindingSource(this.components); this.tc = new Volian.Controls.Library.DisplayTabControl(); - this.labelItem1 = new DevComponents.DotNetBar.LabelItem(); - this.btnItemInfo = new DevComponents.DotNetBar.ButtonItem(); ((System.ComponentModel.ISupportInitialize)(this.bottomBar)).BeginInit(); this.epAnnotations.SuspendLayout(); this.expandablePanel2.SuspendLayout(); @@ -522,7 +522,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 @@ -603,7 +603,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); // @@ -623,7 +623,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); // @@ -639,9 +639,22 @@ namespace VEPROMS this.btnGetRoVals.ForeColor = System.Drawing.Color.Black; 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"; // + // labelItem1 + // + this.labelItem1.BorderSide = DevComponents.DotNetBar.eBorderSide.Left; + this.labelItem1.BorderType = DevComponents.DotNetBar.eBorderType.Bump; + this.labelItem1.Name = "labelItem1"; + // + // btnItemInfo + // + this.btnItemInfo.ForeColor = System.Drawing.Color.Blue; + this.btnItemInfo.Name = "btnItemInfo"; + this.btnItemInfo.Text = "ItemInfo"; + this.btnItemInfo.Click += new System.EventHandler(this.btnItemInfo_Click); + // // epAnnotations // this.epAnnotations.CanvasColor = System.Drawing.SystemColors.Control; @@ -677,13 +690,13 @@ 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; this.ctrlAnnotationDetails.Dock = System.Windows.Forms.DockStyle.Fill; this.ctrlAnnotationDetails.Location = new System.Drawing.Point(0, 26); - this.ctrlAnnotationDetails.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ctrlAnnotationDetails.Margin = new System.Windows.Forms.Padding(2); this.ctrlAnnotationDetails.Name = "ctrlAnnotationDetails"; this.ctrlAnnotationDetails.Size = new System.Drawing.Size(1187, 0); this.ctrlAnnotationDetails.TabIndex = 15; @@ -704,7 +717,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; // @@ -716,7 +729,7 @@ namespace VEPROMS this.expandablePanel2.Controls.Add(this.tv); this.expandablePanel2.Dock = System.Windows.Forms.DockStyle.Left; this.expandablePanel2.Expanded = false; - this.expandablePanel2.ExpandedBounds = new System.Drawing.Rectangle(4, 57, 251, 600); + this.expandablePanel2.ExpandedBounds = new System.Drawing.Rectangle(4, 57, 251, 663); this.expandablePanel2.ExpandOnTitleClick = true; this.expandablePanel2.Location = new System.Drawing.Point(4, 57); this.expandablePanel2.Name = "expandablePanel2"; @@ -742,6 +755,7 @@ namespace VEPROMS // this.tv.AllowDrop = true; this.tv.Dock = System.Windows.Forms.DockStyle.Fill; + this.tv.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.tv.HideSelection = false; this.tv.Location = new System.Drawing.Point(0, 26); this.tv.Name = "tv"; @@ -813,7 +827,7 @@ namespace VEPROMS this.infotabControlPanelTags.Style.BackColor1.Color = System.Drawing.SystemColors.Control; this.infotabControlPanelTags.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.infotabControlPanelTags.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) - | DevComponents.DotNetBar.eBorderSide.Bottom))); + | DevComponents.DotNetBar.eBorderSide.Bottom))); this.infotabControlPanelTags.Style.GradientAngle = 180; this.infotabControlPanelTags.TabIndex = 1; this.infotabControlPanelTags.TabItem = this.infotabTags; @@ -841,7 +855,7 @@ namespace VEPROMS this.displayTags.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.displayTags.Dock = System.Windows.Forms.DockStyle.Top; this.displayTags.Location = new System.Drawing.Point(0, 0); - this.displayTags.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.displayTags.Margin = new System.Windows.Forms.Padding(2); this.displayTags.MyRTB = null; this.displayTags.Name = "displayTags"; this.displayTags.Size = new System.Drawing.Size(201, 500); @@ -866,7 +880,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; @@ -906,7 +920,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; @@ -917,7 +931,7 @@ namespace VEPROMS this.displayRO.CurROLink = null; this.displayRO.Dock = System.Windows.Forms.DockStyle.Fill; this.displayRO.Location = new System.Drawing.Point(1, 1); - this.displayRO.Margin = new System.Windows.Forms.Padding(4); + this.displayRO.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.displayRO.Mydvi = null; this.displayRO.MyROFST = null; this.displayRO.MyRTB = null; @@ -1118,7 +1132,7 @@ namespace VEPROMS 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))); + | DevComponents.DotNetBar.eBorderSide.Bottom))); this.annotationSearch.Style.GradientAngle = 180; this.annotationSearch.TabIndex = 3; this.annotationSearch.TabItem = this.toolstabResults; @@ -1157,7 +1171,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; @@ -1189,9 +1203,10 @@ namespace VEPROMS this.lbxBookMarks.Dock = System.Windows.Forms.DockStyle.Fill; this.lbxBookMarks.FormattingEnabled = true; this.lbxBookMarks.HorizontalScrollbar = true; + this.lbxBookMarks.ItemHeight = 16; this.lbxBookMarks.Location = new System.Drawing.Point(0, 87); this.lbxBookMarks.Name = "lbxBookMarks"; - this.lbxBookMarks.Size = new System.Drawing.Size(314, 537); + this.lbxBookMarks.Size = new System.Drawing.Size(314, 548); this.lbxBookMarks.TabIndex = 3; this.lbxBookMarks.Click += new System.EventHandler(this.lbxBookMarks_Click); // @@ -1248,7 +1263,7 @@ namespace VEPROMS this.tabControlPanelLD.Style.BackColor1.Color = System.Drawing.SystemColors.Control; this.tabControlPanelLD.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.tabControlPanelLD.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) - | DevComponents.DotNetBar.eBorderSide.Bottom))); + | DevComponents.DotNetBar.eBorderSide.Bottom))); this.tabControlPanelLD.Style.GradientAngle = 180; this.tabControlPanelLD.TabIndex = 4; this.tabControlPanelLD.TabItem = this.tabItemLibDocs; @@ -1323,7 +1338,7 @@ namespace VEPROMS this.tc.Dock = System.Windows.Forms.DockStyle.Fill; this.tc.ForeColor = System.Drawing.SystemColors.ControlText; this.tc.Location = new System.Drawing.Point(37, 57); - this.tc.Margin = new System.Windows.Forms.Padding(4); + this.tc.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tc.Name = "tc"; this.tc.RibbonExpanded = true; this.tc.SelectedDisplayTabItem = null; @@ -1334,22 +1349,9 @@ namespace VEPROMS this.tc.LinkModifyTran += new Volian.Controls.Library.StepPanelLinkEvent(this.tc_LinkModifyTran); this.tc.LinkModifyRO += new Volian.Controls.Library.StepPanelLinkEvent(this.tc_LinkModifyRO); // - // labelItem1 - // - this.labelItem1.BorderSide = DevComponents.DotNetBar.eBorderSide.Left; - this.labelItem1.BorderType = DevComponents.DotNetBar.eBorderType.Bump; - this.labelItem1.Name = "labelItem1"; - // - // btnItemInfo - // - this.btnItemInfo.ForeColor = System.Drawing.Color.Blue; - this.btnItemInfo.Name = "btnItemInfo"; - this.btnItemInfo.Text = "ItemInfo"; - this.btnItemInfo.Click += new System.EventHandler(this.btnItemInfo_Click); - // // frmVEPROMS // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScroll = true; this.ClientSize = new System.Drawing.Size(1195, 777); diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 7bc79a76..6124bf3f 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -910,17 +910,17 @@ namespace VEPROMS infotabTags.Visible = true; //vlnStackTrace.ShowStack("enter tc_ItemSelectedChanged {0}", _CurrentItem); } - else if (args.MyStepItem.MyItemInfo.IsSection || args.MyStepItem.MyItemInfo.IsProcedure) - { - // if the current item is a section or procedure, user cannot - // insert a transition or ro: - infotabTransition.Visible = false; - infotabRO.Visible = false; - } else { - //vlnStackTrace.ShowStack("enter tc_ItemSelectedChanged {0}", _CurrentItem); - infotabRO.Visible = infotabTransition.Visible = infotabTags.Visible = true; + if (args.MyStepItem.MyItemInfo.IsSection || args.MyStepItem.MyItemInfo.IsProcedure) + { + infotabRO.Visible = infotabTransition.Visible = false; + infotabTags.Visible = true; + } + else + infotabRO.Visible = infotabTransition.Visible = infotabTags.Visible = true; + + //vlnStackTrace.ShowStack("enter tc_ItemSelectedChanged {0}", _CurrentItem); // When infotabTags is set to Visible, the matching panel also needs to be set to visible // the other panels will appear as they are selected by the user. infotabControlPanelTags.Visible = true; diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.resx b/PROMS/VEPROMS User Interface/frmVEPROMS.resx index 4a7f4a72..2c211bcd 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.resx +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.resx @@ -399,9 +399,6 @@ bCVV/V4Ishh0HwgcBM6/gDFhmSjTv+IXqagSRZEQ5zgAAAAASUVORK5CYII= - - 17, 17 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -416,41 +413,6 @@ Qz2xORPhp3tZMO3km+MAHTcLUCu30KTfJU0WcMicw9SdjVSW7JAbtBq0BMaMuO9txnt/O+8samb7FFJh IrNYW0wWsFm3gYqi7D8MNjXUlaOvVUm6VH0I7cliqW1RmMgs1haTBZyU/B6k8xr/deYna7rBU0DWSCIA AAAASUVORK5CYII= - - - - - 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 @@ -484,6 +446,44 @@ Qz2xORPhp3tZMO3km+MAHTcLUCu30KTfJU0WcMicw9SdjVSW7JAbtBq0BMaMuO9txnt/O+8samb7FFJh IrNYW0wWsFm3gYqi7D8MNjXUlaOvVUm6VH0I7cliqW1RmMgs1haTBZyU/B6k8xr/deYna7rBU0DWSCIA AAAASUVORK5CYII= + + + + 17, 17 + + + + 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 @@ -521,9 +521,6 @@ rkJggg== - - 17, 17 - 402, 17 @@ -533,9 +530,6 @@ True - - True - R0lGODlhFAAUAPEAAAAAAP///////wAAACH5BAEAAAIALAAAAAAUABQAAAIjlI+py20AoUOxThFPdpKC