diff --git a/PROMS/VEPROMS User Interface/frmSectionProperties.Designer.cs b/PROMS/VEPROMS User Interface/frmSectionProperties.Designer.cs index 12e9ee85..1f10083b 100644 --- a/PROMS/VEPROMS User Interface/frmSectionProperties.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmSectionProperties.Designer.cs @@ -86,6 +86,13 @@ namespace VEPROMS this.btnFormat = new DevComponents.DotNetBar.ButtonX(); this.btnGeneral = new DevComponents.DotNetBar.ButtonX(); this.tcSectionProp = new DevComponents.DotNetBar.TabControl(); + this.tcpFormat = new DevComponents.DotNetBar.TabControlPanel(); + this.cbIsFoldoutSection = new System.Windows.Forms.CheckBox(); + this.cbKeepWordDocMargins = new System.Windows.Forms.CheckBox(); + this.rbWordSect = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.rbStepSect = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.ppGpbxSignoffCheckoff = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.tiFormat = new DevComponents.DotNetBar.TabItem(this.components); this.tcpGeneral = new DevComponents.DotNetBar.TabControlPanel(); this.ppCbAutoIndent = new System.Windows.Forms.CheckBox(); this.ppCbEditableData = new System.Windows.Forms.CheckBox(); @@ -93,12 +100,6 @@ namespace VEPROMS this.ppSectNumberStpRTB = new Volian.Controls.Library.StepRTB(this.components); this.ppSectTitleStpRTB = new Volian.Controls.Library.StepRTB(this.components); this.tiGeneral = new DevComponents.DotNetBar.TabItem(this.components); - this.tcpFormat = new DevComponents.DotNetBar.TabControlPanel(); - this.cbKeepWordDocMargins = new System.Windows.Forms.CheckBox(); - this.rbWordSect = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.rbStepSect = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.ppGpbxSignoffCheckoff = new DevComponents.DotNetBar.Controls.GroupPanel(); - this.tiFormat = new DevComponents.DotNetBar.TabItem(this.components); this.tcpLibDoc = new DevComponents.DotNetBar.TabControlPanel(); this.tiLibDoc = new DevComponents.DotNetBar.TabItem(this.components); this.tcpAutomation = new DevComponents.DotNetBar.TabControlPanel(); @@ -118,9 +119,9 @@ namespace VEPROMS this.panSectBtns.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.tcSectionProp)).BeginInit(); this.tcSectionProp.SuspendLayout(); - this.tcpGeneral.SuspendLayout(); this.tcpFormat.SuspendLayout(); this.ppGpbxSignoffCheckoff.SuspendLayout(); + this.tcpGeneral.SuspendLayout(); this.tcpLibDoc.SuspendLayout(); this.tcpAutomation.SuspendLayout(); this.gpTOC.SuspendLayout(); @@ -503,7 +504,7 @@ namespace VEPROMS // this.ppBtnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.ppBtnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.ppBtnCancel.Location = new System.Drawing.Point(671, 388); + this.ppBtnCancel.Location = new System.Drawing.Point(674, 369); this.ppBtnCancel.Margin = new System.Windows.Forms.Padding(2); this.ppBtnCancel.Name = "ppBtnCancel"; this.ppBtnCancel.Size = new System.Drawing.Size(56, 21); @@ -515,7 +516,7 @@ namespace VEPROMS // ppBtnOK // this.ppBtnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.ppBtnOK.Location = new System.Drawing.Point(610, 388); + this.ppBtnOK.Location = new System.Drawing.Point(613, 369); this.ppBtnOK.Margin = new System.Windows.Forms.Padding(2); this.ppBtnOK.Name = "ppBtnOK"; this.ppBtnOK.Size = new System.Drawing.Size(56, 21); @@ -529,7 +530,7 @@ namespace VEPROMS this.ppLblDefSettingsInfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.ppLblDefSettingsInfo.AutoSize = true; this.ppLblDefSettingsInfo.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.ppLblDefSettingsInfo.Location = new System.Drawing.Point(7, 368); + this.ppLblDefSettingsInfo.Location = new System.Drawing.Point(7, 350); this.ppLblDefSettingsInfo.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.ppLblDefSettingsInfo.Name = "ppLblDefSettingsInfo"; this.ppLblDefSettingsInfo.Size = new System.Drawing.Size(156, 13); @@ -707,7 +708,7 @@ namespace VEPROMS this.ppCbDefaultStepSection.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.ppCbDefaultStepSection.AutoSize = true; this.ppCbDefaultStepSection.BackColor = System.Drawing.Color.Transparent; - this.ppCbDefaultStepSection.Location = new System.Drawing.Point(14, 262); + this.ppCbDefaultStepSection.Location = new System.Drawing.Point(10, 252); this.ppCbDefaultStepSection.Margin = new System.Windows.Forms.Padding(2); this.ppCbDefaultStepSection.Name = "ppCbDefaultStepSection"; this.ppCbDefaultStepSection.Size = new System.Drawing.Size(124, 17); @@ -743,8 +744,8 @@ namespace VEPROMS this.ppBtnConvertToDocX.Margin = new System.Windows.Forms.Padding(2); this.ppBtnConvertToDocX.Name = "ppBtnConvertToDocX"; this.ppBtnConvertToDocX.Size = new System.Drawing.Size(209, 36); - this.superTooltip1.SetSuperTooltip(this.ppBtnConvertToDocX, new DevComponents.DotNetBar.SuperTooltipInfo("Convert MSWord DocX Format", "", - "This button will convert the current section to MSWord DocX Format which should save space in the database.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, false, new System.Drawing.Size(250, 76))); + this.superTooltip1.SetSuperTooltip(this.ppBtnConvertToDocX, new DevComponents.DotNetBar.SuperTooltipInfo("Convert MSWord DocX Format", "", "This button will convert the current section to MSWord DocX Format which should s" + + "ave space in the database.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, false, new System.Drawing.Size(250, 76))); this.ppBtnConvertToDocX.TabIndex = 42; this.ppBtnConvertToDocX.Text = "Convert to DocX"; this.ppBtnConvertToDocX.Click += new System.EventHandler(this.ppBtnConvertToDocX_Click); @@ -756,7 +757,7 @@ namespace VEPROMS // // this.ppCbShwDefSettings.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ppCbShwDefSettings.Location = new System.Drawing.Point(10, 388); + this.ppCbShwDefSettings.Location = new System.Drawing.Point(10, 370); this.ppCbShwDefSettings.Margin = new System.Windows.Forms.Padding(2); this.ppCbShwDefSettings.Name = "ppCbShwDefSettings"; this.ppCbShwDefSettings.Size = new System.Drawing.Size(145, 22); @@ -836,12 +837,12 @@ namespace VEPROMS this.tcSectionProp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.tcSectionProp.BackColor = System.Drawing.Color.Transparent; this.tcSectionProp.CanReorderTabs = true; - this.tcSectionProp.Controls.Add(this.tcpFormat); this.tcSectionProp.Controls.Add(this.tcpGeneral); + this.tcSectionProp.Controls.Add(this.tcpFormat); this.tcSectionProp.Controls.Add(this.tcpAutomation); this.tcSectionProp.Controls.Add(this.tcpLibDoc); this.tcSectionProp.Controls.Add(this.tabControlPanel4); - this.tcSectionProp.Location = new System.Drawing.Point(162, 8); + this.tcSectionProp.Location = new System.Drawing.Point(165, 8); this.tcSectionProp.Margin = new System.Windows.Forms.Padding(2); this.tcSectionProp.Name = "tcSectionProp"; this.tcSectionProp.SelectedTabFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold); @@ -857,6 +858,171 @@ namespace VEPROMS this.tcSectionProp.TabsVisible = false; this.tcSectionProp.Text = "tabControl2"; // + // tcpFormat + // + this.tcpFormat.Controls.Add(this.cbIsFoldoutSection); + this.tcpFormat.Controls.Add(this.ppCbDefaultStepSection); + this.tcpFormat.Controls.Add(this.cbKeepWordDocMargins); + this.tcpFormat.Controls.Add(this.ppLblDefaultNumColumns); + this.tcpFormat.Controls.Add(this.ppLblDefPaginationStyle); + this.tcpFormat.Controls.Add(this.ppBtnDefaultNumColumns); + this.tcpFormat.Controls.Add(this.ppBtnDefaultPaginationStyle); + this.tcpFormat.Controls.Add(this.rbWordSect); + this.tcpFormat.Controls.Add(this.rbStepSect); + this.tcpFormat.Controls.Add(this.ppGpbxSignoffCheckoff); + this.tcpFormat.Controls.Add(this.lblFormat); + this.tcpFormat.Controls.Add(this.ppCmbxNumColumns); + this.tcpFormat.Controls.Add(this.lblColumns); + this.tcpFormat.Controls.Add(this.ppCmbxSectPagination); + this.tcpFormat.Controls.Add(this.lblSectType); + this.tcpFormat.Controls.Add(this.ppCmbxStyleSectionType); + this.tcpFormat.Controls.Add(this.lblPagination); + this.tcpFormat.Controls.Add(this.ppBtnDefaultFmt); + this.tcpFormat.Controls.Add(this.ppCmbxFormat); + this.tcpFormat.Controls.Add(this.ppLblFormatDefault); + this.tcpFormat.DisabledBackColor = System.Drawing.Color.Empty; + this.tcpFormat.Dock = System.Windows.Forms.DockStyle.Fill; + this.tcpFormat.Location = new System.Drawing.Point(0, 22); + this.tcpFormat.Margin = new System.Windows.Forms.Padding(2); + this.tcpFormat.Name = "tcpFormat"; + this.tcpFormat.Padding = new System.Windows.Forms.Padding(1); + this.tcpFormat.Size = new System.Drawing.Size(565, 318); + this.tcpFormat.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); + this.tcpFormat.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); + this.tcpFormat.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.tcpFormat.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); + this.tcpFormat.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) + | DevComponents.DotNetBar.eBorderSide.Bottom))); + this.tcpFormat.Style.GradientAngle = 90; + this.tcpFormat.TabIndex = 2; + this.tcpFormat.TabItem = this.tiFormat; + this.tcpFormat.Enter += new System.EventHandler(this.tabpage_Enter); + // + // cbIsFoldoutSection + // + this.cbIsFoldoutSection.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.cbIsFoldoutSection.AutoSize = true; + this.cbIsFoldoutSection.BackColor = System.Drawing.Color.Transparent; + this.cbIsFoldoutSection.Location = new System.Drawing.Point(10, 294); + this.cbIsFoldoutSection.Margin = new System.Windows.Forms.Padding(2); + this.cbIsFoldoutSection.Name = "cbIsFoldoutSection"; + this.cbIsFoldoutSection.Size = new System.Drawing.Size(140, 17); + this.superTooltip1.SetSuperTooltip(this.cbIsFoldoutSection, new DevComponents.DotNetBar.SuperTooltipInfo("This is a Foldout Section", "", resources.GetString("cbIsFoldoutSection.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(350, 166))); + this.cbIsFoldoutSection.TabIndex = 61; + this.cbIsFoldoutSection.Text = "This is a Foldout section"; + this.cbIsFoldoutSection.UseVisualStyleBackColor = false; + this.cbIsFoldoutSection.CheckedChanged += new System.EventHandler(this.cbIsFoldoutSection_CheckedChanged); + // + // cbKeepWordDocMargins + // + this.cbKeepWordDocMargins.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.cbKeepWordDocMargins.AutoSize = true; + this.cbKeepWordDocMargins.BackColor = System.Drawing.Color.Transparent; + this.cbKeepWordDocMargins.Location = new System.Drawing.Point(10, 273); + this.cbKeepWordDocMargins.Margin = new System.Windows.Forms.Padding(2); + this.cbKeepWordDocMargins.Name = "cbKeepWordDocMargins"; + this.cbKeepWordDocMargins.Size = new System.Drawing.Size(250, 17); + this.superTooltip1.SetSuperTooltip(this.cbKeepWordDocMargins, new DevComponents.DotNetBar.SuperTooltipInfo("Keep Word Document Margins", "", "When checked, the page margins and page size (paper size) set in this Word sectio" + + "n will override the default page margins and paper size set in the PROMS format." + + "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(303, 70))); + this.cbKeepWordDocMargins.TabIndex = 59; + this.cbKeepWordDocMargins.Text = "Keep Word Document Margins (and Page Size)"; + this.cbKeepWordDocMargins.UseVisualStyleBackColor = false; + this.cbKeepWordDocMargins.Visible = false; + this.cbKeepWordDocMargins.CheckedChanged += new System.EventHandler(this.cbKeepWordDocMargins_CheckedChanged); + // + // rbWordSect + // + this.rbWordSect.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.rbWordSect.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.rbWordSect.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; + this.rbWordSect.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.rbWordSect.Location = new System.Drawing.Point(247, 60); + this.rbWordSect.Margin = new System.Windows.Forms.Padding(2); + this.rbWordSect.Name = "rbWordSect"; + this.rbWordSect.Size = new System.Drawing.Size(88, 19); + this.rbWordSect.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.rbWordSect.TabIndex = 23; + this.rbWordSect.TabStop = false; + this.rbWordSect.Text = "Word Section"; + // + // rbStepSect + // + this.rbStepSect.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.rbStepSect.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.rbStepSect.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; + this.rbStepSect.Checked = true; + this.rbStepSect.CheckState = System.Windows.Forms.CheckState.Checked; + this.rbStepSect.CheckValue = "Y"; + this.rbStepSect.FocusCuesEnabled = false; + this.rbStepSect.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.rbStepSect.Location = new System.Drawing.Point(138, 60); + this.rbStepSect.Margin = new System.Windows.Forms.Padding(2); + this.rbStepSect.Name = "rbStepSect"; + this.rbStepSect.Size = new System.Drawing.Size(86, 19); + this.rbStepSect.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.rbStepSect.TabIndex = 22; + this.rbStepSect.TabStop = false; + this.rbStepSect.Text = "Step Section"; + this.rbStepSect.CheckedChanged += new System.EventHandler(this.rbStepSect_CheckedChanged); + // + // ppGpbxSignoffCheckoff + // + this.ppGpbxSignoffCheckoff.BackColor = System.Drawing.Color.Transparent; + this.ppGpbxSignoffCheckoff.CanvasColor = System.Drawing.SystemColors.Control; + this.ppGpbxSignoffCheckoff.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.ppGpbxSignoffCheckoff.Controls.Add(this.ppCmbxCheckoffHeading); + this.ppGpbxSignoffCheckoff.Controls.Add(this.lblCheckoffType); + this.ppGpbxSignoffCheckoff.Controls.Add(this.ppCmbxCheckoffType); + this.ppGpbxSignoffCheckoff.Controls.Add(this.lblCheckoffHeading); + this.ppGpbxSignoffCheckoff.DisabledBackColor = System.Drawing.Color.Empty; + this.ppGpbxSignoffCheckoff.Location = new System.Drawing.Point(272, 123); + this.ppGpbxSignoffCheckoff.Margin = new System.Windows.Forms.Padding(2); + this.ppGpbxSignoffCheckoff.Name = "ppGpbxSignoffCheckoff"; + this.ppGpbxSignoffCheckoff.Size = new System.Drawing.Size(206, 117); + // + // + // + this.ppGpbxSignoffCheckoff.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.ppGpbxSignoffCheckoff.Style.BackColorGradientAngle = 90; + this.ppGpbxSignoffCheckoff.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.ppGpbxSignoffCheckoff.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.ppGpbxSignoffCheckoff.Style.BorderBottomWidth = 1; + this.ppGpbxSignoffCheckoff.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.ppGpbxSignoffCheckoff.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.ppGpbxSignoffCheckoff.Style.BorderLeftWidth = 1; + this.ppGpbxSignoffCheckoff.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.ppGpbxSignoffCheckoff.Style.BorderRightWidth = 1; + this.ppGpbxSignoffCheckoff.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.ppGpbxSignoffCheckoff.Style.BorderTopWidth = 1; + this.ppGpbxSignoffCheckoff.Style.CornerDiameter = 4; + this.ppGpbxSignoffCheckoff.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.ppGpbxSignoffCheckoff.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; + this.ppGpbxSignoffCheckoff.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.ppGpbxSignoffCheckoff.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; + // + // + // + this.ppGpbxSignoffCheckoff.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ppGpbxSignoffCheckoff.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ppGpbxSignoffCheckoff.TabIndex = 51; + this.ppGpbxSignoffCheckoff.Text = "Signoffs / Checkoffs"; + // + // tiFormat + // + this.tiFormat.AttachedControl = this.tcpFormat; + this.tiFormat.Name = "tiFormat"; + this.tiFormat.Text = "Format"; + // // tcpGeneral // this.tcpGeneral.Controls.Add(this.ppCbAutoIndent); @@ -959,6 +1125,7 @@ namespace VEPROMS this.ppSectNumberStpRTB.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.None; this.ppSectNumberStpRTB.ShowDebug = false; this.ppSectNumberStpRTB.Size = new System.Drawing.Size(406, 15); + this.ppSectNumberStpRTB.SpellCheckStatus = false; this.ppSectNumberStpRTB.TabIndex = 10; this.ppSectNumberStpRTB.Text = ""; this.ppSectNumberStpRTB.ThisContextMenuStrip = null; @@ -997,6 +1164,7 @@ namespace VEPROMS this.ppSectTitleStpRTB.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.None; this.ppSectTitleStpRTB.ShowDebug = false; this.ppSectTitleStpRTB.Size = new System.Drawing.Size(406, 50); + this.ppSectTitleStpRTB.SpellCheckStatus = false; this.ppSectTitleStpRTB.TabIndex = 11; this.ppSectTitleStpRTB.Text = ""; this.ppSectTitleStpRTB.ThisContextMenuStrip = null; @@ -1009,152 +1177,6 @@ namespace VEPROMS this.tiGeneral.Name = "tiGeneral"; this.tiGeneral.Text = "General"; // - // tcpFormat - // - this.tcpFormat.Controls.Add(this.ppCbDefaultStepSection); - this.tcpFormat.Controls.Add(this.cbKeepWordDocMargins); - this.tcpFormat.Controls.Add(this.ppLblDefaultNumColumns); - this.tcpFormat.Controls.Add(this.ppLblDefPaginationStyle); - this.tcpFormat.Controls.Add(this.ppBtnDefaultNumColumns); - this.tcpFormat.Controls.Add(this.ppBtnDefaultPaginationStyle); - this.tcpFormat.Controls.Add(this.rbWordSect); - this.tcpFormat.Controls.Add(this.rbStepSect); - this.tcpFormat.Controls.Add(this.ppGpbxSignoffCheckoff); - this.tcpFormat.Controls.Add(this.lblFormat); - this.tcpFormat.Controls.Add(this.ppCmbxNumColumns); - this.tcpFormat.Controls.Add(this.lblColumns); - this.tcpFormat.Controls.Add(this.ppCmbxSectPagination); - this.tcpFormat.Controls.Add(this.lblSectType); - this.tcpFormat.Controls.Add(this.ppCmbxStyleSectionType); - this.tcpFormat.Controls.Add(this.lblPagination); - this.tcpFormat.Controls.Add(this.ppBtnDefaultFmt); - this.tcpFormat.Controls.Add(this.ppCmbxFormat); - this.tcpFormat.Controls.Add(this.ppLblFormatDefault); - this.tcpFormat.DisabledBackColor = System.Drawing.Color.Empty; - this.tcpFormat.Dock = System.Windows.Forms.DockStyle.Fill; - this.tcpFormat.Location = new System.Drawing.Point(0, 22); - this.tcpFormat.Margin = new System.Windows.Forms.Padding(2); - this.tcpFormat.Name = "tcpFormat"; - this.tcpFormat.Padding = new System.Windows.Forms.Padding(1); - this.tcpFormat.Size = new System.Drawing.Size(565, 318); - this.tcpFormat.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); - this.tcpFormat.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); - this.tcpFormat.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.tcpFormat.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); - this.tcpFormat.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) - | DevComponents.DotNetBar.eBorderSide.Bottom))); - this.tcpFormat.Style.GradientAngle = 90; - this.tcpFormat.TabIndex = 2; - this.tcpFormat.TabItem = this.tiFormat; - this.tcpFormat.Enter += new System.EventHandler(this.tabpage_Enter); - // - // cbKeepWordDocMargins - // - this.cbKeepWordDocMargins.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.cbKeepWordDocMargins.AutoSize = true; - this.cbKeepWordDocMargins.BackColor = System.Drawing.Color.Transparent; - this.cbKeepWordDocMargins.Location = new System.Drawing.Point(14, 290); - this.cbKeepWordDocMargins.Margin = new System.Windows.Forms.Padding(2); - this.cbKeepWordDocMargins.Name = "cbKeepWordDocMargins"; - this.cbKeepWordDocMargins.Size = new System.Drawing.Size(250, 17); - this.cbKeepWordDocMargins.TabIndex = 59; - this.cbKeepWordDocMargins.Text = "Keep Word Document Margins (and Page Size)"; - this.cbKeepWordDocMargins.UseVisualStyleBackColor = false; - this.cbKeepWordDocMargins.Visible = false; - this.cbKeepWordDocMargins.CheckedChanged += new System.EventHandler(this.cbKeepWordDocMargins_CheckedChanged); - // - // rbWordSect - // - this.rbWordSect.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.rbWordSect.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.rbWordSect.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; - this.rbWordSect.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.rbWordSect.Location = new System.Drawing.Point(247, 60); - this.rbWordSect.Margin = new System.Windows.Forms.Padding(2); - this.rbWordSect.Name = "rbWordSect"; - this.rbWordSect.Size = new System.Drawing.Size(88, 19); - this.rbWordSect.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.rbWordSect.TabIndex = 23; - this.rbWordSect.TabStop = false; - this.rbWordSect.Text = "Word Section"; - // - // rbStepSect - // - this.rbStepSect.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.rbStepSect.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.rbStepSect.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; - this.rbStepSect.Checked = true; - this.rbStepSect.CheckState = System.Windows.Forms.CheckState.Checked; - this.rbStepSect.CheckValue = "Y"; - this.rbStepSect.FocusCuesEnabled = false; - this.rbStepSect.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.rbStepSect.Location = new System.Drawing.Point(138, 60); - this.rbStepSect.Margin = new System.Windows.Forms.Padding(2); - this.rbStepSect.Name = "rbStepSect"; - this.rbStepSect.Size = new System.Drawing.Size(86, 19); - this.rbStepSect.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.rbStepSect.TabIndex = 22; - this.rbStepSect.TabStop = false; - this.rbStepSect.Text = "Step Section"; - this.rbStepSect.CheckedChanged += new System.EventHandler(this.rbStepSect_CheckedChanged); - // - // ppGpbxSignoffCheckoff - // - this.ppGpbxSignoffCheckoff.BackColor = System.Drawing.Color.Transparent; - this.ppGpbxSignoffCheckoff.CanvasColor = System.Drawing.SystemColors.Control; - this.ppGpbxSignoffCheckoff.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.ppGpbxSignoffCheckoff.Controls.Add(this.ppCmbxCheckoffHeading); - this.ppGpbxSignoffCheckoff.Controls.Add(this.lblCheckoffType); - this.ppGpbxSignoffCheckoff.Controls.Add(this.ppCmbxCheckoffType); - this.ppGpbxSignoffCheckoff.Controls.Add(this.lblCheckoffHeading); - this.ppGpbxSignoffCheckoff.DisabledBackColor = System.Drawing.Color.Empty; - this.ppGpbxSignoffCheckoff.Location = new System.Drawing.Point(272, 123); - this.ppGpbxSignoffCheckoff.Margin = new System.Windows.Forms.Padding(2); - this.ppGpbxSignoffCheckoff.Name = "ppGpbxSignoffCheckoff"; - this.ppGpbxSignoffCheckoff.Size = new System.Drawing.Size(206, 117); - // - // - // - this.ppGpbxSignoffCheckoff.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.ppGpbxSignoffCheckoff.Style.BackColorGradientAngle = 90; - this.ppGpbxSignoffCheckoff.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.ppGpbxSignoffCheckoff.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.ppGpbxSignoffCheckoff.Style.BorderBottomWidth = 1; - this.ppGpbxSignoffCheckoff.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.ppGpbxSignoffCheckoff.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.ppGpbxSignoffCheckoff.Style.BorderLeftWidth = 1; - this.ppGpbxSignoffCheckoff.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.ppGpbxSignoffCheckoff.Style.BorderRightWidth = 1; - this.ppGpbxSignoffCheckoff.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.ppGpbxSignoffCheckoff.Style.BorderTopWidth = 1; - this.ppGpbxSignoffCheckoff.Style.CornerDiameter = 4; - this.ppGpbxSignoffCheckoff.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.ppGpbxSignoffCheckoff.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; - this.ppGpbxSignoffCheckoff.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.ppGpbxSignoffCheckoff.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; - // - // - // - this.ppGpbxSignoffCheckoff.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ppGpbxSignoffCheckoff.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ppGpbxSignoffCheckoff.TabIndex = 51; - this.ppGpbxSignoffCheckoff.Text = "Signoffs / Checkoffs"; - // - // tiFormat - // - this.tiFormat.AttachedControl = this.tcpFormat; - this.tiFormat.Name = "tiFormat"; - this.tiFormat.Text = "Format"; - // // tcpLibDoc // this.tcpLibDoc.Controls.Add(this.ppBtnCvrtToLibDoc); @@ -1427,7 +1449,7 @@ namespace VEPROMS this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CaptionFont = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.ClientSize = new System.Drawing.Size(738, 413); + this.ClientSize = new System.Drawing.Size(741, 401); this.ControlBox = false; this.Controls.Add(this.tcSectionProp); this.Controls.Add(this.panSectBtns); @@ -1451,12 +1473,12 @@ namespace VEPROMS this.panSectBtns.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.tcSectionProp)).EndInit(); this.tcSectionProp.ResumeLayout(false); - this.tcpGeneral.ResumeLayout(false); - this.tcpGeneral.PerformLayout(); this.tcpFormat.ResumeLayout(false); this.tcpFormat.PerformLayout(); this.ppGpbxSignoffCheckoff.ResumeLayout(false); this.ppGpbxSignoffCheckoff.PerformLayout(); + this.tcpGeneral.ResumeLayout(false); + this.tcpGeneral.PerformLayout(); this.tcpLibDoc.ResumeLayout(false); this.tcpLibDoc.PerformLayout(); this.tcpAutomation.ResumeLayout(false); @@ -1558,5 +1580,6 @@ namespace VEPROMS private DevComponents.DotNetBar.LabelX labelX1; private DevComponents.DotNetBar.Controls.TextBoxX txbxTOC_Group_Title; private DevComponents.DotNetBar.ButtonX ppBtnConvertToDocX; + private System.Windows.Forms.CheckBox cbIsFoldoutSection; } } diff --git a/PROMS/VEPROMS User Interface/frmSectionProperties.cs b/PROMS/VEPROMS User Interface/frmSectionProperties.cs index 434f97f5..9b35bf84 100644 --- a/PROMS/VEPROMS User Interface/frmSectionProperties.cs +++ b/PROMS/VEPROMS User Interface/frmSectionProperties.cs @@ -564,6 +564,9 @@ namespace VEPROMS // for word docs, no enhanced controls should be visible: grpLnkEnh.Visible = false; } + //C2019-042 a section cannot be a foldout section and the default step section + cbIsFoldoutSection.Checked = _SectionConfig.Section_IsFoldout == "Y"; + cbIsFoldoutSection.Enabled = !_isDefaultStepSection; _Initializing = false; //_InitialIndex = ppCmbxFormat.SelectedIndex; } @@ -1279,29 +1282,44 @@ namespace VEPROMS // The bug was on changing a transition type that included a section header - but the section header was not included // in the transition text if it was a default: int cntDefaultSect = 0; + string defSectDesc = ""; foreach (SectionInfo si in _SectionConfig.MySection.MySectionInfo.MyProcedure.Sections) { SectionConfig sc = si.MyConfig as SectionConfig; - if (sc != null && sc.Section_OriginalSteps == "Y") cntDefaultSect++; + if (sc != null && sc.Section_OriginalSteps == "Y") + { + cntDefaultSect++; + if (cntDefaultSect == 1) defSectDesc = string.Format("{0} {1}", sc.Number, sc.Title).Trim(); // get default section name - used in Warning message if another section is checked to be default + } } - if (!ppCbDefaultStepSection.Checked && cntDefaultSect==1) + if (!ppCbDefaultStepSection.Checked) //user un-checked the default section box { - // If user unchecks this section, i.e. wants to clear it from being 'Default Step Section' - // just tell user that only 1 section can be the default step section. - // The way this is supported in code is to only allow the user to check - // the checkbox if it is not already set. This is the way the code supported only - // allowing 1 section to have this flag. - MessageBox.Show("Only one section can be set as the 'Default Step Section'. To make another section the 'Default Step Section', select the checkbox on the Properties of that section.", "WARNING"); - ppCbDefaultStepSection.Checked = true; + if (cntDefaultSect == 1) + { + // If user unchecks this section, i.e. wants to clear it from being 'Default Step Section' + // remind user that one section Must be the default step section. + MessageBox.Show("One section MUST be set as the 'Default Step Section'.\n\nTo make another section the 'Default Step Section',\n select the checkbox on the Properties of that section.", "WARNING"); + //ppCbDefaultStepSection.Checked = true; + } } - else + else // user checked the default section box { - // Note that this just sets the config item - it does not save it. Save is - // done when the 'OK' button is clicked. At that time, if this section's - // Section_OriginalSteps is set, then all other sections will need to have this - // property cleared (Only 1 section can be the OriginalStep section. - _SectionConfig.Section_OriginalSteps = ppCbDefaultStepSection.Checked ? "Y" : "N"; + if (cntDefaultSect != 0) + { + // Note that this just sets the config item - it does not save it. Save is + // done when the 'OK' button is clicked. At that time, if this section's + // Section_OriginalSteps is set, then all other sections will need to have this + // property cleared (Only 1 section can be the OriginalStep section. + string msg = string.Format("Only one section can be set as the 'Default Step Section'.\n\nYou need to un-select \"{0}\" as the default section before selecting this one.", defSectDesc); + MessageBox.Show(msg, "WARNING"); + _Initializing = true; + ppCbDefaultStepSection.Checked = false; // reset the check box back to unchecked + _Initializing = false; + } } + //C2019-042 a section cannot be a foldout section and the default step section + cbIsFoldoutSection.Enabled = !ppCbDefaultStepSection.Checked; // disable the foldout checkbox if this is the default step section + _SectionConfig.Section_OriginalSteps = ppCbDefaultStepSection.Checked ? "Y" : "N"; } } private void ppBtnConvertToDocX_Click(object sender, EventArgs e) @@ -1357,6 +1375,14 @@ namespace VEPROMS } } + //C2019-042 added check box to identify a Foldout Section + private void cbIsFoldoutSection_CheckedChanged(object sender, EventArgs e) + { + // don't allow a foldout section be the default step section + ppCbDefaultStepSection.Enabled = !cbIsFoldoutSection.Checked; + _SectionConfig.Section_IsFoldout = (cbIsFoldoutSection.Checked) ? "Y" : "N"; + } + //private void ppBtnDefaultPrintSize_Click(object sender, EventArgs e) //{ // // Get the parent setting diff --git a/PROMS/VEPROMS User Interface/frmSectionProperties.resx b/PROMS/VEPROMS User Interface/frmSectionProperties.resx index 1240a52a..47ea2f85 100644 --- a/PROMS/VEPROMS User Interface/frmSectionProperties.resx +++ b/PROMS/VEPROMS User Interface/frmSectionProperties.resx @@ -112,12 +112,12 @@ 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 - + 571, 19 @@ -129,7 +129,7 @@ Separate - this section will always begin on a new page. Continous - this section will not begin on a new page if there is room on the current page. - + 128, 18 @@ -142,4 +142,19 @@ When a format other than the inherited one is selected, a button labeled "Defaul Pressing the "Default" button will revert back to using the inherited format for this section. + + 128, 18 + + + If the PROMS format allows one or more of the following apply: + +- This section will be printed between each procedure page, + so that it will be on the back when printing in duplex mode + +- This section is accounted for in transitions with page numbers + (when this is printed on back pages) + +- Dont count this page when generating an automatic table + of conents if this is printed on the back of the procedure pages + \ No newline at end of file diff --git a/PROMS/VEPROMS.CSLA.Library/Config/SectionConfig.cs b/PROMS/VEPROMS.CSLA.Library/Config/SectionConfig.cs index 5adf1c4f..d16ffb8f 100644 --- a/PROMS/VEPROMS.CSLA.Library/Config/SectionConfig.cs +++ b/PROMS/VEPROMS.CSLA.Library/Config/SectionConfig.cs @@ -274,6 +274,31 @@ namespace VEPROMS.CSLA.Library OnPropertyChanged("Section_WordMargin"); } } + //C2019-042 Section_IsFoldout checks Section Number, Section Title, and use of check box + [Category("Format")] + [DisplayName("This is a Foldout Section")] + [Description("Identify This Section as a Foldout")] + public string Section_IsFoldout + { + get + { + string rtnstr = "N"; + string tmp = _Xp["Section", "IsFoldout"]; + if (tmp == null || tmp == "") + { + if ((Number != null && Number.ToUpper().StartsWith("FOLDOUT")) || (Title != null && Title.ToUpper().Contains("FOLDOUT"))) + rtnstr = "Y"; + } + else + rtnstr = tmp; + return rtnstr; + } + set + { + _Xp["Section", "IsFoldout"] = value; + OnPropertyChanged("Section_IsFoldout"); + } + } #endregion #region ToString public override string ToString() diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs index 328a996f..d1f26e82 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs @@ -1160,8 +1160,8 @@ namespace VEPROMS.CSLA.Library //At some point, add a property off a section 'IsFoldout' and use the next two lines: //if ((myProcedure.ActiveFormat.PlantFormat.FormatData.PrintData.SectionLevelFoldouts && mySection.MyContent.Number.ToUpper() == "FOLDOUT") //|| (myProcedure.ActiveFormat.PlantFormat.FormatData.PrintData.AlternateFloatingFoldout && mySection.MyContent.Text.ToUpper().Contains("FOLDOUT"))) - if (tb._ToItem.PageNumber != -1 && (tb._FromItem.PageNumber != -1 || tb._FromItem.ActiveSection.MyContent.Number.ToUpper() == "FOLDOUT")) - { + if (tb._ToItem.PageNumber != -1 && (tb._FromItem.PageNumber != -1 || (tb._FromItem.ActiveSection.MyConfig as SectionConfig).Section_IsFoldout == "Y")) //C2019-042 Section_IsFoldout checks Section Number, Section Title, and use of check box + { int pgoffset = tb._ToItem.PageNumber - tb._FromItem.PageNumber; tb._ToItem.PageNumberUsed = tb._ToItem.PageNumber; diff --git a/PROMS/Volian.Print.Library/Pagination.cs b/PROMS/Volian.Print.Library/Pagination.cs index a562b494..a83347cf 100644 --- a/PROMS/Volian.Print.Library/Pagination.cs +++ b/PROMS/Volian.Print.Library/Pagination.cs @@ -347,7 +347,8 @@ namespace Volian.Print.Library // The format supports compression // The contents exceeds the length of the page // The Contents fit at seven lines per inch - if (MyItemInfo.DisplayText.ToUpper().StartsWith("FOLDOUT") + //C2019-042 Section_IsFoldout checks Section Number, Section Title, and use of check box + if ((MyItemInfo.MyActiveSection.MyConfig as SectionConfig).Section_IsFoldout == "Y" && MyItemInfo.ActiveFormat.MyStepSectionLayoutData.CompressSteps && mySize > yPageSize && mySize <= yPageSize * SixLinesPerInch / _SevenLinesPerInch) diff --git a/PROMS/Volian.Print.Library/PromsPrinter.cs b/PROMS/Volian.Print.Library/PromsPrinter.cs index fb7d6c36..7ffdbe7e 100644 --- a/PROMS/Volian.Print.Library/PromsPrinter.cs +++ b/PROMS/Volian.Print.Library/PromsPrinter.cs @@ -686,8 +686,9 @@ namespace Volian.Print.Library int cnt = 0; foreach (SectionInfo mySection in myProcedure.Sections) { - if ((myProcedure.ActiveFormat.PlantFormat.FormatData.PrintData.SectionLevelFoldouts && mySection.MyContent.Number.ToUpper() == "FOLDOUT") - || (myProcedure.ActiveFormat.PlantFormat.FormatData.PrintData.AlternateFloatingFoldout && mySection.MyContent.Text.ToUpper().Contains("FOLDOUT"))) + //C2019-042 Section_IsFoldout checks Section Number, Section Title, and use of check box + if ((myProcedure.ActiveFormat.PlantFormat.FormatData.PrintData.SectionLevelFoldouts && (mySection.MyConfig as SectionConfig).Section_IsFoldout == "Y") + || (myProcedure.ActiveFormat.PlantFormat.FormatData.PrintData.AlternateFloatingFoldout && (mySection.MyConfig as SectionConfig).Section_IsFoldout == "Y")) { // if floating foldouts, need a list of sections & foldoutreaders. Just do first for now. @@ -726,7 +727,7 @@ namespace Volian.Print.Library for (int i = cntSect - 1; i >= 0; i--) { SectionInfo mySection = myProcedure.Sections[i] as SectionInfo; - if (!mySection.DisplayText.ToUpper().Contains("FOLDOUT")) + if (!((mySection.MyConfig as SectionConfig).Section_IsFoldout == "Y")) //C2019-042 Section_IsFoldout checks Section Number, Section Title, and use of check box { if (mySection.MyDocStyle.Final != null && mySection.MyDocStyle.Final.Message != null && mySection.MyDocStyle.Final.Message.Length > 0) return mySection.ItemID; @@ -804,8 +805,9 @@ namespace Volian.Print.Library foreach (SectionInfo mySection in myProcedure.Sections) { NeedSupInfoBreak = true; - if (((mySection.MyContent.Number.ToUpper() == "FOLDOUT" && myProcedure.ActiveFormat.PlantFormat.FormatData.PrintData.SectionLevelFoldouts) - || (myProcedure.ActiveFormat.PlantFormat.FormatData.PrintData.AlternateFloatingFoldout && mySection.MyContent.Text.ToUpper().Contains("FOLDOUT"))) + bool isFoldoutSection = (mySection.MyConfig as SectionConfig).Section_IsFoldout == "Y"; //C2019-042 Section_IsFoldout checks Section Number, Section Title, and use of check box + if (((isFoldoutSection && myProcedure.ActiveFormat.PlantFormat.FormatData.PrintData.SectionLevelFoldouts) + || (myProcedure.ActiveFormat.PlantFormat.FormatData.PrintData.AlternateFloatingFoldout && isFoldoutSection)) != doingFoldout) continue; if (myFoldoutSection != null && myFoldoutSection.ItemID != mySection.ItemID) continue; PrintOverride.CompressSuper = mySection.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.CompressHPSuper; diff --git a/PROMS/Volian.Print.Library/Rtf2iTextSharp.cs b/PROMS/Volian.Print.Library/Rtf2iTextSharp.cs index 6cd5324f..b6278847 100644 --- a/PROMS/Volian.Print.Library/Rtf2iTextSharp.cs +++ b/PROMS/Volian.Print.Library/Rtf2iTextSharp.cs @@ -383,7 +383,7 @@ namespace Volian.Print.Library ItemInfo tiDefault = GetDefaultItemInfo(_Ti.MyItemToID); ItemInfo from = _Ti.MyContent.ContentItems[0]; if (_Ti.MyItemToID.MyProcedure.ItemID == from.MyProcedure.ItemID && - !from.ActiveSection.DisplayNumber.ToUpper().StartsWith("FOLDOUT")) + !((from.ActiveSection.MyConfig as SectionConfig).Section_IsFoldout == "Y")) //C2019-042 Section_IsFoldout checks Section Number, Section Title, and use of check box { // Local Go To if (_Ti.MyItemToID.MyContent.Type > 9999) // internal to this file { diff --git a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs index c273d606..7b75f391 100644 --- a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs +++ b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs @@ -272,8 +272,9 @@ namespace Volian.Print.Library DrawRuler(writer.DirectContent); } // added the check for onBlankPage and Foldouts to fix bug found in V.C. Summer auto table of contents - 03/08/2016 + //C2019-042 Section_IsFoldout checks Section Number, Section Title, and use of check box if (!onBlankPage && (MySection.MyDocStyle.StructureStyle.Style==null || (MySection.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DontCountInTabOfCont) == 0) && - !(MySection.ActiveFormat.PlantFormat.FormatData.PrintData.SectionLevelFoldouts && MySection.DisplayNumber.ToUpper() == "FOLDOUT")) + !(MySection.ActiveFormat.PlantFormat.FormatData.PrintData.SectionLevelFoldouts && (MySection.MyConfig as SectionConfig).Section_IsFoldout == "Y")) CurrentTOCPageNumber++; if (MySection.ActiveFormat.PlantFormat.FormatData.SectData.PrintPhoneList) { @@ -1046,7 +1047,8 @@ i = 0; // pagelist items in case there are some section items, for example the checkoff header needs // to be processed for each section whether or not it is continuous. SectionConfig.SectionPagination sPag = SectionConfig.SectionPagination.Separate; - if (mySection.MyContent.Number.ToUpper() != "FOLDOUT" && mySection.IsStepSection && mySection.MyPrevious != null && mySection.MyPrevious.IsStepSection) + //C2019-042 Section_IsFoldout checks Section Number, Section Title, and use of check box + if ((mySection.MyConfig as SectionConfig).Section_IsFoldout != "Y" && mySection.IsStepSection && mySection.MyPrevious != null && mySection.MyPrevious.IsStepSection) { SectionConfig sc = mySection.MyConfig as SectionConfig; sPag = sc.Section_Pagination; @@ -1298,7 +1300,8 @@ i = 0; // If this is a continuous section, then the only pagelist items we want are section type since // we are still on the same page. - CHECK IF ON SAME PAGE!!!! SectionConfig.SectionPagination sPag = SectionConfig.SectionPagination.Separate; - if (section.IsStepSection && section.MyPrevious != null && section.MyPrevious.IsStepSection && section.MyContent.Number.ToUpper() != "FOLDOUT") + //C2019-042 Section_IsFoldout checks Section Number, Section Title, and use of check box + if (section.IsStepSection && section.MyPrevious != null && section.MyPrevious.IsStepSection && (section.MyConfig as SectionConfig).Section_IsFoldout != "Y") { SectionConfig sc1 = section.MyConfig as SectionConfig; sPag = sc1.Section_Pagination; @@ -2083,6 +2086,7 @@ i = 0; { val = DocVersionInfo.GetInheritedSIValue(section.MyProcedure, token.Substring(4, token.Length - 5)); plstr = plstr.Replace(token, val); + break; // B2019-134 break out of switch statement after processing the