diff --git a/PROMS/VEPROMS User Interface/Properties/Resources.Designer.cs b/PROMS/VEPROMS User Interface/Properties/Resources.Designer.cs index cd952ebd..f4621244 100644 --- a/PROMS/VEPROMS User Interface/Properties/Resources.Designer.cs +++ b/PROMS/VEPROMS User Interface/Properties/Resources.Designer.cs @@ -74,6 +74,20 @@ namespace VEPROMS.Properties { } } + internal static System.Drawing.Bitmap PushpinStick { + get { + object obj = ResourceManager.GetObject("PushpinStick", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap PushpinUnStick { + get { + object obj = ResourceManager.GetObject("PushpinUnStick", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap Separator { get { object obj = ResourceManager.GetObject("Separator", resourceCulture); diff --git a/PROMS/VEPROMS User Interface/Properties/Resources.resx b/PROMS/VEPROMS User Interface/Properties/Resources.resx index fabf3406..f79ea421 100644 --- a/PROMS/VEPROMS User Interface/Properties/Resources.resx +++ b/PROMS/VEPROMS User Interface/Properties/Resources.resx @@ -130,4 +130,10 @@ ..\Resources\GoToParentFolderHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\PushpinUnStick.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\PushpinStick.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs index e0706be3..f40b0372 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs @@ -218,6 +218,7 @@ namespace VEPROMS this.labelItem14 = new DevComponents.DotNetBar.LabelItem(); this.btnGetRoVals = new DevComponents.DotNetBar.ButtonItem(); this.epAnnotations = new DevComponents.DotNetBar.ExpandablePanel(); + this.btnAnnoDetailsPushPin = new DevComponents.DotNetBar.ButtonX(); this.pannelAnnoEdit = new DevComponents.DotNetBar.PanelEx(); this.rtxbComment = new System.Windows.Forms.RichTextBox(); this.btnSaveAnnotation = new DevComponents.DotNetBar.ButtonX(); @@ -276,6 +277,7 @@ namespace VEPROMS this.expandableSplitter3 = new DevComponents.DotNetBar.ExpandableSplitter(); this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); + this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); this.tc = new Volian.Controls.Library.DisplayTabControl(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); @@ -2153,10 +2155,12 @@ namespace VEPROMS this.epAnnotations.CanvasColor = System.Drawing.SystemColors.Control; this.epAnnotations.CollapseDirection = DevComponents.DotNetBar.eCollapseDirection.TopToBottom; this.epAnnotations.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.epAnnotations.Controls.Add(this.btnAnnoDetailsPushPin); this.epAnnotations.Controls.Add(this.pannelAnnoEdit); this.epAnnotations.Controls.Add(this.expandableSplitter4); this.epAnnotations.Controls.Add(this.pannelAnnoGrid); this.epAnnotations.Dock = System.Windows.Forms.DockStyle.Bottom; + this.epAnnotations.ExpandedBounds = new System.Drawing.Rectangle(4, 547, 1114, 202); this.epAnnotations.ExpandOnTitleClick = true; this.epAnnotations.Location = new System.Drawing.Point(4, 547); this.epAnnotations.Name = "epAnnotations"; @@ -2169,6 +2173,7 @@ namespace VEPROMS this.epAnnotations.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; this.epAnnotations.Style.GradientAngle = 90; this.epAnnotations.TabIndex = 2; + this.epAnnotations.ThemeAware = true; this.epAnnotations.TitleStyle.Alignment = System.Drawing.StringAlignment.Center; this.epAnnotations.TitleStyle.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.epAnnotations.TitleStyle.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -2179,6 +2184,26 @@ namespace VEPROMS this.epAnnotations.TitleText = "Annotation Details"; this.epAnnotations.Layout += new System.Windows.Forms.LayoutEventHandler(this.epAnnotations_Layout); // + // btnAnnoDetailsPushPin + // + this.btnAnnoDetailsPushPin.AccessibleRole = System.Windows.Forms.AccessibleRole.CheckButton; + this.btnAnnoDetailsPushPin.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnAnnoDetailsPushPin.AutoCheckOnClick = true; + this.btnAnnoDetailsPushPin.BackColor = System.Drawing.Color.Transparent; + this.btnAnnoDetailsPushPin.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.btnAnnoDetailsPushPin.ColorTable = DevComponents.DotNetBar.eButtonColor.Flat; + this.btnAnnoDetailsPushPin.FocusCuesEnabled = false; + this.btnAnnoDetailsPushPin.Image = global::VEPROMS.Properties.Resources.PushpinUnStick; + this.btnAnnoDetailsPushPin.Location = new System.Drawing.Point(1059, 1); + this.btnAnnoDetailsPushPin.Name = "btnAnnoDetailsPushPin"; + this.btnAnnoDetailsPushPin.PressedImage = global::VEPROMS.Properties.Resources.PushpinStick; + 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)); + this.btnAnnoDetailsPushPin.TabIndex = 14; + this.btnAnnoDetailsPushPin.ThemeAware = true; + // // pannelAnnoEdit // this.pannelAnnoEdit.CanvasColor = System.Drawing.SystemColors.Control; @@ -2205,12 +2230,14 @@ 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))); this.rtxbComment.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); - this.rtxbComment.Dock = System.Windows.Forms.DockStyle.Bottom; this.rtxbComment.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.rtxbComment.Location = new System.Drawing.Point(87, 33); this.rtxbComment.Name = "rtxbComment"; - this.rtxbComment.Size = new System.Drawing.Size(520, 143); + this.rtxbComment.Size = new System.Drawing.Size(520, 176); this.superTooltip1.SetSuperTooltip(this.rtxbComment, new DevComponents.DotNetBar.SuperTooltipInfo("Annotation", "", "Enter the annotation information here.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.rtxbComment.TabIndex = 1; this.rtxbComment.Text = ""; @@ -2267,7 +2294,7 @@ namespace VEPROMS // // panelAnnoEditBtns // - this.panelAnnoEditBtns.CanvasColor = System.Drawing.Color.Transparent; + this.panelAnnoEditBtns.CanvasColor = System.Drawing.SystemColors.Control; this.panelAnnoEditBtns.Controls.Add(this.btnRemoveAnnotation); this.panelAnnoEditBtns.Controls.Add(this.btnAddAnnotation); this.panelAnnoEditBtns.Dock = System.Windows.Forms.DockStyle.Left; @@ -2281,7 +2308,6 @@ namespace VEPROMS this.panelAnnoEditBtns.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; this.panelAnnoEditBtns.Style.GradientAngle = 90; this.panelAnnoEditBtns.TabIndex = 11; - this.panelAnnoEditBtns.Text = "panelEx2"; this.panelAnnoEditBtns.ThemeAware = true; // // btnRemoveAnnotation @@ -2387,7 +2413,6 @@ namespace VEPROMS // itemAnnotationsBindingSource // this.itemAnnotationsBindingSource.DataSource = typeof(VEPROMS.CSLA.Library.ItemAnnotation); - //this.itemAnnotationsBindingSource.DataSourceChanged += new System.EventHandler(this.itemAnnotationsBindingSource_DataSourceChanged); // // expandablePanel2 // @@ -3030,7 +3055,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, 4, 4, 4); + this.displayRO.Margin = new System.Windows.Forms.Padding(4); this.displayRO.MyROFST = null; this.displayRO.MyRTB = null; this.displayRO.Name = "displayRO"; @@ -3143,6 +3168,14 @@ namespace VEPROMS // this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; // + // buttonItem1 + // + this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); + this.buttonItem1.ImagePaddingHorizontal = 8; + this.buttonItem1.Name = "buttonItem1"; + this.buttonItem1.Text = "buttonItem19"; + this.buttonItem1.Tooltip = "Degree"; + // // tc // this.tc.Dock = System.Windows.Forms.DockStyle.Fill; @@ -3463,6 +3496,8 @@ namespace VEPROMS private DevComponents.DotNetBar.PanelEx pannelAnnoGrid; private DevComponents.DotNetBar.PanelEx pannelAnnoEdit; private DevComponents.DotNetBar.PanelEx panelAnnoEditBtns; + private DevComponents.DotNetBar.ButtonX btnAnnoDetailsPushPin; + private DevComponents.DotNetBar.ButtonItem buttonItem1; } } diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 9fa82edd..2e8a6eba 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -70,8 +70,9 @@ namespace VEPROMS tv.NodeDelete += new Volian.Controls.Library.vlnTreeViewBoolEvent(tv_NodeDelete); tv.NodeProperties += new Volian.Controls.Library.vlnTreeViewEvent(tv_NodeProperties); _CommentTitleBckColor = epAnnotations.TitleStyle.BackColor1.Color; - epAnnotations.Expanded = false; - infoPanel.Expanded = false; + if (!btnAnnoDetailsPushPin.Checked) + epAnnotations.Expanded = false; + infoPanel.Expanded = false; } private void frmVEPROMS_FormClosing(object sender, FormClosingEventArgs e) @@ -197,8 +198,8 @@ namespace VEPROMS _LastProcedure = null; _LastSection = null; _LastStep = null; - epAnnotations.Expanded = false; - rtxbComment.Text = ""; + //epAnnotations.Expanded = false; + //rtxbComment.Text = ""; epAnnotations.TitleStyle.BackColor1.Color = _CommentTitleBckColor; if (_MyMRIList.Add(node.VEObject) != null) SetupMRU(); @@ -1257,7 +1258,8 @@ private AnnotationInfoList _Annotations; } else { - epAnnotations.Expanded = false; + if (!btnAnnoDetailsPushPin.Checked) + epAnnotations.Expanded = false; epAnnotations.TitleStyle.BackColor1.Color = _CommentTitleBckColor; rtxbComment.Text = null; } diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.resx b/PROMS/VEPROMS User Interface/frmVEPROMS.resx index 7ec5b387..60789d6b 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.resx +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.resx @@ -3672,6 +3672,12 @@ 402, 17 + + + R0lGODlhFAAUAPEAAAAAAP///////wAAACH5BAEAAAIALAAAAAAUABQAAAIjlI+py20AoUOxThFPdpKC + 2WkfN4pguJFVeabXC8fyTNf2bRcAOw== + + 41