diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs b/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs index 3cf2d05b..8ec86eb9 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs @@ -42,6 +42,7 @@ namespace VEPROMS this.txbRevDate = new DevComponents.DotNetBar.Controls.TextBoxX(); this.txbPDFLocation = new DevComponents.DotNetBar.Controls.TextBoxX(); this.cbxOpenAfterCreate2 = new System.Windows.Forms.CheckBox(); + this.docVersionConfigBindingSource = new System.Windows.Forms.BindingSource(this.components); this.cbxOverwritePDF2 = new System.Windows.Forms.CheckBox(); this.txbRevNum = new DevComponents.DotNetBar.Controls.TextBoxX(); this.lblReviewDate = new DevComponents.DotNetBar.LabelX(); @@ -79,6 +80,7 @@ namespace VEPROMS this.labelX2 = new DevComponents.DotNetBar.LabelX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); this.labelX4 = new DevComponents.DotNetBar.LabelX(); + this.btnMergePDFs = new DevComponents.DotNetBar.ButtonX(); this.cbxGenerateConActSum = new System.Windows.Forms.CheckBox(); this.ppGpbxUserSpecCB = new DevComponents.DotNetBar.Controls.GroupPanel(); this.lblCbTxtType = new System.Windows.Forms.Label(); @@ -95,16 +97,14 @@ namespace VEPROMS this.tbBlankPage = new DevComponents.DotNetBar.Controls.TextBoxX(); this.lblBlPg = new DevComponents.DotNetBar.LabelX(); this.swtbtnPDFdtPrefixSuffix = new DevComponents.DotNetBar.Controls.SwitchButton(); - this.docVersionConfigBindingSource = new System.Windows.Forms.BindingSource(this.components); - this.btnMergePDFs = new DevComponents.DotNetBar.ButtonX(); this.gpnlDebug.SuspendLayout(); this.grpDateSelector.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.docVersionConfigBindingSource)).BeginInit(); this.ppGpbxUserSpecTxt.SuspendLayout(); this.ppGpbxUserSpecCB.SuspendLayout(); this.panelEx2.SuspendLayout(); this.expPrnSetting.SuspendLayout(); this.ppGpDuplex.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.docVersionConfigBindingSource)).BeginInit(); this.SuspendLayout(); // // btnPdfLocation @@ -285,7 +285,7 @@ namespace VEPROMS this.calDateSelector.NavigationBackgroundStyle.BackColorGradientAngle = 90; this.calDateSelector.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; this.calDateSelector.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.calDateSelector.Size = new System.Drawing.Size(170, 131); + this.calDateSelector.Size = new System.Drawing.Size(226, 156); this.superTooltip1.SetSuperTooltip(this.calDateSelector, new DevComponents.DotNetBar.SuperTooltipInfo("Calandar", "", "Use the arrows to change the month and year.\r\n\r\nSelect the day.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(110, 100))); this.calDateSelector.TabIndex = 84; this.calDateSelector.Text = "monthCalendarAdv1"; @@ -374,6 +374,10 @@ namespace VEPROMS this.cbxOpenAfterCreate2.Text = "View PDF After Create"; this.cbxOpenAfterCreate2.UseVisualStyleBackColor = false; // + // docVersionConfigBindingSource + // + this.docVersionConfigBindingSource.DataSource = typeof(VEPROMS.CSLA.Library.DocVersionConfig); + // // cbxOverwritePDF2 // this.cbxOverwritePDF2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -914,6 +918,22 @@ namespace VEPROMS this.labelX4.TabIndex = 112; this.labelX4.Text = "Add Date/Time to PDF File Name"; // + // btnMergePDFs + // + this.btnMergePDFs.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnMergePDFs.BackColor = System.Drawing.SystemColors.Control; + this.btnMergePDFs.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnMergePDFs.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnMergePDFs.Location = new System.Drawing.Point(216, 505); + this.btnMergePDFs.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.btnMergePDFs.Name = "btnMergePDFs"; + this.btnMergePDFs.Size = new System.Drawing.Size(177, 46); + this.btnMergePDFs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.superTooltip1.SetSuperTooltip(this.btnMergePDFs, new DevComponents.DotNetBar.SuperTooltipInfo("Create PDF", "", "Generate a PDF of the selected procedure.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + this.btnMergePDFs.TabIndex = 110; + this.btnMergePDFs.Text = "Merge PDFs"; + this.btnMergePDFs.Click += new System.EventHandler(this.btnMergePDFs_Click); + // // cbxGenerateConActSum // this.cbxGenerateConActSum.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -1248,7 +1268,7 @@ namespace VEPROMS // this.ppGpDuplex.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ppGpDuplex.TabIndex = 115; - this.ppGpDuplex.Text = "Duplex Printing"; + this.ppGpDuplex.Text = "Foldouts or Supplemental Information Duplex Printing"; // // tbBlankPage // @@ -1294,26 +1314,6 @@ namespace VEPROMS this.swtbtnPDFdtPrefixSuffix.TabIndex = 111; this.swtbtnPDFdtPrefixSuffix.ValueChanged += new System.EventHandler(this.swtbtnPDFdtPrefixSuffix_ValueChanged); // - // docVersionConfigBindingSource - // - this.docVersionConfigBindingSource.DataSource = typeof(VEPROMS.CSLA.Library.DocVersionConfig); - // - // btnMergePDFs - // - this.btnMergePDFs.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnMergePDFs.BackColor = System.Drawing.SystemColors.Control; - this.btnMergePDFs.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnMergePDFs.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnMergePDFs.Location = new System.Drawing.Point(216, 505); - this.btnMergePDFs.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.btnMergePDFs.Name = "btnMergePDFs"; - this.btnMergePDFs.Size = new System.Drawing.Size(177, 46); - this.btnMergePDFs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.superTooltip1.SetSuperTooltip(this.btnMergePDFs, new DevComponents.DotNetBar.SuperTooltipInfo("Create PDF", "", "Generate a PDF of the selected procedure.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); - this.btnMergePDFs.TabIndex = 110; - this.btnMergePDFs.Text = "Merge PDFs"; - this.btnMergePDFs.Click += new System.EventHandler(this.btnMergePDFs_Click); - // // DlgPrintProcedure // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); @@ -1337,6 +1337,7 @@ namespace VEPROMS this.gpnlDebug.PerformLayout(); this.grpDateSelector.ResumeLayout(false); this.grpDateSelector.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.docVersionConfigBindingSource)).EndInit(); this.ppGpbxUserSpecTxt.ResumeLayout(false); this.ppGpbxUserSpecTxt.PerformLayout(); this.ppGpbxUserSpecCB.ResumeLayout(false); @@ -1345,7 +1346,6 @@ namespace VEPROMS this.panelEx2.PerformLayout(); this.expPrnSetting.ResumeLayout(false); this.ppGpDuplex.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.docVersionConfigBindingSource)).EndInit(); this.ResumeLayout(false); } diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.resx b/PROMS/VEPROMS User Interface/DlgPrintProcedure.resx index 41c2c212..2121c75c 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.resx +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.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 - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 @@ -131,7 +131,7 @@ QmCC - + 549, 17 @@ -155,7 +155,7 @@ The value entered here will be saved and displayed the next time this procedure A different location can be entered (or navigated to via the button to the right), but will be only for this session. - + 321, 17 @@ -163,7 +163,7 @@ A different location can be entered (or navigated to via the button to the right The value entered here will be saved and displayed the next time this procedure is printed. - + 153, 17 @@ -183,7 +183,7 @@ If you find that manual page breaks and/or hard returns are needed for an accept Note that the Add Prefix / Suffix to PDF File Name option will not be available. - + 40 diff --git a/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs b/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs index 80160f61..8515495c 100644 --- a/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs +++ b/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs @@ -258,7 +258,7 @@ namespace VEPROMS { expAddProcConChk.Enabled = false; MessageBox.Show("This procedure set has two or more procedures with the same procedure number.\n\n" + - "The Procedure List panel had be disabled.\n\n" + + "The Procedure List panel has been disabled.\n\n" + "A Consistency Check cannot be done and the list of procedures in the set cannot be displayed.", "Approve Procedure",MessageBoxButtons.OK,MessageBoxIcon.Warning); } _initializing = false;