diff --git a/PROMS/Volian.Controls.Library/AnnotationDetails.Designer.cs b/PROMS/Volian.Controls.Library/AnnotationDetails.Designer.cs index 77b7672e..5a23448d 100644 --- a/PROMS/Volian.Controls.Library/AnnotationDetails.Designer.cs +++ b/PROMS/Volian.Controls.Library/AnnotationDetails.Designer.cs @@ -57,34 +57,35 @@ namespace Volian.Controls.Library // // superTooltip1 // + this.superTooltip1.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray); this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; // // rtxbComment // - this.rtxbComment.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.rtxbComment.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.rtxbComment.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); this.rtxbComment.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.rtxbComment.Location = new System.Drawing.Point(65, 27); - this.rtxbComment.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.rtxbComment.Location = new System.Drawing.Point(87, 33); + this.rtxbComment.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.rtxbComment.Name = "rtxbComment"; - this.rtxbComment.Size = new System.Drawing.Size(368, 238); + this.rtxbComment.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.Vertical; + this.rtxbComment.Size = new System.Drawing.Size(489, 292); this.superTooltip1.SetSuperTooltip(this.rtxbComment, new DevComponents.DotNetBar.SuperTooltipInfo("Annotation", "", "Enter the annotation information here.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.rtxbComment.TabIndex = 1; this.rtxbComment.Text = ""; - this.rtxbComment.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.Vertical; this.rtxbComment.TextChanged += new System.EventHandler(this.rtxbComment_TextChanged); + this.rtxbComment.Leave += new System.EventHandler(this.rtxbComment_Leave); // // btnSaveAnnotation // this.btnSaveAnnotation.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnSaveAnnotation.Enabled = false; - this.btnSaveAnnotation.FocusOnLeftMouseButtonDown = true; - this.btnSaveAnnotation.Location = new System.Drawing.Point(368, 3); - this.btnSaveAnnotation.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnSaveAnnotation.Location = new System.Drawing.Point(491, 4); + this.btnSaveAnnotation.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnSaveAnnotation.Name = "btnSaveAnnotation"; - this.btnSaveAnnotation.Size = new System.Drawing.Size(53, 20); + this.btnSaveAnnotation.Size = new System.Drawing.Size(71, 25); this.superTooltip1.SetSuperTooltip(this.btnSaveAnnotation, new DevComponents.DotNetBar.SuperTooltipInfo("Save Changes", "", "This will save the new annotation or changes made to an existing annotation.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.btnSaveAnnotation.TabIndex = 9; this.btnSaveAnnotation.Text = "Save"; @@ -94,11 +95,10 @@ namespace Volian.Controls.Library // this.btnCancelAnnoation.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnCancelAnnoation.Enabled = false; - this.btnCancelAnnoation.FocusOnLeftMouseButtonDown = true; - this.btnCancelAnnoation.Location = new System.Drawing.Point(301, 3); - this.btnCancelAnnoation.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnCancelAnnoation.Location = new System.Drawing.Point(401, 4); + this.btnCancelAnnoation.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnCancelAnnoation.Name = "btnCancelAnnoation"; - this.btnCancelAnnoation.Size = new System.Drawing.Size(52, 20); + this.btnCancelAnnoation.Size = new System.Drawing.Size(69, 25); this.superTooltip1.SetSuperTooltip(this.btnCancelAnnoation, new DevComponents.DotNetBar.SuperTooltipInfo("Cancel", "", "This will cancel the changes made to the annotation text and type selection", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(145, 100))); this.btnCancelAnnoation.TabIndex = 8; this.btnCancelAnnoation.Text = "Cancel"; @@ -112,11 +112,12 @@ namespace Volian.Controls.Library this.cbGridAnnoType.FlatStyle = System.Windows.Forms.FlatStyle.Standard; this.cbGridAnnoType.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbGridAnnoType.ForeColor = System.Drawing.SystemColors.WindowText; - this.cbGridAnnoType.Location = new System.Drawing.Point(100, 3); - this.cbGridAnnoType.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.cbGridAnnoType.ItemHeight = 17; + this.cbGridAnnoType.Location = new System.Drawing.Point(133, 4); + this.cbGridAnnoType.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbGridAnnoType.Name = "cbGridAnnoType"; this.cbGridAnnoType.PreventEnterBeep = true; - this.cbGridAnnoType.Size = new System.Drawing.Size(184, 20); + this.cbGridAnnoType.Size = new System.Drawing.Size(244, 23); this.superTooltip1.SetSuperTooltip(this.cbGridAnnoType, new DevComponents.DotNetBar.SuperTooltipInfo("Select Annotation Type", "", "This drop down list contains the possible annotation types.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.cbGridAnnoType.TabIndex = 7; this.cbGridAnnoType.WatermarkBehavior = DevComponents.DotNetBar.eWatermarkBehavior.HideNonEmpty; @@ -126,11 +127,10 @@ namespace Volian.Controls.Library // btnRemoveAnnotation // this.btnRemoveAnnotation.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnRemoveAnnotation.FocusOnLeftMouseButtonDown = true; - this.btnRemoveAnnotation.Location = new System.Drawing.Point(4, 28); - this.btnRemoveAnnotation.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnRemoveAnnotation.Location = new System.Drawing.Point(5, 34); + this.btnRemoveAnnotation.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnRemoveAnnotation.Name = "btnRemoveAnnotation"; - this.btnRemoveAnnotation.Size = new System.Drawing.Size(53, 20); + this.btnRemoveAnnotation.Size = new System.Drawing.Size(71, 25); this.superTooltip1.SetSuperTooltip(this.btnRemoveAnnotation, new DevComponents.DotNetBar.SuperTooltipInfo("Remove Annotation", "", "This will remove the currently selected annotation.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.btnRemoveAnnotation.TabIndex = 4; this.btnRemoveAnnotation.Text = "Remove"; @@ -139,11 +139,10 @@ namespace Volian.Controls.Library // btnAddAnnotation // this.btnAddAnnotation.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnAddAnnotation.FocusOnLeftMouseButtonDown = true; - this.btnAddAnnotation.Location = new System.Drawing.Point(4, 3); - this.btnAddAnnotation.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnAddAnnotation.Location = new System.Drawing.Point(5, 4); + this.btnAddAnnotation.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnAddAnnotation.Name = "btnAddAnnotation"; - this.btnAddAnnotation.Size = new System.Drawing.Size(53, 20); + this.btnAddAnnotation.Size = new System.Drawing.Size(71, 25); this.superTooltip1.SetSuperTooltip(this.btnAddAnnotation, new DevComponents.DotNetBar.SuperTooltipInfo("Add New Annotation", "", "This button will create a new annotation.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.btnAddAnnotation.TabIndex = 3; this.btnAddAnnotation.Text = "Add"; @@ -158,11 +157,12 @@ namespace Volian.Controls.Library this.pannelAnnoEdit.Controls.Add(this.labelX1); this.pannelAnnoEdit.Controls.Add(this.cbGridAnnoType); this.pannelAnnoEdit.Controls.Add(this.panelAnnoEditBtns); + this.pannelAnnoEdit.DisabledBackColor = System.Drawing.Color.Empty; this.pannelAnnoEdit.Dock = System.Windows.Forms.DockStyle.Fill; - this.pannelAnnoEdit.Location = new System.Drawing.Point(411, 0); - this.pannelAnnoEdit.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.pannelAnnoEdit.Location = new System.Drawing.Point(548, 0); + this.pannelAnnoEdit.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.pannelAnnoEdit.Name = "pannelAnnoEdit"; - this.pannelAnnoEdit.Size = new System.Drawing.Size(432, 264); + this.pannelAnnoEdit.Size = new System.Drawing.Size(576, 325); this.pannelAnnoEdit.Style.Alignment = System.Drawing.StringAlignment.Center; this.pannelAnnoEdit.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.pannelAnnoEdit.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -182,10 +182,10 @@ namespace Volian.Controls.Library // this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; 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(70, 6); - this.labelX1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.labelX1.Location = new System.Drawing.Point(93, 7); + this.labelX1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.labelX1.Name = "labelX1"; - this.labelX1.Size = new System.Drawing.Size(29, 14); + this.labelX1.Size = new System.Drawing.Size(35, 17); this.labelX1.TabIndex = 10; this.labelX1.Text = "Type:"; // @@ -194,11 +194,12 @@ namespace Volian.Controls.Library this.panelAnnoEditBtns.CanvasColor = System.Drawing.SystemColors.Control; this.panelAnnoEditBtns.Controls.Add(this.btnRemoveAnnotation); this.panelAnnoEditBtns.Controls.Add(this.btnAddAnnotation); + this.panelAnnoEditBtns.DisabledBackColor = System.Drawing.Color.Empty; this.panelAnnoEditBtns.Dock = System.Windows.Forms.DockStyle.Left; this.panelAnnoEditBtns.Location = new System.Drawing.Point(0, 0); - this.panelAnnoEditBtns.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.panelAnnoEditBtns.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panelAnnoEditBtns.Name = "panelAnnoEditBtns"; - this.panelAnnoEditBtns.Size = new System.Drawing.Size(65, 264); + this.panelAnnoEditBtns.Size = new System.Drawing.Size(87, 325); this.panelAnnoEditBtns.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelAnnoEditBtns.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelAnnoEditBtns.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -233,10 +234,10 @@ namespace Volian.Controls.Library this.expandableSplitter4.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter4.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255))))); this.expandableSplitter4.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter4.Location = new System.Drawing.Point(409, 0); - this.expandableSplitter4.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.expandableSplitter4.Location = new System.Drawing.Point(545, 0); + this.expandableSplitter4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.expandableSplitter4.Name = "expandableSplitter4"; - this.expandableSplitter4.Size = new System.Drawing.Size(2, 264); + this.expandableSplitter4.Size = new System.Drawing.Size(3, 325); this.expandableSplitter4.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; this.expandableSplitter4.TabIndex = 15; this.expandableSplitter4.TabStop = false; @@ -245,11 +246,12 @@ namespace Volian.Controls.Library // this.pannelAnnoGrid.CanvasColor = System.Drawing.SystemColors.Control; this.pannelAnnoGrid.Controls.Add(this.dgAnnotations); + this.pannelAnnoGrid.DisabledBackColor = System.Drawing.Color.Empty; this.pannelAnnoGrid.Dock = System.Windows.Forms.DockStyle.Left; this.pannelAnnoGrid.Location = new System.Drawing.Point(0, 0); - this.pannelAnnoGrid.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.pannelAnnoGrid.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.pannelAnnoGrid.Name = "pannelAnnoGrid"; - this.pannelAnnoGrid.Size = new System.Drawing.Size(409, 264); + this.pannelAnnoGrid.Size = new System.Drawing.Size(545, 325); this.pannelAnnoGrid.Style.Alignment = System.Drawing.StringAlignment.Center; this.pannelAnnoGrid.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.pannelAnnoGrid.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -285,7 +287,7 @@ namespace Volian.Controls.Library this.dgAnnotations.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); this.dgAnnotations.HighlightSelectedColumnHeaders = false; this.dgAnnotations.Location = new System.Drawing.Point(0, 0); - this.dgAnnotations.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.dgAnnotations.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.dgAnnotations.MultiSelect = false; this.dgAnnotations.Name = "dgAnnotations"; this.dgAnnotations.RowHeadersVisible = false; @@ -294,7 +296,7 @@ namespace Volian.Controls.Library this.dgAnnotations.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.True; this.dgAnnotations.SelectAllSignVisible = false; this.dgAnnotations.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgAnnotations.Size = new System.Drawing.Size(409, 264); + this.dgAnnotations.Size = new System.Drawing.Size(545, 325); this.dgAnnotations.TabIndex = 1; this.dgAnnotations.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgAnnotations_CellClick); // @@ -303,21 +305,21 @@ namespace Volian.Controls.Library this.myAnnotationTypeDataGridViewTextBoxColumn.DataPropertyName = "MyAnnotationType"; this.myAnnotationTypeDataGridViewTextBoxColumn.HeaderText = "Type"; this.myAnnotationTypeDataGridViewTextBoxColumn.Name = "myAnnotationTypeDataGridViewTextBoxColumn"; - this.myAnnotationTypeDataGridViewTextBoxColumn.Width = 56; + this.myAnnotationTypeDataGridViewTextBoxColumn.Width = 69; // // dTSDataGridViewTextBoxColumn // this.dTSDataGridViewTextBoxColumn.DataPropertyName = "DTS"; this.dTSDataGridViewTextBoxColumn.HeaderText = "Date"; this.dTSDataGridViewTextBoxColumn.Name = "dTSDataGridViewTextBoxColumn"; - this.dTSDataGridViewTextBoxColumn.Width = 55; + this.dTSDataGridViewTextBoxColumn.Width = 67; // // userIDDataGridViewTextBoxColumn // this.userIDDataGridViewTextBoxColumn.DataPropertyName = "UserID"; this.userIDDataGridViewTextBoxColumn.HeaderText = "User"; this.userIDDataGridViewTextBoxColumn.Name = "userIDDataGridViewTextBoxColumn"; - this.userIDDataGridViewTextBoxColumn.Width = 54; + this.userIDDataGridViewTextBoxColumn.Width = 67; // // searchTextDataGridViewTextBoxColumn // @@ -332,14 +334,14 @@ namespace Volian.Controls.Library // // AnnotationDetails // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.pannelAnnoEdit); this.Controls.Add(this.expandableSplitter4); this.Controls.Add(this.pannelAnnoGrid); - this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "AnnotationDetails"; - this.Size = new System.Drawing.Size(843, 264); + this.Size = new System.Drawing.Size(1124, 325); this.pannelAnnoEdit.ResumeLayout(false); this.pannelAnnoEdit.PerformLayout(); this.panelAnnoEditBtns.ResumeLayout(false); diff --git a/PROMS/Volian.Controls.Library/AnnotationDetails.cs b/PROMS/Volian.Controls.Library/AnnotationDetails.cs index af4d3a03..37649475 100644 --- a/PROMS/Volian.Controls.Library/AnnotationDetails.cs +++ b/PROMS/Volian.Controls.Library/AnnotationDetails.cs @@ -318,7 +318,18 @@ namespace Volian.Controls.Library if (!_LoadingAnnotation) AnnotationDirty = true; } - + // B2019-029: Ask user if they want to save an annotation, if it was added (new) and the user did not click to save and moved to a + // new step + private void rtxbComment_Leave(object sender, EventArgs e) + { + if (this.AnnotationDirty && (Annotations == null || Annotations.Count == 0)) + { + if (FlexibleMessageBox.Show(this, "Do you want to save the annotation?", "Confirm Annotation Save", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + SaveAnnotation(); + } + } + } #endregion #region LoadControlData diff --git a/PROMS/Volian.Controls.Library/AnnotationDetails.resx b/PROMS/Volian.Controls.Library/AnnotationDetails.resx index 097309e5..f23589e8 100644 --- a/PROMS/Volian.Controls.Library/AnnotationDetails.resx +++ b/PROMS/Volian.Controls.Library/AnnotationDetails.resx @@ -112,15 +112,15 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 17, 17 - + 156, 17 \ No newline at end of file