diff --git a/PROMS/Volian.Controls.Library/DisplayTags.Designer.cs b/PROMS/Volian.Controls.Library/DisplayTags.Designer.cs index 18b782b3..9d2f8d59 100644 --- a/PROMS/Volian.Controls.Library/DisplayTags.Designer.cs +++ b/PROMS/Volian.Controls.Library/DisplayTags.Designer.cs @@ -34,6 +34,8 @@ namespace Volian.Controls.Library this.cmbCheckoff = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.groupPanelCheckoff = new DevComponents.DotNetBar.Controls.GroupPanel(); this.groupPanelChgBar = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.tbChgID = new System.Windows.Forms.TextBox(); + this.lblChgId = new System.Windows.Forms.Label(); this.rbChgBarOff = new System.Windows.Forms.RadioButton(); this.rbChgBarOn = new System.Windows.Forms.RadioButton(); this.groupPanelChgStepType = new DevComponents.DotNetBar.Controls.GroupPanel(); @@ -42,9 +44,8 @@ namespace Volian.Controls.Library this.listBoxStepTypes = new System.Windows.Forms.ListBox(); this.superTooltipTags = new DevComponents.DotNetBar.SuperTooltip(); this.groupPanelIncludeOn = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.cbPlaceKeeperCont = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.cbPlaceKeeper = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.lblChgId = new System.Windows.Forms.Label(); - this.tbChgID = new System.Windows.Forms.TextBox(); this.groupPanelPaginate.SuspendLayout(); this.groupPanelCheckoff.SuspendLayout(); this.groupPanelChgBar.SuspendLayout(); @@ -59,10 +60,10 @@ namespace Volian.Controls.Library this.groupPanelPaginate.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanelPaginate.Controls.Add(this.cbPageBreak); this.groupPanelPaginate.Dock = System.Windows.Forms.DockStyle.Top; - this.groupPanelPaginate.Location = new System.Drawing.Point(0, 406); - this.groupPanelPaginate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.groupPanelPaginate.Location = new System.Drawing.Point(0, 330); + this.groupPanelPaginate.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.groupPanelPaginate.Name = "groupPanelPaginate"; - this.groupPanelPaginate.Size = new System.Drawing.Size(229, 71); + this.groupPanelPaginate.Size = new System.Drawing.Size(172, 58); // // // @@ -101,10 +102,10 @@ namespace Volian.Controls.Library // // this.cbPageBreak.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbPageBreak.Location = new System.Drawing.Point(4, 14); - this.cbPageBreak.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbPageBreak.Location = new System.Drawing.Point(3, 11); + this.cbPageBreak.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.cbPageBreak.Name = "cbPageBreak"; - this.cbPageBreak.Size = new System.Drawing.Size(140, 17); + this.cbPageBreak.Size = new System.Drawing.Size(122, 15); this.superTooltipTags.SetSuperTooltip(this.cbPageBreak, new DevComponents.DotNetBar.SuperTooltipInfo("Manual Page Break", "", "When set, starts this step at the top of a page.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.cbPageBreak.TabIndex = 0; this.cbPageBreak.Text = "Manual Page Break"; @@ -118,10 +119,10 @@ namespace Volian.Controls.Library // // this.cbCAS.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbCAS.Location = new System.Drawing.Point(4, 17); - this.cbCAS.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbCAS.Location = new System.Drawing.Point(3, 14); + this.cbCAS.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.cbCAS.Name = "cbCAS"; - this.cbCAS.Size = new System.Drawing.Size(187, 17); + this.cbCAS.Size = new System.Drawing.Size(162, 15); this.superTooltipTags.SetSuperTooltip(this.cbCAS, new DevComponents.DotNetBar.SuperTooltipInfo("Continuous Action Summary", "", "Include this in the Continuous Action Summary section", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.cbCAS.TabIndex = 1; this.cbCAS.Text = "Continuous Action Summary"; @@ -136,10 +137,10 @@ namespace Volian.Controls.Library this.cmbCheckoff.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbCheckoff.FormattingEnabled = true; this.cmbCheckoff.ItemHeight = 17; - this.cmbCheckoff.Location = new System.Drawing.Point(4, 21); - this.cmbCheckoff.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cmbCheckoff.Location = new System.Drawing.Point(3, 17); + this.cmbCheckoff.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.cmbCheckoff.Name = "cmbCheckoff"; - this.cmbCheckoff.Size = new System.Drawing.Size(217, 23); + this.cmbCheckoff.Size = new System.Drawing.Size(164, 23); this.cmbCheckoff.TabIndex = 0; this.cmbCheckoff.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cmbCheckoff.WatermarkText = "select signoff / checkoff"; @@ -151,10 +152,10 @@ namespace Volian.Controls.Library this.groupPanelCheckoff.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanelCheckoff.Controls.Add(this.cmbCheckoff); this.groupPanelCheckoff.Dock = System.Windows.Forms.DockStyle.Top; - this.groupPanelCheckoff.Location = new System.Drawing.Point(0, 178); - this.groupPanelCheckoff.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.groupPanelCheckoff.Location = new System.Drawing.Point(0, 145); + this.groupPanelCheckoff.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.groupPanelCheckoff.Name = "groupPanelCheckoff"; - this.groupPanelCheckoff.Size = new System.Drawing.Size(229, 95); + this.groupPanelCheckoff.Size = new System.Drawing.Size(172, 77); // // // @@ -197,10 +198,10 @@ namespace Volian.Controls.Library this.groupPanelChgBar.Controls.Add(this.rbChgBarOff); this.groupPanelChgBar.Controls.Add(this.rbChgBarOn); this.groupPanelChgBar.Dock = System.Windows.Forms.DockStyle.Top; - this.groupPanelChgBar.Location = new System.Drawing.Point(0, 273); - this.groupPanelChgBar.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.groupPanelChgBar.Location = new System.Drawing.Point(0, 222); + this.groupPanelChgBar.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.groupPanelChgBar.Name = "groupPanelChgBar"; - this.groupPanelChgBar.Size = new System.Drawing.Size(229, 133); + this.groupPanelChgBar.Size = new System.Drawing.Size(172, 108); // // // @@ -232,13 +233,32 @@ namespace Volian.Controls.Library this.groupPanelChgBar.TabIndex = 18; this.groupPanelChgBar.Text = "Change Bar"; // + // tbChgID + // + this.tbChgID.Location = new System.Drawing.Point(0, 67); + this.tbChgID.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tbChgID.Name = "tbChgID"; + this.tbChgID.Size = new System.Drawing.Size(81, 20); + this.tbChgID.TabIndex = 4; + this.tbChgID.TextChanged += new System.EventHandler(this.tbChgID_TextChanged); + // + // lblChgId + // + this.lblChgId.AutoSize = true; + this.lblChgId.Location = new System.Drawing.Point(0, 52); + this.lblChgId.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblChgId.Name = "lblChgId"; + this.lblChgId.Size = new System.Drawing.Size(58, 13); + this.lblChgId.TabIndex = 3; + this.lblChgId.Text = "Change ID"; + // // rbChgBarOff // this.rbChgBarOff.AutoSize = true; - this.rbChgBarOff.Location = new System.Drawing.Point(0, 32); - this.rbChgBarOff.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.rbChgBarOff.Location = new System.Drawing.Point(0, 26); + this.rbChgBarOff.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.rbChgBarOff.Name = "rbChgBarOff"; - this.rbChgBarOff.Size = new System.Drawing.Size(56, 21); + this.rbChgBarOff.Size = new System.Drawing.Size(45, 17); this.superTooltipTags.SetSuperTooltip(this.rbChgBarOff, new DevComponents.DotNetBar.SuperTooltipInfo("Change Bar OFF", "", "Turn change bar off. Note that \'OVERRIDE\' will turn off a change bar even though" + " text is changed.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.rbChgBarOff.TabIndex = 2; @@ -250,10 +270,10 @@ namespace Volian.Controls.Library // rbChgBarOn // this.rbChgBarOn.AutoSize = true; - this.rbChgBarOn.Location = new System.Drawing.Point(0, 5); - this.rbChgBarOn.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.rbChgBarOn.Location = new System.Drawing.Point(0, 4); + this.rbChgBarOn.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.rbChgBarOn.Name = "rbChgBarOn"; - this.rbChgBarOn.Size = new System.Drawing.Size(50, 21); + this.rbChgBarOn.Size = new System.Drawing.Size(41, 17); this.superTooltipTags.SetSuperTooltip(this.rbChgBarOn, new DevComponents.DotNetBar.SuperTooltipInfo("Change Bar ON", "", "Add a change bar on this step", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.rbChgBarOn.TabIndex = 1; this.rbChgBarOn.TabStop = true; @@ -271,9 +291,9 @@ namespace Volian.Controls.Library this.groupPanelChgStepType.Controls.Add(this.listBoxStepTypes); this.groupPanelChgStepType.Dock = System.Windows.Forms.DockStyle.Top; this.groupPanelChgStepType.Location = new System.Drawing.Point(0, 0); - this.groupPanelChgStepType.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.groupPanelChgStepType.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.groupPanelChgStepType.Name = "groupPanelChgStepType"; - this.groupPanelChgStepType.Size = new System.Drawing.Size(229, 178); + this.groupPanelChgStepType.Size = new System.Drawing.Size(172, 145); // // // @@ -315,20 +335,20 @@ namespace Volian.Controls.Library // this.lblNoTypeChgReason.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lblNoTypeChgReason.ForeColor = System.Drawing.Color.Red; - this.lblNoTypeChgReason.Location = new System.Drawing.Point(3, 34); - this.lblNoTypeChgReason.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.lblNoTypeChgReason.Location = new System.Drawing.Point(2, 28); + this.lblNoTypeChgReason.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.lblNoTypeChgReason.Name = "lblNoTypeChgReason"; - this.lblNoTypeChgReason.Size = new System.Drawing.Size(219, 118); + this.lblNoTypeChgReason.Size = new System.Drawing.Size(164, 96); this.lblNoTypeChgReason.TabIndex = 5; // // cbChgAll // this.cbChgAll.AutoSize = true; this.cbChgAll.BackColor = System.Drawing.Color.Transparent; - this.cbChgAll.Location = new System.Drawing.Point(3, 7); - this.cbChgAll.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbChgAll.Location = new System.Drawing.Point(2, 6); + this.cbChgAll.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.cbChgAll.Name = "cbChgAll"; - this.cbChgAll.Size = new System.Drawing.Size(153, 21); + this.cbChgAll.Size = new System.Drawing.Size(119, 17); this.superTooltipTags.SetSuperTooltip(this.cbChgAll, new DevComponents.DotNetBar.SuperTooltipInfo("Change Step Type - All At Level", "", "When checked, all steps at the level of current step will have their step type ch" + "anged to the selected type in list below...", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.cbChgAll.TabIndex = 4; @@ -340,11 +360,10 @@ namespace Volian.Controls.Library this.listBoxStepTypes.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.listBoxStepTypes.FormattingEnabled = true; - this.listBoxStepTypes.ItemHeight = 16; - this.listBoxStepTypes.Location = new System.Drawing.Point(3, 34); - this.listBoxStepTypes.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.listBoxStepTypes.Location = new System.Drawing.Point(2, 28); + this.listBoxStepTypes.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.listBoxStepTypes.Name = "listBoxStepTypes"; - this.listBoxStepTypes.Size = new System.Drawing.Size(217, 116); + this.listBoxStepTypes.Size = new System.Drawing.Size(164, 95); this.superTooltipTags.SetSuperTooltip(this.listBoxStepTypes, new DevComponents.DotNetBar.SuperTooltipInfo("Possible Step Types", "", "This list allows change of type showing all selections of any possible step type " + "for the current step.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.listBoxStepTypes.TabIndex = 3; @@ -359,13 +378,14 @@ namespace Volian.Controls.Library this.groupPanelIncludeOn.BackColor = System.Drawing.Color.Transparent; this.groupPanelIncludeOn.CanvasColor = System.Drawing.SystemColors.Control; this.groupPanelIncludeOn.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.groupPanelIncludeOn.Controls.Add(this.cbPlaceKeeperCont); this.groupPanelIncludeOn.Controls.Add(this.cbPlaceKeeper); this.groupPanelIncludeOn.Controls.Add(this.cbCAS); this.groupPanelIncludeOn.Dock = System.Windows.Forms.DockStyle.Top; - this.groupPanelIncludeOn.Location = new System.Drawing.Point(0, 477); - this.groupPanelIncludeOn.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.groupPanelIncludeOn.Location = new System.Drawing.Point(0, 388); + this.groupPanelIncludeOn.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.groupPanelIncludeOn.Name = "groupPanelIncludeOn"; - this.groupPanelIncludeOn.Size = new System.Drawing.Size(229, 97); + this.groupPanelIncludeOn.Size = new System.Drawing.Size(172, 94); // // // @@ -397,6 +417,22 @@ namespace Volian.Controls.Library this.groupPanelIncludeOn.TabIndex = 17; this.groupPanelIncludeOn.Text = "Include On"; // + // cbPlaceKeeperCont + // + this.cbPlaceKeeperCont.AutoSize = true; + this.cbPlaceKeeperCont.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.cbPlaceKeeperCont.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbPlaceKeeperCont.Location = new System.Drawing.Point(3, 52); + this.cbPlaceKeeperCont.Margin = new System.Windows.Forms.Padding(2); + this.cbPlaceKeeperCont.Name = "cbPlaceKeeperCont"; + this.cbPlaceKeeperCont.Size = new System.Drawing.Size(158, 15); + this.cbPlaceKeeperCont.TabIndex = 1; + this.cbPlaceKeeperCont.Text = "Placekeeper as Cont Action"; + this.cbPlaceKeeperCont.CheckedChanged += new System.EventHandler(this.cbPlaceKeeperCont_CheckedChanged); + // // cbPlaceKeeper // this.cbPlaceKeeper.AutoSize = true; @@ -405,43 +441,26 @@ namespace Volian.Controls.Library // // this.cbPlaceKeeper.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbPlaceKeeper.Location = new System.Drawing.Point(4, 41); - this.cbPlaceKeeper.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbPlaceKeeper.Location = new System.Drawing.Point(3, 33); + this.cbPlaceKeeper.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.cbPlaceKeeper.Name = "cbPlaceKeeper"; - this.cbPlaceKeeper.Size = new System.Drawing.Size(95, 17); + this.cbPlaceKeeper.Size = new System.Drawing.Size(84, 15); this.cbPlaceKeeper.TabIndex = 1; this.cbPlaceKeeper.Text = "Placekeeper"; this.cbPlaceKeeper.CheckedChanged += new System.EventHandler(this.cbPlacekeeper_CheckedChanged); // - // lblChgId - // - this.lblChgId.AutoSize = true; - this.lblChgId.Location = new System.Drawing.Point(0, 64); - this.lblChgId.Name = "lblChgId"; - this.lblChgId.Size = new System.Drawing.Size(74, 17); - this.lblChgId.TabIndex = 3; - this.lblChgId.Text = "Change ID"; - // - // tbChgID - // - this.tbChgID.Location = new System.Drawing.Point(0, 83); - this.tbChgID.Name = "tbChgID"; - this.tbChgID.Size = new System.Drawing.Size(107, 22); - this.tbChgID.TabIndex = 4; - this.tbChgID.TextChanged += new System.EventHandler(this.tbChgID_TextChanged); - // // DisplayTags // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.groupPanelIncludeOn); this.Controls.Add(this.groupPanelPaginate); this.Controls.Add(this.groupPanelChgBar); this.Controls.Add(this.groupPanelCheckoff); this.Controls.Add(this.groupPanelChgStepType); - this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.Name = "DisplayTags"; - this.Size = new System.Drawing.Size(229, 630); + this.Size = new System.Drawing.Size(172, 512); this.groupPanelPaginate.ResumeLayout(false); this.groupPanelPaginate.PerformLayout(); this.groupPanelCheckoff.ResumeLayout(false); @@ -472,6 +491,7 @@ namespace Volian.Controls.Library private DevComponents.DotNetBar.SuperTooltip superTooltipTags; private DevComponents.DotNetBar.Controls.GroupPanel groupPanelIncludeOn; private DevComponents.DotNetBar.Controls.CheckBoxX cbPlaceKeeper; + private DevComponents.DotNetBar.Controls.CheckBoxX cbPlaceKeeperCont; private System.Windows.Forms.TextBox tbChgID; private System.Windows.Forms.Label lblChgId; } diff --git a/PROMS/Volian.Controls.Library/DisplayTags.cs b/PROMS/Volian.Controls.Library/DisplayTags.cs index 9292becc..6ca0e032 100644 --- a/PROMS/Volian.Controls.Library/DisplayTags.cs +++ b/PROMS/Volian.Controls.Library/DisplayTags.cs @@ -105,6 +105,7 @@ namespace Volian.Controls.Library cmbCheckoff.Enabled = false; cbPageBreak.Enabled = false; cbPlaceKeeper.Enabled = false; + cbPlaceKeeperCont.Enabled = false; cbCAS.Enabled = false; rbChgBarOff.Enabled = false; rbChgBarOn.Enabled = false; @@ -146,8 +147,10 @@ namespace Volian.Controls.Library groupPanelIncludeOn.Style.BackColor = Color.Cornsilk; cbPageBreak.Checked = false; // will be set below if HLS & config has it on cbPlaceKeeper.Checked = false; // will be set below if HLS & config has this set + cbPlaceKeeperCont.Checked = false; // will be set below if substep & config has this set cbPageBreak.Enabled = CurItemInfo.IsHigh; - cbPlaceKeeper.Enabled = ((SectionConfig)CurItemInfo.ActiveSection.MyConfig).Section_Placekeeper == "Y"; + cbPlaceKeeper.Enabled = (((SectionConfig)CurItemInfo.ActiveSection.MyConfig).Section_Placekeeper == "Y"); + cbPlaceKeeperCont.Enabled = (cbPlaceKeeper.Enabled && !CurItemInfo.IsInRNO && !CurItemInfo.IsHigh); cbCAS.Enabled = true; rbChgBarOff.Enabled = true; rbChgBarOn.Enabled = true; @@ -175,12 +178,14 @@ namespace Volian.Controls.Library if (CurItemInfo.IsHigh)cbPageBreak.Checked = false; cbCAS.Checked = false; cbPlaceKeeper.Checked = false; + cbPlaceKeeperCont.Checked = false; } else // otherwise, get data from config { if (CurItemInfo.IsHigh) cbPageBreak.Checked = sc.Step_NewManualPagebreak; - cbPlaceKeeper.Checked = sc.Step_Placekeeper.ToUpper() != "N"; + cbPlaceKeeper.Checked = (sc.Step_Placekeeper == "Y"); + cbPlaceKeeperCont.Checked = (sc.Step_Placekeeper == "C"); cbCAS.Checked = sc.Step_CAS; } bool _checkoffsAllowed = true; @@ -338,6 +343,26 @@ namespace Volian.Controls.Library StepConfig sc = CurItemInfo.MyConfig as StepConfig; if (sc == null) return; sc.Step_Placekeeper = (cbPlaceKeeper.Checked)?"Y":"N"; + if (cbPlaceKeeper.Checked) + { + _Initalizing = true; + cbPlaceKeeperCont.Checked = false; + _Initalizing = false; + } + } + private void cbPlaceKeeperCont_CheckedChanged(object sender, EventArgs e) + { + if (_Initalizing) return; + MyEditItem.SaveContents(); + StepConfig sc = CurItemInfo.MyConfig as StepConfig; + if (sc == null) return; + sc.Step_Placekeeper = (cbPlaceKeeperCont.Checked) ? "C" : "N"; + if (cbPlaceKeeperCont.Checked) + { + _Initalizing = true; + cbPlaceKeeper.Checked = false; + } + } private void listBoxStepTypes_SelectedIndexChanged(object sender, EventArgs e) {