diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs index f2e4140f..35746490 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs @@ -310,6 +310,7 @@ namespace VEPROMS if ((PDFFileName ?? "") == "") PDFFileName = "NoProcNumber"; if (PDFFileName.StartsWith("*")) PDFFileName = PDFFileName.Replace("*", this.UnitNumber); + if (PDFFileName.Contains("?")) PDFFileName = PDFFileName.Replace("?", "_"); // for wcn sys/BM-2xxA??, etc txbPDFName.Text = PDFFilePrefix + PDFFileName + PDFFileSuffix + ".pdf"; ProcedureConfig pc = _MyProcedure.MyConfig as ProcedureConfig; if(SelectedSlave > 0) pc.SelectedSlave = SelectedSlave; diff --git a/PROMS/VEPROMS User Interface/frmSectionProperties.Designer.cs b/PROMS/VEPROMS User Interface/frmSectionProperties.Designer.cs index ce6f7df8..446d3b14 100644 --- a/PROMS/VEPROMS User Interface/frmSectionProperties.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmSectionProperties.Designer.cs @@ -77,6 +77,7 @@ namespace VEPROMS this.ppBtnDefaultNumColumns = new DevComponents.DotNetBar.ButtonX(); this.ppLblDefPaginationStyle = new System.Windows.Forms.Label(); this.ppLblDefaultNumColumns = new System.Windows.Forms.Label(); + this.ppCbDefaultStepSection = new System.Windows.Forms.CheckBox(); this.panSectBtns = new System.Windows.Forms.Panel(); this.btnAutomation = new DevComponents.DotNetBar.ButtonX(); this.btnLibDocs = new DevComponents.DotNetBar.ButtonX(); @@ -106,7 +107,6 @@ namespace VEPROMS this.tiAutomation = new DevComponents.DotNetBar.TabItem(this.components); this.tabControlPanel4 = new DevComponents.DotNetBar.TabControlPanel(); this.tiViewStnns = new DevComponents.DotNetBar.TabItem(this.components); - this.label1 = new System.Windows.Forms.Label(); this.checkBoxX1 = new DevComponents.DotNetBar.Controls.CheckBoxX(); ((System.ComponentModel.ISupportInitialize)(this.sectionConfigBindingSource)).BeginInit(); this.panSectBtns.SuspendLayout(); @@ -125,10 +125,10 @@ namespace VEPROMS this.ppDtTmLastMod.CustomFormat = "MM\'/\'dd\'/\'yyyy hh\':\'mm:ss tt"; this.ppDtTmLastMod.Enabled = false; this.ppDtTmLastMod.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.ppDtTmLastMod.Location = new System.Drawing.Point(87, 120); - this.ppDtTmLastMod.Margin = new System.Windows.Forms.Padding(2); + this.ppDtTmLastMod.Location = new System.Drawing.Point(116, 148); + this.ppDtTmLastMod.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppDtTmLastMod.Name = "ppDtTmLastMod"; - this.ppDtTmLastMod.Size = new System.Drawing.Size(130, 20); + this.ppDtTmLastMod.Size = new System.Drawing.Size(172, 22); this.ppDtTmLastMod.TabIndex = 24; this.ppDtTmLastMod.TabStop = false; this.ppDtTmLastMod.Visible = false; @@ -137,10 +137,10 @@ namespace VEPROMS // this.ppTxtBxUserID.AcceptsReturn = true; this.ppTxtBxUserID.Enabled = false; - this.ppTxtBxUserID.Location = new System.Drawing.Point(87, 160); - this.ppTxtBxUserID.Margin = new System.Windows.Forms.Padding(2); + this.ppTxtBxUserID.Location = new System.Drawing.Point(116, 197); + this.ppTxtBxUserID.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppTxtBxUserID.Name = "ppTxtBxUserID"; - this.ppTxtBxUserID.Size = new System.Drawing.Size(116, 20); + this.ppTxtBxUserID.Size = new System.Drawing.Size(153, 22); this.ppTxtBxUserID.TabIndex = 12; this.ppTxtBxUserID.TabStop = false; this.ppTxtBxUserID.Visible = false; @@ -149,10 +149,9 @@ namespace VEPROMS // this.lblUserID.AutoSize = true; this.lblUserID.BackColor = System.Drawing.Color.Transparent; - this.lblUserID.Location = new System.Drawing.Point(41, 162); - this.lblUserID.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblUserID.Location = new System.Drawing.Point(55, 199); this.lblUserID.Name = "lblUserID"; - this.lblUserID.Size = new System.Drawing.Size(43, 13); + this.lblUserID.Size = new System.Drawing.Size(55, 17); this.lblUserID.TabIndex = 11; this.lblUserID.Text = "User ID"; this.lblUserID.Visible = false; @@ -161,10 +160,9 @@ namespace VEPROMS // this.lblLastModDate.AutoSize = true; this.lblLastModDate.BackColor = System.Drawing.Color.Transparent; - this.lblLastModDate.Location = new System.Drawing.Point(14, 123); - this.lblLastModDate.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblLastModDate.Location = new System.Drawing.Point(19, 151); this.lblLastModDate.Name = "lblLastModDate"; - this.lblLastModDate.Size = new System.Drawing.Size(70, 13); + this.lblLastModDate.Size = new System.Drawing.Size(92, 17); this.lblLastModDate.TabIndex = 4; this.lblLastModDate.Text = "Last Modified"; this.lblLastModDate.Visible = false; @@ -173,10 +171,9 @@ namespace VEPROMS // this.lblSectTitle.AutoSize = true; this.lblSectTitle.BackColor = System.Drawing.Color.Transparent; - this.lblSectTitle.Location = new System.Drawing.Point(34, 49); - this.lblSectTitle.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblSectTitle.Location = new System.Drawing.Point(45, 60); this.lblSectTitle.Name = "lblSectTitle"; - this.lblSectTitle.Size = new System.Drawing.Size(27, 13); + this.lblSectTitle.Size = new System.Drawing.Size(35, 17); this.lblSectTitle.TabIndex = 1; this.lblSectTitle.Text = "Title"; // @@ -184,10 +181,9 @@ namespace VEPROMS // this.lblSectNumber.AutoSize = true; this.lblSectNumber.BackColor = System.Drawing.Color.Transparent; - this.lblSectNumber.Location = new System.Drawing.Point(16, 10); - this.lblSectNumber.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblSectNumber.Location = new System.Drawing.Point(21, 12); this.lblSectNumber.Name = "lblSectNumber"; - this.lblSectNumber.Size = new System.Drawing.Size(44, 13); + this.lblSectNumber.Size = new System.Drawing.Size(58, 17); this.lblSectNumber.TabIndex = 0; this.lblSectNumber.Text = "Number"; // @@ -197,10 +193,10 @@ namespace VEPROMS this.ppCmbxSectPagination.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.ppCmbxSectPagination.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.ppCmbxSectPagination.FormattingEnabled = true; - this.ppCmbxSectPagination.Location = new System.Drawing.Point(76, 135); - this.ppCmbxSectPagination.Margin = new System.Windows.Forms.Padding(2); + this.ppCmbxSectPagination.Location = new System.Drawing.Point(101, 166); + this.ppCmbxSectPagination.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCmbxSectPagination.Name = "ppCmbxSectPagination"; - this.ppCmbxSectPagination.Size = new System.Drawing.Size(131, 21); + this.ppCmbxSectPagination.Size = new System.Drawing.Size(173, 23); this.superTooltip1.SetSuperTooltip(this.ppCmbxSectPagination, new DevComponents.DotNetBar.SuperTooltipInfo("Section Pagination", "", resources.GetString("ppCmbxSectPagination.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.System, true, true, new System.Drawing.Size(300, 190))); this.ppCmbxSectPagination.TabIndex = 25; this.ppCmbxSectPagination.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -215,10 +211,10 @@ namespace VEPROMS this.ppCmbxStyleSectionType.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.ppCmbxStyleSectionType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.ppCmbxStyleSectionType.FormattingEnabled = true; - this.ppCmbxStyleSectionType.Location = new System.Drawing.Point(84, 89); - this.ppCmbxStyleSectionType.Margin = new System.Windows.Forms.Padding(2); + this.ppCmbxStyleSectionType.Location = new System.Drawing.Point(112, 110); + this.ppCmbxStyleSectionType.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCmbxStyleSectionType.Name = "ppCmbxStyleSectionType"; - this.ppCmbxStyleSectionType.Size = new System.Drawing.Size(383, 21); + this.ppCmbxStyleSectionType.Size = new System.Drawing.Size(509, 23); this.superTooltip1.SetSuperTooltip(this.ppCmbxStyleSectionType, new DevComponents.DotNetBar.SuperTooltipInfo("Section Type", "", "This is a list of the possible section types as they are defined in the selected " + "format.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.ppCmbxStyleSectionType.TabIndex = 24; @@ -230,10 +226,10 @@ namespace VEPROMS // this.ppBtnDefaultFmt.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.ppBtnDefaultFmt.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.ppBtnDefaultFmt.Location = new System.Drawing.Point(472, 18); - this.ppBtnDefaultFmt.Margin = new System.Windows.Forms.Padding(2); + this.ppBtnDefaultFmt.Location = new System.Drawing.Point(629, 22); + this.ppBtnDefaultFmt.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnDefaultFmt.Name = "ppBtnDefaultFmt"; - this.ppBtnDefaultFmt.Size = new System.Drawing.Size(36, 19); + this.ppBtnDefaultFmt.Size = new System.Drawing.Size(48, 23); this.superTooltip1.SetSuperTooltip(this.ppBtnDefaultFmt, new DevComponents.DotNetBar.SuperTooltipInfo("Default Button", "", "This will revert the format selection back to using the parent\'s format.\r\n\r\nCheck" + " \"Show Default Settings\" to display the \"default\" format name (below the format " + "selection box).", null, null, DevComponents.DotNetBar.eTooltipColor.System)); @@ -250,10 +246,10 @@ namespace VEPROMS this.ppCmbxFormat.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.ppCmbxFormat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.ppCmbxFormat.FormattingEnabled = true; - this.ppCmbxFormat.Location = new System.Drawing.Point(10, 18); - this.ppCmbxFormat.Margin = new System.Windows.Forms.Padding(2); + this.ppCmbxFormat.Location = new System.Drawing.Point(13, 22); + this.ppCmbxFormat.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCmbxFormat.Name = "ppCmbxFormat"; - this.ppCmbxFormat.Size = new System.Drawing.Size(457, 21); + this.ppCmbxFormat.Size = new System.Drawing.Size(608, 23); this.superTooltip1.SetSuperTooltip(this.ppCmbxFormat, new DevComponents.DotNetBar.SuperTooltipInfo("Format Selection", "", resources.GetString("ppCmbxFormat.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.ppCmbxFormat.TabIndex = 20; this.ppCmbxFormat.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -271,10 +267,9 @@ namespace VEPROMS this.ppLblFormatDefault.BackColor = System.Drawing.Color.Transparent; this.ppLblFormatDefault.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ppLblFormatDefault.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.ppLblFormatDefault.Location = new System.Drawing.Point(10, 39); - this.ppLblFormatDefault.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.ppLblFormatDefault.Location = new System.Drawing.Point(13, 48); this.ppLblFormatDefault.Name = "ppLblFormatDefault"; - this.ppLblFormatDefault.Size = new System.Drawing.Size(45, 13); + this.ppLblFormatDefault.Size = new System.Drawing.Size(61, 17); this.superTooltip1.SetSuperTooltip(this.ppLblFormatDefault, new DevComponents.DotNetBar.SuperTooltipInfo("This is the default Format setting", "", "Pressing the Default Button (to the right)\r\nwill set the format setting back to t" + "his.\r\n", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(260, 70))); this.ppLblFormatDefault.TabIndex = 43; @@ -286,10 +281,10 @@ namespace VEPROMS this.ppCmbxCheckoffHeading.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.ppCmbxCheckoffHeading.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.ppCmbxCheckoffHeading.FormattingEnabled = true; - this.ppCmbxCheckoffHeading.Location = new System.Drawing.Point(9, 70); - this.ppCmbxCheckoffHeading.Margin = new System.Windows.Forms.Padding(2); + this.ppCmbxCheckoffHeading.Location = new System.Drawing.Point(12, 86); + this.ppCmbxCheckoffHeading.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCmbxCheckoffHeading.Name = "ppCmbxCheckoffHeading"; - this.ppCmbxCheckoffHeading.Size = new System.Drawing.Size(191, 21); + this.ppCmbxCheckoffHeading.Size = new System.Drawing.Size(253, 23); this.superTooltip1.SetSuperTooltip(this.ppCmbxCheckoffHeading, new DevComponents.DotNetBar.SuperTooltipInfo("Signoff / Checkoff Heading", "", "Places a column heading for the signoff/checkoff.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.ppCmbxCheckoffHeading.TabIndex = 30; this.ppCmbxCheckoffHeading.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -302,10 +297,10 @@ namespace VEPROMS this.ppCmbxCheckoffType.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.ppCmbxCheckoffType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.ppCmbxCheckoffType.FormattingEnabled = true; - this.ppCmbxCheckoffType.Location = new System.Drawing.Point(9, 28); - this.ppCmbxCheckoffType.Margin = new System.Windows.Forms.Padding(2); + this.ppCmbxCheckoffType.Location = new System.Drawing.Point(12, 34); + this.ppCmbxCheckoffType.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCmbxCheckoffType.Name = "ppCmbxCheckoffType"; - this.ppCmbxCheckoffType.Size = new System.Drawing.Size(191, 21); + this.ppCmbxCheckoffType.Size = new System.Drawing.Size(253, 23); this.superTooltip1.SetSuperTooltip(this.ppCmbxCheckoffType, new DevComponents.DotNetBar.SuperTooltipInfo("Signoffs / Checkoffs Type", "", "This will automatically assign a signoff/checkoff as defined by the selected form" + "at.\r\n\r\nThis is considered a default and it can be overridden in the step editor." + "", null, null, DevComponents.DotNetBar.eTooltipColor.System)); @@ -317,10 +312,9 @@ namespace VEPROMS // this.lblCheckoffHeading.AutoSize = true; this.lblCheckoffHeading.BackColor = System.Drawing.Color.Transparent; - this.lblCheckoffHeading.Location = new System.Drawing.Point(2, 53); - this.lblCheckoffHeading.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblCheckoffHeading.Location = new System.Drawing.Point(3, 65); this.lblCheckoffHeading.Name = "lblCheckoffHeading"; - this.lblCheckoffHeading.Size = new System.Drawing.Size(47, 13); + this.lblCheckoffHeading.Size = new System.Drawing.Size(61, 17); this.lblCheckoffHeading.TabIndex = 4; this.lblCheckoffHeading.Text = "Heading"; // @@ -328,10 +322,9 @@ namespace VEPROMS // this.lblCheckoffType.AutoSize = true; this.lblCheckoffType.BackColor = System.Drawing.Color.Transparent; - this.lblCheckoffType.Location = new System.Drawing.Point(2, 5); - this.lblCheckoffType.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblCheckoffType.Location = new System.Drawing.Point(3, 6); this.lblCheckoffType.Name = "lblCheckoffType"; - this.lblCheckoffType.Size = new System.Drawing.Size(31, 13); + this.lblCheckoffType.Size = new System.Drawing.Size(40, 17); this.lblCheckoffType.TabIndex = 2; this.lblCheckoffType.Text = "Type"; // @@ -339,10 +332,9 @@ namespace VEPROMS // this.lblPagination.AutoSize = true; this.lblPagination.BackColor = System.Drawing.Color.Transparent; - this.lblPagination.Location = new System.Drawing.Point(18, 135); - this.lblPagination.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblPagination.Location = new System.Drawing.Point(24, 166); this.lblPagination.Name = "lblPagination"; - this.lblPagination.Size = new System.Drawing.Size(57, 13); + this.lblPagination.Size = new System.Drawing.Size(75, 17); this.lblPagination.TabIndex = 34; this.lblPagination.Text = "Pagination"; // @@ -350,10 +342,9 @@ namespace VEPROMS // this.lblSectType.AutoSize = true; this.lblSectType.BackColor = System.Drawing.Color.Transparent; - this.lblSectType.Location = new System.Drawing.Point(11, 89); - this.lblSectType.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblSectType.Location = new System.Drawing.Point(15, 110); this.lblSectType.Name = "lblSectType"; - this.lblSectType.Size = new System.Drawing.Size(70, 13); + this.lblSectType.Size = new System.Drawing.Size(91, 17); this.lblSectType.TabIndex = 32; this.lblSectType.Text = "Section Type"; // @@ -361,10 +352,9 @@ namespace VEPROMS // this.lblColumns.AutoSize = true; this.lblColumns.BackColor = System.Drawing.Color.Transparent; - this.lblColumns.Location = new System.Drawing.Point(26, 188); - this.lblColumns.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblColumns.Location = new System.Drawing.Point(35, 231); this.lblColumns.Name = "lblColumns"; - this.lblColumns.Size = new System.Drawing.Size(47, 13); + this.lblColumns.Size = new System.Drawing.Size(62, 17); this.lblColumns.TabIndex = 30; this.lblColumns.Text = "Columns"; // @@ -372,20 +362,19 @@ namespace VEPROMS // this.lblFormat.AutoSize = true; this.lblFormat.BackColor = System.Drawing.Color.Transparent; - this.lblFormat.Location = new System.Drawing.Point(19, 1); - this.lblFormat.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblFormat.Location = new System.Drawing.Point(25, 1); this.lblFormat.Name = "lblFormat"; - this.lblFormat.Size = new System.Drawing.Size(39, 13); + this.lblFormat.Size = new System.Drawing.Size(52, 17); this.lblFormat.TabIndex = 28; this.lblFormat.Text = "Format"; // // ppBtnCvrtToLibDoc // this.ppBtnCvrtToLibDoc.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ppBtnCvrtToLibDoc.Location = new System.Drawing.Point(16, 193); - this.ppBtnCvrtToLibDoc.Margin = new System.Windows.Forms.Padding(2); + this.ppBtnCvrtToLibDoc.Location = new System.Drawing.Point(21, 238); + this.ppBtnCvrtToLibDoc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnCvrtToLibDoc.Name = "ppBtnCvrtToLibDoc"; - this.ppBtnCvrtToLibDoc.Size = new System.Drawing.Size(209, 36); + this.ppBtnCvrtToLibDoc.Size = new System.Drawing.Size(279, 44); this.superTooltip1.SetSuperTooltip(this.ppBtnCvrtToLibDoc, new DevComponents.DotNetBar.SuperTooltipInfo("Convert To Library Document button", "", "This button will convert the current section to a library document, allowing it t" + "o be shared with other procedures.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, false, new System.Drawing.Size(250, 76))); this.ppBtnCvrtToLibDoc.TabIndex = 41; @@ -398,10 +387,10 @@ namespace VEPROMS this.ppCmbxLibDoc.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.ppCmbxLibDoc.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.ppCmbxLibDoc.FormattingEnabled = true; - this.ppCmbxLibDoc.Location = new System.Drawing.Point(18, 24); - this.ppCmbxLibDoc.Margin = new System.Windows.Forms.Padding(2); + this.ppCmbxLibDoc.Location = new System.Drawing.Point(24, 30); + this.ppCmbxLibDoc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCmbxLibDoc.Name = "ppCmbxLibDoc"; - this.ppCmbxLibDoc.Size = new System.Drawing.Size(428, 21); + this.ppCmbxLibDoc.Size = new System.Drawing.Size(569, 23); this.superTooltip1.SetSuperTooltip(this.ppCmbxLibDoc, new DevComponents.DotNetBar.SuperTooltipInfo("Link to Selected Library Document button", "", "This allows you to select a library document to reference for this section.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 76))); this.ppCmbxLibDoc.TabIndex = 40; this.ppCmbxLibDoc.WatermarkText = "no library document selected"; @@ -411,10 +400,9 @@ namespace VEPROMS // this.lblLibraryDocument.AutoSize = true; this.lblLibraryDocument.BackColor = System.Drawing.Color.Transparent; - this.lblLibraryDocument.Location = new System.Drawing.Point(16, 8); - this.lblLibraryDocument.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblLibraryDocument.Location = new System.Drawing.Point(21, 10); this.lblLibraryDocument.Name = "lblLibraryDocument"; - this.lblLibraryDocument.Size = new System.Drawing.Size(90, 13); + this.lblLibraryDocument.Size = new System.Drawing.Size(120, 17); this.lblLibraryDocument.TabIndex = 31; this.lblLibraryDocument.Text = "Library Document"; // @@ -426,10 +414,10 @@ namespace VEPROMS "Unit Two", "Unit Three", "Unit Four"}); - this.ppCkLstApplicabilityDesinations.Location = new System.Drawing.Point(20, 44); - this.ppCkLstApplicabilityDesinations.Margin = new System.Windows.Forms.Padding(2); + this.ppCkLstApplicabilityDesinations.Location = new System.Drawing.Point(27, 54); + this.ppCkLstApplicabilityDesinations.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCkLstApplicabilityDesinations.Name = "ppCkLstApplicabilityDesinations"; - this.ppCkLstApplicabilityDesinations.Size = new System.Drawing.Size(200, 34); + this.ppCkLstApplicabilityDesinations.Size = new System.Drawing.Size(265, 38); this.ppCkLstApplicabilityDesinations.TabIndex = 35; // // ppCbProcView @@ -437,10 +425,10 @@ namespace VEPROMS this.ppCbProcView.AutoSize = true; this.ppCbProcView.BackColor = System.Drawing.Color.Transparent; this.ppCbProcView.DataBindings.Add(new System.Windows.Forms.Binding("Checked", this.sectionConfigBindingSource, "Section_LnkEnh", true)); - this.ppCbProcView.Location = new System.Drawing.Point(23, 158); - this.ppCbProcView.Margin = new System.Windows.Forms.Padding(2); + this.ppCbProcView.Location = new System.Drawing.Point(31, 194); + this.ppCbProcView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCbProcView.Name = "ppCbProcView"; - this.ppCbProcView.Size = new System.Drawing.Size(150, 17); + this.ppCbProcView.Size = new System.Drawing.Size(193, 21); this.ppCbProcView.TabIndex = 36; this.ppCbProcView.Text = "Include in Procedure View"; this.ppCbProcView.UseVisualStyleBackColor = false; @@ -450,10 +438,9 @@ namespace VEPROMS this.label9.AutoSize = true; this.label9.BackColor = System.Drawing.Color.Transparent; this.label9.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label9.Location = new System.Drawing.Point(20, 24); - this.label9.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label9.Location = new System.Drawing.Point(27, 30); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(123, 13); + this.label9.Size = new System.Drawing.Size(164, 17); this.label9.TabIndex = 34; this.label9.Text = "Applicability Destinations"; // @@ -462,10 +449,10 @@ namespace VEPROMS this.ppCbDeviationView.AutoSize = true; this.ppCbDeviationView.BackColor = System.Drawing.Color.Transparent; this.ppCbDeviationView.DataBindings.Add(new System.Windows.Forms.Binding("Checked", this.sectionConfigBindingSource, "Section_LnkEnh", true)); - this.ppCbDeviationView.Location = new System.Drawing.Point(23, 202); - this.ppCbDeviationView.Margin = new System.Windows.Forms.Padding(2); + this.ppCbDeviationView.Location = new System.Drawing.Point(31, 249); + this.ppCbDeviationView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCbDeviationView.Name = "ppCbDeviationView"; - this.ppCbDeviationView.Size = new System.Drawing.Size(146, 17); + this.ppCbDeviationView.Size = new System.Drawing.Size(186, 21); this.ppCbDeviationView.TabIndex = 33; this.ppCbDeviationView.Text = "Include in Deviation View"; this.ppCbDeviationView.UseVisualStyleBackColor = false; @@ -475,10 +462,10 @@ namespace VEPROMS this.ppCbBackView.AutoSize = true; this.ppCbBackView.BackColor = System.Drawing.Color.Transparent; this.ppCbBackView.DataBindings.Add(new System.Windows.Forms.Binding("Checked", this.sectionConfigBindingSource, "Section_LnkEnh", true)); - this.ppCbBackView.Location = new System.Drawing.Point(23, 180); - this.ppCbBackView.Margin = new System.Windows.Forms.Padding(2); + this.ppCbBackView.Location = new System.Drawing.Point(31, 222); + this.ppCbBackView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCbBackView.Name = "ppCbBackView"; - this.ppCbBackView.Size = new System.Drawing.Size(159, 17); + this.ppCbBackView.Size = new System.Drawing.Size(203, 21); this.ppCbBackView.TabIndex = 32; this.ppCbBackView.Text = "Include in Background View"; this.ppCbBackView.UseVisualStyleBackColor = false; @@ -487,10 +474,10 @@ 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(624, 365); - this.ppBtnCancel.Margin = new System.Windows.Forms.Padding(2); + this.ppBtnCancel.Location = new System.Drawing.Point(811, 454); + this.ppBtnCancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnCancel.Name = "ppBtnCancel"; - this.ppBtnCancel.Size = new System.Drawing.Size(56, 21); + this.ppBtnCancel.Size = new System.Drawing.Size(75, 26); this.ppBtnCancel.TabIndex = 91; this.ppBtnCancel.Text = "Cancel"; this.ppBtnCancel.UseVisualStyleBackColor = true; @@ -499,10 +486,10 @@ 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(564, 366); - this.ppBtnOK.Margin = new System.Windows.Forms.Padding(2); + this.ppBtnOK.Location = new System.Drawing.Point(730, 454); + this.ppBtnOK.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnOK.Name = "ppBtnOK"; - this.ppBtnOK.Size = new System.Drawing.Size(56, 21); + this.ppBtnOK.Size = new System.Drawing.Size(75, 26); this.ppBtnOK.TabIndex = 90; this.ppBtnOK.Text = "OK"; this.ppBtnOK.UseVisualStyleBackColor = true; @@ -513,10 +500,9 @@ 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(12, 350); - this.ppLblDefSettingsInfo.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.ppLblDefSettingsInfo.Location = new System.Drawing.Point(12, 437); this.ppLblDefSettingsInfo.Name = "ppLblDefSettingsInfo"; - this.ppLblDefSettingsInfo.Size = new System.Drawing.Size(156, 13); + this.ppLblDefSettingsInfo.Size = new System.Drawing.Size(205, 17); this.ppLblDefSettingsInfo.TabIndex = 25; this.ppLblDefSettingsInfo.Text = "* Default values shown in italics"; // @@ -527,10 +513,10 @@ namespace VEPROMS // // this.ppCbShwDefSettings.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ppCbShwDefSettings.Location = new System.Drawing.Point(11, 372); - this.ppCbShwDefSettings.Margin = new System.Windows.Forms.Padding(2); + this.ppCbShwDefSettings.Location = new System.Drawing.Point(15, 487); + this.ppCbShwDefSettings.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCbShwDefSettings.Name = "ppCbShwDefSettings"; - this.ppCbShwDefSettings.Size = new System.Drawing.Size(145, 22); + this.ppCbShwDefSettings.Size = new System.Drawing.Size(193, 27); this.superTooltip1.SetSuperTooltip(this.ppCbShwDefSettings, new DevComponents.DotNetBar.SuperTooltipInfo("Show Default Settings", "", "When checked, the default (parent\'s) setting will appear below the overridden sel" + "ection.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.ppCbShwDefSettings.TabIndex = 92; @@ -553,7 +539,7 @@ namespace VEPROMS this.textBox1.AcceptsReturn = true; this.textBox1.Location = new System.Drawing.Point(113, 218); this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(154, 20); + this.textBox1.Size = new System.Drawing.Size(154, 22); this.textBox1.TabIndex = 12; // // label10 @@ -569,7 +555,7 @@ namespace VEPROMS // this.textBox2.Location = new System.Drawing.Point(113, 172); this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(202, 20); + this.textBox2.Size = new System.Drawing.Size(202, 22); this.textBox2.TabIndex = 5; // // label13 @@ -631,10 +617,10 @@ namespace VEPROMS this.ppCmbxNumColumns.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.ppCmbxNumColumns.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.ppCmbxNumColumns.FormattingEnabled = true; - this.ppCmbxNumColumns.Location = new System.Drawing.Point(77, 184); - this.ppCmbxNumColumns.Margin = new System.Windows.Forms.Padding(2); + this.ppCmbxNumColumns.Location = new System.Drawing.Point(103, 226); + this.ppCmbxNumColumns.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCmbxNumColumns.Name = "ppCmbxNumColumns"; - this.ppCmbxNumColumns.Size = new System.Drawing.Size(92, 21); + this.ppCmbxNumColumns.Size = new System.Drawing.Size(121, 23); this.superTooltip1.SetSuperTooltip(this.ppCmbxNumColumns, new DevComponents.DotNetBar.SuperTooltipInfo("Columns", "", "This is used only for procedure step editor sections.\r\n\r\nSelect the number of co" + "lumns for this section", null, null, DevComponents.DotNetBar.eTooltipColor.System, true, true, new System.Drawing.Size(175, 130))); this.ppCmbxNumColumns.TabIndex = 27; @@ -644,10 +630,10 @@ namespace VEPROMS // ppBtnDefaultPaginationStyle // this.ppBtnDefaultPaginationStyle.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ppBtnDefaultPaginationStyle.Location = new System.Drawing.Point(211, 135); - this.ppBtnDefaultPaginationStyle.Margin = new System.Windows.Forms.Padding(2); + this.ppBtnDefaultPaginationStyle.Location = new System.Drawing.Point(281, 166); + this.ppBtnDefaultPaginationStyle.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnDefaultPaginationStyle.Name = "ppBtnDefaultPaginationStyle"; - this.ppBtnDefaultPaginationStyle.Size = new System.Drawing.Size(38, 19); + this.ppBtnDefaultPaginationStyle.Size = new System.Drawing.Size(51, 23); this.superTooltip1.SetSuperTooltip(this.ppBtnDefaultPaginationStyle, new DevComponents.DotNetBar.SuperTooltipInfo("Default Button", "", "This will revert the format selection back to using the parent\'s format.\r\n\r\nCheck" + " \"Show Default Settings\" to display the \"default\" format name (below the format " + "selection box).", null, null, DevComponents.DotNetBar.eTooltipColor.System)); @@ -659,10 +645,10 @@ namespace VEPROMS // ppBtnDefaultNumColumns // this.ppBtnDefaultNumColumns.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ppBtnDefaultNumColumns.Location = new System.Drawing.Point(172, 184); - this.ppBtnDefaultNumColumns.Margin = new System.Windows.Forms.Padding(2); + this.ppBtnDefaultNumColumns.Location = new System.Drawing.Point(229, 226); + this.ppBtnDefaultNumColumns.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnDefaultNumColumns.Name = "ppBtnDefaultNumColumns"; - this.ppBtnDefaultNumColumns.Size = new System.Drawing.Size(38, 19); + this.ppBtnDefaultNumColumns.Size = new System.Drawing.Size(51, 23); this.superTooltip1.SetSuperTooltip(this.ppBtnDefaultNumColumns, new DevComponents.DotNetBar.SuperTooltipInfo("Default Button", "", "This will revert the format selection back to using the parent\'s format.\r\n\r\nCheck" + " \"Show Default Settings\" to display the \"default\" format name (below the format " + "selection box).", null, null, DevComponents.DotNetBar.eTooltipColor.System)); @@ -677,10 +663,9 @@ namespace VEPROMS this.ppLblDefPaginationStyle.BackColor = System.Drawing.Color.Transparent; this.ppLblDefPaginationStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ppLblDefPaginationStyle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.ppLblDefPaginationStyle.Location = new System.Drawing.Point(74, 155); - this.ppLblDefPaginationStyle.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.ppLblDefPaginationStyle.Location = new System.Drawing.Point(99, 191); this.ppLblDefPaginationStyle.Name = "ppLblDefPaginationStyle"; - this.ppLblDefPaginationStyle.Size = new System.Drawing.Size(45, 13); + this.ppLblDefPaginationStyle.Size = new System.Drawing.Size(61, 17); this.superTooltip1.SetSuperTooltip(this.ppLblDefPaginationStyle, new DevComponents.DotNetBar.SuperTooltipInfo("This is the default Format setting", "", "Pressing the Default Button (to the right)\r\nwill set the format setting back to t" + "his.\r\n", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(260, 70))); this.ppLblDefPaginationStyle.TabIndex = 57; @@ -692,15 +677,31 @@ namespace VEPROMS this.ppLblDefaultNumColumns.BackColor = System.Drawing.Color.Transparent; this.ppLblDefaultNumColumns.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ppLblDefaultNumColumns.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.ppLblDefaultNumColumns.Location = new System.Drawing.Point(75, 207); - this.ppLblDefaultNumColumns.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.ppLblDefaultNumColumns.Location = new System.Drawing.Point(100, 255); this.ppLblDefaultNumColumns.Name = "ppLblDefaultNumColumns"; - this.ppLblDefaultNumColumns.Size = new System.Drawing.Size(45, 13); + this.ppLblDefaultNumColumns.Size = new System.Drawing.Size(61, 17); this.superTooltip1.SetSuperTooltip(this.ppLblDefaultNumColumns, new DevComponents.DotNetBar.SuperTooltipInfo("This is the default Format setting", "", "Pressing the Default Button (to the right)\r\nwill set the format setting back to t" + "his.\r\n", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(260, 70))); this.ppLblDefaultNumColumns.TabIndex = 58; this.ppLblDefaultNumColumns.Text = "(default)"; // + // ppCbDefaultStepSection + // + 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(18, 324); + this.ppCbDefaultStepSection.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.ppCbDefaultStepSection.Name = "ppCbDefaultStepSection"; + this.ppCbDefaultStepSection.Size = new System.Drawing.Size(159, 21); + this.superTooltip1.SetSuperTooltip(this.ppCbDefaultStepSection, new DevComponents.DotNetBar.SuperTooltipInfo("Default Step Section", "", "Changing this can potentially affect the printed page numbers for step sections t" + + "hat are numbered with the \'Default Step Section.\'", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + this.ppCbDefaultStepSection.TabIndex = 60; + this.ppCbDefaultStepSection.Text = "Default Step Section"; + this.ppCbDefaultStepSection.UseVisualStyleBackColor = false; + this.ppCbDefaultStepSection.Visible = false; + this.ppCbDefaultStepSection.CheckedChanged += new System.EventHandler(this.ppCbDefaultStepSection_CheckedChanged); + // // panSectBtns // this.panSectBtns.BackColor = System.Drawing.Color.Transparent; @@ -708,10 +709,10 @@ namespace VEPROMS this.panSectBtns.Controls.Add(this.btnLibDocs); this.panSectBtns.Controls.Add(this.btnFormat); this.panSectBtns.Controls.Add(this.btnGeneral); - this.panSectBtns.Location = new System.Drawing.Point(10, 8); - this.panSectBtns.Margin = new System.Windows.Forms.Padding(2); + this.panSectBtns.Location = new System.Drawing.Point(13, 10); + this.panSectBtns.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panSectBtns.Name = "panSectBtns"; - this.panSectBtns.Size = new System.Drawing.Size(144, 340); + this.panSectBtns.Size = new System.Drawing.Size(192, 418); this.panSectBtns.TabIndex = 28; // // btnAutomation @@ -719,10 +720,10 @@ namespace VEPROMS this.btnAutomation.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnAutomation.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnAutomation.Dock = System.Windows.Forms.DockStyle.Top; - this.btnAutomation.Location = new System.Drawing.Point(0, 57); - this.btnAutomation.Margin = new System.Windows.Forms.Padding(2); + this.btnAutomation.Location = new System.Drawing.Point(0, 69); + this.btnAutomation.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnAutomation.Name = "btnAutomation"; - this.btnAutomation.Size = new System.Drawing.Size(144, 19); + this.btnAutomation.Size = new System.Drawing.Size(192, 23); this.btnAutomation.TabIndex = 96; this.btnAutomation.Text = "Automation"; this.btnAutomation.Click += new System.EventHandler(this.btnAutomation_Click); @@ -732,10 +733,10 @@ namespace VEPROMS this.btnLibDocs.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnLibDocs.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnLibDocs.Dock = System.Windows.Forms.DockStyle.Top; - this.btnLibDocs.Location = new System.Drawing.Point(0, 38); - this.btnLibDocs.Margin = new System.Windows.Forms.Padding(2); + this.btnLibDocs.Location = new System.Drawing.Point(0, 46); + this.btnLibDocs.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnLibDocs.Name = "btnLibDocs"; - this.btnLibDocs.Size = new System.Drawing.Size(144, 19); + this.btnLibDocs.Size = new System.Drawing.Size(192, 23); this.btnLibDocs.TabIndex = 95; this.btnLibDocs.Text = "Library Documents"; this.btnLibDocs.Click += new System.EventHandler(this.btnLibDocs_Click); @@ -745,10 +746,10 @@ namespace VEPROMS this.btnFormat.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnFormat.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnFormat.Dock = System.Windows.Forms.DockStyle.Top; - this.btnFormat.Location = new System.Drawing.Point(0, 19); - this.btnFormat.Margin = new System.Windows.Forms.Padding(2); + this.btnFormat.Location = new System.Drawing.Point(0, 23); + this.btnFormat.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnFormat.Name = "btnFormat"; - this.btnFormat.Size = new System.Drawing.Size(144, 19); + this.btnFormat.Size = new System.Drawing.Size(192, 23); this.btnFormat.TabIndex = 94; this.btnFormat.Text = "Format"; this.btnFormat.Click += new System.EventHandler(this.btnFormat_Click); @@ -759,9 +760,9 @@ namespace VEPROMS this.btnGeneral.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnGeneral.Dock = System.Windows.Forms.DockStyle.Top; this.btnGeneral.Location = new System.Drawing.Point(0, 0); - this.btnGeneral.Margin = new System.Windows.Forms.Padding(2); + this.btnGeneral.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnGeneral.Name = "btnGeneral"; - this.btnGeneral.Size = new System.Drawing.Size(144, 19); + this.btnGeneral.Size = new System.Drawing.Size(192, 23); this.btnGeneral.TabIndex = 93; this.btnGeneral.Text = "General"; this.btnGeneral.Click += new System.EventHandler(this.btnGeneral_Click); @@ -771,17 +772,17 @@ 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.tcpGeneral); this.tcSectionProp.Controls.Add(this.tcpFormat); + this.tcSectionProp.Controls.Add(this.tcpGeneral); this.tcSectionProp.Controls.Add(this.tcpLibDoc); this.tcSectionProp.Controls.Add(this.tcpAutomation); this.tcSectionProp.Controls.Add(this.tabControlPanel4); - this.tcSectionProp.Location = new System.Drawing.Point(164, 8); - this.tcSectionProp.Margin = new System.Windows.Forms.Padding(2); + this.tcSectionProp.Location = new System.Drawing.Point(221, 10); + this.tcSectionProp.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tcSectionProp.Name = "tcSectionProp"; this.tcSectionProp.SelectedTabFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold); this.tcSectionProp.SelectedTabIndex = 0; - this.tcSectionProp.Size = new System.Drawing.Size(521, 340); + this.tcSectionProp.Size = new System.Drawing.Size(695, 418); this.tcSectionProp.Style = DevComponents.DotNetBar.eTabStripStyle.Office2007Dock; this.tcSectionProp.TabIndex = 29; this.tcSectionProp.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox; @@ -806,11 +807,11 @@ namespace VEPROMS this.tcpGeneral.Controls.Add(this.lblUserID); this.tcpGeneral.Controls.Add(this.lblLastModDate); this.tcpGeneral.Dock = System.Windows.Forms.DockStyle.Fill; - this.tcpGeneral.Location = new System.Drawing.Point(0, 22); - this.tcpGeneral.Margin = new System.Windows.Forms.Padding(2); + this.tcpGeneral.Location = new System.Drawing.Point(0, 24); + this.tcpGeneral.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tcpGeneral.Name = "tcpGeneral"; this.tcpGeneral.Padding = new System.Windows.Forms.Padding(1); - this.tcpGeneral.Size = new System.Drawing.Size(521, 318); + this.tcpGeneral.Size = new System.Drawing.Size(695, 394); this.tcpGeneral.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); this.tcpGeneral.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); this.tcpGeneral.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -825,10 +826,10 @@ namespace VEPROMS // this.ppCbAutoIndent.AutoSize = true; this.ppCbAutoIndent.BackColor = System.Drawing.Color.Transparent; - this.ppCbAutoIndent.Location = new System.Drawing.Point(268, 180); - this.ppCbAutoIndent.Margin = new System.Windows.Forms.Padding(2); + this.ppCbAutoIndent.Location = new System.Drawing.Point(357, 222); + this.ppCbAutoIndent.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCbAutoIndent.Name = "ppCbAutoIndent"; - this.ppCbAutoIndent.Size = new System.Drawing.Size(106, 17); + this.ppCbAutoIndent.Size = new System.Drawing.Size(135, 21); this.ppCbAutoIndent.TabIndex = 56; this.ppCbAutoIndent.Text = "Automatic Indent"; this.ppCbAutoIndent.UseVisualStyleBackColor = false; @@ -838,10 +839,10 @@ namespace VEPROMS // this.ppCbEditableData.AutoSize = true; this.ppCbEditableData.BackColor = System.Drawing.Color.Transparent; - this.ppCbEditableData.Location = new System.Drawing.Point(268, 152); - this.ppCbEditableData.Margin = new System.Windows.Forms.Padding(2); + this.ppCbEditableData.Location = new System.Drawing.Point(357, 187); + this.ppCbEditableData.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCbEditableData.Name = "ppCbEditableData"; - this.ppCbEditableData.Size = new System.Drawing.Size(90, 17); + this.ppCbEditableData.Size = new System.Drawing.Size(115, 21); this.ppCbEditableData.TabIndex = 55; this.ppCbEditableData.Text = "Editable Data"; this.ppCbEditableData.UseVisualStyleBackColor = false; @@ -851,10 +852,10 @@ namespace VEPROMS // this.ppCbPrnSecNumTitle.AutoSize = true; this.ppCbPrnSecNumTitle.BackColor = System.Drawing.Color.Transparent; - this.ppCbPrnSecNumTitle.Location = new System.Drawing.Point(268, 121); - this.ppCbPrnSecNumTitle.Margin = new System.Windows.Forms.Padding(2); + this.ppCbPrnSecNumTitle.Location = new System.Drawing.Point(357, 149); + this.ppCbPrnSecNumTitle.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCbPrnSecNumTitle.Name = "ppCbPrnSecNumTitle"; - this.ppCbPrnSecNumTitle.Size = new System.Drawing.Size(170, 17); + this.ppCbPrnSecNumTitle.Size = new System.Drawing.Size(223, 21); this.ppCbPrnSecNumTitle.TabIndex = 54; this.ppCbPrnSecNumTitle.Text = "Print Section Number and Title"; this.ppCbPrnSecNumTitle.UseVisualStyleBackColor = false; @@ -876,9 +877,9 @@ namespace VEPROMS this.ppSectNumberStpRTB.FieldToEdit = Volian.Controls.Library.E_FieldToEdit.StepText; this.ppSectNumberStpRTB.FormatFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F); this.ppSectNumberStpRTB.LastRtf = ""; - this.ppSectNumberStpRTB.Location = new System.Drawing.Point(64, 10); - this.ppSectNumberStpRTB.Margin = new System.Windows.Forms.Padding(2); - this.ppSectNumberStpRTB.MinimumSize = new System.Drawing.Size(119, 15); + this.ppSectNumberStpRTB.Location = new System.Drawing.Point(85, 12); + this.ppSectNumberStpRTB.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.ppSectNumberStpRTB.MinimumSize = new System.Drawing.Size(159, 18); this.ppSectNumberStpRTB.MyClassName = "RichEdit20W"; this.ppSectNumberStpRTB.MyItemInfo = null; this.ppSectNumberStpRTB.MyLinkText = null; @@ -889,7 +890,7 @@ namespace VEPROMS this.ppSectNumberStpRTB.RTBRangeStatus = Volian.Controls.Library.StepRTB.RangeStatus.NoContainedLinks; this.ppSectNumberStpRTB.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.None; this.ppSectNumberStpRTB.ShowDebug = false; - this.ppSectNumberStpRTB.Size = new System.Drawing.Size(406, 15); + this.ppSectNumberStpRTB.Size = new System.Drawing.Size(541, 18); this.ppSectNumberStpRTB.TabIndex = 10; this.ppSectNumberStpRTB.Text = ""; this.ppSectNumberStpRTB.ThisContextMenuStrip = null; @@ -912,9 +913,9 @@ namespace VEPROMS this.ppSectTitleStpRTB.FieldToEdit = Volian.Controls.Library.E_FieldToEdit.StepText; this.ppSectTitleStpRTB.FormatFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F); this.ppSectTitleStpRTB.LastRtf = ""; - this.ppSectTitleStpRTB.Location = new System.Drawing.Point(64, 49); - this.ppSectTitleStpRTB.Margin = new System.Windows.Forms.Padding(2); - this.ppSectTitleStpRTB.MinimumSize = new System.Drawing.Size(406, 50); + this.ppSectTitleStpRTB.Location = new System.Drawing.Point(85, 60); + this.ppSectTitleStpRTB.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.ppSectTitleStpRTB.MinimumSize = new System.Drawing.Size(541, 62); this.ppSectTitleStpRTB.MyClassName = "RichEdit20W"; this.ppSectTitleStpRTB.MyItemInfo = null; this.ppSectTitleStpRTB.MyLinkText = null; @@ -925,7 +926,7 @@ namespace VEPROMS this.ppSectTitleStpRTB.RTBRangeStatus = Volian.Controls.Library.StepRTB.RangeStatus.NoContainedLinks; this.ppSectTitleStpRTB.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.None; this.ppSectTitleStpRTB.ShowDebug = false; - this.ppSectTitleStpRTB.Size = new System.Drawing.Size(406, 50); + this.ppSectTitleStpRTB.Size = new System.Drawing.Size(541, 62); this.ppSectTitleStpRTB.TabIndex = 11; this.ppSectTitleStpRTB.Text = ""; this.ppSectTitleStpRTB.ThisContextMenuStrip = null; @@ -940,6 +941,7 @@ namespace VEPROMS // // 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); @@ -959,11 +961,11 @@ namespace VEPROMS this.tcpFormat.Controls.Add(this.ppCmbxFormat); this.tcpFormat.Controls.Add(this.ppLblFormatDefault); 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.Location = new System.Drawing.Point(0, 24); + this.tcpFormat.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tcpFormat.Name = "tcpFormat"; this.tcpFormat.Padding = new System.Windows.Forms.Padding(1); - this.tcpFormat.Size = new System.Drawing.Size(521, 318); + this.tcpFormat.Size = new System.Drawing.Size(695, 394); 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; @@ -980,10 +982,10 @@ namespace VEPROMS 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, 289); - this.cbKeepWordDocMargins.Margin = new System.Windows.Forms.Padding(2); + this.cbKeepWordDocMargins.Location = new System.Drawing.Point(19, 359); + this.cbKeepWordDocMargins.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbKeepWordDocMargins.Name = "cbKeepWordDocMargins"; - this.cbKeepWordDocMargins.Size = new System.Drawing.Size(172, 17); + this.cbKeepWordDocMargins.Size = new System.Drawing.Size(223, 21); this.cbKeepWordDocMargins.TabIndex = 59; this.cbKeepWordDocMargins.Text = "Keep Word Document Margins"; this.cbKeepWordDocMargins.UseVisualStyleBackColor = false; @@ -999,10 +1001,10 @@ namespace VEPROMS 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.Location = new System.Drawing.Point(329, 74); + this.rbWordSect.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.rbWordSect.Name = "rbWordSect"; - this.rbWordSect.Size = new System.Drawing.Size(88, 19); + this.rbWordSect.Size = new System.Drawing.Size(117, 23); this.rbWordSect.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.rbWordSect.TabIndex = 23; this.rbWordSect.TabStop = false; @@ -1021,10 +1023,10 @@ namespace VEPROMS 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.Location = new System.Drawing.Point(184, 74); + this.rbStepSect.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.rbStepSect.Name = "rbStepSect"; - this.rbStepSect.Size = new System.Drawing.Size(86, 19); + this.rbStepSect.Size = new System.Drawing.Size(115, 23); this.rbStepSect.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.rbStepSect.TabIndex = 22; this.rbStepSect.TabStop = false; @@ -1040,10 +1042,10 @@ namespace VEPROMS this.ppGpbxSignoffCheckoff.Controls.Add(this.lblCheckoffType); this.ppGpbxSignoffCheckoff.Controls.Add(this.ppCmbxCheckoffType); this.ppGpbxSignoffCheckoff.Controls.Add(this.lblCheckoffHeading); - this.ppGpbxSignoffCheckoff.Location = new System.Drawing.Point(272, 123); - this.ppGpbxSignoffCheckoff.Margin = new System.Windows.Forms.Padding(2); + this.ppGpbxSignoffCheckoff.Location = new System.Drawing.Point(363, 151); + this.ppGpbxSignoffCheckoff.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppGpbxSignoffCheckoff.Name = "ppGpbxSignoffCheckoff"; - this.ppGpbxSignoffCheckoff.Size = new System.Drawing.Size(206, 117); + this.ppGpbxSignoffCheckoff.Size = new System.Drawing.Size(275, 144); // // // @@ -1087,11 +1089,11 @@ namespace VEPROMS this.tcpLibDoc.Controls.Add(this.lblLibraryDocument); this.tcpLibDoc.Controls.Add(this.ppCmbxLibDoc); this.tcpLibDoc.Dock = System.Windows.Forms.DockStyle.Fill; - this.tcpLibDoc.Location = new System.Drawing.Point(0, 22); - this.tcpLibDoc.Margin = new System.Windows.Forms.Padding(2); + this.tcpLibDoc.Location = new System.Drawing.Point(0, 24); + this.tcpLibDoc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tcpLibDoc.Name = "tcpLibDoc"; this.tcpLibDoc.Padding = new System.Windows.Forms.Padding(1); - this.tcpLibDoc.Size = new System.Drawing.Size(521, 318); + this.tcpLibDoc.Size = new System.Drawing.Size(695, 394); this.tcpLibDoc.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); this.tcpLibDoc.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); this.tcpLibDoc.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -1115,11 +1117,11 @@ namespace VEPROMS this.tcpAutomation.Controls.Add(this.ppCbPlaceKeeper); this.tcpAutomation.Controls.Add(this.ppCbIncTOC); this.tcpAutomation.Dock = System.Windows.Forms.DockStyle.Fill; - this.tcpAutomation.Location = new System.Drawing.Point(0, 22); - this.tcpAutomation.Margin = new System.Windows.Forms.Padding(2); + this.tcpAutomation.Location = new System.Drawing.Point(0, 24); + this.tcpAutomation.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tcpAutomation.Name = "tcpAutomation"; this.tcpAutomation.Padding = new System.Windows.Forms.Padding(1); - this.tcpAutomation.Size = new System.Drawing.Size(521, 318); + this.tcpAutomation.Size = new System.Drawing.Size(695, 394); this.tcpAutomation.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); this.tcpAutomation.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); this.tcpAutomation.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -1135,10 +1137,10 @@ namespace VEPROMS this.ppCbLinkWithEnhancedDoc.AutoSize = true; this.ppCbLinkWithEnhancedDoc.BackColor = System.Drawing.Color.Transparent; this.ppCbLinkWithEnhancedDoc.Enabled = false; - this.ppCbLinkWithEnhancedDoc.Location = new System.Drawing.Point(15, 20); - this.ppCbLinkWithEnhancedDoc.Margin = new System.Windows.Forms.Padding(2); + this.ppCbLinkWithEnhancedDoc.Location = new System.Drawing.Point(20, 25); + this.ppCbLinkWithEnhancedDoc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCbLinkWithEnhancedDoc.Name = "ppCbLinkWithEnhancedDoc"; - this.ppCbLinkWithEnhancedDoc.Size = new System.Drawing.Size(175, 17); + this.ppCbLinkWithEnhancedDoc.Size = new System.Drawing.Size(224, 21); this.ppCbLinkWithEnhancedDoc.TabIndex = 50; this.ppCbLinkWithEnhancedDoc.Text = "Link With Enhanced Document"; this.ppCbLinkWithEnhancedDoc.UseVisualStyleBackColor = false; @@ -1148,10 +1150,10 @@ namespace VEPROMS this.ppCbPhoneList.AutoSize = true; this.ppCbPhoneList.BackColor = System.Drawing.Color.Transparent; this.ppCbPhoneList.Enabled = false; - this.ppCbPhoneList.Location = new System.Drawing.Point(15, 81); - this.ppCbPhoneList.Margin = new System.Windows.Forms.Padding(2); + this.ppCbPhoneList.Location = new System.Drawing.Point(20, 100); + this.ppCbPhoneList.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCbPhoneList.Name = "ppCbPhoneList"; - this.ppCbPhoneList.Size = new System.Drawing.Size(140, 17); + this.ppCbPhoneList.Size = new System.Drawing.Size(184, 21); this.ppCbPhoneList.TabIndex = 52; this.ppCbPhoneList.Text = "Print Phone Number List"; this.ppCbPhoneList.UseVisualStyleBackColor = false; @@ -1162,10 +1164,10 @@ namespace VEPROMS this.ppCbPlaceKeeper.AutoSize = true; this.ppCbPlaceKeeper.BackColor = System.Drawing.Color.Transparent; this.ppCbPlaceKeeper.Enabled = false; - this.ppCbPlaceKeeper.Location = new System.Drawing.Point(15, 60); - this.ppCbPlaceKeeper.Margin = new System.Windows.Forms.Padding(2); + this.ppCbPlaceKeeper.Location = new System.Drawing.Point(20, 74); + this.ppCbPlaceKeeper.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCbPlaceKeeper.Name = "ppCbPlaceKeeper"; - this.ppCbPlaceKeeper.Size = new System.Drawing.Size(135, 17); + this.ppCbPlaceKeeper.Size = new System.Drawing.Size(173, 21); this.ppCbPlaceKeeper.TabIndex = 52; this.ppCbPlaceKeeper.Text = "Include in Placekeeper"; this.ppCbPlaceKeeper.UseVisualStyleBackColor = false; @@ -1176,10 +1178,10 @@ namespace VEPROMS this.ppCbIncTOC.AutoSize = true; this.ppCbIncTOC.BackColor = System.Drawing.Color.Transparent; this.ppCbIncTOC.Enabled = false; - this.ppCbIncTOC.Location = new System.Drawing.Point(15, 40); - this.ppCbIncTOC.Margin = new System.Windows.Forms.Padding(2); + this.ppCbIncTOC.Location = new System.Drawing.Point(20, 49); + this.ppCbIncTOC.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCbIncTOC.Name = "ppCbIncTOC"; - this.ppCbIncTOC.Size = new System.Drawing.Size(165, 17); + this.ppCbIncTOC.Size = new System.Drawing.Size(214, 21); this.ppCbIncTOC.TabIndex = 51; this.ppCbIncTOC.Text = "Include on Table Of Contents"; this.ppCbIncTOC.UseVisualStyleBackColor = false; @@ -1199,11 +1201,11 @@ namespace VEPROMS this.tabControlPanel4.Controls.Add(this.ppCbBackView); this.tabControlPanel4.Controls.Add(this.ppCbDeviationView); this.tabControlPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControlPanel4.Location = new System.Drawing.Point(0, 22); - this.tabControlPanel4.Margin = new System.Windows.Forms.Padding(2); + this.tabControlPanel4.Location = new System.Drawing.Point(0, 24); + this.tabControlPanel4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tabControlPanel4.Name = "tabControlPanel4"; this.tabControlPanel4.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel4.Size = new System.Drawing.Size(521, 318); + this.tabControlPanel4.Size = new System.Drawing.Size(695, 394); this.tabControlPanel4.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); this.tabControlPanel4.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); this.tabControlPanel4.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -1220,18 +1222,6 @@ namespace VEPROMS this.tiViewStnns.Name = "tiViewStnns"; this.tiViewStnns.Text = "View Settings"; // - // label1 - // - this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label1.AutoSize = true; - this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.Location = new System.Drawing.Point(12, 351); - this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(156, 13); - this.label1.TabIndex = 25; - this.label1.Text = "* Default values shown in italics"; - // // checkBoxX1 // this.checkBoxX1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); @@ -1239,31 +1229,31 @@ namespace VEPROMS // // this.checkBoxX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.checkBoxX1.Location = new System.Drawing.Point(10, 366); - this.checkBoxX1.Margin = new System.Windows.Forms.Padding(2); + this.checkBoxX1.Location = new System.Drawing.Point(15, 456); + this.checkBoxX1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.checkBoxX1.Name = "checkBoxX1"; - this.checkBoxX1.Size = new System.Drawing.Size(145, 22); + this.checkBoxX1.Size = new System.Drawing.Size(193, 27); this.checkBoxX1.TabIndex = 92; this.checkBoxX1.Text = "Show Default Settings"; this.checkBoxX1.CheckedChanged += new System.EventHandler(this.tabpage_Enter); // // frmSectionProperties // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); 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(687, 389); + this.ClientSize = new System.Drawing.Size(897, 487); this.ControlBox = false; this.Controls.Add(this.tcSectionProp); this.Controls.Add(this.panSectBtns); this.Controls.Add(this.checkBoxX1); this.Controls.Add(this.ppCbShwDefSettings); - this.Controls.Add(this.label1); this.Controls.Add(this.ppLblDefSettingsInfo); this.Controls.Add(this.ppBtnCancel); this.Controls.Add(this.ppBtnOK); + this.DoubleBuffered = true; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; - this.Margin = new System.Windows.Forms.Padding(2); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "frmSectionProperties"; @@ -1372,7 +1362,7 @@ namespace VEPROMS private System.Windows.Forms.CheckBox ppCbAutoIndent; private System.Windows.Forms.CheckBox cbKeepWordDocMargins; private System.Windows.Forms.CheckBox ppCbPhoneList; - private System.Windows.Forms.Label label1; private DevComponents.DotNetBar.Controls.CheckBoxX checkBoxX1; + private System.Windows.Forms.CheckBox ppCbDefaultStepSection; } } \ No newline at end of file diff --git a/PROMS/VEPROMS User Interface/frmSectionProperties.cs b/PROMS/VEPROMS User Interface/frmSectionProperties.cs index 64b955e8..7a4ffa92 100644 --- a/PROMS/VEPROMS User Interface/frmSectionProperties.cs +++ b/PROMS/VEPROMS User Interface/frmSectionProperties.cs @@ -26,6 +26,7 @@ namespace VEPROMS private StepTabRibbon _MyStepTabRibbon; private bool _isStepSection = true; private bool _hasSectionCheckoffDefault = false; + private bool _isDefaultStepSection = false; public frmSectionProperties(SectionConfig sectionConfig) { @@ -117,6 +118,24 @@ namespace VEPROMS _DocumentToDelete = null; } mySection.Dispose(); + + // if this section is now the 'DefaultStepSection', clear all others (only 1 section can have + // this property set - it is used when printing page numbers with 'WithSteps' numbering sequence. + if (!_isDefaultStepSection && ppCbDefaultStepSection.Checked) + { + foreach (SectionInfo si in _SectionConfig.MySection.MySectionInfo.MyProcedure.Sections) + { + SectionConfig sc = si.MyConfig as SectionConfig; + if (si.ItemID != _SectionConfig.MySection.ItemID && sc!=null && sc.Section_OriginalSteps == "Y") + { + using (Section ssav = si.Get()) + { + ssav.SectionConfig.Section_OriginalSteps = "N"; + ssav.Save(); + } + } + } + } this.DialogResult = DialogResult.OK; this.Close(); } @@ -356,6 +375,25 @@ namespace VEPROMS ppCbPhoneList.Checked = _SectionConfig.Section_PhoneList == "Y"; } + // Handle Default Step Section. First, this checkbox is only visible if it is + // a step section & it is the highest level (top, right below procedures). + ppCbDefaultStepSection.Visible = false; + if (_isStepSection && _SectionConfig.MySection.MySectionInfo.MyParent.IsProcedure) + { + ppCbDefaultStepSection.Visible = true; + ppCbDefaultStepSection.Checked = _SectionConfig.Section_OriginalSteps == "Y"; + // Use checkbox text to clarify what is case for this section, i.e. is it already + // the default or can it be set. Note that this is used when printing of page numbers + // that use the 'WithSteps' numbering sequence. + if (_SectionConfig.Section_OriginalSteps == "Y") + { + ppCbDefaultStepSection.Text = "This is Default Step Section"; + _isDefaultStepSection = true; + } + else + ppCbDefaultStepSection.Text = "Make this the Default Step Section"; + } + _Initializing = false; } @@ -959,6 +997,31 @@ namespace VEPROMS _SectionConfig.Section_PhoneList = ppCbPhoneList.Checked ? "Y" : "N"; } + private void ppCbDefaultStepSection_CheckedChanged(object sender, EventArgs e) + { + if (!_Initializing) + { + if (!ppCbDefaultStepSection.Checked) + { + // 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; + } + else + { + // 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"; + } + } + } + //private void ppBtnDefaultPrintSize_Click(object sender, EventArgs e) //{ // // Get the parent setting diff --git a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs index 8e276916..204285f7 100644 --- a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs +++ b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs @@ -952,7 +952,7 @@ namespace Volian.Print.Library //} if (args.MyText.Contains("{SECONDARYPAGE}") || args.MyText.Contains("{SECONDARYOF}")) { - string key = "SecondaryPage." + MySection.ItemID; + string key = "SecondaryPage." + MySection.DisplayNumber; string txt = args.MyText.Replace("{SECONDARYPAGE}", "{PAGE}").Replace("{SECONDARYOF}", "{OF}"); MyPdfContentByte.AddTemplate(MyPageCounts.AddToTemplateList(key, MyPdfWriter, txt, args.MySvgText.Font, args.MySvgText.Align, args.MySvgText.FillColor), args.MySvgScale.X(args.MySvgText.X), args.MySvgScale.Y(MyPdfContentByte, args.MySvgText.Y)); return string.Empty;